mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 21:30:19 -06:00
exchange XSaveWorkaround (which was fixed in VS2015) for ucrtFreadWorkaround (which was broken in VS2015).
This commit is contained in:
85
Source/Core/Common/ucrtFreadWorkaround.cpp
Normal file
85
Source/Core/Common/ucrtFreadWorkaround.cpp
Normal file
@ -0,0 +1,85 @@
|
||||
// Copyright 2014 Dolphin Emulator Project
|
||||
// Licensed under GPLv2+
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
#include "CommonTypes.h"
|
||||
#include <Windows.h>
|
||||
|
||||
struct PatchInfo {
|
||||
const wchar_t *module_name;
|
||||
u32 checksum;
|
||||
u32 rva;
|
||||
u32 length;
|
||||
} static const s_patches[] = {
|
||||
{ L"ucrtbase.dll", 0xF61ED, 0x6AE7B, 5 },
|
||||
{ L"ucrtbased.dll", 0x1C1915 , 0x91905, 5 },
|
||||
};
|
||||
|
||||
bool ApplyPatch(const PatchInfo &patch) {
|
||||
auto module = GetModuleHandleW(patch.module_name);
|
||||
if (module == nullptr)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
auto ucrtbase_pe = (PIMAGE_NT_HEADERS)((uintptr_t)module + ((PIMAGE_DOS_HEADER)module)->e_lfanew);
|
||||
if (ucrtbase_pe->OptionalHeader.CheckSum != patch.checksum) {
|
||||
return false;
|
||||
}
|
||||
|
||||
void *patch_addr = (void *)((uintptr_t)module + patch.rva);
|
||||
size_t patch_size = patch.length;
|
||||
|
||||
DWORD old_protect;
|
||||
if (!VirtualProtect(patch_addr, patch_size, PAGE_EXECUTE_READWRITE, &old_protect))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
memset(patch_addr, 0x90, patch_size);
|
||||
|
||||
VirtualProtect(patch_addr, patch_size, old_protect, &old_protect);
|
||||
|
||||
FlushInstructionCache(GetCurrentProcess(), patch_addr, patch_size);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int __cdecl EnableucrtFreadWorkaround()
|
||||
{
|
||||
// This patches ucrtbase such that fseek will always
|
||||
// synchronize the file object's internal buffer.
|
||||
|
||||
bool applied_at_least_one = false;
|
||||
for (const auto &patch : s_patches) {
|
||||
if (ApplyPatch(patch)) {
|
||||
applied_at_least_one = true;
|
||||
}
|
||||
}
|
||||
|
||||
/* For forward compat, do not fail if patches don't apply (e.g. version mismatch)
|
||||
if (!applied_at_least_one) {
|
||||
std::abort();
|
||||
}
|
||||
//*/
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Create a segment which is recognized by the linker to be part of the CRT
|
||||
// initialization. XI* = C startup, XC* = C++ startup. "A" placement is reserved
|
||||
// for system use. Thus, the earliest we can get is XIB (C startup is before
|
||||
// C++).
|
||||
#pragma section(".CRT$XIB", read)
|
||||
|
||||
// Place a symbol in the special segment, make it have C linkage so that
|
||||
// referencing it doesn't require ugly decorated names.
|
||||
// Use /include:EnableucrtFreadWorkaround linker flag to enable this.
|
||||
extern "C" {
|
||||
__declspec(allocate(".CRT$XIB"))
|
||||
decltype(&EnableucrtFreadWorkaround) ucrtFreadWorkaround = EnableucrtFreadWorkaround;
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user