May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Factor IsRectEmpty driver check in ShowWindow.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 07b9f3f609e6c6d6d4b9af4c223392479ba99afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=07b9f3f609e6c6d6d4b9af4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:04 2021 +0200 user32: Factor IsRectEmpty driver check in ShowWindow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 6 ++++-- dlls/wineandroid.drv/window.c | 1 - dlls/winemac.drv/window.c | 1 - dlls/winex11.drv/window.c | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c6f806f7beb..cf7e7914869 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1044,7 +1044,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; RECT newPos = {0, 0, 0, 0}; - UINT swp = 0; + UINT new_swp, swp = 0; TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); @@ -1117,7 +1117,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (!IsWindow( hwnd )) goto done; } - swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + if (IsRectEmpty( &newPos )) new_swp = swp; + else new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + swp = new_swp; parent = GetAncestor( hwnd, GA_PARENT ); if (parent && !IsWindowVisible( parent ) && !(swp & SWP_STATECHANGED)) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 1cb1bbbadc9..1c61d4eb76e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1385,7 +1385,6 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag */ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - if (IsRectEmpty( rect )) return swp; if (!IsIconic( hwnd )) return swp; /* always hide icons off-screen */ if (rect->left != -32000 || rect->top != -32000) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7f5327fcdc..4e60189ead9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1798,7 +1798,6 @@ UINT CDECL macdrv_ShowWindow(HWND hwnd, INT cmd, RECT *rect, UINT swp) hwnd, data ? data->cocoa_window : NULL, cmd, wine_dbgstr_rect(rect), swp); if (!data || !data->cocoa_window) goto done; - if (IsRectEmpty(rect)) goto done; if (GetWindowLongW(hwnd, GWL_STYLE) & WS_MINIMIZE) { if (rect->left != -32000 || rect->top != -32000) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b3ae5c54408..c30fe6d39b0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2560,7 +2560,6 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) struct x11drv_win_data *data = get_win_data( hwnd ); if (!data || !data->whole_window) goto done; - if (IsRectEmpty( rect )) goto done; if (style & WS_MINIMIZE) { if (((rect->left != -32000 || rect->top != -32000)) && hide_icon( data ))

1 0

Rémi Bernon : user32: Return WAIT_TIMEOUT in nulldrv_MsgWaitForMultipleObjectsEx.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 702b52fe13fa08040bdd94400b3f4e5eec049d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=702b52fe13fa08040bdd9440… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:06 2021 +0200 user32: Return WAIT_TIMEOUT in nulldrv_MsgWaitForMultipleObjectsEx. When there's nothing to wait for. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index f769677d30d..54a888b16d9 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -305,6 +305,7 @@ static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *w static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { + if (!count && !timeout) return WAIT_TIMEOUT; return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); }

1 0

Rémi Bernon : user32: Duplicate klid to HKL high word in LoadKeyboardLayoutW.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 50ca64fcdf00e782213a541c7d128fdf5815a9e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50ca64fcdf00e782213a541c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:07 2021 +0200 user32: Duplicate klid to HKL high word in LoadKeyboardLayoutW. When high word is 0, and unless it has an explicit layout id. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 5d9bbe14cd6..ba0292c8f88 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1548,7 +1548,8 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags ); tmp = wcstoul( name, NULL, 16 ); - layout = UlongToHandle( tmp ); + if (HIWORD( tmp )) layout = UlongToHandle( tmp ); + else layout = UlongToHandle( MAKELONG( LOWORD( tmp ), LOWORD( tmp ) ) ); wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" ); wcscat( layout_path, name );

1 0

Jacek Caban : configure: Try using pure clang as a cross compiler when mingw is not available.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: b070eb78cc1e9684f841317f1126e47d09ed0f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b070eb78cc1e9684f841317f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 18:41:56 2021 +0200 configure: Try using pure clang as a cross compiler when mingw is not available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 8 ++++---- configure | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bd8ca6b33e5..52b7efc5a03 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,18 +218,18 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-clang ]) - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ])) - m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ])" ;; + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ]) clang" ;; *) ac_prefix_list="" ;; esac diff --git a/configure b/configure index 7c2e31de5af..ac738ca964b 100755 --- a/configure +++ b/configure @@ -9660,16 +9660,16 @@ then case "x$with_mingw" in x|xyes) case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc - x86_64-w64-mingw32-clang amd64-w64-mingw32-clang " ;; + x86_64-w64-mingw32-clang amd64-w64-mingw32-clang clang" ;; *) ac_prefix_list="" ;; esac

1 0

Francois Gouget : advapi32/tests: Time zones should have both MUI and regular strings.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: ec517d4f07873f6cca7ce3753b4bb32acdbda6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec517d4f07873f6cca7ce375… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 16:53:55 2021 +0200 advapi32/tests: Time zones should have both MUI and regular strings. However a few time zones were missing the MUI display name in some Windows 1809 versions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 65 ++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 66382876fa5..72423eae94c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4012,9 +4012,8 @@ static void test_EnumDynamicTimeZoneInformation(void) { LSTATUS status; HKEY key, subkey; - WCHAR name[32]; + WCHAR name[128]; WCHAR keyname[128]; - WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4058,6 +4057,7 @@ static void test_EnumDynamicTimeZoneInformation(void) index = 0; while (!(status = RegEnumKeyW(key, index, keyname, ARRAY_SIZE(keyname)))) { + winetest_push_context("%s" , wine_dbgstr_w(keyname)); subkey = NULL; status = RegOpenKeyExW(key, keyname, 0, KEY_QUERY_VALUE, &subkey); ok(status == ERROR_SUCCESS, "got %d\n", status); @@ -4079,31 +4079,57 @@ static void test_EnumDynamicTimeZoneInformation(void) { size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d Std %s\n", status, + wine_dbgstr_w(name)); + ok(*name, "Std name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Std", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.StandardName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); + ok(status == ERROR_SUCCESS, "status %d MUI_Std %s\n", + status, wine_dbgstr_w(name)); + ok(*name, "MUI_Std name is empty\n"); + } + ok(!memcmp(&dtzi.StandardName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Dlt name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Dlt", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.DaylightName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); - - size = sizeof(displayname); - memset(displayname, 0, sizeof(displayname)); + ok(status == ERROR_SUCCESS, "status %d %s MUI_Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "MUI_Dlt name is empty\n"); + } + ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Display %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Display name is empty\n"); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); - todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); + { + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegLoadMUIStringW(subkey, L"MUI_Display", name, size, &size, 0, sysdir); + /* recently added time zones may not have MUI strings */ + todo_wine ok((status == ERROR_SUCCESS && *name) || + broken(status == ERROR_RESOURCE_TYPE_NOT_FOUND) /* Win10 1809 32-bit */ || + broken(status == ERROR_MUI_FILE_NOT_FOUND) /* Win10 1809 64-bit */, + "status %d MUI_Display %s\n", status, wine_dbgstr_w(name)); + } } else { @@ -4132,6 +4158,7 @@ static void test_EnumDynamicTimeZoneInformation(void) "expected %s, got %s\n", dbgstr_SYSTEMTIME(&tz_data.dlt_date), dbgstr_SYSTEMTIME(&dtzi.DaylightDate)); + winetest_pop_context(); RegCloseKey(subkey); index++; }

1 0

Zebediah Figura : wined3d: Make wined3d_texture_set_map_binding() static.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 3b2f892c4cde6ba283895a2ebc160a59940f703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2f892c4cde6ba283895a2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 14 11:16:35 2021 -0500 wined3d: Make wined3d_texture_set_map_binding() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 39e6e2a68b7..dcdd08ac9b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -920,7 +920,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) texture->update_map_binding = 0; } -void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) +static void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) { texture->update_map_binding = map_binding; if (!texture->resource.map_count) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5b1a078907..079b60e4a7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4364,7 +4364,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : user32/tests: Do not change adapters to every available modes.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: cad102465ddb1151cdac4ec073e734dfaee0d85c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad102465ddb1151cdac4ec0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 17 15:20:21 2021 +0800 user32/tests: Do not change adapters to every available modes. This reduce the time to run the monitor test from 6 minutes to 25 seconds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50086 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b233970ace..4510e15b79b 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -333,6 +333,7 @@ static void test_ChangeDisplaySettingsEx(void) DISPLAY_DEVICEA dd; POINTL position; DEVMODEW dmW; + BOOL found; LONG res; int i; @@ -732,7 +733,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count - 1, "Expect monitor count %d, got %d\n", old_count - 1, count); } - /* Test changing each adapter to every available mode */ + /* Test changing each adapter to different width, height, frequency and depth */ position.x = 0; position.y = 0; for (device = 0; device < device_count; ++device) @@ -741,6 +742,42 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmSize = sizeof(dm); for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode) { + if (mode == 0) + { + dm2 = dm; + } + else + { + found = FALSE; + if (dm2.dmPelsWidth && dm.dmPelsWidth != dm2.dmPelsWidth) + { + dm2.dmPelsWidth = 0; + found = TRUE; + } + if (dm2.dmPelsHeight && dm.dmPelsHeight != dm2.dmPelsHeight) + { + dm2.dmPelsHeight = 0; + found = TRUE; + } + if (dm2.dmDisplayFrequency && dm.dmDisplayFrequency != dm2.dmDisplayFrequency) + { + dm2.dmDisplayFrequency = 0; + found = TRUE; + } + if (dm2.dmBitsPerPel && dm.dmBitsPerPel != dm2.dmBitsPerPel) + { + dm2.dmBitsPerPel = 0; + found = TRUE; + } + + if (!dm2.dmPelsWidth && !dm2.dmPelsHeight && !dm2.dmDisplayFrequency + && !dm2.dmBitsPerPel) + break; + + if (!found) + continue; + } + dm.dmPosition = position; dm.dmFields |= DM_POSITION; /* Reattach detached non-primary adapters, otherwise ChangeDisplaySettingsExA with only CDS_RESET fails */

1 0

Rémi Bernon : user32: Add a default ShowWindow implementation.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 60f6a37f954e88c16fdee81bac255737dd52e449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f6a37f954e88c16fdee81b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 13:40:05 2021 +0200 user32: Add a default ShowWindow implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/winpos.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 87c8cd621b3..f769677d30d 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -356,7 +356,7 @@ static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text ) static UINT CDECL nulldrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - return swp; + return ~0; /* use default implementation */ } static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index cf7e7914869..de5d50d4c3a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1118,7 +1118,16 @@ static BOOL show_window( HWND hwnd, INT cmd ) } if (IsRectEmpty( &newPos )) new_swp = swp; - else new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); + else if ((new_swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp )) == ~0) + { + if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD) new_swp = swp; + else if (IsIconic( hwnd ) && (newPos.left != -32000 || newPos.top != -32000)) + { + OffsetRect( &newPos, -32000 - newPos.left, -32000 - newPos.top ); + new_swp = swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + else new_swp = swp; + } swp = new_swp; parent = GetAncestor( hwnd, GA_PARENT );

1 0

Hugh McMaster : reg: Fail if one or more arguments follow a help switch.
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: 6c466296a7629487930d4d6e4fa7d7ae66a7bf61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c466296a7629487930d4d6e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:06 2021 +1000 reg: Fail if one or more arguments follow a help switch. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 13 ++++++++----- programs/reg/tests/copy.c | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 652fb19d931..8d3bf78f0a9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,14 +349,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 1; } else if (argc == 2) /* Valid operation, no arguments supplied */ - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); - return 1; - } + goto invalid; if (is_help_switch(argvW[2])) { + if (argc > 3) goto invalid; + output_message(op_help); output_message(STRING_REG_VIEW_USAGE); return 0; @@ -378,4 +376,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return reg_import(argc, argvW); return reg_query(argc, argvW); + +invalid: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; } diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index ecd3cc5b29d..5ddcc2c0ffa 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -37,16 +37,16 @@ static void test_command_syntax(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg copy /? /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /? /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_set_state().
by Alexandre Julliard May 17, 2021

May 17, 2021

Module: wine Branch: master Commit: b069e48c13b9d765c836bf8c92205ed4ead74973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b069e48c13b9d765c836bf8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:36:37 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_set_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/wined3d/device.c | 7 +++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0819918b2a1..6b3ff22055f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2839,7 +2839,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 state_impl = impl_from_ID3DDeviceContextState(state); if (!(wined3d_state = d3d_device_context_state_get_wined3d_state(state_impl, device))) ERR("Failed to get wined3d state for device context state %p.\n", state_impl); - wined3d_device_set_state(device->wined3d_device, wined3d_state); + wined3d_device_context_set_state(context->wined3d_context, wined3d_state); if (prev) ID3DDeviceContextState_AddRef(*prev = &prev_impl->ID3DDeviceContextState_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e1297f8896..a8383a89617 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1737,15 +1737,14 @@ void CDECL wined3d_device_context_get_scissor_rects(const struct wined3d_device_ *rect_count = state->scissor_rect_count; } -void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state) +void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) { - struct wined3d_device_context *context = &device->cs->c; const struct wined3d_light_info *light; unsigned int i, j; - TRACE("device %p, state %p.\n", device, state); + TRACE("context %p, state %p.\n", context, state); - device->cs->c.state = state; + context->state = state; wined3d_device_context_emit_set_feature_level(context, state->feature_level); for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2879e1653d3..f339d91ee5c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,7 +129,6 @@ @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) -@ cdecl wined3d_device_set_state(ptr ptr) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long) @@ -189,6 +188,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_state(ptr ptr) @ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dd1c15f14ed..d4762b79e6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2489,7 +2489,6 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); -void __cdecl wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, @@ -2609,6 +2608,7 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state); void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context,

1 0