October 2022 - Wine-Commits

Hans Leidekker : schannel/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 7cd6a6d960fb7f60f5ac493932325bebcb9c68aa URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd6a6d960fb7f60f5ac493932325b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 7 17:21:49 2022 +0200 schannel/tests: Get rid of workarounds for old Windows versions. --- dlls/schannel/tests/main.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 6eeecc7c2c2..b3875636b0c 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -78,26 +78,20 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(cTables == 2 || - broken(cTables == 1), /* Win2k */ - "cTables: %ld\n", cTables); + ok(cTables == 2, "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -124,9 +118,7 @@ static void testInitialize(void) ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(Version == SECPKG_INTERFACE_VERSION || Version == SECPKG_INTERFACE_VERSION_2 /* win11 */, "Version: 0x%lx\n", Version); - ok(cUserTables == 2 || - broken(cUserTables == 4), /* Win2k */ - "cUserTables: %ld\n", cUserTables); + ok(cUserTables == 2, "cUserTables: %ld\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ @@ -250,9 +242,7 @@ static void testGetInfo(void) return; } status = pTables->GetInfo(&PackageInfo); - ok(SUCCEEDED(status) || - status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ - "status: 0x%lx\n", status); + ok(SUCCEEDED(status), "status: 0x%lx\n", status); if (SUCCEEDED(status)) {

1 0

Hans Leidekker : schannel/tests: Fix test failure on Windows 11.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 08d0bc64b3eee7feb083cab3e8e111509a7ba2e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/08d0bc64b3eee7feb083cab3e8e111… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 30 16:44:18 2022 +0200 schannel/tests: Fix test failure on Windows 11. --- dlls/schannel/tests/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index f876d934f3d..6eeecc7c2c2 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -122,7 +122,8 @@ static void testInitialize(void) status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables, &cUserTables); ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); - ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%lx\n", Version); + ok(Version == SECPKG_INTERFACE_VERSION || Version == SECPKG_INTERFACE_VERSION_2 /* win11 */, + "Version: 0x%lx\n", Version); ok(cUserTables == 2 || broken(cUserTables == 4), /* Win2k */ "cUserTables: %ld\n", cUserTables);

1 0

Alistair Leslie-Hughes : sapi: Implement ISpRegDataKey CreateKey.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 3f0ee3ea2fdfbb57d84d91554a4338b2132b36a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f0ee3ea2fdfbb57d84d91554a4338… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 22 19:01:44 2021 +1000 sapi: Implement ISpRegDataKey CreateKey. --- dlls/sapi/tests/token.c | 8 ++++++++ dlls/sapi/token.c | 24 ++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index a65669b585a..63f5c651a50 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -29,6 +29,7 @@ static void test_data_key(void) { ISpRegDataKey *data_key; + ISpDataKey *sub; HRESULT hr; HKEY key; LONG res; @@ -41,11 +42,18 @@ static void test_data_key(void) NULL, &key, NULL ); ok( res == ERROR_SUCCESS, "got %ld\n", res ); + hr = ISpRegDataKey_CreateKey( data_key, L"Testing", &sub ); + ok( hr == E_HANDLE, "got %08lx\n", hr ); + hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); ok( hr == S_OK, "got %08lx\n", hr ); hr = ISpRegDataKey_SetKey( data_key, key, FALSE ); ok( hr == SPERR_ALREADY_INITIALIZED, "got %08lx\n", hr ); + hr = ISpRegDataKey_CreateKey( data_key, L"Testing", &sub ); + ok( hr == S_OK, "got %08lx\n", hr ); + ISpDataKey_Release(sub); + ISpRegDataKey_Release( data_key ); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 6993ffdbac1..133d27a2a66 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -145,8 +145,28 @@ static HRESULT WINAPI data_key_OpenKey( ISpRegDataKey *iface, static HRESULT WINAPI data_key_CreateKey( ISpRegDataKey *iface, LPCWSTR name, ISpDataKey **sub_key ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct data_key *This = impl_from_ISpRegDataKey( iface ); + ISpRegDataKey *spregkey; + HRESULT hr; + HKEY key; + LONG res; + + TRACE( "%p, %s, %p\n", This, debugstr_w(name), sub_key ); + + res = RegCreateKeyExW( This->key, name, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + hr = data_key_create(NULL, &IID_ISpRegDataKey, (void**)&spregkey); + if (SUCCEEDED(hr)) + { + hr = ISpRegDataKey_SetKey(spregkey, key, FALSE); + if (SUCCEEDED(hr)) + hr = ISpRegDataKey_QueryInterface(spregkey, &IID_ISpDataKey, (void**)sub_key); + ISpRegDataKey_Release(spregkey); + } + + return hr; } static HRESULT WINAPI data_key_DeleteKey( ISpRegDataKey *iface, LPCWSTR name )

1 0

Rémi Bernon : winex11.drv: Resize desktop window on WM_DISPLAYCHANGE message.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 63eeb236ed342ba80bf62578bb29085173b8c37f URL: https://gitlab.winehq.org/wine/wine/-/commit/63eeb236ed342ba80bf62578bb2908… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 17:18:04 2022 +0200 winex11.drv: Resize desktop window on WM_DISPLAYCHANGE message. --- dlls/winex11.drv/desktop.c | 6 ------ dlls/winex11.drv/display.c | 9 +-------- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 -- dlls/winex11.drv/xrandr.c | 3 ++- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 721e805f820..c6a08291f6a 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -467,12 +467,6 @@ void X11DRV_resize_desktop(void) width = primary_rect.right; height = primary_rect.bottom; - if (NtUserGetWindowThread( hwnd, NULL ) != GetCurrentThreadId()) - { - send_message( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, 0 ); - return; - } - TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 87f7adb76d2..572b81aa491 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -419,7 +419,7 @@ LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags, if (ret == DISP_CHANGE_SUCCESSFUL) ret = apply_display_settings( displays, ids, TRUE ); if (ret == DISP_CHANGE_SUCCESSFUL) - X11DRV_DisplayDevices_Update(); + X11DRV_DisplayDevices_Init(TRUE); done: free( ids ); @@ -558,13 +558,6 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) handler->register_event_handlers(); } -void X11DRV_DisplayDevices_Update(void) -{ - X11DRV_DisplayDevices_Init(TRUE); - - X11DRV_resize_desktop(); -} - static BOOL force_display_devices_refresh; BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7f4a92abe5f..70a29d24fb1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1893,6 +1893,9 @@ LRESULT X11DRV_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_WINE_ADD_TAB: send_notify_message( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); break; + case WM_DISPLAYCHANGE: + X11DRV_resize_desktop(); + break; } return NtUserMessageCall( hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE ); } @@ -2993,9 +2996,6 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) release_win_data( data ); } return 0; - case WM_X11DRV_RESIZE_DESKTOP: - X11DRV_resize_desktop(); - return 0; case WM_X11DRV_DESKTOP_RESIZED: if ((data = get_win_data( hwnd ))) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fc646771acd..f8f8fe3d4d1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -572,7 +572,6 @@ enum x11drv_window_messages { WM_X11DRV_UPDATE_CLIPBOARD = 0x80001000, WM_X11DRV_SET_WIN_REGION, - WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_DESKTOP_RESIZED, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, @@ -805,7 +804,6 @@ extern BOOL get_host_primary_gpu(struct gdi_gpu *gpu) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Update(void) DECLSPEC_HIDDEN; /* Display device handler used in virtual desktop mode */ extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index a0ac2cb5ec1..c7f922b1aae 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1198,8 +1198,9 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) xrandr14_invalidate_current_mode_cache(); if (hwnd == NtUserGetDesktopWindow() && NtUserGetWindowThread( hwnd, NULL ) == GetCurrentThreadId()) { - X11DRV_DisplayDevices_Update(); + X11DRV_DisplayDevices_Init( TRUE ); init_registry_display_settings(); + X11DRV_resize_desktop(); } return FALSE; }

1 0

Rémi Bernon : win32u: Send WM_DISPLAYCHANGE message to the desktop window.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: ba143493d1c15ac6e82683c887e173d77d36600b URL: https://gitlab.winehq.org/wine/wine/-/commit/ba143493d1c15ac6e82683c887e173… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 17:18:04 2022 +0200 win32u: Send WM_DISPLAYCHANGE message to the desktop window. And pass it down to the drivers DesktopWindowProc entry. --- dlls/user32/desktop.c | 1 + dlls/win32u/defwnd.c | 3 ++- dlls/win32u/sysparams.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 377c21d4f48..b0384b6d8c2 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -83,6 +83,7 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP case WM_NCCREATE: case WM_NCCALCSIZE: case WM_PARENTNOTIFY: + case WM_DISPLAYCHANGE: return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserDesktopWindowProc, FALSE ); default: diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index a5644f594ad..e26e68442ab 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2953,7 +2953,8 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) } case WM_NCCALCSIZE: return 0; - + case WM_DISPLAYCHANGE: + return user_driver->pDesktopWindowProc( hwnd, msg, wparam, lparam ); default: if (msg >= WM_USER && hwnd == get_desktop_window()) return user_driver->pDesktopWindowProc( hwnd, msg, wparam, lparam ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 494bb94c7f1..1c81dda9dd3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2487,6 +2487,8 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod user_driver->pGetCurrentDisplaySettings( adapter->dev.device_name, &current_mode ); adapter_release( adapter ); + send_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ) ); send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE );

1 0

Rémi Bernon : winex11.drv: Send WM_X11DRV_CLIP_CURSOR_REQUEST message from the deskop.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: c70b34e3239359fd48f4ddd329f7e8e3d881a9d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c70b34e3239359fd48f4ddd329f7e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 28 12:01:00 2022 +0200 winex11.drv: Send WM_X11DRV_CLIP_CURSOR_REQUEST message from the deskop. Using send_notify_message directly, which calls clip_fullscreen_window synchronously if the target thread is the same. --- dlls/winex11.drv/desktop.c | 3 +++ dlls/winex11.drv/display.c | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b912c519947..721e805f820 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -482,5 +482,8 @@ void X11DRV_resize_desktop(void) send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); + /* forward clip_fullscreen_window request to the foreground window */ + send_notify_message( NtUserGetForegroundWindow(), WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE ); + old_virtual_rect = virtual_rect; } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b552c52cb56..87f7adb76d2 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -560,20 +560,9 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) void X11DRV_DisplayDevices_Update(void) { - DWORD tid, pid; - HWND foreground; - X11DRV_DisplayDevices_Init(TRUE); X11DRV_resize_desktop(); - - /* forward clip_fullscreen_window request to the foreground window */ - if ((foreground = NtUserGetForegroundWindow()) && - (tid = NtUserGetWindowThread( foreground, &pid )) && pid == GetCurrentProcessId()) - { - if (tid == GetCurrentThreadId()) clip_fullscreen_window( foreground, TRUE ); - else send_notify_message( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE ); - } } static BOOL force_display_devices_refresh;

1 0

Rémi Bernon : winemac.drv: Resize desktop window on WM_DISPLAYCHANGE message.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 67d3735594003514b32e557bdf25f9ebe021713b URL: https://gitlab.winehq.org/wine/wine/-/commit/67d3735594003514b32e557bdf25f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 16:32:21 2022 +0200 winemac.drv: Resize desktop window on WM_DISPLAYCHANGE message. --- dlls/winemac.drv/display.c | 5 +---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 44 +++++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 977949fc47f..e8d26dfd241 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -831,10 +831,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L ret = DISP_CHANGE_BADMODE; } else if (macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) - { macdrv_init_display_devices(TRUE); - send_message(NtUserGetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, 0, 0); - } else { WARN("Failed to set display mode\n"); @@ -1172,7 +1169,7 @@ void macdrv_displays_changed(const macdrv_event *event) { macdrv_init_display_devices(TRUE); init_registry_display_settings(); - send_message(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, 0, 0); + macdrv_resize_desktop(); } } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 683fd1851a3..ea51cf0f702 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -92,7 +92,6 @@ extern BOOL CDECL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_H enum macdrv_window_messages { WM_MACDRV_SET_WIN_REGION = 0x80001000, - WM_MACDRV_UPDATE_DESKTOP_RECT, WM_MACDRV_RESET_DEVICE_METRICS, WM_MACDRV_DISPLAYCHANGE, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, @@ -268,6 +267,7 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI extern void check_retina_status(void) DECLSPEC_HIDDEN; extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN; +extern void macdrv_resize_desktop(void) DECLSPEC_HIDDEN; extern void init_user_driver(void) DECLSPEC_HIDDEN; /* unixlib interface */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7a0f6df6449..37696f02d25 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1570,6 +1570,26 @@ BOOL macdrv_CreateDesktopWindow(HWND hwnd) return TRUE; } +void macdrv_resize_desktop(void) +{ + HWND hwnd = NtUserGetDesktopWindow(); + CGRect new_desktop_rect; + RECT current_desktop_rect; + + macdrv_reset_device_metrics(); + new_desktop_rect = macdrv_get_desktop_rect(); + if (!NtUserGetWindowRect(hwnd, &current_desktop_rect) || + !CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect)) + { + send_message_timeout(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0, + SMTO_ABORTIFHUNG, 2000, NULL); + NtUserSetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect), + CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); + send_message_timeout(HWND_BROADCAST, WM_MACDRV_DISPLAYCHANGE, 0, 0, + SMTO_ABORTIFHUNG, 2000, NULL); + } +} #define WM_WINE_NOTIFY_ACTIVITY WM_USER @@ -1591,6 +1611,9 @@ LRESULT macdrv_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) #pragma clang diagnostic pop break; } + case WM_DISPLAYCHANGE: + macdrv_resize_desktop(); + break; } return NtUserMessageCall(hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE); } @@ -1987,27 +2010,6 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) release_win_data(data); } return 0; - case WM_MACDRV_UPDATE_DESKTOP_RECT: - if (hwnd == NtUserGetDesktopWindow()) - { - CGRect new_desktop_rect; - RECT current_desktop_rect; - - macdrv_reset_device_metrics(); - new_desktop_rect = macdrv_get_desktop_rect(); - if (!NtUserGetWindowRect(hwnd, &current_desktop_rect) || - !CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect)) - { - send_message_timeout(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0, - SMTO_ABORTIFHUNG, 2000, NULL); - NtUserSetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect), - CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect), - SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); - send_message_timeout(HWND_BROADCAST, WM_MACDRV_DISPLAYCHANGE, 0, 0, - SMTO_ABORTIFHUNG, 2000, NULL); - } - } - return 0; case WM_MACDRV_RESET_DEVICE_METRICS: macdrv_reset_device_metrics(); return 0;

1 0

Rémi Bernon : winex11.drv: Sync window positions in a WM_X11DRV_DESKTOP_RESIZED message.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: bc09f0812cc4d751eca286baba0709cef1ff9a2b URL: https://gitlab.winehq.org/wine/wine/-/commit/bc09f0812cc4d751eca286baba0709… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 17:13:00 2022 +0200 winex11.drv: Sync window positions in a WM_X11DRV_DESKTOP_RESIZED message. After desktop is resized, instead of doing it only for the current process windows. --- dlls/winex11.drv/desktop.c | 23 ++++++++++++++--------- dlls/winex11.drv/display.c | 34 ---------------------------------- dlls/winex11.drv/window.c | 23 +++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 38 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 3da8f92978d..b912c519947 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -456,6 +456,8 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) */ void X11DRV_resize_desktop(void) { + static RECT old_virtual_rect; + RECT primary_rect, virtual_rect; HWND hwnd = NtUserGetDesktopWindow(); INT width, height; @@ -468,14 +470,17 @@ void X11DRV_resize_desktop(void) if (NtUserGetWindowThread( hwnd, NULL ) != GetCurrentThreadId()) { send_message( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, 0 ); + return; } - else - { - TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); - update_desktop_fullscreen( width, height ); - NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, - virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); - ungrab_clipping_window(); - } + + TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); + update_desktop_fullscreen( width, height ); + NtUserSetWindowPos( hwnd, 0, virtual_rect.left, virtual_rect.top, + virtual_rect.right - virtual_rect.left, virtual_rect.bottom - virtual_rect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + ungrab_clipping_window(); + send_message_timeout( HWND_BROADCAST, WM_X11DRV_DESKTOP_RESIZED, old_virtual_rect.left, + old_virtual_rect.top, SMTO_ABORTIFHUNG, 2000, FALSE ); + + old_virtual_rect = virtual_rect; } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 76defa7f0e8..b552c52cb56 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -560,47 +560,13 @@ void X11DRV_DisplayDevices_RegisterEventHandlers(void) void X11DRV_DisplayDevices_Update(void) { - RECT old_virtual_rect, new_virtual_rect; DWORD tid, pid; HWND foreground; - UINT mask = 0, i; - HWND *list; - old_virtual_rect = NtUserGetVirtualScreenRect(); X11DRV_DisplayDevices_Init(TRUE); - new_virtual_rect = NtUserGetVirtualScreenRect(); - - /* Calculate XReconfigureWMWindow() mask */ - if (old_virtual_rect.left != new_virtual_rect.left) - mask |= CWX; - if (old_virtual_rect.top != new_virtual_rect.top) - mask |= CWY; X11DRV_resize_desktop(); - list = build_hwnd_list(); - for (i = 0; list && list[i] != HWND_BOTTOM; i++) - { - struct x11drv_win_data *data; - - if (!(data = get_win_data( list[i] ))) continue; - - /* update the full screen state */ - update_net_wm_states(data); - - if (mask && data->whole_window) - { - POINT pos = virtual_screen_to_root(data->whole_rect.left, data->whole_rect.top); - XWindowChanges changes; - changes.x = pos.x; - changes.y = pos.y; - XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); - } - release_win_data(data); - } - - free( list ); - /* forward clip_fullscreen_window request to the foreground window */ if ((foreground = NtUserGetForegroundWindow()) && (tid = NtUserGetWindowThread( foreground, &pid )) && pid == GetCurrentProcessId()) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c0c6e779772..7f4a92abe5f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2996,6 +2996,29 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop(); return 0; + case WM_X11DRV_DESKTOP_RESIZED: + if ((data = get_win_data( hwnd ))) + { + /* update the full screen state */ + update_net_wm_states( data ); + + if (data->whole_window) + { + /* sync window position with the new virtual screen rect */ + POINT old_pos = {.x = data->whole_rect.left - wp, .y = data->whole_rect.top - lp}; + POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); + XWindowChanges changes = {.x = pos.x, .y = pos.y}; + UINT mask = 0; + + if (old_pos.x != pos.x) mask |= CWX; + if (old_pos.y != pos.y) mask |= CWY; + + if (mask) XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); + } + + release_win_data( data ); + } + return 0; case WM_X11DRV_SET_CURSOR: { Window win = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d1a70da9998..fc646771acd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -573,6 +573,7 @@ enum x11drv_window_messages WM_X11DRV_UPDATE_CLIPBOARD = 0x80001000, WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP, + WM_X11DRV_DESKTOP_RESIZED, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST,

1 0

Alexandre Julliard : wined3d: Use a Wine debug channel for vkd3d debug output.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: 89bb66aff8b34c095773e13cdae2f36a22a87abb URL: https://gitlab.winehq.org/wine/wine/-/commit/89bb66aff8b34c095773e13cdae2f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 29 11:47:43 2022 +0200 wined3d: Use a Wine debug channel for vkd3d debug output. Avoids spamming stderr when debug output is disabled. --- dlls/wined3d/wined3d_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2e4dda2c473..576da8034c9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -30,6 +30,7 @@ #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(vkd3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc @@ -471,6 +472,23 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); + if (!getenv( "VKD3D_DEBUG" )) + { + if (TRACE_ON(vkd3d)) putenv( "VKD3D_DEBUG=trace" ); + else if (WARN_ON(vkd3d)) putenv( "VKD3D_DEBUG=warn" ); + else if (FIXME_ON(vkd3d)) putenv( "VKD3D_DEBUG=fixme" ); + else if (ERR_ON(vkd3d)) putenv( "VKD3D_DEBUG=err" ); + else putenv( "VKD3D_DEBUG=none" ); + } + if (!getenv( "VKD3D_SHADER_DEBUG" )) + { + if (TRACE_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=trace" ); + else if (WARN_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=warn" ); + else if (FIXME_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=fixme" ); + else if (ERR_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=err" ); + else putenv( "VKD3D_SHADER_DEBUG=none" ); + } + vkd3d_set_log_callback(vkd3d_log_callback); return TRUE;

1 0

Zebediah Figura : qcap/tests: Test that the video capture filter sets timestamps.
by Alexandre Julliard Oct. 12, 2022

Oct. 12, 2022

Module: wine Branch: master Commit: cc09167060bcf7ebe1a2de075dc59e38cea20a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/cc09167060bcf7ebe1a2de075dc59e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 11 21:39:48 2022 -0500 qcap/tests: Test that the video capture filter sets timestamps. OpenSeeFace depends on this. --- dlls/qcap/tests/videocapture.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 41b2cbc6a3f..cb74c20481f 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -353,6 +353,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_sink sink; + HANDLE got_sample; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -371,6 +372,8 @@ static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, un static void testfilter_destroy(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_strmbase_filter(iface); + + CloseHandle(filter->got_sample); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); } @@ -396,6 +399,17 @@ static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, end; + HRESULT hr; + + if (winetest_debug > 1) trace("Receive()\n"); + + hr = IMediaSample_GetTime(sample, &start, &end); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + SetEvent(filter->got_sample); + return S_OK; } @@ -411,13 +425,16 @@ static void testfilter_init(struct testfilter *filter) memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->got_sample = CreateEventW(NULL, FALSE, FALSE, NULL); } -static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) +static void test_filter_state(IMediaControl *control, struct testfilter *filter) { + IMemAllocator *allocator = filter->sink.pAllocator; IMediaSample *sample; OAFilterState state; HRESULT hr; + DWORD ret; hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -440,6 +457,13 @@ static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + /* starting up the webcam can be a little slow */ + ret = WaitForSingleObject(filter->got_sample, 5000); + ok(!ret, "Got %lu.\n", ret); + + ret = WaitForSingleObject(filter->got_sample, 1000); + ok(!ret, "Got %lu.\n", ret); + hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(state == State_Running, "Got state %lu.\n", state); @@ -547,7 +571,7 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) ok(!!testsink.sink.pAllocator, "Expected to be assigned an allocator.\n"); - test_filter_state(control, testsink.sink.pAllocator); + test_filter_state(control, &testsink); hr = IPin_ConnectedTo(source, &peer); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0