- Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Fix some tests for SymLoadModule*().
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 7b0d974439ed69f2323cd64685bc96d370ec6531 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b0d974439ed69f2323cd64685bc96… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 15:25:51 2023 +0100 dbghelp: Fix some tests for SymLoadModule*(). On top of being closer to native behavior, this helps some games where: - they use dbghelp to gather information of where they generate exceptions, - they generate exception in the game play, - and refresh their list of loaded modules in dbghelp. This can generate some delays (~2ms per module), which affects game play (freeze, slugginess...). Credit to Paul Gofman for triaging this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 18 ++++++++++++++++-- dlls/dbghelp/tests/dbghelp.c | 1 - 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index b12007d270e..f21733c7be9 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -943,6 +943,19 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08lx for %s\n", Flags, debugstr_w(wImageName)); + /* Trying to load a new module at the same address of an existing one, + * native simply keeps the old one in place. + */ + if (BaseOfDll) + for (altmodule = pcs->lmodules; altmodule; altmodule = altmodule->next) + { + if (altmodule->type == DMT_PE && BaseOfDll == altmodule->module.BaseOfImage) + { + SetLastError(ERROR_SUCCESS); + return 0; + } + } + pcs->loader->synchronize_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ @@ -974,6 +987,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (!module) { WARN("Couldn't locate %s\n", debugstr_w(wImageName)); + SetLastError(ERROR_NO_MORE_FILES); return 0; } /* by default module_new fills module.ModuleName from a derivation @@ -997,11 +1011,11 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam * (it's hidden by altmodule). * We need to decide which one the two modules we need to get rid of. */ - /* loading same module at same address... don't change anything */ + /* loading same module at same address... we can only get here when BaseOfDll is 0 */ if (module->module.BaseOfImage == altmodule->module.BaseOfImage) { module_remove(pcs, module); - SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_INVALID_ADDRESS); return 0; } /* replace old module with new one */ diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0259aaac81a..13cd173e761 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -605,7 +605,6 @@ static void test_modules_overlap(void) if (tests[i].error_code != ~0) { ok(base[1] == 0, "SymLoadModuleEx should have failed\n"); - todo_wine_if((i >= 8 && i < 12) || (i >= 20 && i < 32)) ok(GetLastError() == tests[i].error_code || /* Win8 returns this */ (tests[i].error_code == ERROR_NO_MORE_FILES && broken(GetLastError() == ERROR_INVALID_HANDLE)),

1 0

Eric Pouech : dbghelp/tests: Extend tests for module loading.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: f5e86cbea647c3a80fffd00bfc56fb0f24669b24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5e86cbea647c3a80fffd00bfc56fb… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Dec 16 13:04:32 2023 +0100 dbghelp/tests: Extend tests for module loading. Basically, showing specific behavior when calling SymLoadModule() with a non-null base address, and that address is already the exact base address of a loaded module. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 135 +++++++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 31 deletions(-)

1 0

Rémi Bernon : server: Always queue mouse messages delivered to another window.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: bb496ea847bb019067ea4b60b9916378ed6fc452 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb496ea847bb019067ea4b60b99163… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 09:54:42 2023 +0100 server: Always queue mouse messages delivered to another window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 --- server/queue.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/queue.c b/server/queue.c index 15a63f880f1..67249d06599 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1711,6 +1711,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } input = thread->queue->input; + if (win != msg->win) always_queue = 1; if (!always_queue || merge_message( input, msg )) free_message( msg ); else {

1 0

Rémi Bernon : server: Ignore the capture window wrt desktop cursor changes.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 2e90c016968612689cbbb3de114e27e0e32f8ce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e90c016968612689cbbb3de114e27… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 09:54:42 2023 +0100 server: Ignore the capture window wrt desktop cursor changes. This partially reverts commit c3dcf1e2697b2cdf88dffdeb57feb0d5c7ff06cb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56046 --- server/queue.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 67249d06599..d3ca1172d91 100644 --- a/server/queue.c +++ b/server/queue.c @@ -454,8 +454,6 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y ) { - struct thread_input *input; - user_handle_t capture; int updated; x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); @@ -465,7 +463,6 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); - if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture; if (!win || !is_window_visible( win ) || is_window_transparent( win )) win = shallow_window_from_point( desktop, x, y ); if (update_desktop_cursor_window( desktop, win )) updated = 1;

1 0

Jacek Caban : win32u: Use 32-bit window extra size on wow64.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 46df584cc586587e1d46767719eb8421f64375b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/46df584cc586587e1d46767719eb84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 18 13:32:45 2023 +0100 win32u: Use 32-bit window extra size on wow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55582 --- dlls/win32u/class.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 1fb5044b2e5..33baed3dc23 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -1125,14 +1125,6 @@ static const struct builtin_class_descr builtin_classes[] = .extra = DLGWINDOWEXTRA, .cursor = IDC_ARROW, }, - /* edit */ - { - .name = "Edit", - .style = CS_DBLCLKS | CS_PARENTDC, - .proc = WINPROC_EDIT, - .extra = sizeof(UINT64), - .cursor = IDC_IBEAM, - }, /* icon title */ { .name = MAKEINTRESOURCEA(ICONTITLE_CLASS_ATOM), @@ -1233,7 +1225,19 @@ static void register_builtins(void) ULONG ret_len, i; void *ret_ptr; + /* 64-bit Windows use sizeof(UINT64) for all processes, while 32-bit Windows use 6 for extra + * bytes size. Civilization II depends on the size being 6, so we use that even in wow64. */ + const struct builtin_class_descr edit_class = + { + .name = "Edit", + .style = CS_DBLCLKS | CS_PARENTDC, + .proc = WINPROC_EDIT, + .extra = sizeof(void *) == 4 || NtCurrentTeb()->WowTebOffset ? 6 : sizeof(UINT64), + .cursor = IDC_IBEAM, + }; + for (i = 0; i < ARRAYSIZE(builtin_classes); i++) register_builtin( &builtin_classes[i] ); + register_builtin( &edit_class ); KeUserModeCallback( NtUserInitBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); }

1 0

Rémi Bernon : dinput/tests: Avoid calling UnloadKeyboardLayout.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: e98388b6a09f2115d35aa340d4a57fdc8bc5680e URL: https://gitlab.winehq.org/wine/wine/-/commit/e98388b6a09f2115d35aa340d4a57f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 16:01:29 2023 +0100 dinput/tests: Avoid calling UnloadKeyboardLayout. This seems to later mess up with the preload keyboard list and GetKeyboardLayoutNameW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478 --- dlls/dinput/tests/device8.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 1d53d35a93b..5d4c2bb4366 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1707,7 +1707,6 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); - UnloadKeyboardLayout( hkl ); winetest_pop_context(); } @@ -2253,7 +2252,6 @@ static void test_sys_keyboard( DWORD version ) skip_key_tests: ActivateKeyboardLayout( old_hkl, 0 ); - UnloadKeyboardLayout( hkl ); test_dik_codes( device, event, hwnd, version );

1 0

Rémi Bernon : user32/tests: Skip some keyboard layout tests on broken VMs.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: c29d7330bc5879aae1064a41f05083e15ff64e8d URL: https://gitlab.winehq.org/wine/wine/-/commit/c29d7330bc5879aae1064a41f05083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 15:15:54 2023 +0100 user32/tests: Skip some keyboard layout tests on broken VMs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55327 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55328 --- dlls/user32/tests/input.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8619cfe30ee..f92b839f1cb 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3369,6 +3369,16 @@ static void test_keyboard_layout_name(void) ok(GetLastError() == ERROR_NOACCESS, "got %ld\n", GetLastError()); layout = GetKeyboardLayout(0); + if (broken( layout == (HKL)0x040a0c0a )) + { + /* The testbot w7u_es has a broken layout configuration, its active layout is 040a:0c0a, + * with 0c0a its user locale and 040a its layout langid. Its layout preload list contains + * a 00000c0a layout but the system layouts OTOH only contains the standard 0000040a layout. + * Later, after activating 0409:0409 layout, GetKeyboardLayoutNameW returns 00000c0a. + */ + win_skip( "broken keyboard layout, skipping tests\n" ); + return; + } len = GetKeyboardLayoutList(0, NULL); ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); @@ -3549,6 +3559,13 @@ static void test_ActivateKeyboardLayout( char **argv ) DWORD ret; layout = GetKeyboardLayout( 0 ); + if (broken( layout == (HKL)0x040a0c0a )) + { + /* The testbot w7u_es has a broken layout configuration, see test_keyboard_layout_name above. */ + win_skip( "broken keyboard layout, skipping tests\n" ); + return; + } + count = GetKeyboardLayoutList( 0, NULL ); ok( count > 0, "GetKeyboardLayoutList returned %d\n", count ); layouts = malloc( count * sizeof(HKL) );

1 0

Rémi Bernon : user32/tests: Avoid calling UnloadKeyboardLayout.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 7b947654b2d5ee2433d3965c4213d317374f1145 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b947654b2d5ee2433d3965c4213d3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 15 16:08:11 2023 +0100 user32/tests: Avoid calling UnloadKeyboardLayout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478 --- dlls/user32/tests/msg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0059afcbac7..bb7b74558c4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16535,7 +16535,6 @@ static void test_unicode_wm_char(void) DestroyWindow( hwnd ); ActivateKeyboardLayout( hkl_orig, 0 ); - UnloadKeyboardLayout( hkl_greek ); } #define ID_LISTBOX 0x000f

1 0

Eric Pouech : riched20: Don't crash when no OLE obj is present.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 015aae30cf2217164f631d1c03abfc9ea63bb43d URL: https://gitlab.winehq.org/wine/wine/-/commit/015aae30cf2217164f631d1c03abfc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Dec 13 10:41:41 2023 +0100 riched20: Don't crash when no OLE obj is present. This was generating a lot of crashes in riched20 tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/riched20/richole.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5bc1c30c1f2..51ae41d2fe7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5799,6 +5799,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); + if (!run->reobj->obj.poleobj) return; + if (SUCCEEDED(IOleObject_QueryInterface(run->reobj->obj.poleobj, &IID_IViewObject, (void**)&ivo))) { HRESULT hr;

1 0

Rémi Bernon : user32/tests: Dynamically resize the keyboard layout preload list.
by Alexandre Julliard Dec. 18, 2023

Dec. 18, 2023

Module: wine Branch: master Commit: 6e815d773de5cba380f3c66ed2840a7a296e4c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e815d773de5cba380f3c66ed2840a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 18 13:23:17 2023 +0100 user32/tests: Dynamically resize the keyboard layout preload list. --- dlls/user32/tests/input.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6a28bd24301..8619cfe30ee 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3379,7 +3379,7 @@ static void test_keyboard_layout_name(void) len = GetKeyboardLayoutList(len, layouts); ok(len > 0, "GetKeyboardLayoutList returned %d\n", len); - layouts_preload = calloc(len, sizeof(HKL)); + layouts_preload = calloc(1, sizeof(HKL)); ok(layouts_preload != NULL, "Could not allocate memory\n"); if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", &hkey )) @@ -3388,24 +3388,26 @@ static void test_keyboard_layout_name(void) type = REG_SZ; klid_size = sizeof(klid); value_size = ARRAY_SIZE(value); - while (i < len && !RegEnumValueW( hkey, i++, value, &value_size, NULL, &type, (void *)&klid, &klid_size )) + while (!RegEnumValueW( hkey, i++, value, &value_size, NULL, &type, (void *)&klid, &klid_size )) { klid_size = sizeof(klid); value_size = ARRAY_SIZE(value); + layouts_preload = realloc( layouts_preload, (i + 1) * sizeof(*layouts_preload) ); + ok(layouts_preload != NULL, "Could not allocate memory\n"); layouts_preload[i - 1] = UlongToHandle( wcstoul( klid, NULL, 16 ) ); + layouts_preload[i] = 0; id = (DWORD_PTR)layouts_preload[i - 1]; if (id & 0x80000000) todo_wine_if(HIWORD(id) == 0xe001) ok((id & 0xf0000000) == 0xd0000000, "Unexpected preloaded keyboard layout high bits %#lx\n", id); else ok(!(id & 0xf0000000), "Unexpected preloaded keyboard layout high bits %#lx\n", id); } - ok(i <= len, "Unexpected keyboard count %d in preload list\n", i); RegCloseKey( hkey ); } if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", &hkey )) { - for (i = 0; i < len && layouts_preload[i]; ++i) + for (i = 0; layouts_preload[i]; ++i) { type = REG_SZ; klid_size = sizeof(klid); @@ -3447,7 +3449,7 @@ static void test_keyboard_layout_name(void) GetKeyboardLayoutNameW(klid); - for (j = 0; j < len; ++j) + for (j = 0; layouts_preload[j]; ++j) { swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break;

1 0