wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Rémi Bernon : imm32: Reorder control flow in ImmGetRegisterWordStyleW.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 1bc81cd8aedcd76072710c1403467b9b79e45622 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bc81cd8aedcd76072710c1403467b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmGetRegisterWordStyleW. --- dlls/imm32/imm.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2c9c04fc684..ea5dd127a9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1909,29 +1909,26 @@ UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA ) /*********************************************************************** * ImmGetRegisterWordStyleW (IMM32.@) */ -UINT WINAPI ImmGetRegisterWordStyleW( - HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) +UINT WINAPI ImmGetRegisterWordStyleW( HKL hkl, UINT count, STYLEBUFW *styleW ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); - if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeGetRegisterWordStyle(nItem,lpStyleBuf); - else - { - STYLEBUFA sba; - UINT rc; + struct ime *ime = IMM_GetImmHkl( hkl ); + UINT ret; - rc = immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)&sba); - MultiByteToWideChar(CP_ACP, 0, sba.szDescription, -1, - lpStyleBuf->szDescription, 32); - lpStyleBuf->dwStyle = sba.dwStyle; - return rc; - } - } + TRACE( "hkl %p, count %u, styleW %p.\n", hkl, count, styleW ); + + if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0; + + if (is_kbd_ime_unicode( ime )) + ret = ime->pImeGetRegisterWordStyle( count, styleW ); else - return 0; + { + STYLEBUFA styleA; + ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)&styleA ); + MultiByteToWideChar( CP_ACP, 0, styleA.szDescription, -1, styleW->szDescription, 32 ); + styleW->dwStyle = styleA.dwStyle; + } + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmGetRegisterWordStyleA.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 4693428b0562030c2454b6601bfb29d001bfad1b URL: https://gitlab.winehq.org/wine/wine/-/commit/4693428b0562030c2454b6601bfb29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmGetRegisterWordStyleA. --- dlls/imm32/imm.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index de455c71b9d..2c9c04fc684 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1884,29 +1884,26 @@ DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index ) /*********************************************************************** * ImmGetRegisterWordStyleA (IMM32.@) */ -UINT WINAPI ImmGetRegisterWordStyleA( - HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) +UINT WINAPI ImmGetRegisterWordStyleA( HKL hkl, UINT count, STYLEBUFA *styleA ) { - struct ime *immHkl = IMM_GetImmHkl( hKL ); - TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); - if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)lpStyleBuf); - else - { - STYLEBUFW sbw; - UINT rc; + struct ime *ime = IMM_GetImmHkl( hkl ); + UINT ret; - rc = immHkl->pImeGetRegisterWordStyle(nItem,&sbw); - WideCharToMultiByte(CP_ACP, 0, sbw.szDescription, -1, - lpStyleBuf->szDescription, 32, NULL, NULL); - lpStyleBuf->dwStyle = sbw.dwStyle; - return rc; - } - } + TRACE( "hkl %p, count %u, styleA %p.\n", hkl, count, styleA ); + + if (!ime->hIME || !ime->pImeGetRegisterWordStyle) return 0; + + if (!is_kbd_ime_unicode( ime )) + ret = ime->pImeGetRegisterWordStyle( count, (STYLEBUFW *)styleA ); else - return 0; + { + STYLEBUFW styleW; + ret = ime->pImeGetRegisterWordStyle( count, &styleW ); + WideCharToMultiByte( CP_ACP, 0, styleW.szDescription, -1, styleA->szDescription, 32, NULL, NULL ); + styleA->dwStyle = styleW.dwStyle; + } + + return ret; } /***********************************************************************

1 0

Rémi Bernon : imm32: Reorder control flow in ImmGetProperty.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 03f1780653daf35b8654fa9610d153c47b319a8c URL: https://gitlab.winehq.org/wine/wine/-/commit/03f1780653daf35b8654fa9610d153… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 13:30:36 2023 +0100 imm32: Reorder control flow in ImmGetProperty. --- dlls/imm32/imm.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6a5ee4f2217..de455c71b9d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1856,29 +1856,29 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) /*********************************************************************** * ImmGetProperty (IMM32.@) */ -DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) +DWORD WINAPI ImmGetProperty( HKL hkl, DWORD index ) { - DWORD rc = 0; - struct ime *kbd; + struct ime *ime; + DWORD ret; + + TRACE( "hkl %p, index %lu.\n", hkl, index ); - TRACE("(%p, %ld)\n", hKL, fdwIndex); - kbd = IMM_GetImmHkl(hKL); + ime = IMM_GetImmHkl( hkl ); + if (!ime || !ime->hIME) return 0; - if (kbd && kbd->hIME) + switch (index) { - switch (fdwIndex) - { - case IGP_PROPERTY: rc = kbd->imeInfo.fdwProperty; break; - case IGP_CONVERSION: rc = kbd->imeInfo.fdwConversionCaps; break; - case IGP_SENTENCE: rc = kbd->imeInfo.fdwSentenceCaps; break; - case IGP_SETCOMPSTR: rc = kbd->imeInfo.fdwSCSCaps; break; - case IGP_SELECT: rc = kbd->imeInfo.fdwSelectCaps; break; - case IGP_GETIMEVERSION: rc = IMEVER_0400; break; - case IGP_UI: rc = 0; break; - default: rc = 0; - } + case IGP_PROPERTY: ret = ime->imeInfo.fdwProperty; break; + case IGP_CONVERSION: ret = ime->imeInfo.fdwConversionCaps; break; + case IGP_SENTENCE: ret = ime->imeInfo.fdwSentenceCaps; break; + case IGP_SETCOMPSTR: ret = ime->imeInfo.fdwSCSCaps; break; + case IGP_SELECT: ret = ime->imeInfo.fdwSelectCaps; break; + case IGP_GETIMEVERSION: ret = IMEVER_0400; break; + case IGP_UI: ret = 0; break; + default: ret = 0; break; } - return rc; + + return ret; } /***********************************************************************

1 0

Fan WenJie : opengl32: Fix missing conversion of glUnmapNamedBuffer_params from 32bit to 64bit.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: b3ae4f794788628ffa62f15db78d14564cc8c21d URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ae4f794788628ffa62f15db78d14… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Thu Mar 9 22:03:59 2023 +0800 opengl32: Fix missing conversion of glUnmapNamedBuffer_params from 32bit to 64bit. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/opengl32/unix_wgl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a410321994d..6c3379b90a2 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -2080,14 +2080,20 @@ static NTSTATUS wow64_gl_unmap_named_buffer( void *args, NTSTATUS (*gl_unmap_nam GLint buffer; GLboolean ret; } *params32 = args; + struct glUnmapNamedBuffer_params params = + { + .teb = get_teb64(params32->teb), + .buffer = params32->buffer, + .ret = TRUE, + }; NTSTATUS status; - TEB *teb = get_teb64( params32->teb ); - if (!(ptr = get_named_buffer_pointer( teb, params32->buffer ))) return STATUS_SUCCESS; + if (!(ptr = get_named_buffer_pointer( params.teb, params.buffer ))) return STATUS_SUCCESS; - status = wow64_unmap_buffer( ptr, get_named_buffer_param( teb, params32->buffer, GL_BUFFER_MAP_LENGTH ), - get_named_buffer_param( teb, params32->buffer, GL_BUFFER_ACCESS_FLAGS ) ); - gl_unmap_named_buffer64( args ); + status = wow64_unmap_buffer( ptr, get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_MAP_LENGTH ), + get_named_buffer_param( params.teb, params.buffer, GL_BUFFER_ACCESS_FLAGS ) ); + gl_unmap_named_buffer64( &params ); + params32->ret = params.ret; return status; }

1 0

Fan WenJie : opengl32: Fix missing conversion of glUnmapBuffer_params from 32bit to 64bit.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 60ce80e6ac779408d83bfc303108353fb5993d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/60ce80e6ac779408d83bfc30310835… Author: Fan WenJie <fanwj(a)mail.ustc.edu.cn> Date: Thu Mar 9 22:03:59 2023 +0800 opengl32: Fix missing conversion of glUnmapBuffer_params from 32bit to 64bit. Signed-off-by: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/opengl32/unix_wgl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 24bd904b068..a410321994d 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -2043,14 +2043,20 @@ static NTSTATUS wow64_gl_unmap_buffer( void *args, NTSTATUS (*gl_unmap_buffer64) GLenum target; GLboolean ret; } *params32 = args; + struct glUnmapBuffer_params params = + { + .teb = get_teb64(params32->teb), + .target = params32->target, + .ret = TRUE, + }; NTSTATUS status; - TEB *teb = get_teb64( params32->teb ); - if (!(ptr = get_buffer_pointer( teb, params32->target ))) return STATUS_SUCCESS; + if (!(ptr = get_buffer_pointer( params.teb, params.target ))) return STATUS_SUCCESS; - status = wow64_unmap_buffer( ptr, get_buffer_param( teb, params32->target, GL_BUFFER_MAP_LENGTH ), - get_buffer_param( teb, params32->target, GL_BUFFER_ACCESS_FLAGS ) ); - gl_unmap_buffer64( args ); + status = wow64_unmap_buffer( ptr, get_buffer_param( params.teb, params.target, GL_BUFFER_MAP_LENGTH ), + get_buffer_param( params.teb, params.target, GL_BUFFER_ACCESS_FLAGS ) ); + gl_unmap_buffer64( &params ); + params32->ret = params.ret; return status; }

1 0

Stefan Dösinger : dxgi/tests: Test nested SetFullscreenState from the same thread.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 617831054f13922cd646ad3653f959f667604273 URL: https://gitlab.winehq.org/wine/wine/-/commit/617831054f13922cd646ad3653f959… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 13 15:51:35 2023 +0300 dxgi/tests: Test nested SetFullscreenState from the same thread. I am still deliberately not testing after which message the swapchain state changes from the old state to the new until we find a game that depends on this. ddraw, d3d8 and d3d9 do not catch recursive SetDisplayMode or Reset() calls. They will recurse for about 16 times and then return library specific weird return values like 0xd0000510 (NTSTATUS, but nonexistent facility) or 0x88760868 (non-existent HRESULT facility). I suspect it aborts when the kernel-side message processing stack is exhausted. As such, an application depending on nested calls in those libraries would have to deliberately do it, but limit the amount of nesting to a non-zero amount. --- dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index fe933a3852f..ac302840dec 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5889,14 +5889,54 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static BOOL reentry; + IDXGIOutput *target; + HRESULT hr, hr2; + BOOL fs; + flaky ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n", message, hwnd, wparam, lparam); + ok(!reentry, "Re-entered wndproc in nested SetFullscreenState call\n"); + if (expect_messages) { if (check_message(expect_messages, hwnd, message, wparam, lparam)) + { ++expect_messages; + + if (swapchain) + { + reentry = TRUE; + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Priority of error values. */ + hr = IDXGISwapChain_GetContainingOutput(swapchain, &target); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, target); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", DXGI_ERROR_INVALID_CALL); + IDXGIOutput_Release(target); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + hr2 = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + + if (fs) + { + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr2 == DXGI_STATUS_MODE_CHANGE_IN_PROGRESS, "Got unexpected hr %#lx.\n", hr); + } + else + { + ok(hr == DXGI_STATUS_MODE_CHANGE_IN_PROGRESS, "Got unexpected hr %#lx.\n", hr); + ok(hr2 == S_OK, "Got unexpected hr %#lx.\n", hr); + } + reentry = FALSE; + } + } } if (expect_messages_broken) @@ -6028,12 +6068,14 @@ static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); /* enter fullscreen */ + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)swapchain); expect_messages = enter_fullscreen_messages; expect_messages_broken = enter_fullscreen_messages_vista; hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ "Got unexpected hr %#lx.\n", hr); + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)NULL); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -6078,9 +6120,11 @@ static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) expect_messages_broken = NULL; /* leave fullscreen */ + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)swapchain); expect_messages = leave_fullscreen_messages; hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + SetWindowLongPtrA(window, GWLP_USERDATA, (LONG_PTR)NULL); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL;

1 0

Stefan Dösinger : dxgi/tests: Test nested fullscreen application from different thread.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 92544264fdf0335b8ba54ae24458853613723e30 URL: https://gitlab.winehq.org/wine/wine/-/commit/92544264fdf0335b8ba54ae2445885… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 3 15:23:18 2023 +0300 dxgi/tests: Test nested fullscreen application from different thread. --- dlls/dxgi/tests/dxgi.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index c6e06312d76..fe933a3852f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3358,25 +3358,42 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } +struct resize_target_data +{ + IDXGISwapChain *swapchain; + BOOL test_nested_sfs; +}; + static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { - IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + struct resize_target_data *data = (struct resize_target_data *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); DXGI_SWAP_CHAIN_DESC desc; HRESULT hr; + BOOL fs; switch (message) { case WM_SIZE: - ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); - hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(!!data, "GWLP_USERDATA is NULL.\n"); + hr = IDXGISwapChain_GetDesc(data->swapchain, &desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); return 0; - default: - return DefWindowProcA(hwnd, message, wparam, lparam); + case WM_WINDOWPOSCHANGED: + if (!data->test_nested_sfs) + break; + + /* We are not supposed to deadlock if the window is owned by a different thread. + * The current fullscreen state and consequently the return value of the nested + * SetFullscreenState call are racy on Windows, do not test them. */ + hr = IDXGISwapChain_GetFullscreenState(data->swapchain, &fs, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + IDXGISwapChain_SetFullscreenState(data->swapchain, FALSE, NULL); + break; } + return DefWindowProcA(hwnd, message, wparam, lparam); } struct window_thread_data @@ -3425,6 +3442,7 @@ static DWORD WINAPI window_thread(void *data) static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) { + struct resize_target_data window_data = {0}; struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; @@ -3436,6 +3454,7 @@ static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) HANDLE thread; HRESULT hr; RECT rect; + BOOL fs; get_factory(device, is_d3d12, &factory); @@ -3468,7 +3487,8 @@ static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); + window_data.swapchain = swapchain; + data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)&window_data); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); memset(&mode, 0, sizeof(mode)); @@ -3489,6 +3509,21 @@ static void test_resize_target_wndproc(IUnknown *device, BOOL is_d3d12) ok(rect.right == mode.Width && rect.bottom == mode.Height, "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); + /* Win7 testbot reports no output for the swapchain and can't switch to fullscreen. */ + window_data.test_nested_sfs = TRUE; + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fs, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(fs, "Got unexpected fullscreen state %x.\n", fs); + } + window_data.test_nested_sfs = FALSE; + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount);

1 0

Stefan Dösinger : dxgi: Catch nested SetFullscreenState invocations.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 33170e27206e4e94ea3365822cdd2e807e5656d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/33170e27206e4e94ea3365822cdd2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 13 16:27:59 2023 +0300 dxgi: Catch nested SetFullscreenState invocations. --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index dd17e39eca6..fa704d28b0f 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -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, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9449d13ae49..1f5eb99ab4b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -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; }

1 0

Stefan Dösinger : dxgi: Unlock the wined3d mutex after storing the new target.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 75f7bd0eea4f0a9a351c858196ef6c83fda2a747 URL: https://gitlab.winehq.org/wine/wine/-/commit/75f7bd0eea4f0a9a351c858196ef6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 10:38:46 2023 +0300 dxgi: Unlock the wined3d mutex after storing the new target. Otherwise a second thread might set it to something else between the unlock and assignment. --- dlls/dxgi/swapchain.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 454d58792fe..9449d13ae49 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -410,12 +410,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) { IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; } if (!fullscreen) @@ -428,7 +427,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapChain1 *iface, @@ -2098,13 +2099,20 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen if (FAILED(hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, target, window, swapchain_desc, fullscreen_desc))) - goto fail; + { + IDXGIOutput_Release(target); + return hr; + } + wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); - wined3d_mutex_unlock(); if (FAILED(hr)) - goto fail; + { + IDXGIOutput_Release(target); + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; + goto done; + } fullscreen_desc->Windowed = wined3d_desc.windowed; if (!fullscreen) @@ -2117,12 +2125,9 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen IDXGIOutput_Release(swapchain->target); swapchain->target = target; - return S_OK; - -fail: - IDXGIOutput_Release(target); - - return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain4 *iface,

1 0

Stefan Dösinger : dxgi/tests: Run test_swapchain_window_messages on d3d12.
by Alexandre Julliard 10 Mar '23

10 Mar '23

Module: wine Branch: master Commit: 52bdd0dbcd482da836ef488bb201bcdc5b7b8c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/52bdd0dbcd482da836ef488bb201bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 8 20:46:01 2023 +0300 dxgi/tests: Run test_swapchain_window_messages on d3d12. --- dlls/dxgi/tests/dxgi.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5788a82b32e..c6e06312d76 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5873,14 +5873,12 @@ static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wpa return DefWindowProcA(hwnd, message, wparam, lparam); } -static void test_swapchain_window_messages(void) +static void test_swapchain_window_messages(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; DXGI_MODE_DESC mode_desc; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; ULONG refcount; WNDCLASSA wc; HWND window; @@ -5942,12 +5940,6 @@ static void test_swapchain_window_messages(void) {0, FALSE, 0}, }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - memset(&wc, 0, sizeof(wc)); wc.lpfnWndProc = test_wndproc; wc.lpszClassName = "dxgi_test_wndproc_wc"; @@ -5955,11 +5947,7 @@ static void test_swapchain_window_messages(void) window = CreateWindowA("dxgi_test_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); ok(!!window, "Failed to create window.\n"); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -5971,16 +5959,16 @@ static void test_swapchain_window_messages(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = window; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; /* create swapchain */ flush_events(); expect_no_messages = TRUE; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); expect_no_messages = FALSE; @@ -6045,7 +6033,7 @@ static void test_swapchain_window_messages(void) expect_messages = enter_fullscreen_messages; expect_messages_broken = enter_fullscreen_messages_vista; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); todo_wine @@ -6067,10 +6055,8 @@ done: ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(window); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %lu references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); } @@ -7717,7 +7703,6 @@ START_TEST(dxgi) test_gamma_control(); test_multi_adapter(); test_swapchain_parameters(); - test_swapchain_window_messages(); test_swapchain_window_styles(); run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); @@ -7733,6 +7718,7 @@ START_TEST(dxgi) run_on_d3d10(test_mode_change); run_on_d3d10(test_swapchain_present_count); run_on_d3d10(test_resize_target_wndproc); + run_on_d3d10(test_swapchain_window_messages); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7765,6 +7751,7 @@ START_TEST(dxgi) run_on_d3d12(test_mode_change); run_on_d3d12(test_swapchain_present_count); run_on_d3d12(test_resize_target_wndproc); + run_on_d3d12(test_swapchain_window_messages); FreeLibrary(d3d12_module); }

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
91
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 March 2023