diff options
author | Etaash Mathamsetty <etaash.mathamsetty@gmail.com> | 2023-08-09 06:19:30 +0300 |
---|---|---|
committer | Philip Rebohle <25567304+doitsujin@users.noreply.github.com> | 2023-08-09 13:18:24 +0300 |
commit | 429555a540761bd5201a391e62452c0e6448fb28 (patch) | |
tree | 3f556956ed2e225aea841c1def6513b76df40cd4 | |
parent | dfcd7aedd8d970ae9a4b1ba1c2c53bc94cc5c8e1 (diff) |
[dxgi] Fix behavior of GetWindowAssociation
-rw-r--r-- | src/dxgi/dxgi_factory.cpp | 4 | ||||
-rw-r--r-- | src/dxgi/dxgi_factory.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/dxgi/dxgi_factory.cpp b/src/dxgi/dxgi_factory.cpp index 314a30b0..877cef19 100644 --- a/src/dxgi/dxgi_factory.cpp +++ b/src/dxgi/dxgi_factory.cpp @@ -407,7 +407,8 @@ namespace dxvk { if (pWindowHandle == nullptr) return DXGI_ERROR_INVALID_CALL; - *pWindowHandle = m_associatedWindow; + // Wine tests show that this is always null for whatever reason + *pWindowHandle = nullptr; return S_OK; } @@ -422,7 +423,6 @@ namespace dxvk { HRESULT STDMETHODCALLTYPE DxgiFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags) { Logger::warn("DXGI: MakeWindowAssociation: Ignoring flags"); - m_associatedWindow = WindowHandle; return S_OK; } diff --git a/src/dxgi/dxgi_factory.h b/src/dxgi/dxgi_factory.h index 5c65bf49..81b51143 100644 --- a/src/dxgi/dxgi_factory.h +++ b/src/dxgi/dxgi_factory.h @@ -182,9 +182,7 @@ namespace dxvk { DxgiMonitorInfo m_monitorInfo; UINT m_flags; BOOL m_monitorFallback; - - HWND m_associatedWindow = nullptr; - + }; } |