Module: wine Branch: master Commit: d513eee3ee4e9107c0b433bf9182155022fdf8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d513eee3ee4e9107c0b433bf9...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 6 11:11:07 2022 +0200
user.exe: Remove no longer used wait_message16.
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/user.exe16/message.c | 15 --------------- dlls/user.exe16/user_private.h | 2 -- dlls/user32/controls.h | 2 -- dlls/user32/driver.c | 11 +---------- dlls/user32/winproc.c | 10 ---------- 5 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 05285d55eb5..f6730fcee7b 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2563,20 +2563,6 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, }
-/*********************************************************************** - * wait_message16 - */ -static DWORD wait_message16( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) -{ - DWORD lock, ret; - - ReleaseThunkLock( &lock ); - ret = wow_handlers32.wait_message( count, handles, timeout, mask, flags ); - RestoreThunkLock( lock ); - return ret; -} - - /*********************************************************************** * create_window16 */ @@ -2621,7 +2607,6 @@ void register_wow_handlers(void) mdiclient_proc16, scrollbar_proc16, static_proc16, - wait_message16, create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16, diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 83c57379d35..8a325cf9fb2 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -41,7 +41,6 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -56,7 +55,6 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ffa131e9d63..5e762e10a7c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -69,7 +69,6 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); @@ -84,7 +83,6 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - DWORD (*wait_message)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 0c3a1b62575..f4516a2f9da 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -69,14 +69,6 @@ static void CDECL nulldrv_UpdateClipboard(void) { }
-static DWORD CDECL nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD mask, DWORD flags ) -{ - if (!count && !timeout) return WAIT_TIMEOUT; - return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, - timeout, flags & MWMO_ALERTABLE ); -} - static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { } @@ -134,7 +126,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, - nulldrv_MsgWaitForMultipleObjectsEx, + NULL, NULL, NULL, NULL, @@ -178,7 +170,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0)
SET_USER_FUNC(UpdateClipboard); - SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(SetWindowIcon); SET_USER_FUNC(SetWindowText); SET_USER_FUNC(SysCommand); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 51c89111202..ebbb25e92dc 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1482,14 +1482,6 @@ static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); }
-static DWORD wait_message( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) -{ - DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); - if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); - if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; - return ret; -} - /********************************************************************** * UserRegisterWowHandlers (USER32.@) * @@ -1505,7 +1497,6 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->mdiclient_proc = MDIClientWndProc_common; orig->scrollbar_proc = ScrollBarWndProc_common; orig->static_proc = StaticWndProc_common; - orig->wait_message = wait_message; orig->create_window = WIN_CreateWindowEx; orig->get_win_handle = WIN_GetFullHandle; orig->alloc_winproc = WINPROC_AllocProc; @@ -1524,7 +1515,6 @@ struct wow_handlers16 wow_handlers = MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, - wait_message, WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL, /* call_dialog_proc */