rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-18 20:52:10 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Add and use D3D9WindowMessageFilter helper

Browse Source 
Stops us forgetting to reset the message filter

Previously when the device was intially created with fullscreen, filter would always be enabled
This commit is contained in:
Joshua Ashton 2020-04-08 20:19:52 +01:00
parent e95e4ca225
commit 93b4427a13
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/d3d9/d3d9_swapchain.cpp
View File

@ -29,6 +29,34 @@ namespace dxvk {
}
class D3D9WindowMessageFilter {
public:
D3D9WindowMessageFilter(HWND window, bool filter = true)
: m_window(window) {
std::lock_guard lock(g_windowProcMapMutex);
auto it = g_windowProcMap.find(m_window);
m_filter = std::exchange(it->second.filter, filter);
}
~D3D9WindowMessageFilter() {
std::lock_guard lock(g_windowProcMapMutex);
auto it = g_windowProcMap.find(m_window);
it->second.filter = m_filter;
}
D3D9WindowMessageFilter (const D3D9WindowMessageFilter&) = delete;
D3D9WindowMessageFilter& operator = (const D3D9WindowMessageFilter&) = delete;
private:
HWND m_window;
bool m_filter;
};
LRESULT CALLBACK D3D9WindowProc(HWND window, UINT message, WPARAM wparam, LPARAM lparam);
@ -61,7 +89,7 @@ namespace dxvk {
D3D9WindowData windowData;
windowData.unicode = IsWindowUnicode(window);
windowData.filter = true;
windowData.filter = false;
windowData.proc = reinterpret_cast<WNDPROC>(
CallCharsetFunction(
SetWindowLongPtrW, SetWindowLongPtrA, windowData.unicode,
@ -582,11 +610,7 @@ namespace dxvk {
if (changeFullscreen)
this->EnterFullscreenMode(pPresentParams, pFullscreenDisplayMode);
{
std::lock_guard lock(g_windowProcMapMutex);
auto it = g_windowProcMap.find(m_window);
it->second.filter = true;
}
D3D9WindowMessageFilter filter(m_window);
if (!changeFullscreen)
ChangeDisplayMode(pPresentParams, pFullscreenDisplayMode);
@ -598,12 +622,6 @@ namespace dxvk {
::SetWindowPos(m_window, HWND_TOPMOST,
rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE);
{
std::lock_guard lock(g_windowProcMapMutex);
auto it = g_windowProcMap.find(m_window);
it->second.filter = false;
}
}
m_presentParams = *pPresentParams;
@ -1368,6 +1386,8 @@ namespace dxvk {
// also required. Doing it will allow us to create fullscreen windows
// regardless of their style and it also appears to work on Windows.
HookWindowProc(m_window);
D3D9WindowMessageFilter filter(m_window);
// Change the window flags to remove the decoration etc.
LONG style = ::GetWindowLongW(m_window, GWL_STYLE);