May 2020 - Wine-devel - list.winehq.org

[PATCH] ntdll: Remove extraneous newline from debugstr_ObjectAttributes().
by Zebediah Figura 18 May '20

18 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 58e8f1afd86..9b0156a3eb3 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { if (!oa) return "<null>"; - return wine_dbg_sprintf( "{name=%s, attr=0x%08x, hRoot=%p, sd=%p}\n", + return wine_dbg_sprintf( "{name=%s, attr=0x%08x, hRoot=%p, sd=%p}", debugstr_us(oa->ObjectName), oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor ); } -- 2.26.2

1 0

[PATCH 1/2] quartz: Complain louder if a filter reports the wrong state.
by Zebediah Figura 18 May '20

18 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c867d69ce58..47782f2d24f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5215,7 +5215,7 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_hr != S_OK && filter_hr != VFW_S_STATE_INTERMEDIATE) hr = filter_hr; if (filter_state != graph->state) - WARN("Filter %p reported incorrect state %u.\n", filter->filter, filter_state); + ERR("Filter %p reported incorrect state %u.\n", filter->filter, filter_state); } LeaveCriticalSection(&graph->cs); -- 2.26.2

1 1

[PATCH 1/2] libwine: fix incorrect usage of mincore() by try_mmap_fixed()
by Damjan Jovanovic 18 May '20

18 May '20

The return value of mincore() only tells us whether the system call succeeded, not whether the memory is resident. Check the result in the "vec" parameter like we're supposed to. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- libs/wine/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 2/2] libwine: add support for mmap at fixed start addresses on FreeBSD
by Damjan Jovanovic 18 May '20

18 May '20

The way to implement MAP_TRYFIXED on FreeBSD is call mmap() with MAP_FIXED | MAP_EXCL, which will allocate the mapping from the exact starting address if possible, and if that fails, call mmap() again without them. This gets PE DLLs loading at their correct base addresses, and fixes a FreeBSD-specific problem with Cygwin's fork() caused by cygwin1.dll loading at different base addresses in the parent and child. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- libs/wine/mmap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

1 0

[PATCH] winemac.drv: Use InitOnceExecuteOnce to initialize OpenGL.
by Chip Davis 18 May '20

18 May '20

Currently, there is a race condition where if two threads call into OpenGL at the same time, one of them will initialize OpenGL, but the other will barrel on ahead, thinking GL is already initialized, even though the first thread hasn't finished initializing it yet. One of the symptoms of this is that no pixel formats appear to be available, because the first thread hasn't yet enumerated the available pixel formats. InitOnceExecuteOnce() forces the other thread(s) to wait until initialization is actually done; this resolves the race condition. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/opengl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b80c8fffb0c..b66af0f1c47 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4242,7 +4242,7 @@ static void load_extensions(void) } -static BOOL init_opengl(void) +static BOOL CALLBACK init_opengl(INIT_ONCE *init_once, void *context, void **param) { static BOOL init_done = FALSE; unsigned int i; @@ -4654,13 +4654,15 @@ static struct opengl_funcs opengl_funcs = */ struct opengl_funcs * CDECL macdrv_wine_get_wgl_driver(PHYSDEV dev, UINT version) { + static INIT_ONCE opengl_init = INIT_ONCE_STATIC_INIT; + if (version != WINE_WGL_DRIVER_VERSION) { ERR("version mismatch, opengl32 wants %u but macdrv has %u\n", version, WINE_WGL_DRIVER_VERSION); return NULL; } - if (!init_opengl()) return (void *)-1; + if (!InitOnceExecuteOnce(&opengl_init, init_opengl, NULL, NULL)) return (void *)-1; return &opengl_funcs; } -- 2.24.0

2 1

[PATCH v2 0/2] user32: Change GetKeyState() / GetKeyboardState() to fix some programs.
by Markus Engel 18 May '20

18 May '20

Hi, the documentation for these two functions isn't clear about the contents of the bits of the return value, except for the highest and lowest bit. Some programs assume that the others are always set to zero, which seems to be the actual behavior in Windows. Specifically, this leads to stuck keys in "Age of Empires 2 HD" and "Age of Empires 2: Definitive Edition" when tabbing out as reported in https://bugs.winehq.org/show_bug.cgi?id=30814 . The following patch makes sure that all undefined bits in the first byte are set to zero. Markus v2: As the test for the first version revealed, Windows XP indeed behaves differently from all newer versions. The patch now only clears bits 1-6 in the first byte and uses sign extension to create the SHORT return value again. Signed-off-by: Markus Engel <markus_wine(a)familie-engel.online> Markus Engel (2): user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. user32/tests: Add more tests for GetKeyState(). dlls/user32/input.c | 6 +++++- dlls/user32/tests/input.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.26.2

2 4

[PATCH 5/5] wined3d: Remove no longer needed output parameter in wined3d_swapchain_state_resize_target().
by Zhiyi Zhang 18 May '20

18 May '20

current output is stored as part of the swapchain state now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 19 +++++-------------- dlls/wined3d/swapchain.c | 9 +++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 432c114d848..f37aee933ec 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -159,13 +159,10 @@ HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOut return DXGI_ERROR_NOT_FOUND; } -static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, - struct wined3d_swapchain_state *state, const DXGI_MODE_DESC *target_mode_desc) +static HRESULT dxgi_swapchain_resize_target(struct wined3d_swapchain_state *state, + const DXGI_MODE_DESC *target_mode_desc) { struct wined3d_display_mode mode; - struct dxgi_output *dxgi_output; - IDXGIOutput *output; - HRESULT hr; if (!target_mode_desc) { @@ -173,10 +170,6 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, return DXGI_ERROR_INVALID_CALL; } - if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(swapchain, &output))) - return hr; - dxgi_output = unsafe_impl_from_IDXGIOutput(output); - TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); if (target_mode_desc->Scaling) @@ -184,9 +177,7 @@ static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - hr = wined3d_swapchain_state_resize_target(state, dxgi_output->wined3d_output, &mode); - IDXGIOutput_Release(output); - return hr; + return wined3d_swapchain_state_resize_target(state, &mode); } static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) @@ -571,7 +562,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i state = wined3d_swapchain_get_state(swapchain->wined3d_swapchain); - return dxgi_swapchain_resize_target(iface, state, target_mode_desc); + return dxgi_swapchain_resize_target(state, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) @@ -2399,7 +2390,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *i TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - return dxgi_swapchain_resize_target((IDXGISwapChain1 *)iface, swapchain->state, target_mode_desc); + return dxgi_swapchain_resize_target(swapchain->state, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0e439e1b068..0af6e8e41c5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1459,7 +1459,7 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d_output *output, const struct wined3d_display_mode *mode) + const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; @@ -1468,7 +1468,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta HWND window; HRESULT hr; - TRACE("state %p, output %p, mode %p.\n", state, output, mode); + TRACE("state %p, mode %p.\n", state, mode); wined3d_mutex_lock(); @@ -1492,7 +1492,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, state->desc.output, + &actual_mode))) { ERR("Failed to set display mode, hr %#x.\n", hr); wined3d_mutex_unlock(); @@ -1500,7 +1501,7 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta } } - if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(state->desc.output, &output_desc))) { ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 22b837bc4bd..e7d08914cda 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -283,7 +283,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) -@ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr) +@ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 75734949af6..f42c1a80502 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2772,7 +2772,7 @@ HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_de HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, - struct wined3d_output *output, const struct wined3d_display_mode *mode); + const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); -- 2.25.1

2 1

[PATCH 4/5] dxgi: Remove dxgi_swapchain_set_fullscreen_state().
by Zhiyi Zhang 18 May '20

18 May '20

dxgi_swapchain_set_fullscreen_state() is a mere wrapper of wined3d_swapchain_state_set_fullscreen() now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e2757b5f006..432c114d848 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -159,18 +159,6 @@ HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOut return DXGI_ERROR_NOT_FOUND; } -static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *swapchain_desc) -{ - HRESULT hr; - - wined3d_mutex_lock(); - hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, NULL); - wined3d_mutex_unlock(); - - return hr; -} - static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *swapchain, struct wined3d_swapchain_state *state, const DXGI_MODE_DESC *target_mode_desc) { @@ -437,7 +425,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; - hr = dxgi_swapchain_set_fullscreen_state(state, &swapchain_desc); + hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -893,7 +881,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } - if (FAILED(hr = dxgi_swapchain_set_fullscreen_state(state, desc))) + if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(state, desc, NULL))) { WARN("Failed to set fullscreen state, hr %#x.\n", hr); IDXGIOutput_Release(swapchain->target); @@ -2264,7 +2252,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen goto fail; wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; - hr = dxgi_swapchain_set_fullscreen_state(swapchain->state, &wined3d_desc); + hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) goto fail; -- 2.25.1

2 1

[PATCH 3/5] wined3d: Remove no longer needed output parameter in wined3d_swapchain_state_set_fullscreen().
by Zhiyi Zhang 18 May '20

18 May '20

struct wined3d_swapchain_desc has already specified a output parameter now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 14 +++++--------- dlls/wined3d/device.c | 11 ++--------- dlls/wined3d/swapchain.c | 17 +++++++++-------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 3 +-- include/wine/wined3d.h | 3 +-- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e16eb86a701..e2757b5f006 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -160,16 +160,12 @@ HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, IDXGIOut } static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *swapchain_desc, IDXGIOutput *output) + const struct wined3d_swapchain_desc *swapchain_desc) { - struct dxgi_output *dxgi_output; HRESULT hr; - dxgi_output = unsafe_impl_from_IDXGIOutput(output); - wined3d_mutex_lock(); - hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - dxgi_output->wined3d_output, NULL); + hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, NULL); wined3d_mutex_unlock(); return hr; @@ -441,7 +437,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; - hr = dxgi_swapchain_set_fullscreen_state(state, &swapchain_desc, target); + hr = dxgi_swapchain_set_fullscreen_state(state, &swapchain_desc); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -897,7 +893,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } - if (FAILED(hr = dxgi_swapchain_set_fullscreen_state(state, desc, swapchain->target))) + if (FAILED(hr = dxgi_swapchain_set_fullscreen_state(state, desc))) { WARN("Failed to set fullscreen state, hr %#x.\n", hr); IDXGIOutput_Release(swapchain->target); @@ -2268,7 +2264,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen goto fail; wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; - hr = dxgi_swapchain_set_fullscreen_state(swapchain->state, &wined3d_desc, target); + hr = dxgi_swapchain_set_fullscreen_state(swapchain->state, &wined3d_desc); wined3d_mutex_unlock(); if (FAILED(hr)) goto fail; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ffc73bd2339..7f9b7254bd6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5223,7 +5223,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; - struct wined3d_output *output; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5317,12 +5316,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } - if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -5341,7 +5334,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, output, mode))) + swapchain_desc, mode))) return hr; /* Switch from fullscreen to windowed. */ @@ -5358,7 +5351,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ - if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(swapchain_desc->output, &output_desc))) { ERR("Failed to get output description, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a4929b7a5b9..0e439e1b068 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1631,15 +1631,14 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st } HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d_output *output, + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; struct wined3d_output_desc output_desc; HRESULT hr; - TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", - state, swapchain_desc, output, mode); + TRACE("state %p, swapchain_desc %p, mode %p.\n", state, swapchain_desc, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1654,7 +1653,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, + actual_mode.format_id = adapter_format_from_backbuffer_format(swapchain_desc->output->adapter, swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } @@ -1664,7 +1663,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, swapchain_desc->output, + &actual_mode))) return hr; } else @@ -1672,7 +1672,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st if (mode) WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(swapchain_desc->output, &actual_mode, + NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; @@ -1684,7 +1685,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; - if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + if (FAILED(hr = wined3d_output_get_desc(swapchain_desc->output, &output_desc))) { ERR("Failed to get output description, hr %#x.\n", hr); return hr; @@ -1720,7 +1721,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st wined3d_swapchain_state_restore_from_fullscreen(state, state->device_window, window_rect); } - state->desc.output = output; + state->desc.output = swapchain_desc->output; state->desc.windowed = swapchain_desc->windowed; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a240aba555a..22b837bc4bd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -284,7 +284,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr ptr) -@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index a1fe4ac28db..ccddd755803 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -605,8 +605,7 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, output, - NULL); + wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 381a823cfbf..75734949af6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2774,8 +2774,7 @@ void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *sta HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, struct wined3d_output *output, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, - const struct wined3d_swapchain_desc *desc, struct wined3d_output *output, - const struct wined3d_display_mode *mode); + const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.25.1

2 1

[PATCH 2/5] wined3d: Restore display mode for the previous output before changing to another output.
by Zhiyi Zhang 18 May '20

18 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 21e9ec459eb..a4929b7a5b9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1434,6 +1434,21 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain } } + if (output != state->desc.output) + { + if (FAILED(hr = wined3d_output_set_display_mode(state->desc.output, &state->original_mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = wined3d_output_get_display_mode(output, &state->original_mode, NULL))) + { + WARN("Failed to get current display mode, hr %#x.\n", hr); + return hr; + } + } + if (FAILED(hr = wined3d_output_set_display_mode(output, mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); -- 2.25.1

2 1