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

Alexandre Julliard : wrc: Use the locale.nls data to determine a language's codepage.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: f445f21a3881d21687d18d4ba7d8e6a84aabea6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f445f21a3881d21687d18d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 13:39:58 2022 +0200 wrc: Use the locale.nls data to determine a language's codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 253 +++++++++++++++++------------------------------------- 1 file changed, 78 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f445f21a3881d21687d1…

1 0

Mohamad Al-Jaf : propsys: Implement VariantToStringWithDefault.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: bf0f1fdcf80657a42116b79a0953181191cf9221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0f1fdcf80657a42116b79a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Apr 1 16:10:13 2022 +0300 propsys: Implement VariantToStringWithDefault. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Mohamad Al-Jaf : propsys/tests: Add VariantToStringWithDefault tests.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 89aba13dc381dbbda62d1019e1af2af5a589b0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=89aba13dc381dbbda62d1019… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Apr 1 16:10:14 2022 +0300 propsys/tests: Add VariantToStringWithDefault tests. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 187 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 124b3405bcb..47a7930a18b 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2064,6 +2064,192 @@ static void test_InitVariantFromFileTime(void) ok(V_DATE(&var) == d, "got wrong value: %f, expected %f\n", V_DATE(&var), d); } +static void test_VariantToStringWithDefault(void) +{ + static WCHAR default_value[] = L"test"; + VARIANT var, var2; + PCWSTR result; + BSTR b; + + V_VT(&var) = VT_EMPTY; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_NULL; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_BOOL; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + V_BOOL(&var) = VARIANT_TRUE; + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_CY; + V_CY(&var).int64 = 100000; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_DATE; + V_DATE(&var) = 42.0; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_ERROR; + V_ERROR(&var) = DISP_E_PARAMNOTFOUND; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_I4; + V_I4(&var) = 15; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_I1; + V_I1(&var) = 1; + result = VariantToStringWithDefault(&var, NULL); + ok(result == NULL, "Unexpected value %s\n", wine_dbgstr_w(result)); + result = VariantToStringWithDefault(&var, default_value); + ok(result == default_value, "Unexpected value %s\n", wine_dbgstr_w(result)); + + /* V_BSTR */ + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = NULL; + result = VariantToStringWithDefault(&var, default_value); + ok(result[0] == '\0', "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L""); + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L" "); + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(L"test1"); + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var); + + /* V_BSTRREF */ + + V_VT(&var) = VT_BYREF | VT_BSTR; + b = NULL; + V_BSTRREF(&var) = &b; + result = VariantToStringWithDefault(&var, default_value); + ok(result[0] == '\0', "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_BYREF | VT_BSTR; + b = SysAllocString(L""); + V_BSTRREF(&var) = &b; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); + + V_VT(&var) = VT_BYREF | VT_BSTR; + b = SysAllocString(L" "); + V_BSTRREF(&var) = &b; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); + + V_VT(&var) = VT_BYREF | VT_BSTR; + b = SysAllocString(L"test1"); + V_BSTRREF(&var) = &b; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); + + /* Nested V_BSTR */ + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BSTR; + V_BSTR(&var2) = NULL; + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result[0] == '\0', "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BSTR; + V_BSTR(&var2) = SysAllocString(L""); + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var2), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var2); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BSTR; + V_BSTR(&var2) = SysAllocString(L" "); + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var2), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var2); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BSTR; + V_BSTR(&var2) = SysAllocString(L"test1"); + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == V_BSTR(&var2), "Unexpected value %s\n", wine_dbgstr_w(result)); + VariantClear(&var2); + + /* Nested V_BSTRREF */ + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BYREF | VT_BSTR; + b = NULL; + V_BSTRREF(&var2) = &b; + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result[0] == '\0', "Unexpected value %s\n", wine_dbgstr_w(result)); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BYREF | VT_BSTR; + b = SysAllocString(L""); + V_BSTRREF(&var2) = &b; + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BYREF | VT_BSTR; + b = SysAllocString(L" "); + V_BSTRREF(&var2) = &b; + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VT(&var2) = VT_BYREF | VT_BSTR; + b = SysAllocString(L"test1"); + V_BSTRREF(&var2) = &b; + V_VARIANTREF(&var) = &var2; + result = VariantToStringWithDefault(&var, default_value); + ok(result == b, "Unexpected value %s\n", wine_dbgstr_w(result)); + SysFreeString(b); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -2088,4 +2274,5 @@ START_TEST(propsys) test_propertystore(); test_PSCreatePropertyStoreFromObject(); test_InitVariantFromFileTime(); + test_VariantToStringWithDefault(); }

1 0

Jacek Caban : win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 2db1fea630887995ddef50bfe8bf1255188a8b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db1fea630887995ddef50bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:45:57 2022 +0200 win32u: Move NtUserMsgWaitForMultipleObjectsEx 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 | 66 ++------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 +++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 045ec5bd01d..c5f55bf11c9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1962,42 +1962,6 @@ static void wait_message_reply( UINT flags ) } -/*********************************************************************** - * wait_objects - * - * Wait for multiple objects including the server queue, with specific queue masks. - */ -static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, - DWORD wake_mask, DWORD changed_mask, DWORD flags ) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - DWORD ret; - - assert( count ); /* we must have at least the server queue */ - - flush_window_surfaces( TRUE ); - - if (thread_info->wake_mask != wake_mask || thread_info->changed_mask != changed_mask) - { - SERVER_START_REQ( set_queue_mask ) - { - req->wake_mask = wake_mask; - req->changed_mask = changed_mask; - req->skip_wait = 0; - wine_server_call( req ); - } - SERVER_END_REQ; - thread_info->wake_mask = wake_mask; - thread_info->changed_mask = changed_mask; - } - - ret = wow_handlers.wait_message( count, handles, timeout, changed_mask, flags ); - - if (ret != WAIT_TIMEOUT) thread_info->wake_mask = thread_info->changed_mask = 0; - return ret; -} - - /*********************************************************************** * put_message_in_queue * @@ -2992,31 +2956,7 @@ BOOL WINAPI GetCurrentInputMessageSource( INPUT_MESSAGE_SOURCE *source ) */ BOOL WINAPI WaitMessage(void) { - return (MsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ) != WAIT_FAILED); -} - - -/*********************************************************************** - * MsgWaitForMultipleObjectsEx (USER32.@) - */ -DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, - DWORD timeout, DWORD mask, DWORD flags ) -{ - HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - DWORD i; - - if (count > MAXIMUM_WAIT_OBJECTS-1) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return WAIT_FAILED; - } - - /* add the queue to the handle list */ - for (i = 0; i < count; i++) handles[i] = pHandles[i]; - handles[count] = get_server_queue_handle(); - - return wait_objects( count+1, handles, timeout, - (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); + return NtUserMsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ) != WAIT_FAILED; } @@ -3026,8 +2966,8 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOL wait_all, DWORD timeout, DWORD mask ) { - return MsgWaitForMultipleObjectsEx( count, handles, timeout, mask, - wait_all ? MWMO_WAITALL : 0 ); + return NtUserMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, + wait_all ? MWMO_WAITALL : 0 ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5d0c6746a51..00a73a6d04d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -544,7 +544,7 @@ @ stdcall MonitorFromWindow(long long) @ stdcall MoveWindow(long long long long long long) NtUserMoveWindow @ stdcall MsgWaitForMultipleObjects(long ptr long long long) -@ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) +@ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) NtUserMsgWaitForMultipleObjectsEx @ stdcall NotifyWinEvent(long long long long) NtUserNotifyWinEvent @ stdcall OemKeyScan(long) @ stdcall OemToCharA(str ptr) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 24e1bbece2e..ccab4beeaf4 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1191,6 +1191,7 @@ static struct unix_funcs unix_funcs = NtUserMapVirtualKeyEx, NtUserMessageCall, NtUserMoveWindow, + NtUserMsgWaitForMultipleObjectsEx, NtUserPeekMessage, NtUserRedrawWindow, NtUserRegisterClassExWOW, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 7202745a94d..0a311f5a6ef 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -957,6 +957,29 @@ static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, return ret; } +/*********************************************************************** + * NtUserMsgWaitForMultipleObjectsEx (win32u.@) + */ +DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags ) +{ + HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; + DWORD i; + + if (count > MAXIMUM_WAIT_OBJECTS-1) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return WAIT_FAILED; + } + + /* add the queue to the handle list */ + for (i = 0; i < count; i++) wait_handles[i] = handles[i]; + wait_handles[count] = get_server_queue_handle(); + + return wait_objects( count+1, wait_handles, timeout, + (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); +} + /*********************************************************************** * NtUserPeekMessage (win32u.@) */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 6d290085942..47e2afb315f 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1085,7 +1085,7 @@ @ stub NtUserModifyUserStartupInfoFlags @ stub NtUserModifyWindowTouchCapability @ stdcall NtUserMoveWindow(long long long long long long) -@ stub NtUserMsgWaitForMultipleObjectsEx +@ stdcall NtUserMsgWaitForMultipleObjectsEx(long ptr long long long) @ stub NtUserNavigateFocus @ stub NtUserNotifyIMEStatus @ stub NtUserNotifyProcessCreate diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 9ff475f493e..83fdecc9348 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -239,6 +239,8 @@ struct unix_funcs BOOL (WINAPI *pNtUserMessageCall)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, ULONG_PTR result_info, DWORD type, BOOL ansi ); BOOL (WINAPI *pNtUserMoveWindow)( HWND hwnd, INT x, INT y, INT cx, INT cy, BOOL repaint ); + 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 *pNtUserRedrawWindow)( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM (WINAPI *pNtUserRegisterClassExWOW)( const WNDCLASSEXW *wc, UNICODE_STRING *name, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 0a1d45f1eb8..74677a969db 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -964,6 +964,13 @@ BOOL WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam return unix_funcs->pNtUserMessageCall( hwnd, msg, wparam, lparam, result_info, type, ansi ); } +DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); +} + BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ) { if (!unix_funcs) return FALSE; diff --git a/include/ntuser.h b/include/ntuser.h index 7afc930438e..df1766afac6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -586,6 +586,8 @@ UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); BOOL WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, ULONG_PTR result_info, DWORD type, BOOL ansi ); BOOL WINAPI NtUserMoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, BOOL repaint ); +DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags ); void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG child_id ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len );

1 0

Jacek Caban : win32u: Move NtUserWaitForInputIdle implementation from user32.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 2a833a1c862e7ec421978540ad83aadc16cdda8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a833a1c862e7ec421978540… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:04 2022 +0200 win32u: Move NtUserWaitForInputIdle 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 | 48 ++-------------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 +++++++++++++++++++++++++++++++++++++------- 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, 63 insertions(+), 58 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5f55bf11c9..0df521a5a47 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2974,53 +2974,9 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD count, const HANDLE *handles, /*********************************************************************** * WaitForInputIdle (USER32.@) */ -DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) +DWORD WINAPI WaitForInputIdle( HANDLE process, DWORD timeout ) { - DWORD start_time, elapsed, ret; - HANDLE handles[2]; - - handles[0] = hProcess; - SERVER_START_REQ( get_process_idle_event ) - { - req->handle = wine_server_obj_handle( hProcess ); - wine_server_call_err( req ); - handles[1] = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ - - start_time = GetTickCount(); - elapsed = 0; - - TRACE("waiting for %p\n", handles[1] ); - do - { - ret = MsgWaitForMultipleObjects ( 2, handles, FALSE, dwTimeOut - elapsed, QS_SENDMESSAGE ); - switch (ret) - { - case WAIT_OBJECT_0: - return 0; - case WAIT_OBJECT_0+2: - process_sent_messages(); - break; - case WAIT_TIMEOUT: - case WAIT_FAILED: - TRACE("timeout or error\n"); - return ret; - default: - TRACE("finished\n"); - return 0; - } - if (dwTimeOut != INFINITE) - { - elapsed = GetTickCount() - start_time; - if (elapsed > dwTimeOut) - break; - } - } - while (1); - - return WAIT_TIMEOUT; + return NtUserWaitForInputIdle( process, timeout, FALSE ); } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 599bc3f636f..8eb60232c2f 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = SendNotifyMessageW, SetSystemMenu, ShowCaret, - WaitForInputIdle, free_menu_items, free_win_ptr, MENU_IsMenuActive, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index ccab4beeaf4..5f3c7bdf7b1 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1226,6 +1226,7 @@ static struct unix_funcs unix_funcs = NtUserUnregisterHotKey, NtUserUpdateLayeredWindow, NtUserVkKeyScanEx, + NtUserWaitForInputIdle, NtUserWindowFromPoint, SetDIBits, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0a311f5a6ef..24813fac66f 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -481,15 +481,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar } } -/*********************************************************************** - * NtUserWaitForInputIdle (win32u.@) - */ -DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) -{ - if (!user_callbacks) return 0; - return user_callbacks->pWaitForInputIdle( process, timeout ); -} - /********************************************************************** * NtUserGetGUIThreadInfo (win32u.@) */ @@ -980,6 +971,58 @@ DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handl (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); } +/*********************************************************************** + * NtUserWaitForInputIdle (win32u.@) + */ +DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) +{ + DWORD start_time, elapsed, ret; + HANDLE handles[2]; + + handles[0] = process; + SERVER_START_REQ( get_process_idle_event ) + { + req->handle = wine_server_obj_handle( process ); + wine_server_call_err( req ); + handles[1] = wine_server_ptr_handle( reply->event ); + } + SERVER_END_REQ; + if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ + + start_time = NtGetTickCount(); + elapsed = 0; + + TRACE("waiting for %p\n", handles[1] ); + + for (;;) + { + ret = NtUserMsgWaitForMultipleObjectsEx( 2, handles, timeout - elapsed, QS_SENDMESSAGE, 0 ); + switch (ret) + { + case WAIT_OBJECT_0: + return 0; + case WAIT_OBJECT_0+2: + process_sent_messages(); + break; + case WAIT_TIMEOUT: + case WAIT_FAILED: + TRACE("timeout or error\n"); + return ret; + default: + TRACE("finished\n"); + return 0; + } + if (timeout != INFINITE) + { + elapsed = NtGetTickCount() - start_time; + if (elapsed > timeout) + break; + } + } + + return WAIT_TIMEOUT; +} + /*********************************************************************** * NtUserPeekMessage (win32u.@) */ diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 3b6b6badfdc..4dade6c78a5 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -45,7 +45,6 @@ struct user_callbacks BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); - DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *free_menu_items)( void *ptr ); void (CDECL *free_win_ptr)( struct tagWND *win ); HWND (CDECL *is_menu_active)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 47e2afb315f..3e4b3ab5e30 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1305,7 +1305,7 @@ @ stdcall NtUserVkKeyScanEx(long long) @ stub NtUserWOWCleanup @ stub NtUserWaitAvailableMessageEx -@ stub NtUserWaitForInputIdle +@ stdcall NtUserWaitForInputIdle(long long long) @ stub NtUserWaitForMsgAndEvent @ stub NtUserWaitForRedirectionStartComplete @ stub NtUserWaitMessage diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 83fdecc9348..80cae3dad35 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -286,6 +286,7 @@ struct unix_funcs COLORREF key, const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ); WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); + DWORD (WINAPI *pNtUserWaitForInputIdle)( HANDLE process, DWORD timeout, BOOL wow ); HWND (WINAPI *pNtUserWindowFromPoint)( LONG x, LONG y ); /* Wine-specific functions */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 74677a969db..6348093e1fc 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1184,6 +1184,12 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } +DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserWaitForInputIdle( process, timeout, wow ); +} + HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) { if (!unix_funcs) return 0;

1 0

Jacek Caban : user32: Avoid internal structs in post_dde_message.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: b666d908d5827e5b2ce2bd0c111b3297f4a6de2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b666d908d5827e5b2ce2bd0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:11 2022 +0200 user32: Avoid internal structs in post_dde_message. 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 | 53 ++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 0df521a5a47..25db8c42728 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1184,22 +1184,21 @@ static HGLOBAL dde_get_pair(HGLOBAL shm) * * Post a DDE message */ -static BOOL post_dde_message( struct packed_message *data, const struct send_message_info *info ) +static BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) { void* ptr = NULL; int size = 0; UINT_PTR uiLo, uiHi; LPARAM lp; HGLOBAL hunlock = 0; - int i; DWORD res; ULONGLONG hpack; - if (!UnpackDDElParam( info->msg, info->lparam, &uiLo, &uiHi )) + if (!UnpackDDElParam( msg, lparam, &uiLo, &uiHi )) return FALSE; - lp = info->lparam; - switch (info->msg) + lp = lparam; + switch (msg) { /* DDE messages which don't require packing are: * WM_DDE_INITIATE @@ -1216,7 +1215,8 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes { hpack = pack_ptr( h ); /* send back the value of h on the other side */ - push_data( data, &hpack, sizeof(hpack) ); + ptr = &hpack; + size = sizeof(hpack); lp = uiLo; TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); } @@ -1231,17 +1231,15 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - size = 0; if (uiLo) { size = GlobalSize( (HGLOBAL)uiLo ) ; - if ((info->msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || - (info->msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || - (info->msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value)) - ) - return FALSE; + if ((msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || + (msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || + (msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value))) + return FALSE; } - else if (info->msg != WM_DDE_DATA) return FALSE; + else if (msg != WM_DDE_DATA) return FALSE; lp = uiHi; if (uiLo) @@ -1252,37 +1250,35 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes TRACE("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n", dde_data->unused, dde_data->fResponse, dde_data->fRelease, dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat); - push_data( data, ptr, size ); hunlock = (HGLOBAL)uiLo; } } TRACE( "send ddepack %u %lx\n", size, uiHi ); break; case WM_DDE_EXECUTE: - if (info->lparam) + if (lparam) { - if ((ptr = GlobalLock( (HGLOBAL)info->lparam) )) + if ((ptr = GlobalLock( (HGLOBAL)lparam) )) { - push_data(data, ptr, GlobalSize( (HGLOBAL)info->lparam )); + size = GlobalSize( (HGLOBAL)lparam ); /* so that the other side can send it back on ACK */ - lp = info->lparam; - hunlock = (HGLOBAL)info->lparam; + lp = lparam; + hunlock = (HGLOBAL)lparam; } } break; } SERVER_START_REQ( send_message ) { - req->id = info->dest_tid; - req->type = info->type; + req->id = dest_tid; + req->type = type; req->flags = 0; - req->win = wine_server_user_handle( info->hwnd ); - req->msg = info->msg; - req->wparam = info->wparam; + req->win = wine_server_user_handle( hwnd ); + req->msg = msg; + req->wparam = wparam; req->lparam = lp; req->timeout = TIMEOUT_INFINITE; - for (i = 0; i < data->count; i++) - wine_server_add_data( req, data->data[i], data->size[i] ); + if (size) wine_server_add_data( req, ptr, size ); if ((res = wine_server_call( req ))) { if (res == STATUS_INVALID_PARAMETER) @@ -1292,7 +1288,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes SetLastError( RtlNtStatusToDosError(res) ); } else - FreeDDElParam(info->msg, info->lparam); + FreeDDElParam( msg, lparam ); } SERVER_END_REQ; if (hunlock) GlobalUnlock(hunlock); @@ -2010,7 +2006,8 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } else if (info->type == MSG_POSTED && info->msg >= WM_DDE_FIRST && info->msg <= WM_DDE_LAST) { - return post_dde_message( &data, info ); + return post_dde_message( info->hwnd, info->msg, info->wparam, info->lparam, + info->dest_tid, info->type ); } SERVER_START_REQ( send_message )

1 0

Jacek Caban : win32u: Move send_internal_message_timeout implementation from user32.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 7ba3c31d84fcf49810aaf78aff63ef28b32eb159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba3c31d84fcf49810aaf78a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:51 2022 +0200 win32u: Move send_internal_message_timeout 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 | 43 +-- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ba3c31d84fcf49810aa…

1 0

Jacek Caban : win32u: Move __wine_send_input implementation from user32.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 21d60952cb3a45c8c5dc0d88dab19ecdb1807570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d60952cb3a45c8c5dc0d88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:46:58 2022 +0200 win32u: Move __wine_send_input 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/hidclass.sys/Makefile.in | 2 +- dlls/user32/input.c | 13 ----- dlls/user32/user32.spec | 1 - dlls/user32/user_main.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 10 ++++ dlls/win32u/message.c | 116 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 1 + dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/wrappers.c | 6 +++ 11 files changed, 140 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21d60952cb3a45c8c5dc…

1 0

Jacek Caban : win32u: Move NtUserSendInput implementation from user32.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: 6ff2d287c2a74c7701e649218d3f4fc39014ab79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff2d287c2a74c7701e64921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 14:47:12 2022 +0200 win32u: Move NtUserSendInput 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/driver.c | 13 +---- dlls/user32/input.c | 103 +------------------------------------ dlls/user32/message.c | 117 ------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 93 +++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/sysparams.c | 2 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 2 +- 14 files changed, 105 insertions(+), 240 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ff2d287c2a74c7701e6…

1 0

Gijs Vermeulen : setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Alexandre Julliard 01 Apr '22

01 Apr '22

Module: wine Branch: master Commit: dc0aa67ce690f67ae8c12d7bed0a449c1af8c693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0aa67ce690f67ae8c12d7b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Apr 1 16:16:31 2022 +0200 setupapi: Add SetupQueryInfVersionInformationA/W stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/query.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index b25bd883cc6..e662b422a06 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -731,3 +731,21 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8..7578fb25c9c 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long)

1 0