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

Jacek Caban : win32u: Move EnumClipboardFormats implementation from user32.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: ea9fb81c0998222bf72d982494433c8a2d7149aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9fb81c0998222bf72d9824… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:46:17 2022 +0200 win32u: Move EnumClipboardFormats 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/clipboard.c | 16 +--------------- dlls/win32u/clipboard.c | 20 ++++++++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 911014ee628..9a7753520f5 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -764,21 +764,7 @@ done: */ UINT WINAPI EnumClipboardFormats( UINT format ) { - UINT ret = 0; - - SERVER_START_REQ( enum_clipboard_formats ) - { - req->previous = format; - if (!wine_server_call_err( req )) - { - ret = reply->format; - SetLastError( ERROR_SUCCESS ); - } - } - SERVER_END_REQ; - - TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret )); - return ret; + return NtUserEnumClipboardFormats( format ); } diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 29bf36ee80d..bf1c241d7c8 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -334,6 +334,26 @@ DWORD WINAPI NtUserGetClipboardSequenceNumber(void) return seqno; } +/* see EnumClipboardFormats */ +UINT enum_clipboard_formats( UINT format ) +{ + UINT ret = 0; + + SERVER_START_REQ( enum_clipboard_formats ) + { + req->previous = format; + if (!wine_server_call_err( req )) + { + ret = reply->format; + SetLastError( ERROR_SUCCESS ); + } + } + SERVER_END_REQ; + + TRACE( "%s -> %s\n", debugstr_format( format ), debugstr_format( ret )); + return ret; +} + /************************************************************************** * NtUserAddClipboardFormatListener (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1e8b0fbf489..3b380c017e5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4707,6 +4707,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) enable_thunk_lock = arg; return 0; + case NtUserCallOneParam_EnumClipboardFormats: + return enum_clipboard_formats( arg ); + case NtUserCallOneParam_GetClipCursor: return get_clip_cursor( (RECT *)arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 9d4c7b5021c..4c1b0a7b45b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -313,6 +313,7 @@ struct unix_funcs }; /* clipboard.c */ +extern UINT enum_clipboard_formats( UINT format ) DECLSPEC_HIDDEN; extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN; /* cursoricon.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 836854a12b4..d06b76ab605 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -637,6 +637,7 @@ enum NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, + NtUserCallOneParam_EnumClipboardFormats, NtUserCallOneParam_GetClipCursor, NtUserCallOneParam_GetCursorPos, NtUserCallOneParam_GetIconParam, @@ -688,6 +689,11 @@ static inline void NtUserEnableThunkLock( BOOL enable ) NtUserCallOneParam( enable, NtUserCallOneParam_EnableThunkLock ); } +static inline UINT NtUserEnumClipboardFormats( UINT format ) +{ + return NtUserCallOneParam( format, NtUserCallOneParam_EnumClipboardFormats ); +} + static inline BOOL NtUserGetClipCursor( RECT *rect ) { return NtUserCallOneParam( (UINT_PTR)rect, NtUserCallOneParam_GetClipCursor );

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove some tests.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: d25ff1802a0191a03cdba8f7a56e40d50c24e16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25ff1802a0191a03cdba8f7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:02 2022 +0200 windows.media.speech/tests: Remove some tests. The tests were mostly broken, racing or inconsistent. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 3021686b228..4f1f92ded5f 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -966,7 +966,6 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine check_refcount(&compilation_handler.IAsyncHandler_Compilation_iface, 1); todo_wine ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); CloseHandle(compilation_handler.event_finished); @@ -974,10 +973,8 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); todo_wine ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); - handler = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(handler == NULL, "Handler had value %p.\n", handler); hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -996,14 +993,6 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - /* Check if AsyncInfo and AsyncOperation share the same refcount. */ - IAsyncOperation_SpeechRecognitionCompilationResult_AddRef(operation); - todo_wine check_refcount(operation, 3); - todo_wine check_refcount(info, 3); - - IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - todo_wine check_refcount(info, 2); - id = 0xdeadbeef; hr = IAsyncInfo_get_Id(info, &id); todo_wine ok(hr == S_OK, "IAsyncInfo_get_Id failed, hr %#lx.\n", hr); @@ -1058,16 +1047,10 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - /* This one can fail, if the async operation had already finished */ - compilation_result = (void*)0xdeadbeef; - hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); - async_status = 0xdeadbeef; hr = IAsyncInfo_get_Status(info, &async_status); todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - todo_wine ok(async_status == Started || async_status == Completed, "Status was %#x.\n", async_status); + todo_wine ok(async_status != AsyncStatus_Closed, "Status was %#x.\n", async_status); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler2.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Jacek Caban : win32u: Move NtUserSetClipboardViewer implementation from user32.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: c38e287befdf1f2910d7e23ccff5638d57cd411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c38e287befdf1f2910d7e23c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:43 2022 +0200 win32u: Move NtUserSetClipboardViewer 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/clipboard.c | 25 ------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 26 ++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index f2861fce28f..0a502de5846 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -702,31 +702,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * SetClipboardViewer (USER32.@) - */ -HWND WINAPI SetClipboardViewer( HWND hwnd ) -{ - HWND prev = 0, owner = 0; - - SERVER_START_REQ( set_clipboard_viewer ) - { - req->viewer = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - prev = wine_server_ptr_handle( reply->old_viewer ); - owner = wine_server_ptr_handle( reply->owner ); - } - } - SERVER_END_REQ; - - if (hwnd) SendNotifyMessageW( hwnd, WM_DRAWCLIPBOARD, (WPARAM)owner, 0 ); - - TRACE( "%p returning %p\n", hwnd, prev ); - return prev; -} - - /************************************************************************** * ChangeClipboardChain (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f8683a78426..fa195442b27 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -655,7 +655,7 @@ @ stdcall SetClassLongW(long long long) @ stdcall SetClassWord(long long long) NtUserSetClassWord @ stdcall SetClipboardData(long long) -@ stdcall SetClipboardViewer(long) +@ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer @ stdcall SetCoalescableTimer(long long long ptr long) NtUserSetTimer # @ stub SetConsoleReserveKeys @ stdcall -import SetCursor(long) NtUserSetCursor diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index f49d9db3b9d..d4004c045e0 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -231,6 +231,32 @@ HWND WINAPI NtUserGetClipboardOwner(void) return owner; } +/************************************************************************** + * NtUserSetClipboardViewer (win32u.@) + */ +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ) +{ + HWND prev = 0, owner = 0; + + SERVER_START_REQ( set_clipboard_viewer ) + { + req->viewer = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + prev = wine_server_ptr_handle( reply->old_viewer ); + owner = wine_server_ptr_handle( reply->owner ); + } + } + SERVER_END_REQ; + + if (hwnd) + NtUserMessageCall( hwnd, WM_DRAWCLIPBOARD, (WPARAM)owner, 0, + NULL, NtUserSendNotifyMessage, FALSE ); + + TRACE( "%p returning %p\n", hwnd, prev ); + return prev; +} + /************************************************************************** * NtUserGetClipboardViewer (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index c0f21662403..453c4893317 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1192,6 +1192,7 @@ static struct unix_funcs unix_funcs = NtUserSetClassLong, NtUserSetClassLongPtr, NtUserSetClassWord, + NtUserSetClipboardViewer, NtUserSetCursor, NtUserSetCursorIconData, NtUserSetCursorPos, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index f3e2f9ca2f5..05818d001cd 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1175,7 +1175,7 @@ @ stdcall NtUserSetClassLongPtr(long long long long) @ stdcall NtUserSetClassWord(long long long) @ stub NtUserSetClipboardData -@ stub NtUserSetClipboardViewer +@ stdcall NtUserSetClipboardViewer(long) @ stub NtUserSetCoreWindow @ stub NtUserSetCoreWindowPartner @ stdcall NtUserSetCursor(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2299330be0d..a693a972830 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -263,6 +263,7 @@ struct unix_funcs DWORD (WINAPI *pNtUserSetClassLong)( HWND hwnd, INT offset, LONG newval, BOOL ansi ); ULONG_PTR (WINAPI *pNtUserSetClassLongPtr)( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); WORD (WINAPI *pNtUserSetClassWord)( HWND hwnd, INT offset, WORD newval ); + HWND (WINAPI *pNtUserSetClipboardViewer)( HWND hwnd ); HCURSOR (WINAPI *pNtUserSetCursor)( HCURSOR cursor ); BOOL (WINAPI *pNtUserSetCursorIconData)( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index d8b117bac8f..994f8c63a5b 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1088,6 +1088,12 @@ WORD WINAPI NtUserSetClassWord( HWND hwnd, INT offset, WORD newval ) return unix_funcs->pNtUserSetClassWord( hwnd, offset, newval ); } +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserSetClipboardViewer( hwnd ); +} + BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc ) { diff --git a/include/ntuser.h b/include/ntuser.h index 7fc52979e7e..5d49cd8caba 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -547,6 +547,7 @@ HWND WINAPI NtUserSetCapture( HWND hwnd ); DWORD WINAPI NtUserSetClassLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ); ULONG_PTR WINAPI NtUserSetClassLongPtr( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); WORD WINAPI NtUserSetClassWord( HWND hwnd, INT offset, WORD newval ); +HWND WINAPI NtUserSetClipboardViewer( HWND hwnd ); HCURSOR WINAPI NtUserSetCursor( HCURSOR cursor ); BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, struct cursoricon_desc *desc );

1 0

Tag wine-7.7 : Alexandre Julliard : Release 7.7
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: refs/tags/wine-7.7 Tag: 72a1d76aa2aec5b410eca5abba0c405bfa3d1426 URL: https://source.winehq.org/git/wine.git/?a=tag;h=72a1d76aa2aec5b410eca5abba0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:44:11 2022 +0200 Release 7.7

1 0

Alexandre Julliard : Release 7.7.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: f4fdafbb5597bde5d2d3433d5c64f5a74dfac859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4fdafbb5597bde5d2d3433d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 21:44:11 2022 +0200 Release 7.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 853 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 459 insertions(+), 415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f4fdafbb5597bde5d2d3…

1 0

Bernhard Kölbl : windows.media.speech: Add ISpeechRecognitionCompilationResult.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 5c27a1ccc2aba5f986ab62581399aff051fad947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c27a1ccc2aba5f986ab6258… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:07 2022 +0200 windows.media.speech: Add ISpeechRecognitionCompilationResult. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/recognizer.c | 124 ++++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 17 ++--- 2 files changed, 130 insertions(+), 11 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 9802a4ae5da..39813ef5607 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -23,6 +23,128 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * ISpeechRecognitionCompilationResult + * + */ + +struct compilation_result +{ + ISpeechRecognitionCompilationResult ISpeechRecognitionCompilationResult_iface; + LONG ref; + + SpeechRecognitionResultStatus status; +}; + +static inline struct compilation_result *impl_from_ISpeechRecognitionCompilationResult( ISpeechRecognitionCompilationResult *iface ) +{ + return CONTAINING_RECORD(iface, struct compilation_result, ISpeechRecognitionCompilationResult_iface); +} + +static HRESULT WINAPI compilation_result_QueryInterface( ISpeechRecognitionCompilationResult *iface, REFIID iid, void **out ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_ISpeechRecognitionCompilationResult)) + { + IInspectable_AddRef((*out = &impl->ISpeechRecognitionCompilationResult_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI compilation_result_AddRef( ISpeechRecognitionCompilationResult *iface ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI compilation_result_Release( ISpeechRecognitionCompilationResult *iface ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + free(impl); + + return ref; +} + +static HRESULT WINAPI compilation_result_GetIids( ISpeechRecognitionCompilationResult *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_GetRuntimeClassName( ISpeechRecognitionCompilationResult *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_GetTrustLevel( ISpeechRecognitionCompilationResult *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI compilation_result_get_Status( ISpeechRecognitionCompilationResult *iface, SpeechRecognitionResultStatus *value ) +{ + struct compilation_result *impl = impl_from_ISpeechRecognitionCompilationResult(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->status; + return S_OK; +} + +static const struct ISpeechRecognitionCompilationResultVtbl compilation_result_vtbl = +{ + /* IUnknown methods */ + compilation_result_QueryInterface, + compilation_result_AddRef, + compilation_result_Release, + /* IInspectable methods */ + compilation_result_GetIids, + compilation_result_GetRuntimeClassName, + compilation_result_GetTrustLevel, + /* ISpeechRecognitionCompilationResult methods */ + compilation_result_get_Status +}; + + +static HRESULT WINAPI compilation_result_create( SpeechRecognitionResultStatus status, ISpeechRecognitionCompilationResult **out ) +{ + struct compilation_result *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + impl->ISpeechRecognitionCompilationResult_iface.lpVtbl = &compilation_result_vtbl; + impl->ref = 1; + impl->status = status; + + *out = &impl->ISpeechRecognitionCompilationResult_iface; + TRACE("created %p\n", *out); + return S_OK; +} + /* * * SpeechContinuousRecognitionSession @@ -350,7 +472,7 @@ static HRESULT WINAPI recognizer_get_UIOptions( ISpeechRecognizer *iface, ISpeec static HRESULT WINAPI compile_callback( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return compilation_result_create(SpeechRecognitionResultStatus_Success, (ISpeechRecognitionCompilationResult **) result); } static HRESULT WINAPI recognizer_CompileConstraintsAsync( ISpeechRecognizer *iface, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e04198c93d9..051b38ce0f9 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1005,19 +1005,16 @@ static void test_SpeechRecognizer(void) compilation_result = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (compilation_result != (void*)0xdeadbeef) - { - todo_wine check_interface(compilation_result, &IID_IAgileObject, TRUE); + check_interface(compilation_result, &IID_IAgileObject, TRUE); - hr = ISpeechRecognitionCompilationResult_get_Status(compilation_result, &result_status); - todo_wine ok(hr == S_OK, "ISpeechRecognitionCompilationResult_get_Status failed, hr %#lx.\n", hr); - todo_wine ok(result_status == SpeechRecognitionResultStatus_Success, "Got unexpected status %#x.\n", result_status); + hr = ISpeechRecognitionCompilationResult_get_Status(compilation_result, &result_status); + ok(hr == S_OK, "ISpeechRecognitionCompilationResult_get_Status failed, hr %#lx.\n", hr); + ok(result_status == SpeechRecognitionResultStatus_Success, "Got unexpected status %#x.\n", result_status); - ref = ISpeechRecognitionCompilationResult_Release(compilation_result); - todo_wine ok(!ref , "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechRecognitionCompilationResult_Release(compilation_result); + ok(!ref , "Got unexpected ref %lu.\n", ref); hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); ok(hr == E_UNEXPECTED, "Got unexpected hr %#lx.\n", hr);

1 0

Bernhard Kölbl : windows.media.speech: Implement concurrency in IAsyncOperation.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: f3c131c7689a142e304c6680c1cdd2688c013c87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c131c7689a142e304c6680… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Apr 22 14:48:06 2022 +0200 windows.media.speech: Implement concurrency in IAsyncOperation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 95 +++++++++++++++++++++++++++++++- dlls/windows.media.speech/private.h | 4 +- dlls/windows.media.speech/recognizer.c | 7 ++- dlls/windows.media.speech/tests/speech.c | 8 +-- 4 files changed, 105 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f3c131c7689a142e304c…

1 0

Jacek Caban : winex11: Directly use ntdll in X11DRV_GetICMProfile.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 30c266a625286f264e65b1e205001f781e5d55c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c266a625286f264e65b1e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:46:45 2022 +0200 winex11: Directly use ntdll in X11DRV_GetICMProfile. 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/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index dadedf2d9cf..715afcb8f6a 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1660,7 +1660,7 @@ static const WCHAR mntr_key[] = 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r'}; static const WCHAR color_path[] = - {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2', + {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2', '\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r','\\'}; /*********************************************************************** @@ -1679,6 +1679,8 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, unsigned long buflen, i; ULONG full_size; WCHAR fullname[MAX_PATH + ARRAY_SIZE( color_path )], *p; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; if (!size) return FALSE; @@ -1697,8 +1699,10 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, else if ((buffer = get_icm_profile( &buflen ))) { static const WCHAR icm[] = {'.','i','c','m',0}; + IO_STATUS_BLOCK io; UINT64 hash = 0; HANDLE file; + NTSTATUS status; for (i = 0; i < buflen; i++) hash = (hash << 16) - hash + buffer[i]; for (i = 0; i < sizeof(hash) * 2; i++) @@ -1710,14 +1714,15 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, memcpy( p + i, icm, sizeof(icm) ); - file = CreateFileW( fullname, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0 ); - if (file != INVALID_HANDLE_VALUE) + RtlInitUnicodeString( &name, fullname ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL ); + status = NtCreateFile( &file, GENERIC_WRITE, &attr, &io, NULL, 0, 0, FILE_CREATE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + if (!status) { - DWORD written; - - if (!WriteFile( file, buffer, buflen, &written, NULL ) || written != buflen) - ERR( "Unable to write color profile\n" ); - CloseHandle( file ); + status = NtWriteFile( file, NULL, NULL, NULL, &io, buffer, buflen, NULL, NULL ); + if (status) ERR( "Unable to write color profile: %x\n", status ); + NtClose( file ); } HeapFree( GetProcessHeap(), 0, buffer ); } @@ -1725,7 +1730,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, else lstrcpyW( p, srgb ); NtClose( hkey ); - required = strlenW( fullname ) + 1; + required = strlenW( fullname ) + 1 - 4 /* skip NT prefix */; if (*size < required) { *size = required; @@ -1734,9 +1739,12 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, } if (filename) { - strcpyW( filename, fullname ); - if (GetFileAttributesW( filename ) == INVALID_FILE_ATTRIBUTES) - WARN( "color profile not found\n" ); + FILE_BASIC_INFORMATION info; + strcpyW( filename, fullname + 4 ); + RtlInitUnicodeString( &name, fullname ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, NULL, NULL ); + if (NtQueryAttributesFile( &attr, &info )) + WARN( "color profile not found in %s\n", debugstr_w(fullname) ); } *size = required; return TRUE;

1 0

Jacek Caban : winex11: Use a simple sdbm hash implementation in X11DRV_GetICMProfile.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: f1fb42ac4d4924beba3e5d48cf76132a2bbbaecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fb42ac4d4924beba3e5d48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:46:31 2022 +0200 winex11: Use a simple sdbm hash implementation in X11DRV_GetICMProfile. 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/winex11.drv/graphics.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 4dafb5a339b..dadedf2d9cf 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1621,12 +1621,13 @@ fallback: return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); } -static unsigned char *get_icm_profile( unsigned long *size ) +static char *get_icm_profile( unsigned long *size ) { Atom type; int format; unsigned long count, remaining; - unsigned char *profile, *ret = NULL; + unsigned char *profile; + char *ret = NULL; XGetWindowProperty( gdi_display, DefaultRootWindow(gdi_display), x11drv_atom(_ICC_PROFILE), 0, ~0UL, False, AnyPropertyType, @@ -1674,15 +1675,15 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, DWORD required; char buf[4096]; KEY_VALUE_FULL_INFORMATION *info = (void *)buf; - unsigned char *buffer; - unsigned long buflen; + char *buffer; + unsigned long buflen, i; ULONG full_size; - WCHAR profile[MAX_PATH], fullname[MAX_PATH + ARRAY_SIZE( color_path )]; + WCHAR fullname[MAX_PATH + ARRAY_SIZE( color_path )], *p; if (!size) return FALSE; memcpy( fullname, color_path, sizeof(color_path) ); - fullname[ARRAYSIZE(color_path)] = 0; + p = fullname + ARRAYSIZE(color_path); hkey = reg_open_key( NULL, mntr_key, sizeof(mntr_key) ); @@ -1690,27 +1691,25 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, info, sizeof(buf), &full_size )) { /* FIXME handle multiple values */ - memcpy( fullname + ARRAYSIZE(color_path), info->Name, info->NameLength ); - fullname[ARRAYSIZE(color_path) + info->NameLength / sizeof(WCHAR)] = 0; + memcpy( p, info->Name, info->NameLength ); + p[info->NameLength / sizeof(WCHAR)] = 0; } else if ((buffer = get_icm_profile( &buflen ))) { - static const WCHAR fmt[] = {'%','0','2','x',0}; static const WCHAR icm[] = {'.','i','c','m',0}; - - unsigned char sha1sum[20]; - unsigned int i; - sha_ctx ctx; + UINT64 hash = 0; HANDLE file; - A_SHAInit( &ctx ); - A_SHAUpdate( &ctx, buffer, buflen ); - A_SHAFinal( &ctx, sha1sum ); + for (i = 0; i < buflen; i++) hash = (hash << 16) - hash + buffer[i]; + for (i = 0; i < sizeof(hash) * 2; i++) + { + int digit = hash & 0xf; + p[i] = digit < 10 ? '0' + digit : 'a' - 10 + digit; + hash >>= 4; + } - for (i = 0; i < sizeof(sha1sum); i++) sprintfW( &profile[i * 2], fmt, sha1sum[i] ); - memcpy( &profile[i * 2], icm, sizeof(icm) ); + memcpy( p + i, icm, sizeof(icm) ); - strcatW( fullname, profile ); file = CreateFileW( fullname, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0 ); if (file != INVALID_HANDLE_VALUE) { @@ -1723,7 +1722,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, HeapFree( GetProcessHeap(), 0, buffer ); } else if (!allow_default) return FALSE; - else strcatW( fullname, srgb ); + else lstrcpyW( p, srgb ); NtClose( hkey ); required = strlenW( fullname ) + 1;

1 0

Jacek Caban : win32u: Move NtUserChangeClipboardChain implementation from user32.
by Alexandre Julliard April 22, 2022

April 22, 2022

Module: wine Branch: master Commit: 357d8654c9fd128e801b7fa914dc635fc84d7b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=357d8654c9fd128e801b7fa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:45:59 2022 +0200 win32u: Move NtUserChangeClipboardChain 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/clipboard.c | 27 --------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 26 ++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0a502de5846..911014ee628 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -702,33 +702,6 @@ BOOL WINAPI EmptyClipboard(void) } -/************************************************************************** - * ChangeClipboardChain (USER32.@) - */ -BOOL WINAPI ChangeClipboardChain( HWND hwnd, HWND next ) -{ - NTSTATUS status; - HWND viewer; - - if (!hwnd) return FALSE; - - SERVER_START_REQ( set_clipboard_viewer ) - { - req->viewer = wine_server_user_handle( next ); - req->previous = wine_server_user_handle( hwnd ); - status = wine_server_call( req ); - viewer = wine_server_ptr_handle( reply->old_viewer ); - } - SERVER_END_REQ; - - if (status == STATUS_PENDING) - return !SendMessageW( viewer, WM_CHANGECBCHAIN, (WPARAM)hwnd, (LPARAM)next ); - - if (status) SetLastError( RtlNtStatusToDosError( status )); - return !status; -} - - /************************************************************************** * SetClipboardData (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index fa195442b27..a7b2f7e0681 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -33,7 +33,7 @@ @ stdcall CallWindowProcW(ptr long long long long) @ stdcall CascadeChildWindows(long long) @ stdcall CascadeWindows(long long ptr long ptr) -@ stdcall ChangeClipboardChain(long long) +@ stdcall ChangeClipboardChain(long long) NtUserChangeClipboardChain @ stdcall ChangeDisplaySettingsA(ptr long) @ stdcall ChangeDisplaySettingsExA(str ptr long long ptr) @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index d4004c045e0..29bf36ee80d 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -274,6 +274,32 @@ HWND WINAPI NtUserGetClipboardViewer(void) return viewer; } +/************************************************************************** + * NtUserChangeClipboardChain (win32u.@) + */ +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ) +{ + NTSTATUS status; + HWND viewer; + + if (!hwnd) return FALSE; + + SERVER_START_REQ( set_clipboard_viewer ) + { + req->viewer = wine_server_user_handle( next ); + req->previous = wine_server_user_handle( hwnd ); + status = wine_server_call( req ); + viewer = wine_server_ptr_handle( reply->old_viewer ); + } + SERVER_END_REQ; + + if (status == STATUS_PENDING) + return !send_message( viewer, WM_CHANGECBCHAIN, (WPARAM)hwnd, (LPARAM)next ); + + if (status) SetLastError( RtlNtStatusToDosError( status )); + return !status; +} + /************************************************************************** * NtUserGetOpenClipboardWindow (win32u.@) */ diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 453c4893317..fbaf61a52f6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1139,6 +1139,7 @@ static struct unix_funcs unix_funcs = NtUserCallNoParam, NtUserCallOneParam, NtUserCallTwoParam, + NtUserChangeClipboardChain, NtUserChangeDisplaySettings, NtUserClipCursor, NtUserCloseClipboard, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 05818d001cd..aa40be5f652 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -782,7 +782,7 @@ @ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground -@ stub NtUserChangeClipboardChain +@ stdcall NtUserChangeClipboardChain(long long) @ stdcall NtUserChangeDisplaySettings(ptr ptr long long ptr) @ stub NtUserChangeWindowMessageFilterEx @ stub NtUserCheckAccessForIntegrityLevel diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a693a972830..9d4c7b5021c 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -191,6 +191,7 @@ struct unix_funcs ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); + BOOL (WINAPI *pNtUserChangeClipboardChain)( HWND hwnd, HWND next ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); BOOL (WINAPI *pNtUserClipCursor)( const RECT *rect ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 994f8c63a5b..d3497d29f03 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -755,6 +755,12 @@ BOOL WINAPI NtUserCloseClipboard(void) return unix_funcs->pNtUserCloseClipboard(); } +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ) +{ + if (!unix_funcs) return DISP_CHANGE_FAILED; + return unix_funcs->pNtUserChangeClipboardChain( hwnd, next ); +} + LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { diff --git a/include/ntuser.h b/include/ntuser.h index 5d49cd8caba..836854a12b4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -417,6 +417,7 @@ LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARA ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ); ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); +BOOL WINAPI NtUserChangeClipboardChain( HWND hwnd, HWND next ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); DWORD WINAPI NtUserCheckMenuItem( HMENU handle, UINT id, UINT flags );

1 0