Module: wine Branch: master Commit: 322ee7938386e0c96ba5423ba92a45520dda3f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=322ee7938386e0c96ba5423ba...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 13 15:07:30 2022 +0200
win32u: Remove no longer needed NtUserCallOneParam exports.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user32/message.c | 15 --------------- dlls/user32/win.c | 11 ----------- dlls/user32/win.h | 1 - dlls/win32u/message.c | 2 +- dlls/win32u/ntuser_private.h | 3 --- dlls/win32u/sysparams.c | 10 ---------- include/ntuser.h | 2 -- 7 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e45c5fb0425..72f5c084432 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -266,21 +266,6 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) }
-/*********************************************************************** - * handle_internal_message - * - * Handle an internal Wine message instead of calling the window proc. - */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - MSG m; - m.hwnd = hwnd; - m.message = msg; - m.wParam = wparam; - m.lParam = lparam; - return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage ); -} - /* since the WM_DDE_ACK response to a WM_DDE_EXECUTE message should contain the handle * to the memory handle, we keep track (in the server side) of all pairs of handle * used (the client passes its value and the content of the memory handle), and diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ec5a964b3c2..24aeaaeadfd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -142,17 +142,6 @@ BOOL is_desktop_window( HWND hwnd ) }
-/******************************************************************* - * flush_window_surfaces - * - * Flush pending output from all window surfaces. - */ -void flush_window_surfaces( BOOL idle ) -{ - NtUserCallOneParam( idle, NtUserFlushWindowSurfaces ); -} - - /*********************************************************************** * WIN_GetPtr * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 8e0998e3715..d741965d2be 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -36,7 +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 void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 9479595ae53..36bafccc9a4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1079,7 +1079,7 @@ BOOL reply_message_result( LRESULT result, MSG *msg ) * * Handle an internal Wine message instead of calling the window proc. */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { switch(msg) { diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6ba47443dc7..5aee58fa1e3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -292,9 +292,6 @@ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( WND *win, const RECT *extra_rect ) DECLSPEC_HIDDEN;
-/* message.c */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; - /* window.c */ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_HIDDEN; void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 080efded675..0a4fa4f524d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4729,22 +4729,12 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) params->next_unicode ); }
- case NtUserFlushWindowSurfaces: - flush_window_surfaces( arg ); - return 0; - case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg );
case NtUserGetWinProcPtr: return (UINT_PTR)get_winproc_ptr( UlongToHandle(arg) );
- case NtUserHandleInternalMessage: - { - MSG *msg = (MSG *)arg; - return handle_internal_message( msg->hwnd, msg->message, msg->wParam, msg->lParam ); - } - case NtUserLock: switch( arg ) { diff --git a/include/ntuser.h b/include/ntuser.h index 1535a813a79..5cf25aca64f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -687,10 +687,8 @@ enum NtUserCallOneParam_RealizePalette, /* temporary exports */ NtUserCallHooks, - NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserGetWinProcPtr, - NtUserHandleInternalMessage, NtUserLock, NtUserSetCallbacks, NtUserSpyGetVKeyName,