system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 11:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

dxgi: Catch nested SetFullscreenState invocations.

Browse source
This commit is contained in:
Stefan Dösinger 2023-01-13 16:27:59 +03:00 committed by Alexandre Julliard
parent 75f7bd0eea
commit 33170e2720
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/dxgi/dxgi_private.h
View file

@ -183,6 +183,7 @@ struct d3d11_swapchain
IDXGIOutput *target;
LONG present_count;
LONG in_set_fullscreen_state;
};
HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device,

28
dlls/dxgi/swapchain.c
View file

@ -383,6 +383,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen
struct wined3d_swapchain_desc swapchain_desc;
struct wined3d_swapchain_state *state;
struct dxgi_output *dxgi_output;
LONG in_set_fullscreen_state;
BOOL old_fs;
HRESULT hr;
TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target);
@ -404,6 +406,18 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen
}
dxgi_output = unsafe_impl_from_IDXGIOutput(target);
/* DXGI catches nested SetFullscreenState invocations, earlier versions of d3d
* do not. Final Fantasy XIV depends on this behavior. It tries to call SFS on
* WM_WINDOWPOSCHANGED messages. */
in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1);
if (in_set_fullscreen_state)
{
WARN("Nested invocation of SetFullscreenState.\n");
IDXGIOutput_Release(target);
IDXGISwapChain1_GetFullscreenState(iface, &old_fs, NULL);
return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS;
}
wined3d_mutex_lock();
state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain);
wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc);
@ -429,6 +443,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen
done:
wined3d_mutex_unlock();
InterlockedExchange(&swapchain->in_set_fullscreen_state, 0);
return hr;
}
@ -1016,6 +1031,7 @@ struct d3d12_swapchain
IDXGIOutput *target;
DXGI_SWAP_CHAIN_DESC1 desc;
DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc;
LONG in_set_fullscreen_state;
ID3D12Fence *frame_latency_fence;
HANDLE frame_latency_event;
@ -2077,6 +2093,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen
const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc;
struct wined3d_swapchain_desc wined3d_desc;
HWND window = swapchain->window;
LONG in_set_fullscreen_state;
BOOL old_fs;
HRESULT hr;
TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target);
@ -2104,6 +2122,15 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen
return hr;
}
in_set_fullscreen_state = InterlockedExchange(&swapchain->in_set_fullscreen_state, 1);
if (in_set_fullscreen_state)
{
WARN("Nested invocation of SetFullscreenState.\n");
IDXGIOutput_Release(target);
IDXGISwapChain4_GetFullscreenState(iface, &old_fs, NULL);
return old_fs == fullscreen ? S_OK : DXGI_STATUS_MODE_CHANGE_IN_PROGRESS;
}
wined3d_mutex_lock();
wined3d_desc.windowed = !fullscreen;
hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL);
@ -2127,6 +2154,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen
done:
wined3d_mutex_unlock();
InterlockedExchange(&swapchain->in_set_fullscreen_state, 0);
return hr;
}