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

Jacek Caban : win32u: Introduce NtUserGetWindowSysSubMenu.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 224a8fc24ed79a52d69a2cb2cb71cf11b8564f55 URL: https://gitlab.winehq.org/wine/wine/-/commit/224a8fc24ed79a52d69a2cb2cb71cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 19:21:53 2022 +0200 win32u: Introduce NtUserGetWindowSysSubMenu. And use it for MDI client implementation. --- dlls/user32/mdi.c | 15 ++++----------- dlls/win32u/menu.c | 11 +++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 3 +++ include/ntuser.h | 6 ++++++ 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 11ba1382804..cb278525f13 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1359,17 +1359,12 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, { /* control menu is between the frame system menu and * the first entry of menu bar */ - WND *wndPtr = WIN_GetPtr(hwnd); - - if( (wParam == VK_LEFT && GetMenu(hwnd) == next_menu->hmenuIn) || - (wParam == VK_RIGHT && GetSubMenu(wndPtr->hSysMenu, 0) == next_menu->hmenuIn) ) + if ((wParam == VK_LEFT && GetMenu(hwnd) == next_menu->hmenuIn) || + (wParam == VK_RIGHT && NtUserGetWindowSysSubMenu( hwnd ) == next_menu->hmenuIn)) { - WIN_ReleasePtr(wndPtr); - wndPtr = WIN_GetPtr(ci->hwndActiveChild); - next_menu->hmenuNext = GetSubMenu(wndPtr->hSysMenu, 0); + next_menu->hmenuNext = NtUserGetWindowSysSubMenu( ci->hwndActiveChild ); next_menu->hwndNext = ci->hwndActiveChild; } - WIN_ReleasePtr(wndPtr); } return 0; } @@ -1551,9 +1546,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, if( wParam == VK_LEFT ) /* switch to frame system menu */ { - WND *wndPtr = WIN_GetPtr( parent ); - next_menu->hmenuNext = GetSubMenu( wndPtr->hSysMenu, 0 ); - WIN_ReleasePtr( wndPtr ); + next_menu->hmenuNext = NtUserGetWindowSysSubMenu( parent ); } if( wParam == VK_RIGHT ) /* to frame menu bar */ { diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 641eb926e16..53dcf3ced8e 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -1619,6 +1619,17 @@ BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) return TRUE; } +HMENU get_window_sys_sub_menu( HWND hwnd ) +{ + WND *win; + HMENU ret; + + if (!(win = get_win_ptr( hwnd )) || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return 0; + ret = win->hSysMenu; + release_win_ptr( win ); + return get_sub_menu( ret, 0 ); +} + /********************************************************************** * NtUserSetMenuDefaultItem (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 6e9a1926891..d4b86d1e6a9 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -289,6 +289,7 @@ extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y ) D extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; +extern HMENU get_window_sys_sub_menu( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; extern HWND is_menu_active(void) DECLSPEC_HIDDEN; extern LRESULT popup_menu_window_proc( HWND hwnd, UINT message, WPARAM wparam, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 506af7530d3..41cfde752c7 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5419,6 +5419,9 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_GetWindowInputContext: return HandleToUlong( get_window_input_context( hwnd )); + case NtUserCallHwnd_GetWindowSysSubMenu: + return HandleToUlong( get_window_sys_sub_menu( hwnd )); + case NtUserCallHwnd_GetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); diff --git a/include/ntuser.h b/include/ntuser.h index 86e2d329eb9..65abfc65b18 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1105,6 +1105,7 @@ enum NtUserCallHwnd_GetWindowContextHelpId, NtUserCallHwnd_GetWindowDpiAwarenessContext, NtUserCallHwnd_GetWindowInputContext, + NtUserCallHwnd_GetWindowSysSubMenu, NtUserCallHwnd_GetWindowTextLength, NtUserCallHwnd_IsWindow, NtUserCallHwnd_IsWindowEnabled, @@ -1163,6 +1164,11 @@ static inline HIMC NtUserGetWindowInputContext( HWND hwnd ) return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowInputContext )); } +static inline HMENU NtUserGetWindowSysSubMenu( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowSysSubMenu )); +} + static inline INT NtUserGetWindowTextLength( HWND hwnd ) { return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowTextLength );

1 0

Jacek Caban : user32: Store MDI client info on client heap.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 1bd73c6c3e2b8737b7377dd7be3dc7e7a13c2edf URL: https://gitlab.winehq.org/wine/wine/-/commit/1bd73c6c3e2b8737b7377dd7be3dc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 21:12:23 2022 +0200 user32: Store MDI client info on client heap. --- dlls/user32/mdi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index cb278525f13..d8d26a3b2f1 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,7 +127,6 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ - LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; @@ -187,7 +186,7 @@ const struct builtin_class_descr MDICLIENT_builtin_class = L"MDIClient", /* name */ 0, /* style */ WINPROC_MDICLIENT, /* proc */ - sizeof(MDICLIENTINFO), /* extra */ + 2 * sizeof(void *), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ }; @@ -205,7 +204,7 @@ static MDICLIENTINFO *get_client_info( HWND client ) return NULL; } if (win->flags & WIN_ISMDICLIENT) - ret = (MDICLIENTINFO *)win->wExtra; + ret = ((MDICLIENTINFO **)win->wExtra)[1]; else WARN( "%p is not an MDI client\n", client ); WIN_ReleasePtr( win ); @@ -1036,7 +1035,12 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM if (!(ci = get_client_info( hwnd ))) { - if (message == WM_NCCREATE) win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + if (message == WM_NCCREATE) + { + if (!(ci = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci) ))) return 0; + SetWindowLongPtrW( hwnd, sizeof(void *), (ULONG_PTR)ci ); + win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + } return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : DefWindowProcA( hwnd, message, wParam, lParam ); } @@ -1077,7 +1081,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM HeapFree( GetProcessHeap(), 0, ci->child ); HeapFree( GetProcessHeap(), 0, ci->frameTitle ); - + HeapFree( GetProcessHeap(), 0, ci ); return 0; }

1 0

Jacek Caban : user32: Use win32u to get and set MDI client info.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: c0b62eb5aef8b58c903521685a155b224b38b6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0b62eb5aef8b58c903521685a155b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 21:26:31 2022 +0200 user32: Use win32u to get and set MDI client info. --- dlls/user32/mdi.c | 20 ++------------------ dlls/user32/win.c | 24 +++--------------------- dlls/user32/win.h | 2 -- dlls/win32u/window.c | 8 ++++++++ include/ntuser.h | 12 ++++++++++++ 5 files changed, 25 insertions(+), 41 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index d8d26a3b2f1..12dd61c5376 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -194,22 +194,7 @@ const struct builtin_class_descr MDICLIENT_builtin_class = static MDICLIENTINFO *get_client_info( HWND client ) { - MDICLIENTINFO *ret = NULL; - WND *win = WIN_GetPtr( client ); - if (win) - { - if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) - { - if (IsWindow(client)) WARN( "client %p belongs to other process\n", client ); - return NULL; - } - if (win->flags & WIN_ISMDICLIENT) - ret = ((MDICLIENTINFO **)win->wExtra)[1]; - else - WARN( "%p is not an MDI client\n", client ); - WIN_ReleasePtr( win ); - } - return ret; + return NtUserGetMDIClientInfo( client ); } static BOOL is_close_enabled(HWND hwnd, HMENU hSysMenu) @@ -1038,8 +1023,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM if (message == WM_NCCREATE) { if (!(ci = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci) ))) return 0; - SetWindowLongPtrW( hwnd, sizeof(void *), (ULONG_PTR)ci ); - win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + NtUserSetMDIClientInfo( hwnd, ci ); } return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : DefWindowProcA( hwnd, message, wParam, lParam ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 23263166eeb..5cbef6d2342 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -128,7 +128,7 @@ BOOL is_desktop_window( HWND hwnd ) * or WND_OTHER_PROCESS if handle may be valid in other process. * If ret value is a valid pointer, it must be released with WIN_ReleasePtr. */ -WND *WIN_GetPtr( HWND hwnd ) +static WND *WIN_GetPtr( HWND hwnd ) { WND *ptr = (void *)NtUserCallTwoParam( HandleToUlong(hwnd), NTUSER_OBJ_WINDOW, NtUserGetHandlePtr ); if (ptr == WND_OTHER_PROCESS && is_desktop_window( hwnd )) ptr = WND_DESKTOP; @@ -139,7 +139,7 @@ WND *WIN_GetPtr( HWND hwnd ) /*********************************************************************** * WIN_ReleasePtr */ -void WIN_ReleasePtr( WND *ptr ) +static void WIN_ReleasePtr( WND *ptr ) { assert( ptr && ptr != OBJ_OTHER_PROCESS ); NtUserCallOneParam( 1, NtUserLock ); @@ -168,24 +168,6 @@ HWND WIN_IsCurrentThread( HWND hwnd ) } -/*********************************************************************** - * win_set_flags - * - * Set the flags of a window and return the previous value. - */ -UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) -{ - UINT ret; - WND *ptr = WIN_GetPtr( hwnd ); - - if (!ptr || ptr == WND_OTHER_PROCESS || ptr == WND_DESKTOP) return 0; - ret = ptr->flags; - ptr->flags = (ret & ~clear_mask) | set_mask; - WIN_ReleasePtr( ptr ); - return ret; -} - - /*********************************************************************** * WIN_GetFullHandle * @@ -494,7 +476,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, POINT pos[2]; UINT id = 0; - if (!(win_get_flags( cs->hwndParent ) & WIN_ISMDICLIENT)) + if (!NtUserGetMDIClientInfo( cs->hwndParent )) { WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", cs->hwndParent); return 0; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 8ef090fe983..5b744ade004 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -36,8 +36,6 @@ struct tagDIALOGINFO; /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; -extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; -extern void WIN_ReleasePtr( WND *ptr ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 41cfde752c7..ef8d3dea19e 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5410,6 +5410,10 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) case NtUserCallHwnd_GetDialogInfo: return (ULONG_PTR)get_dialog_info( hwnd ); + case NtUserCallHwnd_GetMDIClientInfo: + if (!(win_get_flags( hwnd ) & WIN_ISMDICLIENT)) return 0; + return get_window_long_ptr( hwnd, sizeof(void *), FALSE ); + case NtUserCallHwnd_GetWindowContextHelpId: return get_window_context_help_id( hwnd ); @@ -5548,6 +5552,10 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetDialogInfo: return set_dialog_info( hwnd, (void *)param ); + case NtUserCallHwndParam_SetMDIClientInfo: + NtUserSetWindowLongPtr( hwnd, sizeof(void *), param, FALSE ); + return win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + case NtUserCallHwndParam_SetWindowContextHelpId: return set_window_context_help_id( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 65abfc65b18..882bd4fad30 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1101,6 +1101,7 @@ enum NtUserCallHwnd_GetDefaultImeWindow, NtUserCallHwnd_GetDialogInfo, NtUserCallHwnd_GetDpiForWindow, + NtUserCallHwnd_GetMDIClientInfo, NtUserCallHwnd_GetParent, NtUserCallHwnd_GetWindowContextHelpId, NtUserCallHwnd_GetWindowDpiAwarenessContext, @@ -1148,6 +1149,11 @@ static inline UINT NtUserGetDpiForWindow( HWND hwnd ) return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDpiForWindow ); } +static inline void *NtUserGetMDIClientInfo( HWND hwnd ) +{ + return (void *)NtUserCallHwnd( hwnd, NtUserCallHwnd_GetMDIClientInfo ); +} + static inline HWND NtUserGetParent( HWND hwnd ) { return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetParent )); @@ -1228,6 +1234,7 @@ enum NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, NtUserCallHwndParam_SetDialogInfo, + NtUserCallHwndParam_SetMDIClientInfo, NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, @@ -1394,6 +1401,11 @@ static inline void NtUserSetDialogInfo( HWND hwnd, void *info ) NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserCallHwndParam_SetDialogInfo ); } +static inline void NtUserSetMDIClientInfo( HWND hwnd, void *info ) +{ + NtUserCallHwndParam( hwnd, (UINT_PTR)info, NtUserCallHwndParam_SetMDIClientInfo ); +} + static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) { return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId );

1 0

Jacek Caban : user32: Use GetClientRect in EDIT_WM_ContextMenu.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 98128a65e7e10d705d90ad05e2b5ff3ca517b6cb URL: https://gitlab.winehq.org/wine/wine/-/commit/98128a65e7e10d705d90ad05e2b5ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 19:36:20 2022 +0200 user32: Use GetClientRect in EDIT_WM_ContextMenu. --- dlls/user32/edit.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 80758dd60ef..81296f7deeb 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3328,11 +3328,16 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) if (x == -1 && y == -1) /* passed via VK_APPS press/release */ { + POINT pt; RECT rc; + /* Windows places the menu at the edit's center in this case */ - WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); - x = rc.left + (rc.right - rc.left) / 2; - y = rc.top + (rc.bottom - rc.top) / 2; + GetClientRect( es->hwndSelf, &rc ); + pt.x = rc.right / 2; + pt.y = rc.bottom / 2; + ClientToScreen( es->hwndSelf, &pt ); + x = pt.x; + y = pt.y; } if (!(es->flags & EF_FOCUSED))

1 0

Jacek Caban : win32u: Introduce NtUserGetChildRect.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 421fb1c80493df8e9ce0b8e5dabe6e78bf624a52 URL: https://gitlab.winehq.org/wine/wine/-/commit/421fb1c80493df8e9ce0b8e5dabe6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 19:44:39 2022 +0200 win32u: Introduce NtUserGetChildRect. And use it in CalcChildScroll. --- dlls/user32/class.c | 38 ----------- dlls/user32/controls.h | 2 - dlls/user32/mdi.c | 2 +- dlls/user32/user_private.h | 3 - dlls/user32/win.c | 160 --------------------------------------------- dlls/user32/win.h | 4 -- dlls/win32u/sysparams.c | 3 - dlls/win32u/window.c | 3 + include/ntuser.h | 7 +- 9 files changed, 10 insertions(+), 212 deletions(-)

1 0

Jacek Caban : user32: Remove USER_CheckNotLock.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 929694c66d216484ba54b1c2c270d63b41d93ea9 URL: https://gitlab.winehq.org/wine/wine/-/commit/929694c66d216484ba54b1c2c270d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 19:55:35 2022 +0200 user32: Remove USER_CheckNotLock. It's no longer interesting. Its remaining callers are not used by locked code, which is restricted to win32u. --- dlls/user32/user_main.c | 10 ---------- dlls/user32/user_private.h | 1 - dlls/user32/win.c | 8 -------- dlls/user32/winproc.c | 2 -- dlls/win32u/sysparams.c | 8 -------- include/ntuser.h | 1 - 6 files changed, 30 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 91f2891f198..acbd93cccdd 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -41,16 +41,6 @@ HMODULE user32_module = 0; extern void WDML_NotifyThreadDetach(void); -/*********************************************************************** - * USER_CheckNotLock - * - * Make sure that we don't hold the user lock. - */ -void USER_CheckNotLock(void) -{ - NtUserCallOneParam( 2, NtUserLock ); -} - /*********************************************************************** * UserRealizePalette (USER32.@) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 8e3388c6fd5..4abb0080a0f 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -73,7 +73,6 @@ extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping extern HPEN SYSCOLOR_GetPen( INT index ) DECLSPEC_HIDDEN; extern HBRUSH SYSCOLOR_Get55AABrush(void) DECLSPEC_HIDDEN; extern void SYSPARAMS_Init(void) DECLSPEC_HIDDEN; -extern void USER_CheckNotLock(void) DECLSPEC_HIDDEN; typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 93ac7f7b7c5..8ba4b6ea69e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1034,8 +1034,6 @@ BOOL WINAPI EnumWindows( WNDENUMPROC lpEnumFunc, LPARAM lParam ) BOOL ret = TRUE; int i; - USER_CheckNotLock(); - /* We have to build a list of all windows first, to avoid */ /* unpleasant side-effects, for instance if the callback */ /* function changes the Z-order of the windows. */ @@ -1064,8 +1062,6 @@ BOOL WINAPI EnumThreadWindows( DWORD id, WNDENUMPROC func, LPARAM lParam ) int i; BOOL ret = TRUE; - USER_CheckNotLock(); - if (!(list = list_window_children( 0, GetDesktopWindow(), NULL, id ))) return TRUE; /* Now call the callback function for every window */ @@ -1085,8 +1081,6 @@ BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) HWND *list; int i; - USER_CheckNotLock(); - if (!(list = list_window_children( desktop, 0, NULL, 0 ))) return TRUE; for (i = 0; list[i]; i++) @@ -1159,8 +1153,6 @@ BOOL WINAPI EnumChildWindows( HWND parent, WNDENUMPROC func, LPARAM lParam ) HWND *list; BOOL ret; - USER_CheckNotLock(); - if (!(list = WIN_ListChildren( parent ))) return FALSE; ret = WIN_EnumChildWindows( list, func, lParam ); HeapFree( GetProcessHeap(), 0, list ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3b7927891b5..cc59a290ca5 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -147,8 +147,6 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES WNDPROC proc = arg; LRESULT ret; - USER_CheckNotLock(); - hwnd = WIN_GetFullHandle( hwnd ); TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8bcf3e57624..3a77ec47769 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -5031,14 +5031,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); - case NtUserLock: - switch( arg ) - { - case 0: user_lock(); return 0; - case 1: user_unlock(); return 0; - default: user_check_not_lock(); return 0; - } - default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 8811a9e7993..eb1b860b5c4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -922,7 +922,6 @@ enum NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ NtUserGetDeskPattern, - NtUserLock, }; static inline HDWP NtUserBeginDeferWindowPos( INT count )

1 0

Nikolay Sivov : d2d1: Add parameter validation to FillOpacityMask().
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 4f1dfdad1d529e004043f16c1fff1dc8e9895094 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f1dfdad1d529e004043f16c1fff1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 00:54:07 2022 +0300 d2d1: Add parameter validation to FillOpacityMask(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c502c5dc4e4..7bed9245d75 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1096,8 +1096,25 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mask %p, brush %p, content %#x, dst_rect %s, src_rect %s stub!\n", iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); + + if (FAILED(context->error.code)) + return; + + if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED) + { + d2d_device_context_set_error(context, D2DERR_WRONG_STATE); + return; + } + + if ((unsigned int)content > D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE) + { + d2d_device_context_set_error(context, E_INVALIDARG); + return; + } } static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, @@ -2584,8 +2601,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectRequiredInputRectan static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityMask(ID2D1DeviceContext1 *iface, ID2D1Bitmap *mask, ID2D1Brush *brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mask %p, brush %p, dst_rect %s, src_rect %s stub!\n", iface, mask, brush, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); + + if (FAILED(context->error.code)) + return; + + if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED) + { + d2d_device_context_set_error(context, D2DERR_WRONG_STATE); + return; + } } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,

1 0

Nikolay Sivov : d2d1/commandlist: Implement FillOpacityMask() command.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 7cfe6d8f29ce5b69ae974e2eb53608fcd59df965 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cfe6d8f29ce5b69ae974e2eb53608… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 13:07:55 2022 +0300 d2d1/commandlist: Implement FillOpacityMask() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 6 ++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 664b2f1a412..8e5654adac8 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -41,6 +41,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_DRAW_BITMAP, D2D_COMMAND_FILL_MESH, + D2D_COMMAND_FILL_OPACITY_MASK, D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, @@ -142,6 +143,15 @@ struct d2d_command_fill_mesh ID2D1Brush *brush; }; +struct d2d_command_fill_opacity_mask +{ + struct d2d_command c; + ID2D1Bitmap *bitmap; + ID2D1Brush *brush; + D2D1_RECT_F *dst_rect; + D2D1_RECT_F *src_rect; +}; + struct d2d_command_fill_geometry { struct d2d_command c; @@ -383,6 +393,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_FillMesh(sink, c->mesh, c->brush); break; } + case D2D_COMMAND_FILL_OPACITY_MASK: + { + const struct d2d_command_fill_opacity_mask *c = data; + hr = ID2D1CommandSink_FillOpacityMask(sink, c->bitmap, c->brush, c->dst_rect, c->src_rect); + break; + } case D2D_COMMAND_FILL_GEOMETRY: { const struct d2d_command_fill_geometry *c = data; @@ -960,3 +976,34 @@ void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const str command->mesh = mesh; command->brush = brush; } + +void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) +{ + struct d2d_command_fill_opacity_mask *command; + ID2D1Brush *brush; + size_t size; + BYTE *data; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + size = sizeof(*command); + if (dst_rect) size += sizeof(*dst_rect); + if (src_rect) size += sizeof(*src_rect); + + d2d_command_list_reference_object(command_list, bitmap); + + command = d2d_command_list_require_space(command_list, size); + command->c.op = D2D_COMMAND_FILL_OPACITY_MASK; + command->bitmap = bitmap; + command->brush = brush; + + data = (BYTE *)(command + 1); + + d2d_command_list_write_field(&data, &command->dst_rect, dst_rect, sizeof(*dst_rect)); + d2d_command_list_write_field(&data, &command->src_rect, src_rect, sizeof(*src_rect)); +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index eae8801fe4b..4cc77079e0f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -771,6 +771,8 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; +void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7bed9245d75..796d837c3d9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1115,6 +1115,9 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont d2d_device_context_set_error(context, E_INVALIDARG); return; } + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect); } static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, @@ -2614,6 +2617,9 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityM d2d_device_context_set_error(context, D2DERR_WRONG_STATE); return; } + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect); } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,

1 0

Paul Gofman : winhttp: Avoid invalid memory access in netconn_resolve().
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: fa359ed9c88b75fd918c5aab5245114a54800dbf URL: https://gitlab.winehq.org/wine/wine/-/commit/fa359ed9c88b75fd918c5aab524511… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 4 17:47:32 2022 -0500 winhttp: Avoid invalid memory access in netconn_resolve(). --- dlls/winhttp/net.c | 64 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 31d8529f1d7..ab94b5bfd1d 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -752,18 +752,51 @@ static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct soc struct async_resolve { - const WCHAR *hostname; + LONG ref; + WCHAR *hostname; INTERNET_PORT port; - struct sockaddr_storage *addr; + struct sockaddr_storage addr; DWORD result; HANDLE done; }; +static struct async_resolve *create_async_resolve( const WCHAR *hostname, INTERNET_PORT port ) +{ + struct async_resolve *ret; + + if (!(ret = malloc(sizeof(*ret)))) + { + ERR( "No memory.\n" ); + return NULL; + } + ret->ref = 1; + ret->hostname = strdupW( hostname ); + ret->port = port; + if (!(ret->done = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + free( ret->hostname ); + free( ret ); + return NULL; + } + return ret; +} + +static void async_resolve_release( struct async_resolve *async ) +{ + if (InterlockedDecrement( &async->ref )) return; + + free( async->hostname ); + CloseHandle( async->done ); + free( async ); +} + static void CALLBACK resolve_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { struct async_resolve *async = ctx; - async->result = resolve_hostname( async->hostname, async->port, async->addr ); + + async->result = resolve_hostname( async->hostname, async->port, &async->addr ); SetEvent( async->done ); + async_resolve_release( async ); } DWORD netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *addr, int timeout ) @@ -773,20 +806,25 @@ DWORD netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_stor if (!timeout) ret = resolve_hostname( hostname, port, addr ); else { - struct async_resolve async; + struct async_resolve *async; + + if (!(async = create_async_resolve( hostname, port ))) + return ERROR_OUTOFMEMORY; - async.hostname = hostname; - async.port = port; - async.addr = addr; - if (!(async.done = CreateEventW( NULL, FALSE, FALSE, NULL ))) return GetLastError(); - if (!TrySubmitThreadpoolCallback( resolve_proc, &async, NULL )) + InterlockedIncrement( &async->ref ); + if (!TrySubmitThreadpoolCallback( resolve_proc, async, NULL )) { - CloseHandle( async.done ); + InterlockedDecrement( &async->ref ); + async_resolve_release( async ); return GetLastError(); } - if (WaitForSingleObject( async.done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; - else ret = async.result; - CloseHandle( async.done ); + if (WaitForSingleObject( async->done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; + else + { + *addr = async->addr; + ret = async->result; + } + async_resolve_release( async ); } return ret;

1 0

Shaun Ren : webservices: Add support for reading WS_FAULT values.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 42980ed28a06aff93237924425c6fb9d16c644ec URL: https://gitlab.winehq.org/wine/wine/-/commit/42980ed28a06aff93237924425c6fb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 18:55:15 2022 -0400 webservices: Add support for reading WS_FAULT values. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/reader.c | 164 +++++++++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 106 +++++++++++++++++--------- 2 files changed, 235 insertions(+), 35 deletions(-)

1 0