wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Józef Kucia : dxgi/tests: Add test for default fullscreen target output.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 709ca356cd032eec3724d9dbfb8d33ed71fa9acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=709ca356cd032eec3724d9dbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:47 2016 +0200 dxgi/tests: Add test for default fullscreen target output. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 2946aa7..85e17a4 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -386,7 +386,7 @@ static void test_output(void) "Failed to list modes, hr %#x.\n", hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { - skip("GetDisplayModeList() not supported, skipping tests.\n"); + win_skip("GetDisplayModeList() not supported.\n"); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); IDXGIDevice_Release(device); @@ -750,6 +750,7 @@ static void test_get_containing_output(void) "GetContainingOutput failed, hr %#x.\n", hr); if (hr == DXGI_ERROR_UNSUPPORTED) { + win_skip("GetContainingOutput() not supported.\n"); IDXGISwapChain_Release(swapchain); goto done; } @@ -1296,6 +1297,126 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_default_fullscreen_target_output(void) +{ + IDXGIOutput *output, *containing_output, *target; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; + IDXGISwapChain *swapchain; + unsigned int output_idx; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + HRESULT hr; + BOOL ret; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 100; + swapchain_desc.BufferDesc.Height = 100; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + output_idx = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) + { + ok(SUCCEEDED(hr), "Failed to enumarate output %u, hr %#x.\n", output_idx, hr); + + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + /* Move the OutputWindow to the current output. */ + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, + output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, + 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed.\n"); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "GetContainingOutput failed, hr %#x.\n", hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("GetContainingOutput() not supported.\n"); + IDXGIOutput_Release(output); + goto done; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, + "SetFullscreenState failed, hr %#x.\n", hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Could not change fullscreen state.\n"); + IDXGIOutput_Release(containing_output); + IDXGIOutput_Release(output); + goto done; + } + + target = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); + ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok(target != containing_output, "Got unexpected output pointers %p, %p.\n", + target, containing_output); + check_output_equal(target, containing_output); + + refcount = IDXGIOutput_Release(containing_output); + ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok(containing_output == target, "Got unexpected containing output %p, expected %p.\n", + containing_output, target); + refcount = IDXGIOutput_Release(containing_output); + ok(refcount >= 2, "Got unexpected refcount %u.\n", refcount); + refcount = IDXGIOutput_Release(target); + ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + IDXGIOutput_Release(output); + ++output_idx; + } + +done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "Adapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void test_create_factory(void) { IDXGIFactory1 *factory; @@ -2146,6 +2267,7 @@ START_TEST(device) test_create_swapchain(); test_get_containing_output(); test_set_fullscreen(); + test_default_fullscreen_target_output(); test_create_factory(); test_private_data(); test_swapchain_resize();

1 0

Józef Kucia : dxgi/tests: Add multi-monitor test for IDXGISwapChain_GetContainingOutput().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 47430b92645d584f6277baab6788e99d8f131e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47430b92645d584f6277baab6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:46 2016 +0200 dxgi/tests: Add multi-monitor test for IDXGISwapChain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 163 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 137 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47430b92645d584f6277b…

1 0

Józef Kucia : dxgi/tests: Add test for IDXGISwapChain_SetFullscreenState().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 476cbd2f8ab9922459392b0656337a22daacb28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476cbd2f8ab9922459392b065… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:45 2016 +0200 dxgi/tests: Add test for IDXGISwapChain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 432 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 424 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=476cbd2f8ab9922459392…

1 0

Józef Kucia : dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 587a4d9810764db22b9c547dd89c016b32bfb1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587a4d9810764db22b9c547dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:44 2016 +0200 dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 141 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 120 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=587a4d9810764db22b9c5…

1 0

Józef Kucia : dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput ().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 8b646aef63fda5916f4c14bef3d12be585d87b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b646aef63fda5916f4c14bef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:43 2016 +0200 dxgi: Return swapchain target output when available in dxgi_swapchain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3ea7d57..869c799 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -344,12 +344,19 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetContainingOutput(IDXGISwapChain *iface, IDXGIOutput **output) { + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; TRACE("iface %p, output %p.\n", iface, output); + if (swapchain->target) + { + IDXGIOutput_AddRef(*output = swapchain->target); + return S_OK; + } + if (FAILED(hr = dxgi_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) return hr;

1 0

Józef Kucia : dxgi: Switch display mode when creating fullscreen swapchains.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 005a6c6396c7db6a61e534290ce56454b3412de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005a6c6396c7db6a61e534290… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:42 2016 +0200 dxgi: Switch display mode when creating fullscreen swapchains. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index cdb28e4..3ea7d57 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -443,8 +443,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device WARN("Failed to get adapter parent, hr %#x.\n", hr); return hr; } - swapchain->device = &device->IWineDXGIDevice_iface; - IWineDXGIDevice_AddRef(swapchain->device); + IWineDXGIDevice_AddRef(swapchain->device = &device->IWineDXGIDevice_iface); } else { @@ -454,8 +453,6 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; - swapchain->fullscreen = FALSE; - swapchain->target = NULL; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); @@ -463,15 +460,39 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); - wined3d_private_store_cleanup(&swapchain->private_store); - wined3d_mutex_unlock(); - if (swapchain->factory) - IDXGIFactory_Release(swapchain->factory); - if (swapchain->device) - IWineDXGIDevice_Release(swapchain->device); - return hr; + goto cleanup; + } + + swapchain->fullscreen = !desc->windowed; + swapchain->target = NULL; + if (swapchain->fullscreen) + { + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, + desc, NULL))) + { + WARN("Failed to set fullscreen state, hr %#x.\n", hr); + wined3d_swapchain_decref(swapchain->wined3d_swapchain); + goto cleanup; + } + + if (FAILED(hr = IDXGISwapChain_GetContainingOutput(&swapchain->IDXGISwapChain_iface, + &swapchain->target))) + { + WARN("Failed to get target output for fullscreen swapchain, hr %#x.\n", hr); + wined3d_swapchain_decref(swapchain->wined3d_swapchain); + goto cleanup; + } } wined3d_mutex_unlock(); return S_OK; + +cleanup: + wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_mutex_unlock(); + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); + if (swapchain->device) + IWineDXGIDevice_Release(swapchain->device); + return hr; }

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_SetFullscreenState().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: bbc2d604ce156da4947d00f4cc64b9bd5e917138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc2d604ce156da4947d00f4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:41 2016 +0200 dxgi: Implement dxgi_swapchain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 6 +++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6b80ead..cdb28e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -204,9 +204,43 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); + struct wined3d_swapchain_desc swapchain_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); + + if (!fullscreen && target) + { + WARN("Invalid call.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (fullscreen) + { + if (target) + { + IDXGIOutput_AddRef(target); + } + else if (FAILED(hr = IDXGISwapChain_GetContainingOutput(iface, &target))) + { + WARN("Failed to get default target output for swapchain, hr %#x.\n", hr); + return hr; + } + } + + swapchain->fullscreen = fullscreen; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + swapchain_desc.windowed = !fullscreen; + hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); + wined3d_mutex_unlock(); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChain *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 3c43895..9c0aa9d 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -545,7 +545,7 @@ static void test_create_swapchain(void) "Denominator %u is %u.\n", i ,result_desc.BufferDesc.RefreshRate.Denominator); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); } @@ -1301,7 +1301,7 @@ static void test_swapchain_parameters(void) if (FAILED(hr)) { hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); continue; @@ -1357,7 +1357,7 @@ static void test_swapchain_parameters(void) ok(hr == DXGI_ERROR_INVALID_CALL, "GetBuffer(%u) returned unexpected hr %#x, test %u.\n", j, hr, i); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); }

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetFullscreenState().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: f586cc98a02b140678ceb59a3021bacdd90a36d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f586cc98a02b140678ceb59a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:40 2016 +0200 dxgi: Implement dxgi_swapchain_GetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 3 +++ dlls/dxgi/swapchain.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 680f835..7148811 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -160,6 +160,9 @@ struct dxgi_swapchain struct wined3d_swapchain *wined3d_swapchain; IWineDXGIDevice *device; IDXGIFactory *factory; + + BOOL fullscreen; + IDXGIOutput *target; }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 54bd52d..6b80ead 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -212,9 +212,21 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenS static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenState(IDXGISwapChain *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); + + if (fullscreen) + *fullscreen = swapchain->fullscreen; + + if (target) + { + *target = swapchain->target; + if (*target) + IDXGIOutput_AddRef(*target); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, DXGI_SWAP_CHAIN_DESC *desc) @@ -408,6 +420,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; swapchain->refcount = 1; + swapchain->fullscreen = FALSE; + swapchain->target = NULL; wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store);

1 0

Józef Kucia : wined3d: Add WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT flag.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 2f5850c56a0e487520327665afe7ad4794909996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5850c56a0e487520327665a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:39 2016 +0200 wined3d: Add WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/utils.c | 4 +++- dlls/wined3d/device.c | 15 ++++++++++++--- dlls/wined3d/swapchain.c | 13 ++++++++++++- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 +++- 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aa4ac5c..c9efba6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -890,7 +890,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if ((cooplevel & DDSCL_FULLSCREEN) != (ddraw->cooperative_level & DDSCL_FULLSCREEN) || window != ddraw->dest_window) { if (ddraw->cooperative_level & DDSCL_FULLSCREEN) - wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window); + wined3d_device_restore_fullscreen_window(ddraw->wined3d_device, ddraw->dest_window, NULL); if (cooplevel & DDSCL_FULLSCREEN) { diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index f671e30..5c6c5bd 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -405,6 +405,8 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) { unsigned int flags = 0; + wined3d_flags &= ~WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; + if (wined3d_flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { wined3d_flags &= ~WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; @@ -419,7 +421,7 @@ unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) { - unsigned int wined3d_flags = 0; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ + unsigned int wined3d_flags = WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT; /* WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL? */ if (flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34ce224..9a4f0d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -911,12 +911,16 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, device->filter_messages = filter_messages; } -void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window) +void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect) { + unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; BOOL filter_messages; LONG style, exstyle; + RECT rect = {0}; - if (!device->style && !device->exStyle) return; + if (!device->style && !device->exStyle) + return; style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); @@ -945,7 +949,12 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic SetWindowLongW(window, GWL_STYLE, device->style); SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); } - SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + + if (window_rect) + rect = *window_rect; + else + window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); + SetWindowPos(window, 0, rect.left, rect.top, rect.right, rect.bottom, window_pos_flags); device->filter_messages = filter_messages; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1adf8eb..e3d6259 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -77,6 +77,13 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) if (FAILED(hr = wined3d_set_adapter_display_mode(swapchain->device->wined3d, swapchain->device->adapter->ordinal, &swapchain->original_mode))) ERR("Failed to restore display mode, hr %#x.\n", hr); + + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + { + wined3d_device_restore_fullscreen_window(swapchain->device, swapchain->device_window, + &swapchain->original_window_rect); + wined3d_device_release_focus_window(swapchain->device); + } } if (swapchain->backup_dc) @@ -839,6 +846,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 ERR("Failed to get current display mode, hr %#x.\n", hr); goto err; } + GetWindowRect(window, &swapchain->original_window_rect); GetClientRect(window, &client_rect); if (desc->windowed) @@ -1472,8 +1480,11 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha } else if (!swapchain->desc.windowed) { + RECT *window_rect = NULL; /* Fullscreen -> windowed switch */ - wined3d_device_restore_fullscreen_window(device, swapchain->device_window); + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) + window_rect = &swapchain->original_window_rect; + wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); wined3d_device_release_focus_window(device); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bdf3916..e0cc501 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -107,7 +107,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) -@ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) +@ cdecl wined3d_device_restore_fullscreen_window(ptr ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abb950c..f300e4b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3228,6 +3228,7 @@ struct wined3d_swapchain struct wined3d_texture *front_buffer; struct wined3d_swapchain_desc desc; struct wined3d_display_mode original_mode, d3d_mode; + RECT original_window_rect; struct wined3d_gamma_ramp orig_gamma; BOOL render_to_fbo, reapply_mode; const struct wined3d_format *ds_format; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4f26f2e..661191d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -825,6 +825,7 @@ enum wined3d_display_rotation #define WINED3D_SWAPCHAIN_NOAUTOROTATE 0x00000020u #define WINED3D_SWAPCHAIN_UNPRUNEDMODE 0x00000040u #define WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH 0x00001000u +#define WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT 0x00002000u #define WINED3DDP_MAXTEXCOORD 8 @@ -2252,7 +2253,8 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); -void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane);

1 0

Józef Kucia : wined3d: Add WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH flag.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 8d032351f23ff28a979501b1079fdc6d93f3eb20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d032351f23ff28a979501b10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 3 09:41:38 2016 +0200 wined3d: Add WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH flag. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 8 +++-- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 8 +++-- dlls/ddraw/ddraw.c | 1 + dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 8 ++--- dlls/dxgi/swapchain.c | 4 +-- dlls/dxgi/utils.c | 32 +++++++++++++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/swapchain.c | 91 ++++++++++++++++++++++++++++++------------------ include/wine/wined3d.h | 13 +++---- 12 files changed, 122 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d032351f23ff28a97950…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016