mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: app.runningUnderARM64Translation() always returning true on Windows ARM64 (#39920)

Browse source 
fix: app.runningUnderARM64Translation() always returning true on ARM64
This commit is contained in:
Milan Burda 2023-09-20 22:15:19 +02:00 committed by GitHub
parent 1766511e34
commit 6a8b70639b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/api/electron_api_app.cc
View file

@ -19,6 +19,7 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "base/system/sys_info.h" #include "base/system/sys_info.h"
#include "base/values.h" #include "base/values.h"
#include "base/win/windows_version.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/icon_manager.h" #include "chrome/browser/icon_manager.h"
#include "chrome/common/chrome_features.h" #include "chrome/common/chrome_features.h"
@ -1475,23 +1476,8 @@ void App::SetUserAgentFallback(const std::string& user_agent) {
} }
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
bool App::IsRunningUnderARM64Translation() const { bool App::IsRunningUnderARM64Translation() const {
USHORT processMachine = 0; return base::win::OSInfo::IsRunningEmulatedOnArm64();
USHORT nativeMachine = 0;
auto IsWow64Process2 = reinterpret_cast<decltype(&::IsWow64Process2)>(
GetProcAddress(GetModuleHandle(L"kernel32.dll"), "IsWow64Process2"));
if (IsWow64Process2 == nullptr) {
return false;
}
if (!IsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine)) {
return false;
}
return nativeMachine == IMAGE_FILE_MACHINE_ARM64;
} }
#endif #endif