[PATCH v2 2/9] win32u: Remove no longer needed NtUserDispatchMessageA.

[Jacek Caban]

From: Jacek Caban

---
 dlls/user32/message.c        |  2 +-
 dlls/win32u/message.c        | 16 ++++------------
 dlls/win32u/sysparams.c      |  3 ---
 dlls/win32u/win32u_private.h |  1 -
 include/ntuser.h             |  6 ------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index f72d837ac94..40babb71eba 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -877,7 +877,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg )
     if (msg->message != WM_SYSTIMER && msg->message != WM_PAINT)
         return dispatch_message( msg, TRUE );

-    return NtUserDispatchMessageA( msg );
+    return NtUserDispatchMessage( msg );
 }

diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index 50bce801339..49dc3fd6d08 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -2496,9 +2496,9 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r
 }

/**********************************************************************
- *           dispatch_message
+ *           NtUserDispatchMessage  (win32u.@)
  */
-LRESULT dispatch_message( const MSG *msg, BOOL ansi )
+LRESULT WINAPI NtUserDispatchMessage( const MSG *msg )
 {
     struct win_proc_params params;
     LRESULT retval = 0;
@@ -2509,7 +2509,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
         params.func = (WNDPROC)msg->lParam;
         params.result = &retval; /* FIXME */
         if (!init_win_proc_params( &params, msg->hwnd, msg->message,
-                                   msg->wParam, NtGetTickCount(), ansi ))
+                                   msg->wParam, NtGetTickCount(), FALSE ))
             return 0;
         __TRY
         {
@@ -2541,7 +2541,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
     spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam );

if (init_window_call_params( &params, msg->hwnd, msg->message, msg->wParam, msg->lParam,
-                                 &retval, ansi, WMCHAR_MAP_DISPATCHMESSAGE ))
+                                 &retval, FALSE, WMCHAR_MAP_DISPATCHMESSAGE ))
         dispatch_win_proc_params( &params, sizeof(params) );
     else if (!is_window( msg->hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE );
     else SetLastError( ERROR_MESSAGE_SYNC_ONLY );
@@ -2558,14 +2558,6 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi )
     return retval;
 }

-/**********************************************************************
- *           NtUserDispatchMessage  (win32u.@)
- */
-LRESULT WINAPI NtUserDispatchMessage( const MSG *msg )
-{
-    return dispatch_message( msg, FALSE );
-}
-
 static BOOL is_message_broadcastable( UINT msg )
 {
     return msg < WM_USER || msg >= 0xc000;
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index 2c1f8f4241f..e8b55616f6a 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -4880,9 +4880,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code )
     case NtUserCallOneParam_CreateMenu:
         return HandleToUlong( create_menu( arg ) );

-    case NtUserCallOneParam_DispatchMessageA:
-        return dispatch_message( (const MSG *)arg, TRUE );
-
     case NtUserCallOneParam_EnableDC:
         return set_dce_flags( UlongToHandle(arg), DCHF_ENABLEDC );

diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index a0b3e8c2e9e..a7f0624fdba 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -436,7 +436,6 @@ extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch ) DECLSPEC
 extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y ) DECLSPEC_HIDDEN;

/* message.c */
-extern LRESULT dispatch_message( const MSG *msg, BOOL ansi ) DECLSPEC_HIDDEN;
 extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN;
 extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN;
 extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput,
diff --git a/include/ntuser.h b/include/ntuser.h
index b0ebfbfcf5f..67058defb6f 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -902,7 +902,6 @@ enum
     NtUserCallOneParam_BeginDeferWindowPos,
     NtUserCallOneParam_CreateCursorIcon,
     NtUserCallOneParam_CreateMenu,
-    NtUserCallOneParam_DispatchMessageA,
     NtUserCallOneParam_EnableDC,
     NtUserCallOneParam_EnableThunkLock,
     NtUserCallOneParam_EnumClipboardFormats,
@@ -944,11 +943,6 @@ static inline HMENU NtUserCreateMenu( BOOL is_popup )
     return UlongToHandle( NtUserCallOneParam( is_popup, NtUserCallOneParam_CreateMenu ));
 }

-static inline LRESULT NtUserDispatchMessageA( const MSG *msg )
-{
-    return NtUserCallOneParam( (UINT_PTR)msg, NtUserCallOneParam_DispatchMessageA );
-}
-
 static inline WORD NtUserEnableDC( HDC hdc )
 {
     return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_EnableDC );