September 2023 - Wine-Commits

Alexandros Frantzis : winewayland.drv: Handle xdg_toplevel close event.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 76eecdb205146b33cd041c94cbdbae8657e58693 URL: https://gitlab.winehq.org/wine/wine/-/commit/76eecdb205146b33cd041c94cbdbae… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 13 09:49:27 2023 +0300 winewayland.drv: Handle xdg_toplevel close event. --- dlls/winewayland.drv/wayland_surface.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index e8ab52da543..832a1081234 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -65,6 +65,24 @@ static const struct xdg_surface_listener xdg_surface_listener = xdg_surface_handle_configure }; +static void xdg_toplevel_handle_configure(void *data, + struct xdg_toplevel *xdg_toplevel, + int32_t width, int32_t height, + struct wl_array *states) +{ +} + +static void xdg_toplevel_handle_close(void *data, struct xdg_toplevel *xdg_toplevel) +{ + NtUserPostMessage((HWND)data, WM_SYSCOMMAND, SC_CLOSE, 0); +} + +static const struct xdg_toplevel_listener xdg_toplevel_listener = +{ + xdg_toplevel_handle_configure, + xdg_toplevel_handle_close +}; + /********************************************************************** * wayland_surface_create * @@ -164,6 +182,7 @@ void wayland_surface_make_toplevel(struct wayland_surface *surface) surface->xdg_toplevel = xdg_surface_get_toplevel(surface->xdg_surface); if (!surface->xdg_toplevel) goto err; + xdg_toplevel_add_listener(surface->xdg_toplevel, &xdg_toplevel_listener, surface->hwnd); wl_surface_commit(surface->wl_surface); wl_display_flush(process_wayland.wl_display);

1 0

Alistair Leslie-Hughes : msado15: _Recordset::Open store active connection parameter.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 5bfd2fc19c30d3ee952ef2584740cd7de37e2715 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bfd2fc19c30d3ee952ef2584740cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 27 17:57:38 2023 +1000 msado15: _Recordset::Open store active connection parameter. --- dlls/msado15/recordset.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 272131a0d31..ce91e7b17c0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -2071,6 +2071,10 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT if (FAILED(hr)) return E_FAIL; + hr = VariantCopy(&recordset->active_connection, &active_connection); + if (FAILED(hr)) + return E_FAIL; + if (V_VT(&source) != VT_BSTR) { FIXME("Unsupported source type!\n");

1 0

Alexandros Frantzis : winewayland.drv: Remove wayland_surface destruction double locking.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: e0a5f3564972b0a51e3c14a8fcf1e8f0dcdd0c73 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0a5f3564972b0a51e3c14a8fcf1e8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Sep 12 15:37:42 2023 +0300 winewayland.drv: Remove wayland_surface destruction double locking. Ignoring the possibility of HWND recycling allows us to use a simpler scheme to ensure valid access to the wayland_surface associated with an xdg_surface during event handling. The scheme involves setting HWND as the xdg_surface user data and using that to get to the wayland_surface. The prerequisite for this code to be correct is that the wayland surface destruction for a HWND must be performed under the wayland_win_data mutex. --- dlls/winewayland.drv/wayland_surface.c | 25 +++---------------------- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window.c | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 7e77c9ba55f..e8ab52da543 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -33,38 +33,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -/* Protects access to the user data of xdg_surface */ -static pthread_mutex_t xdg_data_mutex = PTHREAD_MUTEX_INITIALIZER; - -static struct wayland_surface *wayland_surface_lock_xdg(struct xdg_surface *xdg_surface) -{ - struct wayland_surface *surface; - - pthread_mutex_lock(&xdg_data_mutex); - surface = xdg_surface_get_user_data(xdg_surface); - if (surface) pthread_mutex_lock(&surface->mutex); - pthread_mutex_unlock(&xdg_data_mutex); - - return surface; -} - static void xdg_surface_handle_configure(void *data, struct xdg_surface *xdg_surface, uint32_t serial) { struct wayland_surface *surface; BOOL initial_configure = FALSE; - HWND hwnd; + HWND hwnd = data; TRACE("serial=%u\n", serial); - if (!(surface = wayland_surface_lock_xdg(xdg_surface))) return; + if (!(surface = wayland_surface_lock_hwnd(hwnd))) return; /* Handle this event only if wayland_surface is still associated with * the target xdg_surface. */ if (surface->xdg_surface == xdg_surface) { initial_configure = surface->current_serial == 0; - hwnd = surface->hwnd; surface->current_serial = serial; xdg_surface_ack_configure(xdg_surface, serial); } @@ -132,7 +116,6 @@ void wayland_surface_destroy(struct wayland_surface *surface) } pthread_mutex_unlock(&process_wayland.pointer.mutex); - pthread_mutex_lock(&xdg_data_mutex); pthread_mutex_lock(&surface->mutex); if (surface->xdg_toplevel) @@ -143,7 +126,6 @@ void wayland_surface_destroy(struct wayland_surface *surface) if (surface->xdg_surface) { - xdg_surface_set_user_data(surface->xdg_surface, NULL); xdg_surface_destroy(surface->xdg_surface); surface->xdg_surface = NULL; } @@ -155,7 +137,6 @@ void wayland_surface_destroy(struct wayland_surface *surface) } pthread_mutex_unlock(&surface->mutex); - pthread_mutex_unlock(&xdg_data_mutex); if (surface->latest_window_buffer) wayland_shm_buffer_unref(surface->latest_window_buffer); @@ -179,7 +160,7 @@ void wayland_surface_make_toplevel(struct wayland_surface *surface) surface->xdg_surface = xdg_wm_base_get_xdg_surface(process_wayland.xdg_wm_base, surface->wl_surface); if (!surface->xdg_surface) goto err; - xdg_surface_add_listener(surface->xdg_surface, &xdg_surface_listener, surface); + xdg_surface_add_listener(surface->xdg_surface, &xdg_surface_listener, surface->hwnd); surface->xdg_toplevel = xdg_surface_get_toplevel(surface->xdg_surface); if (!surface->xdg_toplevel) goto err; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index f4292e0ae28..6e0b5c6fb10 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -166,6 +166,7 @@ void wayland_surface_clear_role(struct wayland_surface *surface) DECLSPEC_HIDDEN void wayland_surface_attach_shm(struct wayland_surface *surface, struct wayland_shm_buffer *shm_buffer, HRGN surface_damage_region) DECLSPEC_HIDDEN; +struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index efe72baf92e..958bc5dbe68 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -338,3 +338,20 @@ void wayland_window_flush(HWND hwnd) wayland_win_data_release(data); } + +/********************************************************************** + * wayland_surface_lock_hwnd + */ +struct wayland_surface *wayland_surface_lock_hwnd(HWND hwnd) +{ + struct wayland_win_data *data = wayland_win_data_get(hwnd); + struct wayland_surface *surface; + + if (!data) return NULL; + + if ((surface = data->wayland_surface)) pthread_mutex_lock(&surface->mutex); + + wayland_win_data_release(data); + + return surface; +}

1 0

Alistair Leslie-Hughes : msado15: Update editMode in AddNew/Cancel/Update functions.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 8fa02bf0863a8115c604ab90235e96d6735b6220 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa02bf0863a8115c604ab90235e96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 27 17:57:38 2023 +1000 msado15: Update editMode in AddNew/Cancel/Update functions. --- dlls/msado15/recordset.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 19 ++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ce91e7b17c0..99779f99dfa 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1588,12 +1588,20 @@ static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, V if (!resize_recordset( recordset, recordset->count + 1 )) return E_OUTOFMEMORY; recordset->index++; + recordset->editmode = adEditAdd; return S_OK; } static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface ) { + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p\n", iface ); + + if (V_DISPATCH(&recordset->active_connection) == NULL) + return S_OK; + + recordset->editmode = adEditNone; return E_NOTIMPL; } @@ -2153,7 +2161,14 @@ static HRESULT WINAPI recordset__xResync( _Recordset *iface, AffectEnum affect_r static HRESULT WINAPI recordset_Update( _Recordset *iface, VARIANT fields, VARIANT values ) { + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %s, %s\n", iface, debugstr_variant(&fields), debugstr_variant(&values) ); + + if (V_DISPATCH(&recordset->active_connection) == NULL) + return S_OK; + + recordset->editmode = adEditNone; return E_NOTIMPL; } @@ -2270,13 +2285,27 @@ static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj ) static HRESULT WINAPI recordset_UpdateBatch( _Recordset *iface, AffectEnum affect_records ) { + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %u\n", iface, affect_records ); + + if (V_DISPATCH(&recordset->active_connection) == NULL) + return S_OK; + + recordset->editmode = adEditNone; return E_NOTIMPL; } static HRESULT WINAPI recordset_CancelBatch( _Recordset *iface, AffectEnum affect_records ) { + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %u\n", iface, affect_records ); + + if (V_DISPATCH(&recordset->active_connection) == NULL) + return S_OK; + + recordset->editmode = adEditNone; return E_NOTIMPL; } @@ -2350,7 +2379,14 @@ static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG ski static HRESULT WINAPI recordset_Cancel( _Recordset *iface ) { + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p\n", iface ); + + if (V_DISPATCH(&recordset->active_connection) == NULL) + return S_OK; + + recordset->editmode = adEditNone; return E_NOTIMPL; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index c60ea69227c..9c9afbc120f 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -267,7 +267,7 @@ if (0) editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == S_OK, "got %08lx\n", hr ); - todo_wine ok( editmode == adEditAdd, "got %d\n", editmode ); + ok( editmode == adEditAdd, "got %d\n", editmode ); rec_count = -1; hr = _Recordset_get_RecordCount( recordset, &rec_count ); @@ -317,6 +317,23 @@ if (0) ok( V_VT( &val ) == VT_I4, "got %u\n", V_VT( &val ) ); ok( V_I4( &val ) == -1, "got %ld\n", V_I4( &val ) ); + /* Update/Cancel doesn't update EditMode when no active connection. */ + hr = _Recordset_Update( recordset, missing, missing ); + ok( hr == S_OK, "got %08lx\n", hr ); + + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( editmode == adEditAdd, "got %d\n", editmode ); + + hr = _Recordset_Cancel( recordset ); + ok( hr == S_OK, "got %08lx\n", hr ); + + editmode = -1; + hr = _Recordset_get_EditMode( recordset, &editmode ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( editmode == adEditAdd, "got %d\n", editmode ); + hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == S_OK, "got %08lx\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset::get_ActiveConnection.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: a1610861ff3fe215470ac48e6e3cbbf9873e197b URL: https://gitlab.winehq.org/wine/wine/-/commit/a1610861ff3fe215470ac48e6e3cbb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 27 17:57:38 2023 +1000 msado15: Implement _Recordset::get_ActiveConnection. --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 9107aca26e7..272131a0d31 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -39,6 +39,7 @@ struct recordset ADORecordsetConstruction ADORecordsetConstruction_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG refs; + VARIANT active_connection; LONG state; struct fields *fields; LONG count; @@ -1401,8 +1402,9 @@ static HRESULT WINAPI recordset_put_ActiveConnection( _Recordset *iface, VARIANT static HRESULT WINAPI recordset_get_ActiveConnection( _Recordset *iface, VARIANT *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, connection ); + return VariantCopy(connection, &recordset->active_connection); } static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) @@ -2737,6 +2739,8 @@ HRESULT Recordset_create( void **obj ) recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->ADORecordsetConstruction_iface.lpVtbl = &rsconstruction_vtbl; + V_VT(&recordset->active_connection) = VT_DISPATCH; + V_DISPATCH(&recordset->active_connection) = NULL; recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 724787870e0..c60ea69227c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -59,7 +59,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; - VARIANT bookmark, filter; + VARIANT bookmark, filter, active; EditModeEnum editmode; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -222,6 +222,18 @@ static void test_Recordset(void) ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); +if (0) +{ /* Causes a crash */ + hr = _Recordset_get_ActiveConnection( recordset, NULL ); +} + + VariantInit(&active); + hr = _Recordset_get_ActiveConnection( recordset, &active ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( V_VT(&active) == VT_DISPATCH, "got %d\n", V_VT(&active) ); + ok( V_DISPATCH(&active) == NULL, "got %p\n", V_DISPATCH(&active) ); + VariantClear(&active); + editmode = -1; hr = _Recordset_get_EditMode( recordset, &editmode ); ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08lx\n", hr );

1 0

Joel Holdsworth : ntdll/tests: Skip FileRenameInformationEx tests on older Windows versions.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: b19b9a35cee927e310b7bccedeef932a5128888c URL: https://gitlab.winehq.org/wine/wine/-/commit/b19b9a35cee927e310b7bccedeef93… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Sep 25 11:18:24 2023 +0100 ntdll/tests: Skip FileRenameInformationEx tests on older Windows versions. Test failures were introduced in 67479f8c2fc03c2043b8414bc063e671e36fdbda, and affect Windows 10 1607 and older. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55631 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index fc7a6e82059..ac1a6fd5f75 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1546,6 +1546,16 @@ static void test_file_rename_information(FILE_INFORMATION_CLASS class) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, class ); + + if (class == FileRenameInformationEx && (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS)) + { + todo_wine win_skip( "FileRenameInformationEx not supported\n" ); + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + delete_object( oldpath ); + return; + } + todo_wine_if( class == FileRenameInformationEx ) ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); todo_wine_if( class == FileRenameInformationEx )

1 0

Joel Holdsworth : ntdll/tests: Skip FileLinkInformationEx tests on older Windows versions.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: e06780c3a7cb833ff7a99c7853458fa1e932b9f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e06780c3a7cb833ff7a99c7853458f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Sep 25 11:29:22 2023 +0100 ntdll/tests: Skip FileLinkInformationEx tests on older Windows versions. Test failures were introduced in 67479f8c2fc03c2043b8414bc063e671e36fdbda, and affect Windows 10 1607 and older. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55631 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ac1a6fd5f75..1fcffe36a35 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2255,6 +2255,16 @@ static void test_file_link_information(FILE_INFORMATION_CLASS class) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fli, sizeof(FILE_LINK_INFORMATION) + fli->FileNameLength, class ); + + if (class == FileLinkInformationEx && (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_INFO_CLASS)) + { + todo_wine win_skip( "FileLinkInformationEx not supported\n" ); + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fli ); + delete_object( oldpath ); + return; + } + todo_wine_if( class == FileLinkInformationEx ) ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); todo_wine_if( class == FileLinkInformationEx )

1 0

Zhiyi Zhang : user32/tests: Fix test failures in Hindi UTF-8 and mixed locales.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: b000b6593750c2cb82605c2f960afa36dd68f44c URL: https://gitlab.winehq.org/wine/wine/-/commit/b000b6593750c2cb82605c2f960afa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 27 15:54:31 2023 +0800 user32/tests: Fix test failures in Hindi UTF-8 and mixed locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55656 --- dlls/user32/tests/dialog.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 18a9685b230..7ea0d13c0f3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -38,6 +38,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #define MAXHWNDS 1024 static HWND hwnd [MAXHWNDS]; @@ -569,13 +570,24 @@ static LRESULT CALLBACK test_control_procA(HWND hwnd, UINT msg, WPARAM wparam, L static int wm_char_count; +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} + static LRESULT CALLBACK test_IsDialogMessageA_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { case WM_CHAR: - if (GetSystemMetrics(SM_DBCSENABLED)) + if (is_cjk()) ok(wparam == 0x5b57, "Got unexpected wparam %#Ix.\n", wparam); + else if (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_HINDI && GetACP() == CP_UTF8) + ok(wparam == 0xfffd, "Got unexpected wparam %#Ix.\n", wparam); else ok(wparam == 0x3f, "Got unexpected wparam %#Ix.\n", wparam); wm_char_count++; @@ -863,8 +875,10 @@ static void test_IsDialogMessage(void) { if (msg.message == WM_CHAR) { - if (GetSystemMetrics(SM_DBCSENABLED)) + if (is_cjk()) ok(msg.wParam != 0x3f && msg.wParam != 0x5b57, "Got unexpected wparam %#Ix.\n", msg.wParam); + else if (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_HINDI && GetACP() == CP_UTF8) + ok(msg.wParam == 0x97ade5, "Got unexpected wparam %#Ix.\n", msg.wParam); else ok(msg.wParam == 0x3f, "Got unexpected wparam %#Ix.\n", msg.wParam); ret = IsDialogMessageA(g_hwndMain, &msg);

1 0

Esme Povirk : user32/tests: Use open_clipboard helper in msg tests.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: ef837dbceb702d9d31477d8edd17b54a71665dd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef837dbceb702d9d31477d8edd17b5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 27 13:17:00 2023 -0500 user32/tests: Use open_clipboard helper in msg tests. --- dlls/user32/tests/msg.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9d2cc404139..10240b18826 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17623,11 +17623,41 @@ out_unregister: UnregisterClassA("TestDesktopClass", instance); } +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + #define clear_clipboard(hwnd) clear_clipboard_(__LINE__, (hwnd)) static void clear_clipboard_(int line, HWND hWnd) { BOOL succ; - succ = OpenClipboard(hWnd); + succ = open_clipboard_(line, hWnd); ok_(__FILE__, line)(succ, "OpenClipboard failed, err=%lu\n", GetLastError()); succ = EmptyClipboard(); ok_(__FILE__, line)(succ, "EmptyClipboard failed, err=%lu\n", GetLastError());

1 0

Zhiyi Zhang : user32: Enable IsDialogMessageA() ASCII to Unicode mapping only when the user default lang ID is CJK.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 8d5d413697e92042c64a6a77894b88eed063a8b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d5d413697e92042c64a6a77894b88… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 27 15:57:53 2023 +0800 user32: Enable IsDialogMessageA() ASCII to Unicode mapping only when the user default lang ID is CJK. Using GetSystemMetrics(SM_DBCSENABLED) may incorrectly enable ASCII to Unicode mapping in mixed locale environments. For example, when UserDefaultLCID is French(040c) but SystemDefaultLCID is Japanese(0411). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55655 --- dlls/user32/message.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4016c95539a..86c6593e192 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -807,6 +807,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT return (msg->message != WM_QUIT); } +static BOOL is_cjk(void) +{ + int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); + + if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN) + return TRUE; + return FALSE; +} /*********************************************************************** * IsDialogMessageA (USER32.@) @@ -817,7 +825,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) enum wm_char_mapping mapping; MSG msg = *pmsg; - mapping = GetSystemMetrics( SM_DBCSENABLED ) ? WMCHAR_MAP_ISDIALOGMESSAGE : WMCHAR_MAP_NOMAPPING; + mapping = is_cjk() ? WMCHAR_MAP_ISDIALOGMESSAGE : WMCHAR_MAP_NOMAPPING; if (!map_wparam_AtoW( msg.message, &msg.wParam, mapping )) return TRUE; return IsDialogMessageW( hwndDlg, &msg );

1 0