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

Jacek Caban : win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Alexandre Julliard April 1, 2022

April 1, 2022

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

Alexandre Julliard : wrc: Remove the verify translation mode.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 51d3369334c6050a13be7f0337863fd4ebf145d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d3369334c6050a13be7f03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:57 2022 +0200 wrc: Remove the verify translation mode. It's no longer useful now that we support po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 1 - tools/wrc/translation.c | 998 ------------------------------------------------ tools/wrc/wrc.c | 12 - tools/wrc/wrc.h | 1 - 4 files changed, 1012 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51d3369334c6050a13be…

1 0

Mohamad Al-Jaf : propsys/tests: Add VariantToStringWithDefault tests.
by Alexandre Julliard April 1, 2022

April 1, 2022

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

Gijs Vermeulen : setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Alexandre Julliard April 1, 2022

April 1, 2022

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

Jacek Caban : win32u: Move send_internal_message_timeout implementation from user32.
by Alexandre Julliard April 1, 2022

April 1, 2022

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

Ziqing Hui : include: Add defines for ID2D1Device2.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: db98900ccba711fd80e614baf4b7a4be60ea526a URL: https://source.winehq.org/git/wine.git/?a=commit;h=db98900ccba711fd80e614ba… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Mar 31 10:59:32 2022 +0800 include: Add defines for ID2D1Device2. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 2eeda0dd616..c96821ae276 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -323,3 +323,22 @@ interface ID2D1DeviceContext2 : ID2D1DeviceContext1 [out] ID2D1TransformedImageSource **transformed ); } + +[ + object, + uuid(a44472e1-8dfb-4e60-8492-6e2861c9ca8b), + local, +] +interface ID2D1Device2 : ID2D1Device1 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext2 **context + ); + void FlushDeviceContexts( + [in] ID2D1Bitmap *bitmap + ); + HRESULT GetDxgiDevice( + [out] IDXGIDevice **dxgi_device + ); +}

1 0

Alexandre Julliard : kernelbase: Set system/user locales by name if they have no LCID.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: c0ff1a221be311534db72e9ff316287eb6b31351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ff1a221be311534db72e9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 15:24:59 2022 +0200 kernelbase: Set system/user locales by name if they have no LCID. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 997c7b6f4bc..4f0957ceff6 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1547,12 +1547,32 @@ void init_locale( HMODULE module ) SIZE_T size; HKEY hkey; + kernelbase_handle = module; load_locale_nls(); + NtQueryDefaultLocale( FALSE, &system_lcid ); NtQueryDefaultLocale( FALSE, &user_lcid ); - system_locale = get_locale_by_id( &system_lcid, 0 ); - user_locale = get_locale_by_id( &user_lcid, 0 ); - kernelbase_handle = module; + if (!(system_locale = get_locale_by_id( &system_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINELOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + system_locale = get_locale_by_name( bufferW, &system_lcid ); + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = LOCALE_CUSTOM_DEFAULT; + } + } + if (!(user_locale = get_locale_by_id( &user_lcid, 0 ))) + { + if (GetEnvironmentVariableW( L"WINEUSERLOCALE", bufferW, ARRAY_SIZE(bufferW) )) + { + user_locale = get_locale_by_name( bufferW, &user_lcid ); + if (user_lcid == LOCALE_CUSTOM_UNSPECIFIED) user_lcid = LOCALE_CUSTOM_DEFAULT; + } + else + { + user_locale = system_locale; + user_lcid = system_lcid; + } + } if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 );

1 0

Alexandre Julliard : oleaut32: Silence error message for unknown languages.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 917d4306989ebdf24faefdaec2128b25b64d6b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=917d4306989ebdf24faefdae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 12:57:45 2022 +0200 oleaut32: Silence error message for unknown languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/hash.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index f1df69ef5e3..896e0ec5d37 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -520,34 +520,6 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid); - /* .. Fall Through .. */ - case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: - case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: - case LANG_BELARUSIAN: case LANG_BENGALI: case LANG_BULGARIAN: - case LANG_CATALAN: case LANG_DANISH: case LANG_DIVEHI: - case LANG_DUTCH: case LANG_ENGLISH: case LANG_ESTONIAN: - case LANG_FAEROESE: case LANG_FINNISH: case LANG_FRENCH: - case LANG_GALICIAN: case LANG_GEORGIAN: case LANG_GERMAN: - case LANG_GUJARATI: case LANG_HINDI: case LANG_INDONESIAN: - case LANG_ITALIAN: case LANG_KANNADA: case LANG_KASHMIRI: - case LANG_KAZAK: case LANG_KONKANI: case LANG_KYRGYZ: - case LANG_LATVIAN: case LANG_LITHUANIAN: case LANG_MACEDONIAN: - case LANG_MALAY: case LANG_MALAYALAM: case LANG_MANIPURI: - case LANG_MARATHI: case LANG_MONGOLIAN: case LANG_NEPALI: - case LANG_ORIYA: case LANG_PORTUGUESE: case LANG_PUNJABI: - case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: - case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: - case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: - case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: - case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: - case LANG_VIETNAMESE: case LANG_SCOTTISH_GAELIC: case LANG_MALTESE: - case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH: - case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: - case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: - case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: - case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: - case LANG_BRETON: case LANG_MANX_GAELIC: nOffset = 16; pnLookup = Lookup_16; break;

1 0

Alexandre Julliard : ntdll: Recognize more script names in Unix locales.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 4a757e2d20eec90b6061ca2868cd7ecd02a9afd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a757e2d20eec90b6061ca28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 1 15:24:39 2022 +0200 ntdll: Recognize more script names in Unix locales. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 2302ee46e86..64117e70abe 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1019,6 +1019,7 @@ static WCHAR **build_wargv( const WCHAR *image ) static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) { static const char sep[] = "_.@"; + const char *extra = NULL; char buffer[LOCALE_NAME_MAX_LENGTH]; char *p, *country = NULL, *modifier = NULL; @@ -1062,9 +1063,23 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) strcpy( win_name, buffer ); if (modifier) { - if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); - else if (!strcmp( modifier, "euro" )) {} /* ignore */ - else return FALSE; + if (!strcmp( modifier, "arabic" )) strcat( win_name, "-Arab" ); + else if (!strcmp( modifier, "chakma" )) strcat( win_name, "-Cakm" ); + else if (!strcmp( modifier, "cherokee" )) strcat( win_name, "-Cher" ); + else if (!strcmp( modifier, "cyrillic" )) strcat( win_name, "-Cyrl" ); + else if (!strcmp( modifier, "devanagari" )) strcat( win_name, "-Deva" ); + else if (!strcmp( modifier, "gurmukhi" )) strcat( win_name, "-Guru" ); + else if (!strcmp( modifier, "javanese" )) strcat( win_name, "-Java" ); + else if (!strcmp( modifier, "latin" )) strcat( win_name, "-Latn" ); + else if (!strcmp( modifier, "mongolian" )) strcat( win_name, "-Mong" ); + else if (!strcmp( modifier, "syriac" )) strcat( win_name, "-Syrc" ); + else if (!strcmp( modifier, "tifinagh" )) strcat( win_name, "-Tfng" ); + else if (!strcmp( modifier, "tibetan" )) strcat( win_name, "-Tibt" ); + else if (!strcmp( modifier, "vai" )) strcat( win_name, "-Vaii" ); + else if (!strcmp( modifier, "yi" )) strcat( win_name, "-Yiii" ); + else if (!strcmp( modifier, "saaho" )) strcpy( win_name, "ssy" ); + else if (!strcmp( modifier, "valencia" )) extra = "-valencia"; + /* ignore unknown modifiers */ } if (country) { @@ -1072,6 +1087,7 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) *p++ = '-'; strcpy( p, country ); } + if (extra) strcat( win_name, extra ); return TRUE; }

1 0

Nikolay Sivov : mfmediaengine/tests: Remove unused header include.
by Alexandre Julliard April 1, 2022

April 1, 2022

Module: wine Branch: master Commit: 8ce0ab9739e76544dcd59e2496b6da6ecb928b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce0ab9739e76544dcd59e24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 10:32:54 2022 +0300 mfmediaengine/tests: Remove unused header include. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index ea2f570d721..008ee58849c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -32,7 +32,6 @@ #include "mmdeviceapi.h" #include "audiosessiontypes.h" -#include "wine/heap.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager);

1 0