dxgi: Retrieve swapchains' fullscreen state from wined3d.

Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dxgi: Retrieve swapchains' fullscreen state from wined3d.
2b2ea820 · Zhiyi Zhang · Alexandre Julliard · 6c3c5b23 · 2b2ea820 · 2b2ea820
Commit 2b2ea820 authored Jun 19, 2019 by Zhiyi Zhang Committed by Alexandre Julliard Jun 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

dxgi_private.h dlls/dxgi/dxgi_private.h +0 -1

swapchain.c dlls/dxgi/swapchain.c +10 -4

No files found.
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -173,7 +173,6 @@ struct d3d11_swapchain
    IWineDXGIDevice *device;
    IDXGIFactory *factory;

-    BOOL fullscreen;
    IDXGIOutput *target;
 };


--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -388,7 +388,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen

    if (SUCCEEDED(hr))
    {
-        swapchain->fullscreen = fullscreen;
        if (swapchain->target)
            IDXGIOutput_Release(swapchain->target);
        swapchain->target = target;
@@ -404,11 +403,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha
        BOOL *fullscreen, IDXGIOutput **target)
 {
    struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface);
+    struct wined3d_swapchain_desc swapchain_desc;

    TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target);

    if (fullscreen)
-        *fullscreen = swapchain->fullscreen;
+    {
+        wined3d_mutex_lock();
+        wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc);
+        wined3d_mutex_unlock();
+        *fullscreen = !swapchain_desc.windowed;
+    }

    if (target)
    {
@@ -781,6 +786,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops =
 HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device,
        struct wined3d_swapchain_desc *desc)
 {
+    BOOL fullscreen;
    HRESULT hr;

    /* A reference to the implicit swapchain is held by the wined3d device. In
@@ -813,7 +819,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi
    if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height))
        FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n");

-    swapchain->fullscreen = !desc->windowed;
+    fullscreen = !desc->windowed;
    desc->windowed = TRUE;
    if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain,
            &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain)))
@@ -823,7 +829,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi
    }

    swapchain->target = NULL;
-    if (swapchain->fullscreen)
+    if (fullscreen)
    {
        desc->windowed = FALSE;
        if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain,