April 2022 - Wine-commits - list.winehq.org

Eric Pouech : mciavi32: Use I width modifier instead of casting to DWORD.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 2f2e3ea50b638f482018c1eddcaa8e44efe079c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2e3ea50b638f482018c1ed… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 6 08:35:03 2022 +0200 mciavi32: Use I width modifier instead of casting to DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d..dcd07032fec 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

Mohamad Al-Jaf : ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: dec096934a2a30864f92446de317ef491d8d3bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec096934a2a30864f92446d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 03:19:52 2022 -0400 ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index cc979a539d2..13909a2dd9e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status);

1 0

Mohamad Al-Jaf : ncrypt: Warn on invalid flags in NCryptImportKey.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 807d368f1d3707ccc4682c7fcd1e871ec34aafe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=807d368f1d3707ccc4682c7f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 03:19:53 2022 -0400 ncrypt: Warn on invalid flags in NCryptImportKey. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 13909a2dd9e..e12284e0867 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -374,7 +374,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H } else if (flags) { - ERR("Invalid flags %#lx\n", flags); + WARN("Invalid flags %#lx\n", flags); return NTE_BAD_FLAGS; }

1 0

Hans Leidekker : bcrypt: Fix array index in BCryptEnumAlgorithms().
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 40306db34145bc46c650dc56df37144dc7aee4b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40306db34145bc46c650dc56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 10:38:38 2022 +0200 bcrypt: Fix array index in BCryptEnumAlgorithms(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 11 ++++++----- dlls/bcrypt/tests/bcrypt.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ffeff66d7b..98ae8c97e3a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -147,7 +147,7 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR BCRYPT_SIGNATURE_OPERATION |\ BCRYPT_RNG_OPERATION; BCRYPT_ALGORITHM_IDENTIFIER *list; - ULONG i, count = 0; + ULONG i, j, count = 0; TRACE( "%#lx, %p, %p, %#lx\n", type, ret_count, ret_list, flags ); @@ -160,12 +160,13 @@ NTSTATUS WINAPI BCryptEnumAlgorithms( ULONG type, ULONG *ret_count, BCRYPT_ALGOR if (!(list = malloc( count * sizeof(*list) ))) return STATUS_NO_MEMORY; - for (i = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) + for (i = 0, j = 0; i < ARRAY_SIZE( builtin_algorithms ); i++) { if (!match_operation_type( type, builtin_algorithms[i].class )) continue; - list[i].pszName = (WCHAR *)builtin_algorithms[i].name; - list[i].dwClass = builtin_algorithms[i].class; - list[i].dwFlags = 0; + list[j].pszName = (WCHAR *)builtin_algorithms[i].name; + list[j].dwClass = builtin_algorithms[i].class; + list[j].dwFlags = 0; + j++; } *ret_count = count; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index df650379cfb..08ce360cac0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2668,7 +2668,7 @@ static void test_BCryptEnumAlgorithms(void) { BCRYPT_ALGORITHM_IDENTIFIER *list; NTSTATUS ret; - ULONG count; + ULONG count, op; ret = BCryptEnumAlgorithms(0, NULL, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); @@ -2689,6 +2689,16 @@ static void test_BCryptEnumAlgorithms(void) ok(list != NULL, "NULL list\n"); ok(count, "got %lu\n", count); BCryptFreeBuffer( list ); + + op = BCRYPT_CIPHER_OPERATION | BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION | BCRYPT_SIGNATURE_OPERATION | + BCRYPT_SECRET_AGREEMENT_OPERATION; + count = 0; + list = NULL; + ret = BCryptEnumAlgorithms(op, &count, &list, 0); + ok(!ret, "got %#lx\n", ret); + ok(list != NULL, "NULL list\n"); + ok(count, "got %lu\n", count); + BCryptFreeBuffer( list ); } static void test_aes_vector(void)

1 0

Hans Leidekker : bcrypt: Implement BCryptFreeBuffer().
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 2ad18d3992832de1762a1599bcaae79ed35c9259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad18d3992832de1762a1599… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 10:38:39 2022 +0200 bcrypt: Implement BCryptFreeBuffer(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 98ae8c97e3a..2c0d2f8f965 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG void WINAPI BCryptFreeBuffer( void *buffer ) { - FIXME( "%p\n", buffer ); + free( buffer ); } NTSTATUS WINAPI BCryptRegisterProvider( const WCHAR *provider, ULONG flags, CRYPT_PROVIDER_REG *reg )

1 0

Jacek Caban : win32u: Add missing return in NtUserExitingThread implementation.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 6062065723c0d1f964ed1569a17cbe8fba01d9f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6062065723c0d1f964ed1569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:05:01 2022 +0200 win32u: Add missing return in NtUserExitingThread implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2d63158935d..b4e1a699451 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4643,6 +4643,7 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) /* temporary exports */ case NtUserExitingThread: exiting_thread_id = GetCurrentThreadId(); + return 0; case NtUserThreadDetach: thread_detach(); return 0;

1 0

Jacek Caban : win32u: Move NtUserPostThreadMessage implementation from user32.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: e1db9fef05154f59f21d199a6a9691ae9c81144c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1db9fef05154f59f21d199a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:05:19 2022 +0200 win32u: Move NtUserPostThreadMessage implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 29 ++--------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 24 ++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 7 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2255e0ee4ba..dff7ca24786 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1807,7 +1807,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) return TRUE; } - if (!hwnd) return PostThreadMessageW( GetCurrentThreadId(), msg, wparam, lparam ); + if (!hwnd) return NtUserPostThreadMessage( GetCurrentThreadId(), msg, wparam, lparam ); if (!(info.dest_tid = GetWindowThreadProcessId( hwnd, NULL ))) return FALSE; @@ -1823,32 +1823,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) BOOL WINAPI PostThreadMessageA( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) { if (!map_wparam_AtoW( msg, &wparam, WMCHAR_MAP_POSTMESSAGE )) return TRUE; - return PostThreadMessageW( thread, msg, wparam, lparam ); -} - - -/********************************************************************** - * PostThreadMessageW (USER32.@) - */ -BOOL WINAPI PostThreadMessageW( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - struct send_message_info info; - - if (is_pointer_message( msg, wparam )) - { - SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - if (USER_IsExitingThread( thread )) return TRUE; - - info.type = MSG_POSTED; - info.dest_tid = thread; - info.hwnd = 0; - info.msg = msg; - info.wparam = wparam; - info.lparam = lparam; - info.flags = 0; - return put_message_in_queue( &info, NULL ); + return NtUserPostThreadMessage( thread, msg, wparam, lparam ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 89c9d76f568..2c4dba5cd86 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -571,7 +571,7 @@ @ stdcall PostMessageW(long long long long) @ stdcall PostQuitMessage(long) @ stdcall PostThreadMessageA(long long long long) -@ stdcall PostThreadMessageW(long long long long) +@ stdcall PostThreadMessageW(long long long long) NtUserPostThreadMessage @ stdcall PrintWindow(long long long) @ stdcall PrivateExtractIconExA(str long ptr ptr long) @ stdcall PrivateExtractIconExW(wstr long ptr ptr long) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 4d78c99bbc7..645e29305e8 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1193,6 +1193,7 @@ static struct unix_funcs unix_funcs = NtUserMoveWindow, NtUserMsgWaitForMultipleObjectsEx, NtUserPeekMessage, + NtUserPostThreadMessage, NtUserRedrawWindow, NtUserRegisterClassExWOW, NtUserRegisterHotKey, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 73312424283..f3e695ea16a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2407,6 +2407,30 @@ BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam return user_callbacks->pPostMessageW( hwnd, msg, wparam, lparam ); } +/********************************************************************** + * NtUserPostThreadMessage (win32u.@) + */ +BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + struct send_message_info info; + + if (is_pointer_message( msg, wparam )) + { + SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + if (is_exiting_thread( thread )) return TRUE; + + info.type = MSG_POSTED; + info.dest_tid = thread; + info.hwnd = 0; + info.msg = msg; + info.wparam = wparam; + info.lparam = lparam; + info.flags = 0; + return put_message_in_queue( &info, NULL ); +} + LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, void *result_info, DWORD type, BOOL ansi ) { diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 31561cb3a1c..7670e1a5310 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1104,7 +1104,7 @@ @ stub NtUserPhysicalToLogicalPoint @ stub NtUserPostKeyboardInputMessage @ stub NtUserPostMessage -@ stub NtUserPostThreadMessage +@ stdcall NtUserPostThreadMessage(long long long long) @ stub NtUserPrintWindow @ stub NtUserProcessConnect @ stub NtUserProcessInkFeedbackCommand diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c844603640e..ffd050adbcf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -242,6 +242,7 @@ struct unix_funcs DWORD (WINAPI *pNtUserMsgWaitForMultipleObjectsEx)( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ); BOOL (WINAPI *pNtUserPeekMessage)( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ); + BOOL (WINAPI *pNtUserPostThreadMessage)( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL (WINAPI *pNtUserRedrawWindow)( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM (WINAPI *pNtUserRegisterClassExWOW)( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4f7c6191df8..159cade9aea 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -977,6 +977,12 @@ BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, U return unix_funcs->pNtUserPeekMessage( msg_out, hwnd, first, last, flags ); } +BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserPostThreadMessage( thread, msg, wparam, lparam ); +} + BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) { if (!unix_funcs) return FALSE;

1 0

Jacek Caban : win32u: Move NtUserPostMessage implementation from user32.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 4072ba5d8a893df73cc1f3ce48f290d07643a109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4072ba5d8a893df73cc1f3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:05:31 2022 +0200 win32u: Move NtUserPostMessage implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 673 +------------------------------------------ dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 30 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + 8 files changed, 37 insertions(+), 678 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4072ba5d8a893df73cc1…

1 0

Jacek Caban : win32u: Move process_hardware_message implementation from user32.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: 5bcb9d12631769e9d980151399f059805dc37dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bcb9d12631769e9d9801513… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 11:10:45 2022 +0200 win32u: Move process_hardware_message implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 395 +------------------------------------------ dlls/user32/user_main.c | 3 +- dlls/user32/user_private.h | 4 +- dlls/win32u/message.c | 393 +++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 4 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 8 +- 7 files changed, 405 insertions(+), 406 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bcb9d12631769e9d980…

1 0

Jacek Caban : user.exe: Remove no longer used wait_message16.
by Alexandre Julliard 06 Apr '22

06 Apr '22

Module: wine Branch: master Commit: d513eee3ee4e9107c0b433bf9182155022fdf8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d513eee3ee4e9107c0b433bf… Author: Jacek Caban <jacek(a)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(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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 */

1 0