win32u: Remove no longer needed NtUserWinProcResult.

dlls/user32/winproc.c

@@ -926,73 +926,12 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size )
 
         result = dispatch_win_proc_params( params );
 
-        switch (params->msg)
-        {
-        case WM_NCCREATE:
-        case WM_CREATE:
-        case WM_NCCALCSIZE:
-        case WM_GETTEXT:
-        case WM_ASKCBFORMATNAME:
-        case WM_WININICHANGE:
-        case WM_SETTEXT:
-        case WM_DEVMODECHANGE:
-        case CB_DIR:
-        case LB_DIR:
-        case LB_ADDFILE:
-        case EM_REPLACESEL:
-        case WM_GETMINMAXINFO:
-        case WM_MEASUREITEM:
-        case WM_DELETEITEM:
-        case WM_COMPAREITEM:
-        case WM_WINDOWPOSCHANGING:
-        case WM_WINDOWPOSCHANGED:
-        case WM_COPYDATA:
-        case WM_HELP:
-        case WM_STYLECHANGING:
-        case WM_STYLECHANGED:
-        case WM_GETDLGCODE:
-        case SBM_SETSCROLLINFO:
-        case SBM_GETSCROLLINFO:
-        case SBM_GETSCROLLBARINFO:
-        case EM_GETSEL:
-        case SBM_GETRANGE:
-        case CB_GETEDITSEL:
-        case EM_GETRECT:
-        case LB_GETITEMRECT:
-        case CB_GETDROPPEDCONTROLRECT:
-        case EM_SETRECT:
-        case EM_SETRECTNP:
-        case EM_GETLINE:
-        case EM_SETTABSTOPS:
-        case LB_SETTABSTOPS:
-        case CB_ADDSTRING:
-        case CB_INSERTSTRING:
-        case CB_FINDSTRING:
-        case CB_FINDSTRINGEXACT:
-        case CB_SELECTSTRING:
-        case LB_ADDSTRING:
-        case LB_INSERTSTRING:
-        case LB_FINDSTRING:
-        case LB_FINDSTRINGEXACT:
-        case LB_SELECTSTRING:
-        case CB_GETLBTEXT:
-        case LB_GETTEXT:
-        case LB_GETSELITEMS:
-        case WM_NEXTMENU:
-        case WM_SIZING:
-        case WM_MOVING:
-        case WM_MDICREATE:
-        case CB_GETCOMBOBOXINFO:
-        case WM_MDIGETACTIVE:
+        if (size)
         {
             LRESULT *result_ptr = (LRESULT *)buffer - 1;
             *result_ptr = result;
             return NtCallbackReturn( result_ptr, sizeof(*result_ptr) + size, TRUE );
         }
-        }
-
-        NtUserMessageCall( params->hwnd, params->msg, params->wparam, params->lparam,
-                           (void *)result, NtUserWinProcResult, FALSE );
     }
     else
     {

dlls/win32u/message.c

@@ -57,8 +57,6 @@ struct received_message_info
     struct received_message_info *prev;
 };
 
-#define MSG_CLIENT_MESSAGE 0xff
-
 struct packed_hook_extra_info
 {
     user_handle_t handle;
@@ -1971,7 +1969,6 @@ BOOL reply_message_result( LRESULT result )
     struct user_thread_info *thread_info = get_user_thread_info();
     struct received_message_info *info = thread_info->receive_info;
 
-    while (info && info->type == MSG_CLIENT_MESSAGE) info = info->prev;
     if (!info) return FALSE;
     reply_message( info, result, NULL );
     return TRUE;
@@ -1989,7 +1986,6 @@ static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARA
     MSG msg;
 
     if (!info) return FALSE;
-    if (info->type == MSG_CLIENT_MESSAGE) return TRUE;
 
     msg.hwnd = hwnd;
     msg.message = message;
@@ -3595,8 +3591,6 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt
 
 static BOOL process_packed_message( struct send_message_info *info, LRESULT *res_ptr, BOOL ansi )
 {
-    struct user_thread_info *thread_info = get_user_thread_info();
-    struct received_message_info receive_info;
     struct packed_message data;
     size_t buffer_size = 0, i;
     void *buffer = NULL;
@@ -3613,19 +3607,9 @@ static BOOL process_packed_message( struct send_message_info *info, LRESULT *res
         ptr += data.size[i];
     }
 
-    receive_info.type = MSG_CLIENT_MESSAGE;
-    receive_info.msg.hwnd = info->hwnd;
-    receive_info.msg.message = info->msg;
-    receive_info.msg.wParam = info->wparam;
-    receive_info.msg.lParam = info->lparam;
-    receive_info.flags = 0;
-    receive_info.prev = thread_info->receive_info;
-    thread_info->receive_info = &receive_info;
-
     *res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam,
                                  !ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size );
-    if (thread_info->receive_info == &receive_info)
-        thread_info->receive_info = receive_info.prev;
+
     free( buffer );
     return TRUE;
 }
@@ -4273,9 +4257,6 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
     case NtUserClipboardWindowProc:
         return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam );
 
-    case NtUserWinProcResult:
-        return reply_winproc_result( (LRESULT)result_info, hwnd, msg, wparam, lparam );
-
     case NtUserGetDispatchParams:
         if (!hwnd) return FALSE;
         if (init_window_call_params( result_info, hwnd, msg, wparam, lparam,

dlls/wow64win/user.c

@@ -3552,13 +3552,6 @@ NTSTATUS WINAPI wow64_NtUserMessageCall( UINT *args )
         /* no argument conversion */
         return NtUserMessageCall( hwnd, msg, wparam, lparam, result_info, type, ansi );
 
-    case NtUserWinProcResult:
-        {
-            LONG result32 = PtrToLong( result_info );
-            return message_call_32to64( hwnd, msg, wparam, lparam,
-                                        LongToPtr( result32 ), type, ansi );
-        }
-
     case NtUserImeDriverCall:
         {
             struct

include/ntuser.h

@@ -306,8 +306,7 @@ enum
     NtUserSpyGetMsgName       = 0x3003,
     NtUserSpyEnter            = 0x0304,
     NtUserSpyExit             = 0x0305,
-    NtUserWinProcResult       = 0x0306,
-    NtUserImeDriverCall       = 0x0307,
+    NtUserImeDriverCall       = 0x0306,
 };
 
 /* NtUserThunkedMenuItemInfo codes */