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

Jacek Caban : win32u: Move GetDesktopWindow implementation from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 257206e08c30182011cd7e91822b527efa14f76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=257206e08c30182011cd7e91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:20:25 2022 +0100 win32u: Move GetDesktopWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 3 +- dlls/user32/win.c | 82 +------------------------------- dlls/win32u/message.c | 9 ++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/winstation.c | 110 ++++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 6 files changed, 123 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=257206e08c30182011cd…

1 0

Jacek Caban : win32u: Move IsWindowUnicode implementation from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: cc20ef3b3bd6ea0649419f14b0b0f59a156e0aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc20ef3b3bd6ea0649419f14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:21:36 2022 +0100 win32u: Move IsWindowUnicode implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 23 +---------------------- dlls/win32u/window.c | 29 +++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f491c16f65..a81e112ee0d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2081,28 +2081,7 @@ BOOL WINAPI IsWindowEnabled(HWND hWnd) */ BOOL WINAPI IsWindowUnicode( HWND hwnd ) { - WND * wndPtr; - BOOL retvalue = FALSE; - - if (!(wndPtr = WIN_GetPtr(hwnd))) return FALSE; - - if (wndPtr == WND_DESKTOP) return TRUE; - - if (wndPtr != WND_OTHER_PROCESS) - { - retvalue = (wndPtr->flags & WIN_ISUNICODE) != 0; - WIN_ReleasePtr( wndPtr ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) retvalue = reply->is_unicode; - } - SERVER_END_REQ; - } - return retvalue; + return NtUserCallHwnd( hwnd, NtUserIsWindowUnicode ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index aed536c9c54..90e96e17842 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -652,6 +652,33 @@ static BOOL is_window_drawable( HWND hwnd, BOOL icon ) return retval; } +/* see IsWindowUnicode */ +static BOOL is_window_unicode( HWND hwnd ) +{ + WND *win; + BOOL ret = FALSE; + + if (!(win = get_win_ptr(hwnd))) return FALSE; + + if (win == WND_DESKTOP) return TRUE; + + if (win != WND_OTHER_PROCESS) + { + ret = (win->flags & WIN_ISUNICODE) != 0; + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = reply->is_unicode; + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1065,6 +1092,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: return is_window( hwnd ); + case NtUserIsWindowUnicode: + return is_window_unicode( hwnd ); case NtUserIsWindowVisible: return is_window_visible( hwnd ); /* temporary exports */ diff --git a/include/ntuser.h b/include/ntuser.h index 5463853afde..1587e1db2f7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -144,6 +144,7 @@ enum NtUserGetParent, NtUserGetWindowTextLength, NtUserIsWindow, + NtUserIsWindowUnicode, NtUserIsWindowVisible, /* temporary exports */ NtUserCreateDesktopWindow,

1 0

Jacek Caban : win32u: Move GetWindowDpiAwarenessContext from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 72316326356c6eeb724708b0d375572295781a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72316326356c6eeb724708b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:21:51 2022 +0100 win32u: Move GetWindowDpiAwarenessContext from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 25 +------------------------ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 33 ++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 3 ++- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a81e112ee0d..48541c19a66 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2090,30 +2090,7 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd ) */ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) { - WND *win; - DPI_AWARENESS_CONTEXT ret = 0; - - if (!(win = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (win == WND_DESKTOP) return DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; - if (win != WND_OTHER_PROCESS) - { - ret = ULongToHandle( win->dpi_awareness | 0x10 ); - WIN_ReleasePtr( win ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) ret = ULongToHandle( reply->awareness | 0x10 ); - } - SERVER_END_REQ; - } - return ret; + return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, NtUserGetWindowDpiAwarenessContext ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f987f0099da..131e177a397 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -184,7 +184,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); - DWORD (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); + ULONG_PTR (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); ULONG_PTR (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 90e96e17842..ce03df84994 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -679,6 +679,35 @@ static BOOL is_window_unicode( HWND hwnd ) return ret; } +/* see GetWindowDpiAwarenessContext */ +static DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) +{ + DPI_AWARENESS_CONTEXT ret = 0; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; + if (win != WND_OTHER_PROCESS) + { + ret = ULongToHandle( win->dpi_awareness | 0x10 ); + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = ULongToHandle( reply->awareness | 0x10 ); + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1082,12 +1111,14 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) /***************************************************************************** * NtUserCallHwnd (win32u.@) */ -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserGetWindowDpiAwarenessContext: + return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); case NtUserGetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 02ec62e741b..74150e11db1 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,7 +725,7 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { if (!unix_funcs) return 0; return unix_funcs->pNtUserCallHwnd( hwnd, code ); diff --git a/include/ntuser.h b/include/ntuser.h index 1587e1db2f7..f45d0e8641c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -142,6 +142,7 @@ enum enum { NtUserGetParent, + NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow, NtUserIsWindowUnicode, @@ -254,7 +255,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code );

1 0

Jacek Caban : win32u: Move GetDpiForWindow from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 6c8cac10ef9d6b38a7db8a23e6ce47e3a9b91bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8cac10ef9d6b38a7db8a23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:07 2022 +0100 win32u: Move GetDpiForWindow from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/sysparams.c | 9 +++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 48541c19a66..98396293912 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2099,35 +2099,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - WND *win; - UINT ret = 0; - - if (!(win = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (win == WND_DESKTOP) - { - POINT pt = { 0, 0 }; - return get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY )); - } - if (win != WND_OTHER_PROCESS) - { - ret = win->dpi; - if (!ret) ret = get_win_monitor_dpi( hwnd ); - WIN_ReleasePtr( win ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) ret = reply->dpi; - } - SERVER_END_REQ; - } - return ret; + return NtUserCallHwnd( hwnd, NtUserGetDpiForWindow ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c1a5470d9c1..3bcc2df007a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1379,6 +1379,15 @@ UINT get_monitor_dpi( HMONITOR monitor ) return system_dpi; } +/********************************************************************** + * get_win_monitor_dpi + */ +UINT get_win_monitor_dpi( HWND hwnd ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + /********************************************************************** * get_thread_dpi_awareness */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 131e177a397..42426a512f0 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -284,6 +284,7 @@ extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; +extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; extern int get_system_metrics( int index ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ce03df84994..8aa794421d2 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -708,6 +708,40 @@ static DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) return ret; } +/* see GetDpiForWindow */ +static UINT get_dpi_for_window( HWND hwnd ) +{ + WND *win; + UINT ret = 0; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) + { + POINT pt = { 0, 0 }; + return get_monitor_dpi( monitor_from_point( pt, MONITOR_DEFAULTTOPRIMARY, 0 )); + } + if (win != WND_OTHER_PROCESS) + { + ret = win->dpi; + if (!ret) ret = get_win_monitor_dpi( hwnd ); + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = reply->dpi; + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1115,6 +1149,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserGetDpiForWindow: + return get_dpi_for_window( hwnd ); case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); case NtUserGetWindowDpiAwarenessContext: diff --git a/include/ntuser.h b/include/ntuser.h index f45d0e8641c..20c8c2876f0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -141,6 +141,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserGetDpiForWindow, NtUserGetParent, NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength,

1 0

Jacek Caban : win32u: Move GetWindowRect implementation from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 8a8b5179d0c59d7c4171ad5447ef55689cba86b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8b5179d0c59d7c4171ad54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:22 2022 +0100 win32u: Move GetWindowRect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 - dlls/user32/winpos.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/region.c | 3 +- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/window.c | 154 ++++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 8 files changed, 159 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a8b5179d0c59d7c4171…

1 0

Jacek Caban : win32u: Move GetWindowInfo implementation from user32.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 441522add7943e0bfa3cbd81a9d8f93062ba2b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=441522add7943e0bfa3cbd81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:22:39 2022 +0100 win32u: Move GetWindowInfo implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 21 ++------------------- dlls/win32u/input.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 98396293912..bb792037640 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3214,26 +3214,9 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) * * Note: tests show that Windows doesn't check cbSize of the structure. */ -BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) +BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, WINDOWINFO *info ) { - RECT rcWindow, rcClient; - - if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &rcWindow, &rcClient )) return FALSE; - if (!pwi) return FALSE; - - pwi->rcWindow = rcWindow; - pwi->rcClient = rcClient; - pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); - pwi->dwWindowStatus = ((GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0); - - pwi->cxWindowBorders = pwi->rcClient.left - pwi->rcWindow.left; - pwi->cyWindowBorders = pwi->rcWindow.bottom - pwi->rcClient.bottom; - - pwi->atomWindowType = GetClassLongW( hwnd, GCW_ATOM ); - pwi->wCreatorVersion = 0x0400; - - return TRUE; + return NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserGetWindowInfo ); } /****************************************************************************** diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 72af32fd471..71f30e7ae20 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1078,3 +1078,11 @@ HWND WINAPI NtUserGetForegroundWindow(void) SERVER_END_REQ; return ret; } + +/* see GetActiveWindow */ +HWND get_active_window(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 988a009d874..7c8134367c2 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -275,6 +275,7 @@ extern BOOL unhook_windows_hook( INT id, HOOKPROC proc ) DECLSPEC_HIDDEN; /* input.c */ extern LONG global_key_state_counter DECLSPEC_HIDDEN; +extern HWND get_active_window(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 84aa052a231..19b2b4335f8 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1139,6 +1139,24 @@ BOOL get_window_rect( HWND hwnd, RECT *rect ) return get_window_rects( hwnd, COORDS_SCREEN, rect, NULL, get_thread_dpi() ); } +/* see GetWindowInfo */ +static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) +{ + + if (!info || !get_window_rects( hwnd, COORDS_SCREEN, &info->rcWindow, + &info->rcClient, get_thread_dpi() )) + return FALSE; + + info->dwStyle = get_window_long( hwnd, GWL_STYLE ); + info->dwExStyle = get_window_long( hwnd, GWL_EXSTYLE ); + info->dwWindowStatus = get_active_window() == hwnd ? WS_ACTIVECAPTION : 0; + info->cxWindowBorders = info->rcClient.left - info->rcWindow.left; + info->cyWindowBorders = info->rcWindow.bottom - info->rcClient.bottom; + info->atomWindowType = get_class_long( hwnd, GCW_ATOM, FALSE ); + info->wCreatorVersion = 0x0400; + return TRUE; +} + /***************************************************************************** * NtUserGetLayeredWindowAttributes (win32u.@) */ @@ -1339,6 +1357,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_class_long_ptr( hwnd, param, FALSE ); case NtUserGetClassWord: return get_class_word( hwnd, param ); + case NtUserGetWindowInfo: + return get_window_info( hwnd, (WINDOWINFO *)param ); case NtUserGetWindowLongA: return get_window_long_size( hwnd, param, sizeof(LONG), TRUE ); case NtUserGetWindowLongW: diff --git a/include/ntuser.h b/include/ntuser.h index f5911d112a2..5192bd63a90 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -160,6 +160,7 @@ enum NtUserGetClassLongPtrA, NtUserGetClassLongPtrW, NtUserGetClassWord, + NtUserGetWindowInfo, NtUserGetWindowLongA, NtUserGetWindowLongW, NtUserGetWindowLongPtrA,

1 0

Eric Pouech : wiaservc/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 1aebae9212edc8f3ed00a8a6096988cb37b79483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aebae9212edc8f3ed00a8a6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:21:08 2022 +0100 wiaservc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/Makefile.in | 1 - dlls/wiaservc/tests/wia.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in index 7eadf649a35..594e1b2a988 100644 --- a/dlls/wiaservc/tests/Makefile.in +++ b/dlls/wiaservc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wiaservc.dll IMPORTS = ole32 diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index 48050f4ecc9..b2ac607a8dd 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -39,19 +39,19 @@ static void test_EnumDeviceInfo(void) ULONG count; hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL); - ok(FAILED(hr), "got 0x%08x\n", hr); + ok(FAILED(hr), "got 0x%08lx\n", hr); hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); - ok(FAILED(hr), "got 0x%08x\n", hr); + ok(FAILED(hr), "got 0x%08lx\n", hr); count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count != 1000, "got %u\n", count); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(count != 1000, "got %lu\n", count); IEnumWIA_DEV_INFO_Release(devenum); } @@ -62,11 +62,11 @@ static void test_SelectDeviceDlg(void) IWiaItem *root; hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); todo_wine - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); todo_wine - ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); + ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08lx\n", hr); } START_TEST(wia) @@ -77,7 +77,7 @@ START_TEST(wia) hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager); if (FAILED(hr)) { - win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr); + win_skip("Failed to create WiaDevMgr instance, 0x%08lx\n", hr); CoUninitialize(); return; }

1 0

Eric Pouech : windows.globalization/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 309c1014dc25aa3b8fc17b4e56bcf5ee9fe1c58a URL: https://source.winehq.org/git/wine.git/?a=commit;h=309c1014dc25aa3b8fc17b4e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:22:05 2022 +0100 windows.globalization/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/tests/Makefile.in | 1 - dlls/windows.globalization/tests/globalization.c | 52 ++++++++++++------------ 2 files changed, 26 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=309c1014dc25aa3b8fc1…

1 0

Eric Pouech : windows.media.devices/tests: Enable compilation with long types.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: 65d75fdf2fae956cd879e19f0230cf781b3dfadf URL: https://source.winehq.org/git/wine.git/?a=commit;h=65d75fdf2fae956cd879e19f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:22:18 2022 +0100 windows.media.devices/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.devices/tests/Makefile.in | 1 - dlls/windows.media.devices/tests/devices.c | 40 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 37f5f7bde06..4d107889dad 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c index d8acc638837..c992686d4e8 100644 --- a/dlls/windows.media.devices/tests/devices.c +++ b/dlls/windows.media.devices/tests/devices.c @@ -103,7 +103,7 @@ static HRESULT WINAPI async_activate_ActivateCompleted( hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, &async_activate_test.result_hr, &async_activate_test.result_iface); ok(hr == S_OK, - "%s: GetActivateResult failed: %08x\n", + "%s: GetActivateResult failed: %08lx\n", async_activate_test.msg_pfx, hr); return S_OK; @@ -135,29 +135,29 @@ static void test_MediaDeviceStatics(void) DWORD dr; hr = WindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); WindowsDeleteString(str); /* interface tests */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IMediaDeviceStatics, (void **)&media_device_statics); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IMediaDeviceStatics failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IMediaDeviceStatics failed, hr %#lx\n", hr); hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IMediaDeviceStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IMediaDeviceStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); @@ -169,7 +169,7 @@ static void test_MediaDeviceStatics(void) /* test default capture device creation */ hr = IMediaDeviceStatics_GetDefaultAudioCaptureId(media_device_statics, AudioDeviceRole_Default, &str); - ok(hr == S_OK, "GetDefaultAudioCaptureId failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioCaptureId failed: %08lx\n", hr); ok((!!g_default_capture_id) == (!!str), "Presence of default capture device doesn't match expected state\n"); @@ -181,7 +181,7 @@ static void test_MediaDeviceStatics(void) /* returned id does not work in GetDevice... */ hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ async_activate_test.ref = 1; @@ -194,14 +194,14 @@ static void test_MediaDeviceStatics(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); @@ -210,7 +210,7 @@ static void test_MediaDeviceStatics(void) /* test default render device creation */ hr = IMediaDeviceStatics_GetDefaultAudioRenderId(media_device_statics, AudioDeviceRole_Default, &str); - ok(hr == S_OK, "GetDefaultAudioRenderId failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioRenderId failed: %08lx\n", hr); ok((!!g_default_render_id) == (!!str), "Presence of default render device doesn't match expected state\n"); @@ -222,7 +222,7 @@ static void test_MediaDeviceStatics(void) /* returned id does not work in GetDevice... */ hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ async_activate_test.ref = 1; @@ -235,14 +235,14 @@ static void test_MediaDeviceStatics(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); @@ -278,17 +278,17 @@ START_TEST(devices) #undef LOAD_FUNCPTR hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_mmdevenum); - ok(hr == S_OK, "Couldn't make MMDeviceEnumerator: %08x\n", hr); + ok(hr == S_OK, "Couldn't make MMDeviceEnumerator: %08lx\n", hr); hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(g_mmdevenum, eCapture, eMultimedia, &mmdev); if (hr == S_OK) { hr = IMMDevice_GetId(mmdev, &g_default_capture_id); - ok(hr == S_OK, "IMMDevice::GetId(capture) failed: %08x\n", hr); + ok(hr == S_OK, "IMMDevice::GetId(capture) failed: %08lx\n", hr); IMMDevice_Release(mmdev); } @@ -299,7 +299,7 @@ START_TEST(devices) if (hr == S_OK) { hr = IMMDevice_GetId(mmdev, &g_default_render_id); - ok(hr == S_OK, "IMMDevice::GetId(render) failed: %08x\n", hr); + ok(hr == S_OK, "IMMDevice::GetId(render) failed: %08lx\n", hr); IMMDevice_Release(mmdev); }

1 0

Eric Pouech : wininet/tests: Use correct integral type.
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: wine Branch: master Commit: c31fc18016cdbca866105347b9d7cfa692541ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c31fc18016cdbca866105347… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:22:41 2022 +0100 wininet/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..706b8fa623b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -363,7 +363,7 @@ static void _test_http_version(unsigned line, HINTERNET req) ok_(__FILE__,line)(v.dwMinorVersion == 1, "dwMinorVersion = %d\n", v.dwMinorVersion); } -static int close_handle_cnt; +static LONG close_handle_cnt; static VOID WINAPI callback( HINTERNET hInternet,

1 0