backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d9] Cleanup and formatting for window proc hook

Browse Source
This commit is contained in:
Joshua Ashton 2020-04-06 19:42:48 +01:00
parent 47ddd8466a
commit 135d246610
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/d3d9/d3d9_swapchain.cpp
View File

@ -17,8 +17,8 @@ namespace dxvk {
}; };
static std::recursive_mutex windowProcMapMutex; static std::recursive_mutex g_windowProcMapMutex;
static std::unordered_map<HWND, D3D9WindowData> windowProcMap; static std::unordered_map<HWND, D3D9WindowData> g_windowProcMap;
static LRESULT CALLBACK D3D9WindowProc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) { static LRESULT CALLBACK D3D9WindowProc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) {
@ -28,10 +28,10 @@ namespace dxvk {
D3D9WindowData windowData = {}; D3D9WindowData windowData = {};
{ {
std::lock_guard<std::recursive_mutex> lock(windowProcMapMutex); std::lock_guard lock(g_windowProcMapMutex);
auto it = windowProcMap.find(window); auto it = g_windowProcMap.find(window);
if (it != windowProcMap.end()) if (it != g_windowProcMap.end())
windowData = it->second; windowData = it->second;
} }
@ -530,8 +530,8 @@ namespace dxvk {
this->EnterFullscreenMode(pPresentParams, pFullscreenDisplayMode); this->EnterFullscreenMode(pPresentParams, pFullscreenDisplayMode);
{ {
std::lock_guard<std::recursive_mutex> lock(windowProcMapMutex); std::lock_guard lock(g_windowProcMapMutex);
auto it = windowProcMap.find(m_window); auto it = g_windowProcMap.find(m_window);
it->second.filter = true; it->second.filter = true;
} }
@ -547,8 +547,8 @@ namespace dxvk {
SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE);
{ {
std::lock_guard<std::recursive_mutex> lock(windowProcMapMutex); std::lock_guard lock(g_windowProcMapMutex);
auto it = windowProcMap.find(m_window); auto it = g_windowProcMap.find(m_window);
it->second.filter = false; it->second.filter = false;
} }
} }
@ -1473,7 +1473,7 @@ namespace dxvk {
void D3D9SwapChainEx::HookWindowProc() { void D3D9SwapChainEx::HookWindowProc() {
std::lock_guard<std::recursive_mutex> lock(windowProcMapMutex); std::lock_guard lock(g_windowProcMapMutex);
ResetWindowProc(); ResetWindowProc();
@ -1484,14 +1484,14 @@ namespace dxvk {
? (WNDPROC)SetWindowLongPtrW(m_window, GWLP_WNDPROC, (LONG_PTR)D3D9WindowProc) ? (WNDPROC)SetWindowLongPtrW(m_window, GWLP_WNDPROC, (LONG_PTR)D3D9WindowProc)
: (WNDPROC)SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)D3D9WindowProc); : (WNDPROC)SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)D3D9WindowProc);
windowProcMap[m_window] = std::move(windowData); g_windowProcMap[m_window] = std::move(windowData);
} }
void D3D9SwapChainEx::ResetWindowProc() { void D3D9SwapChainEx::ResetWindowProc() {
std::lock_guard<std::recursive_mutex> lock(windowProcMapMutex); std::lock_guard lock(g_windowProcMapMutex);
auto it = windowProcMap.find(m_window); auto it = g_windowProcMap.find(m_window);
if (it == windowProcMap.end()) if (it == g_windowProcMap.end())
return; return;
auto proc = it->second.unicode auto proc = it->second.unicode
@ -1503,7 +1503,7 @@ namespace dxvk {
else if (proc == D3D9WindowProc && !it->second.unicode) else if (proc == D3D9WindowProc && !it->second.unicode)
SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc); SetWindowLongPtrA(m_window, GWLP_WNDPROC, (LONG_PTR)it->second.proc);
windowProcMap.erase(m_window); g_windowProcMap.erase(m_window);
} }
} }