From 743564bc29f9fbee6e96ecd254769256b539f57c Mon Sep 17 00:00:00 2001 From: GameParrot <85067619+GameParrot@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:17:13 -0400 Subject: [PATCH 1/3] macOS: stub cpuinfo symbols --- src/minecraft_utils.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/minecraft_utils.cpp b/src/minecraft_utils.cpp index 871784b..02d2c3e 100644 --- a/src/minecraft_utils.cpp +++ b/src/minecraft_utils.cpp @@ -180,7 +180,10 @@ void* MinecraftUtils::loadMinecraftLib(void *showMousePointerCallback, void *hid // Shadowing it, avoids allways defining OPENSSL_armcap=0 hooks.emplace_back(mcpelauncher_hook_t{ "OPENSSL_cpuid_setup", (void*) + []() -> void {} }); #endif - +#ifdef __APPLE__ + hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_packages_count", (void*) + []() -> void {} }); + hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_package", (void*) + []() -> void {} }); +#endif for (auto&& e : preinitHooks) { hooks.emplace_back(mcpelauncher_hook_t{ e.first.data(), e.second.value}); } From e57a6283bfdd331d0be7bf4ea704d9d19997ae21 Mon Sep 17 00:00:00 2001 From: GameParrot <85067619+GameParrot@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:44:17 -0400 Subject: [PATCH 2/3] Update minecraft_utils.cpp --- src/minecraft_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/minecraft_utils.cpp b/src/minecraft_utils.cpp index 02d2c3e..a20655d 100644 --- a/src/minecraft_utils.cpp +++ b/src/minecraft_utils.cpp @@ -181,7 +181,7 @@ void* MinecraftUtils::loadMinecraftLib(void *showMousePointerCallback, void *hid hooks.emplace_back(mcpelauncher_hook_t{ "OPENSSL_cpuid_setup", (void*) + []() -> void {} }); #endif #ifdef __APPLE__ - hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_packages_count", (void*) + []() -> void {} }); + hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_packages_count", (void*) + []() -> uint32_t {return 1;} }); hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_package", (void*) + []() -> void {} }); #endif for (auto&& e : preinitHooks) { From 2655751e31ca6b1f46216d4344c00f6a40775be0 Mon Sep 17 00:00:00 2001 From: GameParrot <85067619+GameParrot@users.noreply.github.com> Date: Thu, 13 Jul 2023 17:46:29 -0400 Subject: [PATCH 3/3] fix --- src/minecraft_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/minecraft_utils.cpp b/src/minecraft_utils.cpp index a20655d..b224b1d 100644 --- a/src/minecraft_utils.cpp +++ b/src/minecraft_utils.cpp @@ -181,7 +181,7 @@ void* MinecraftUtils::loadMinecraftLib(void *showMousePointerCallback, void *hid hooks.emplace_back(mcpelauncher_hook_t{ "OPENSSL_cpuid_setup", (void*) + []() -> void {} }); #endif #ifdef __APPLE__ - hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_packages_count", (void*) + []() -> uint32_t {return 1;} }); + hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_packages_count", (void*) + []() -> uint32_t {return 0;} }); hooks.emplace_back(mcpelauncher_hook_t{ "cpuinfo_get_package", (void*) + []() -> void {} }); #endif for (auto&& e : preinitHooks) {