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

[dxgi] Fix SetFullscreenState behaviour with invalid usage

Browse Source 
Fixes various wine test failures.
This commit is contained in:
Philip Rebohle 2019-10-02 00:01:26 +02:00
parent 60ff2b8977
commit f58c1c2d1d
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dxgi/dxgi_swapchain.cpp
View File

@ -382,6 +382,9 @@ namespace dxvk {
IDXGIOutput* pTarget) {
std::lock_guard<std::recursive_mutex> lock(m_lockWindow);
if (!Fullscreen && pTarget)
return DXGI_ERROR_INVALID_CALL;
if (m_descFs.Windowed && Fullscreen)
return this->EnterFullscreenMode(pTarget);
else if (!m_descFs.Windowed && !Fullscreen)
@ -610,9 +613,6 @@ namespace dxvk {
HRESULT DxgiSwapChain::LeaveFullscreenMode() {
if (!IsWindow(m_window))
return S_OK;
if (FAILED(RestoreDisplayMode(m_monitor)))
Logger::warn("DXGI: LeaveFullscreenMode: Failed to restore display mode");
@ -632,6 +632,9 @@ namespace dxvk {
m_monitor = nullptr;
m_target = nullptr;
if (!IsWindow(m_window))
return S_OK;
// Only restore the window style if the application hasn't
// changed them. This is in line with what native DXGI does.
LONG curStyle = ::GetWindowLongW(m_window, GWL_STYLE) & ~WS_VISIBLE;