March 2023 - Wine-commits - list.winehq.org

Georg Lehmann : winevulkan: Add basic support for extension dependencies.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 421140b6246a5efd3352a21345f1b7b69b3cc980 URL: https://gitlab.winehq.org/wine/wine/-/commit/421140b6246a5efd3352a21345f1b7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 21:26:31 2023 +0100 winevulkan: Add basic support for extension dependencies. --- dlls/winevulkan/make_vulkan | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 173de720443..95e65a087b6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3533,6 +3533,11 @@ class VkRegistry(object): if len(set(requires).intersection(skipped_exts)) > 0: skipped_exts.append(ext_name) return + elif "depends" in ext.attrib: + # The syntax for this is more complex, but this is good enough for now. + if any([sext in ext.attrib["depends"] for sext in skipped_exts]): + skipped_exts.append(ext_name) + return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0

Francois Gouget : advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales.
by Alexandre Julliard 06 Mar '23

06 Mar '23

Module: wine Branch: master Commit: 95f2cc0f15b1dde0318e75e2a7f21957fa76af55 URL: https://gitlab.winehq.org/wine/wine/-/commit/95f2cc0f15b1dde0318e75e2a7f219… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 3 16:23:07 2023 +0100 advapi32/tests: Fix the RegEnumValueA() tests in UTF-8 locales. On Windows RegEnumValueA() is buggy such that when the value name buffer is too small, it may way overestimate the required data buffer size, sometimes returning more than the sufficiently large buffer it was provided, in which case that buffer is untouched and thus not NUL-terminated. So modify the tests to accept this broken result and avoid checking out-of-bounds data. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53172 --- dlls/advapi32/tests/registry.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 480e96ef6ee..524c3e0ef76 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -476,7 +476,7 @@ static void test_enum_value(void) { DWORD res; HKEY test_key; - char value[20], data[20]; + char value[20], data[30]; WCHAR valueW[20], dataW[20]; DWORD val_count, data_count, type; @@ -542,39 +542,50 @@ static void test_enum_value(void) /* overflow name */ val_count = 3; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 3, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* In double-byte and UTF-8 locales Windows 10 may set data_count > 7, + * potentially even more than the declared buffer size, in which case the + * buffer is not NUL-terminated. + */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); - /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in this case */ + /* v5.1.2600.0 (XP Home and Professional) does not touch value or data in + * this case. Neither does Windows 10 21H1 in UTF-8 locales. + */ ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow empty name */ val_count = 0; - data_count = 20; + data_count = 16; type = 1234; strcpy( value, "xxxxxxxxxx" ); memset( data, 'x', sizeof(data) ); + data[sizeof(data)-1] = '\0'; res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %ld\n", res ); ok( val_count == 0, "val_count set to %ld\n", val_count ); - /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + /* See comment in 'overflow name' section */ ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); - /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ + /* See comment in 'overflow name' section */ ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ) || - broken( data_count > 7 && strspn( data, "x" ) == data_count && data[data_count] == 0 ), + broken( data_count > 7 && data_count < 16 && + strspn( data, "x" ) == data_count && data[data_count] == 0 ) || + broken( data_count >= 16 && strspn( data, "x" ) == sizeof(data) - 1 ), "data set to '%s' instead of 'foobar' or x's, data_count=%lu\n", data, data_count ); /* overflow data */

1 0

Alexandre Julliard : Wine release 8.3
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: website Branch: master Commit: 68a726c06f3f79e39e5bf9236fc2950075b6d1dd URL: https://gitlab.winehq.org/winehq/winehq/-/commit/68a726c06f3f79e39e5bf9236f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:31:16 2023 +0100 Wine release 8.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023030301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023030301.xml b/news/en/2023030301.xml new file mode 100644 index 00000000..d1c50957 --- /dev/null +++ b/news/en/2023030301.xml @@ -0,0 +1,16 @@ +<news> +<date>March 3, 2023</date> +<title>Wine 8.3 Released</title> +<body> + The Wine development release 8.3 is now available. + <a href="{$root}/announce/8.3">What's new</a> in this release: +<ul> + <li>Support for the Low Fragmentation Heap.</li> + <li>Smard card support using PCSC-Lite.</li> + <li>Bundled Zydis library for more correct disassembly.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.3 : Alexandre Julliard : Release 8.3
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: refs/tags/wine-8.3 Tag: 343a857a2648ebe1c276e558ca238f0b8087a900 URL: https://gitlab.winehq.org/wine/wine/-/tags/343a857a2648ebe1c276e558ca238f0b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:28:42 2023 +0100 Release 8.3

1 0

Alexandre Julliard : Release 8.3.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: e796002ee61bf5dfb2718e8f4fb8fa928ccdc236 URL: https://gitlab.winehq.org/wine/wine/-/commit/e796002ee61bf5dfb2718e8f4fb8fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 22:25:34 2023 +0100 Release 8.3. --- ANNOUNCE | 701 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 346 insertions(+), 380 deletions(-)

1 0

Zebediah Figura : d3d8/tests: Do not check for WM_MOVE in sc_maximize_messages.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 45f69f73bf335fa49770be8bcc61e676aab5c2e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/45f69f73bf335fa49770be8bcc61e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 2 19:48:07 2023 -0600 d3d8/tests: Do not check for WM_MOVE in sc_maximize_messages. --- dlls/d3d8/tests/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c8f52484054..804dd6955de 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2973,7 +2973,20 @@ static void test_wndproc(void) {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, - {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + /* Windows always sends WM_MOVE here. + * + * In the first case, we are maximizing from a minimized state, and + * hence the client rect moves from the minimized position to (0, 0). + * + * In the second case, we are maximizing from an on-screen restored + * state. The window is at (0, 0), but it has a caption, so the client + * rect is offset, and the *client* will move to (0, 0) when maximized. + * + * Wine doesn't send WM_MOVE here because it messes with the window + * styles when switching to fullscreen, and hence the client rect is + * already at (0, 0). Obviously Wine shouldn't do this, but it's hard to + * fix, and the WM_MOVE is not particularly interesting, so just ignore + * it. */ {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, };

1 0

Zebediah Figura : d3d9/tests: Restore the focus window before sending SC_MAXIMIZE to it.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: ff752311cd1feff44b60aa72cc0a27b77c10c226 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff752311cd1feff44b60aa72cc0a27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 2 19:51:39 2023 -0600 d3d9/tests: Restore the focus window before sending SC_MAXIMIZE to it. To match d3d8. The original patch [1] claims "WM_SIZE(SIZE_MAXIMIZED) is reliable here. The unreliable behavior occured only with NOWINDOWCHANGES." but this doesn't match my testing. Probably when that patch was submitted, this very fix was applied to the d3d8 tests but forgotten for the d3d9 tests, and then the wrong conclusions were drawn. [1] https://www.winehq.org/pipermail/wine-patches/2014-December/135964.html --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0e361b3ac23..e0f3fa45898 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3962,8 +3962,21 @@ static void test_wndproc(void) {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, - {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, - /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ + /* Windows always sends WM_MOVE here. + * + * In the first case, we are maximizing from a minimized state, and + * hence the client rect moves from the minimized position to (0, 0). + * + * In the second case, we are maximizing from an on-screen restored + * state. The window is at (0, 0), but it has a caption, so the client + * rect is offset, and the *client* will move to (0, 0) when maximized. + * + * Wine doesn't send WM_MOVE here because it messes with the window + * styles when switching to fullscreen, and hence the client rect is + * already at (0, 0). Obviously Wine shouldn't do this, but it's hard to + * fix, and the WM_MOVE is not particularly interesting, so just ignore + * it. */ + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, }; static const struct message mode_change_messages[] = @@ -4376,6 +4389,9 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; + /* Needed to make the next test reliably send WM_SIZE(SIZE_MAXIMIZED). Without + * this call it sends WM_SIZE(SIZE_RESTORED). */ + ShowWindow(focus_window, SW_RESTORE); flush_events(); expect_messages = sc_maximize_messages;

1 0

Rémi Bernon : user32/tests: Test VK_MENU effect on ToUnicode.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 3785dd1f37534777a0e20f162aee3d5d2e82eb3a URL: https://gitlab.winehq.org/wine/wine/-/commit/3785dd1f37534777a0e20f162aee3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 10:04:07 2023 +0100 user32/tests: Test VK_MENU effect on ToUnicode. --- dlls/user32/tests/input.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index be41078bf29..c534880679a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3042,6 +3042,7 @@ static void test_key_map(void) #define shift 1 #define ctrl 2 +#define menu 4 static const struct tounicode_tests { @@ -3054,6 +3055,9 @@ static const struct tounicode_tests { { 0, 0, 'a', 1, {'a',0}}, { 0, shift, 'a', 1, {'A',0}}, + { 0, menu, 'a', 1, {'a',0}}, + { 0, shift|menu, 'a', 1, {'A',0}}, + { 0, shift|ctrl|menu, 'a', 0, {}}, { 0, ctrl, 'a', 1, {1, 0}}, { 0, shift|ctrl, 'a', 1, {1, 0}}, { VK_TAB, ctrl, 0, 0, {}}, @@ -3142,6 +3146,7 @@ static void test_ToUnicode(void) state[VK_SHIFT] = state[VK_LSHIFT] = (mod & shift) ? HIGHEST_BIT : 0; state[VK_CONTROL] = state[VK_LCONTROL] = (mod & ctrl) ? HIGHEST_BIT : 0; + state[VK_MENU] = state[VK_LMENU] = (mod & menu) ? HIGHEST_BIT : 0; ret = ToUnicode(vk, scan, state, wStr, 4, 0); ok(ret == utests[i].expect_ret, "%d: got %d expected %d\n", i, ret, utests[i].expect_ret);

1 0

Rémi Bernon : win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 2a6b80b508c6fd983729835a3d5c10f87a49f55b URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6b80b508c6fd983729835a3d5c10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 09:59:51 2023 +0100 win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers. --- dlls/win32u/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index f768453594f..d7e502a4513 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -135,8 +135,8 @@ static const VK_TO_BIT vk_to_bit[] = static const MODIFIERS modifiers = { .pVkToBit = (VK_TO_BIT *)vk_to_bit, - .wMaxModBits = 3, - .ModNumber = {0, 1, 2, 3}, + .wMaxModBits = 7, + .ModNumber = {0, 1, 2, 3, 0, 1, 0, 0}, }; static const VK_TO_WCHARS2 vk_to_wchars2[] =

1 0

Rémi Bernon : win32u: Return the current display mode depth with nulldrv.
by Alexandre Julliard 03 Mar '23

03 Mar '23

Module: wine Branch: master Commit: 8531f23a41956dcc3c68d6b02401f5c78db8ec60 URL: https://gitlab.winehq.org/wine/wine/-/commit/8531f23a41956dcc3c68d6b02401f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 3 10:26:37 2023 +0100 win32u: Return the current display mode depth with nulldrv. --- dlls/win32u/driver.c | 2 +- dlls/win32u/sysparams.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 1c0708461a1..3f676dc5796 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -761,7 +761,7 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) { - return 32; + return -1; /* use default implementation */ } static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bcdb8c5103b..60b12321953 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2727,6 +2727,7 @@ static unsigned int active_monitor_count(void) INT get_display_depth( UNICODE_STRING *name ) { struct display_device *device; + BOOL is_primary; INT depth; if (!lock_display_devices()) @@ -2743,8 +2744,16 @@ INT get_display_depth( UNICODE_STRING *name ) return 32; } - depth = user_driver->pGetDisplayDepth( device->device_name, - !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) ); + is_primary = !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE); + if ((depth = user_driver->pGetDisplayDepth( device->device_name, is_primary )) < 0) + { + struct adapter *adapter = CONTAINING_RECORD( device, struct adapter, dev ); + DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; + + if (!adapter_get_current_settings( adapter, &current_mode )) depth = 32; + else depth = current_mode.dmBitsPerPel; + } + unlock_display_devices(); return depth; }

1 0