From 2f0bfbac36b36e5b0221b51c4b54ba235e8e3d23 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 13 Dec 2009 10:59:31 +0100 Subject: [PATCH] user32: Remove the no longer used WINPROC_CallDlgProc16 function. --- dlls/user32/user_private.h | 1 - dlls/user32/winproc.c | 43 -------------------------------------- 2 files changed, 44 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67fdbb6909e..e5db691309d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -250,7 +250,6 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 91eeeb7d858..d08a59fb262 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -593,14 +593,6 @@ static LRESULT call_window_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, arg, WMCHAR_MAP_CALLWINDOWPROC ); } -/* helper callback for 16->32W conversion */ -static LRESULT call_dialog_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - return WINPROC_CallProcAtoW( call_dialog_proc, hwnd, msg, wp, lp, result, - arg, WMCHAR_MAP_CALLWINDOWPROC ); -} - /********************************************************************** * WINPROC_GetProc16 @@ -2329,41 +2321,6 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, } -/********************************************************************** - * WINPROC_CallDlgProc16 - */ -INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) -{ - WINDOWPROC *proc; - LRESULT result; - INT_PTR ret; - - if (!func) return 0; - - if (!(proc = handle16_to_proc( (WNDPROC16)func ))) - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, func ); - } - else if (proc->procA) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc, hwnd, msg, wParam, lParam, - &result, proc->procA ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else if (proc->procW) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc_AtoW, hwnd, msg, wParam, lParam, - &result, proc->procW ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, proc->proc16 ); - } - return ret; -} - - /********************************************************************** * WINPROC_CallDlgProcA */