From: Jacek Caban jacek@codeweavers.com
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 )