Skip to content

Commit

Permalink
fix: app.runningUnderARM64Translation() always returning true on Wi…
Browse files Browse the repository at this point in the history
…ndows ARM64 (#39930)

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

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
  • Loading branch information
trop[bot] and miniak authored Sep 21, 2023
1 parent 67b2739 commit e42169b
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions shell/browser/api/electron_api_app.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "base/path_service.h"
#include "base/system/sys_info.h"
#include "base/values.h"
#include "base/win/windows_version.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/icon_manager.h"
#include "chrome/common/chrome_features.h"
Expand Down Expand Up @@ -1519,23 +1520,8 @@ void App::SetUserAgentFallback(const std::string& user_agent) {
}

#if BUILDFLAG(IS_WIN)

bool App::IsRunningUnderARM64Translation() const {
USHORT processMachine = 0;
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;
return base::win::OSInfo::IsRunningEmulatedOnArm64();
}
#endif

Expand Down

0 comments on commit e42169b

Please sign in to comment.