Get system arch using 'GetNativeSystemInfo'

2022-02-04 12:50:05 +08:00
parent 2b21f5f48f
commit 98e0a92745
3 changed files with 7 additions and 35 deletions
--- a/HMCLauncher/HMCL/main.cpp
+++ b/HMCLauncher/HMCL/main.cpp
@@ -48,11 +48,14 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,

  // TODO: check whether the bundled JRE is valid.
  // First try the Java packaged together.
-  bool is64Bit = false;
-  GetArch(is64Bit);  // if failed to determine architecture of operating system,
-                     // consider 32-bit.
+  bool isX64 = false;

-  if (is64Bit) {
+  SYSTEM_INFO systemInfo;
+  GetNativeSystemInfo(&systemInfo);
+
+  isX64 = (systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64);
+
+  if (isX64) {
    RawLaunchJVM(L"jre-x64\\bin\\javaw.exe", workdir, exeName);
  } else {
    RawLaunchJVM(L"jre-x86\\bin\\javaw.exe", workdir, exeName);