[PATCH 5/5] user32: Remove no longer needed helpers.

[Jacek Caban]

From: Jacek Caban <jacek at codeweavers.com>

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
---
 dlls/user32/user_main.c | 18 ------------------
 dlls/user32/win.c       |  2 +-
 dlls/user32/win.h       |  6 +-----
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c
index eeef0d57f62..d0c1cc616a7 100644
--- a/dlls/user32/user_main.c
+++ b/dlls/user32/user_main.c
@@ -42,24 +42,6 @@ static DWORD exiting_thread_id;
 
 extern void WDML_NotifyThreadDetach(void);
 
-/***********************************************************************
- *           USER_Lock
- */
-void USER_Lock(void)
-{
-    NtUserCallOneParam( 0, NtUserLock );
-}
-
-
-/***********************************************************************
- *           USER_Unlock
- */
-void USER_Unlock(void)
-{
-    NtUserCallOneParam( 1, NtUserLock );
-}
-
-
 /***********************************************************************
  *           USER_CheckNotLock
  *
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 9b9dde82561..bac75063f7d 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -54,7 +54,7 @@ void *get_user_handle_ptr( HANDLE handle, unsigned int type )
 void release_user_handle_ptr( void *ptr )
 {
     assert( ptr && ptr != OBJ_OTHER_PROCESS );
-    USER_Unlock();
+    NtUserCallOneParam( 1, NtUserLock );
 }
 
 
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index dfa5fdf3283..9d42aef6645 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -48,14 +48,10 @@ extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN;
 extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ) DECLSPEC_HIDDEN;
 extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) DECLSPEC_HIDDEN;
 
-/* user lock */
-extern void USER_Lock(void) DECLSPEC_HIDDEN;
-extern void USER_Unlock(void) DECLSPEC_HIDDEN;
-
 /* to release pointers retrieved by WIN_GetPtr */
 static inline void WIN_ReleasePtr( WND *ptr )
 {
-    USER_Unlock();
+    release_user_handle_ptr( ptr );
 }
 
 extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/204