diff --git a/Source/Windows/ARM64EC/Module.cpp b/Source/Windows/ARM64EC/Module.cpp index 075cf9e32..bc085b92d 100644 --- a/Source/Windows/ARM64EC/Module.cpp +++ b/Source/Windows/ARM64EC/Module.cpp @@ -543,7 +543,7 @@ NTSTATUS ProcessInit() { Exception::HandlerConfig.emplace(); const auto NtDll = GetModuleHandle("ntdll.dll"); - const bool IsWine = !!GetProcAddress(NtDll, "__wine_get_version"); + const bool IsWine = !!GetProcAddress(NtDll, "wine_get_version"); OvercommitTracker.emplace(IsWine); { diff --git a/Source/Windows/Common/OvercommitTracker.h b/Source/Windows/Common/OvercommitTracker.h index 63a707cd6..797c4c748 100644 --- a/Source/Windows/Common/OvercommitTracker.h +++ b/Source/Windows/Common/OvercommitTracker.h @@ -38,7 +38,7 @@ public: if (IsWine) { MEMORY_BASIC_INFORMATION Info; NtQueryVirtualMemory(NtCurrentProcess(), reinterpret_cast(FaultAddress), MemoryBasicInformation, &Info, sizeof(Info), nullptr); - const auto CommitSize = reinterpret_cast(Info.BaseAddress) + Info.RegionSize - FaultAddress; + const auto CommitSize = reinterpret_cast(Info.BaseAddress) + Info.RegionSize - reinterpret_cast(Info.AllocationBase); VirtualAlloc(reinterpret_cast(Info.AllocationBase), CommitSize, MEM_COMMIT, PAGE_READWRITE); } else { static constexpr size_t MaxFaultCommitSize = 1024 * 64; diff --git a/Source/Windows/WOW64/Module.cpp b/Source/Windows/WOW64/Module.cpp index c2a3ca3cc..8a6e55228 100644 --- a/Source/Windows/WOW64/Module.cpp +++ b/Source/Windows/WOW64/Module.cpp @@ -466,7 +466,7 @@ void BTCpuProcessInit() { SyscallHandler = fextl::make_unique(); Context::HandlerConfig.emplace(); const auto NtDll = GetModuleHandle("ntdll.dll"); - const bool IsWine = !!GetProcAddress(NtDll, "__wine_get_version"); + const bool IsWine = !!GetProcAddress(NtDll, "wine_get_version"); OvercommitTracker.emplace(IsWine); {