ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemArena: Use Common::DynamicLibrary for m_api_ms_win_core_memory_l1_1_6_handle.

This commit is contained in:
Admiral H. Curtiss 2022-02-14 21:49:22 +01:00
parent 7c91acb000
commit 3a4de2b306
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/MemArena.h
View File

@ -7,6 +7,7 @@
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/DynamicLibrary.h"
namespace Common namespace Common
{ {
@ -106,7 +107,7 @@ private:
std::vector<WindowsMemoryRegion> m_regions; std::vector<WindowsMemoryRegion> m_regions;
void* m_reserved_region = nullptr; void* m_reserved_region = nullptr;
void* m_memory_handle = nullptr; void* m_memory_handle = nullptr;
void* m_api_ms_win_core_memory_l1_1_6_handle = nullptr; Common::DynamicLibrary m_api_ms_win_core_memory_l1_1_6_handle;
void* m_address_VirtualAlloc2 = nullptr; void* m_address_VirtualAlloc2 = nullptr;
void* m_address_MapViewOfFile3 = nullptr; void* m_address_MapViewOfFile3 = nullptr;
#else #else

23
Source/Core/Common/MemArenaWin.cpp
View File

@ -61,22 +61,23 @@ MemArena::MemArena()
if (!static_cast<PIsApiSetImplemented>(ptr_IsApiSetImplemented)("api-ms-win-core-memory-l1-1-6")) if (!static_cast<PIsApiSetImplemented>(ptr_IsApiSetImplemented)("api-ms-win-core-memory-l1-1-6"))
return; return;
const HMODULE handle = LoadLibraryW(L"api-ms-win-core-memory-l1-1-6.dll"); m_api_ms_win_core_memory_l1_1_6_handle.Open("api-ms-win-core-memory-l1-1-6.dll");
if (!handle) if (!m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
return; return;
void* const address_VirtualAlloc2 = GetProcAddress(handle, "VirtualAlloc2FromApp"); void* const address_VirtualAlloc2 =
void* const address_MapViewOfFile3 = GetProcAddress(handle, "MapViewOfFile3FromApp"); m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("VirtualAlloc2FromApp");
void* const address_MapViewOfFile3 =
m_api_ms_win_core_memory_l1_1_6_handle.GetSymbolAddress("MapViewOfFile3FromApp");
if (address_VirtualAlloc2 && address_MapViewOfFile3) if (address_VirtualAlloc2 && address_MapViewOfFile3)
{ {
m_api_ms_win_core_memory_l1_1_6_handle = handle;
m_address_VirtualAlloc2 = address_VirtualAlloc2; m_address_VirtualAlloc2 = address_VirtualAlloc2;
m_address_MapViewOfFile3 = address_MapViewOfFile3; m_address_MapViewOfFile3 = address_MapViewOfFile3;
} }
else else
{ {
// at least one function is not available, use legacy logic // at least one function is not available, use legacy logic
FreeLibrary(handle); m_api_ms_win_core_memory_l1_1_6_handle.Close();
} }
} }
@ -84,8 +85,6 @@ MemArena::~MemArena()
{ {
ReleaseMemoryRegion(); ReleaseMemoryRegion();
ReleaseSHMSegment(); ReleaseSHMSegment();
if (m_api_ms_win_core_memory_l1_1_6_handle)
FreeLibrary(static_cast<HMODULE>(m_api_ms_win_core_memory_l1_1_6_handle));
} }
void MemArena::GrabSHMSegment(size_t size) void MemArena::GrabSHMSegment(size_t size)
@ -123,7 +122,7 @@ u8* MemArena::ReserveMemoryRegion(size_t memory_size)
} }
u8* base; u8* base;
if (m_api_ms_win_core_memory_l1_1_6_handle) if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{ {
base = static_cast<u8*>(static_cast<PVirtualAlloc2>(m_address_VirtualAlloc2)( base = static_cast<u8*>(static_cast<PVirtualAlloc2>(m_address_VirtualAlloc2)(
nullptr, nullptr, memory_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, nullptr, memory_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS,
@ -154,7 +153,7 @@ u8* MemArena::ReserveMemoryRegion(size_t memory_size)
void MemArena::ReleaseMemoryRegion() void MemArena::ReleaseMemoryRegion()
{ {
if (m_api_ms_win_core_memory_l1_1_6_handle && m_reserved_region) if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen() && m_reserved_region)
{ {
// user should have unmapped everything by this point, check if that's true and yell if not // user should have unmapped everything by this point, check if that's true and yell if not
// (it indicates a bug in the emulated memory mapping logic) // (it indicates a bug in the emulated memory mapping logic)
@ -291,7 +290,7 @@ WindowsMemoryRegion* MemArena::EnsureSplitRegionForMapping(void* start_address,
void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base) void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
{ {
if (m_api_ms_win_core_memory_l1_1_6_handle) if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{ {
WindowsMemoryRegion* const region = EnsureSplitRegionForMapping(base, size); WindowsMemoryRegion* const region = EnsureSplitRegionForMapping(base, size);
if (!region) if (!region)
@ -393,7 +392,7 @@ bool MemArena::JoinRegionsAfterUnmap(void* start_address, size_t size)
void MemArena::UnmapFromMemoryRegion(void* view, size_t size) void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
{ {
if (m_api_ms_win_core_memory_l1_1_6_handle) if (m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
{ {
if (UnmapViewOfFileEx(view, MEM_PRESERVE_PLACEHOLDER)) if (UnmapViewOfFileEx(view, MEM_PRESERVE_PLACEHOLDER))
{ {