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

Piotr Caban : msvcr110: Make sure we don't hang in _Condition_variable::notify* functions.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 746df92dba928c8f5bfbff44c2b7156ab5bcf195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746df92dba928c8f5bfbff44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 16 14:38:02 2022 +0100 msvcr110: Make sure we don't hang in _Condition_variable::notify* functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 18138901594..54b2c49db99 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -261,6 +261,7 @@ typedef struct } event; #if _MSVCR_VER >= 110 +#define CV_WAKE (void*)1 typedef struct cv_queue { struct cv_queue *next; LONG expired; @@ -2299,18 +2300,20 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this) DEFINE_THISCALL_WRAPPER(_Condition_variable_wait, 8) void __thiscall _Condition_variable_wait(_Condition_variable *this, critical_section *cs) { - cv_queue q; + cv_queue q, *next; TRACE("(%p, %p)\n", this, cs); critical_section_lock(&this->lock); q.next = this->queue; q.expired = FALSE; + next = q.next; this->queue = &q; critical_section_unlock(&this->lock); critical_section_unlock(cs); - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + while (q.next != CV_WAKE) + RtlWaitOnAddress(&q.next, &next, sizeof(next), NULL); critical_section_lock(cs); } @@ -2323,7 +2326,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, LARGE_INTEGER to; NTSTATUS status; FILETIME ft; - cv_queue *q; + cv_queue *q, *next; TRACE("(%p %p %d)\n", this, cs, timeout); @@ -2331,6 +2334,7 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, critical_section_lock(&this->lock); q->next = this->queue; q->expired = FALSE; + next = q->next; this->queue = q; critical_section_unlock(&this->lock); @@ -2339,14 +2343,15 @@ bool __thiscall _Condition_variable_wait_for(_Condition_variable *this, GetSystemTimeAsFileTime(&ft); to.QuadPart = ((LONGLONG)ft.dwHighDateTime << 32) + ft.dwLowDateTime + (LONGLONG)timeout * 10000; - status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); - if(status == STATUS_TIMEOUT) { - if(!InterlockedExchange(&q->expired, TRUE)) { - critical_section_lock(cs); - return FALSE; + while (q->next != CV_WAKE) { + status = RtlWaitOnAddress(&q->next, &next, sizeof(next), &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->expired, TRUE)) { + critical_section_lock(cs); + return FALSE; + } + break; } - else - NtWaitForKeyedEvent(keyed_event, q, 0, 0); } operator_delete(q); @@ -2376,8 +2381,9 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this) this->queue = node->next; critical_section_unlock(&this->lock); + node->next = CV_WAKE; if(!InterlockedExchange(&node->expired, TRUE)) { - NtReleaseKeyedEvent(keyed_event, node, 0, NULL); + RtlWakeAddressSingle(&node->next); return; } else { HeapFree(GetProcessHeap(), 0, node); @@ -2405,8 +2411,9 @@ void __thiscall _Condition_variable_notify_all(_Condition_variable *this) while(ptr) { cv_queue *next = ptr->next; + ptr->next = CV_WAKE; if(!InterlockedExchange(&ptr->expired, TRUE)) - NtReleaseKeyedEvent(keyed_event, ptr, 0, NULL); + RtlWakeAddressSingle(&ptr->next); else HeapFree(GetProcessHeap(), 0, ptr); ptr = next;

1 0

Dmitry Timoshkov : combase: Always pass explicit access to the registry helpers.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: f0461bb1651e9b288b8586b37544aabe4f74b18e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0461bb1651e9b288b8586b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 16 13:14:33 2022 +0300 combase: Always pass explicit access to the registry helpers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 3ffd08ab635..de2375fba78 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -315,7 +315,7 @@ HRESULT open_key_for_clsid(REFCLSID clsid, const WCHAR *keyname, REGSAM access, lstrcpyW(path, clsidW); StringFromGUID2(clsid, path + lstrlenW(clsidW), CHARS_IN_GUID); - res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key); + res = open_classes_key(HKEY_CLASSES_ROOT, path, access, &key); if (res == ERROR_FILE_NOT_FOUND) return REGDB_E_CLASSNOTREG; else if (res != ERROR_SUCCESS) @@ -350,7 +350,7 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) HRESULT hr; /* read the AppID value under the class's key */ - hr = open_key_for_clsid(clsid, NULL, KEY_READ, &hkey); + hr = open_key_for_clsid(clsid, NULL, access, &hkey); if (FAILED(hr)) return hr; @@ -2320,9 +2320,9 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) StringFromGUID2(riid, path + ARRAY_SIZE(interfaceW) - 1, CHARS_IN_GUID); lstrcpyW(path + ARRAY_SIZE(interfaceW) - 1 + CHARS_IN_GUID - 1, psW); - hr = get_ps_clsid_from_registry(path, 0, pclsid); + hr = get_ps_clsid_from_registry(path, KEY_READ, pclsid); if (FAILED(hr) && (opposite == KEY_WOW64_32KEY || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) - hr = get_ps_clsid_from_registry(path, opposite, pclsid); + hr = get_ps_clsid_from_registry(path, opposite | KEY_READ, pclsid); if (hr == S_OK) TRACE("() Returning CLSID %s\n", debugstr_guid(pclsid));

1 0

Bernhard Kölbl : windows.media.speech: Add SpeechContinousRecognitionSession stub.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: a03a4ee60e0efe43e083272573adf268df717bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03a4ee60e0efe43e0832725… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:01 2022 +0100 windows.media.speech: Add SpeechContinousRecognitionSession stub. 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 | 202 ++++++++++++++++++++++++++++++++- 1 file changed, 197 insertions(+), 5 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 490493850c8..8819a46d5ba 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -23,6 +23,189 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * SpeechContinuousRecognitionSession + * + */ + +struct session +{ + ISpeechContinuousRecognitionSession ISpeechContinuousRecognitionSession_iface; + LONG ref; +}; + +/* + * + * ISpeechContinuousRecognitionSession + * + */ + +static inline struct session *impl_from_ISpeechContinuousRecognitionSession( ISpeechContinuousRecognitionSession *iface ) +{ + return CONTAINING_RECORD(iface, struct session, ISpeechContinuousRecognitionSession_iface); +} + +static HRESULT WINAPI session_QueryInterface( ISpeechContinuousRecognitionSession *iface, REFIID iid, void **out ) +{ + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(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_ISpeechContinuousRecognitionSession)) + { + IInspectable_AddRef((*out = &impl->ISpeechContinuousRecognitionSession_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI session_AddRef( ISpeechContinuousRecognitionSession *iface ) +{ + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface ) +{ + struct session *impl = impl_from_ISpeechContinuousRecognitionSession(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + free(impl); + + return ref; +} + +static HRESULT WINAPI session_GetIids( ISpeechContinuousRecognitionSession *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 session_GetRuntimeClassName( ISpeechContinuousRecognitionSession *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_GetTrustLevel( ISpeechContinuousRecognitionSession *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_get_AutoStopSilenceTimeout( ISpeechContinuousRecognitionSession *iface, TimeSpan *value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecognitionSession *iface, TimeSpan value ) +{ + FIXME("iface %p, value %#I64x stub!\n", iface, value.Duration); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) +{ + FIXME("iface %p, action %p semi stub!\n", iface, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface, + SpeechContinuousRecognitionMode mode, + IAsyncAction **action ) +{ + FIXME("iface %p, mode %u, action %p stub!\n", iface, mode, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_StopAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) +{ + FIXME("iface %p, action %p stub!\n", iface, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_CancelAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) +{ + FIXME("iface %p, action %p stub!\n", iface, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_PauseAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) +{ + FIXME("iface %p, action %p stub!\n", iface, action); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_Resume( ISpeechContinuousRecognitionSession *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_add_Completed( ISpeechContinuousRecognitionSession *iface, + ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionCompletedEventArgs *handler, + EventRegistrationToken *token ) +{ + FIXME("iface %p, handler %p, token %p stub!\n", iface, handler, token); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_remove_Completed( ISpeechContinuousRecognitionSession *iface, EventRegistrationToken token ) +{ + FIXME("iface %p, token.value %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_add_ResultGenerated( ISpeechContinuousRecognitionSession *iface, + ITypedEventHandler_SpeechContinuousRecognitionSession_SpeechContinuousRecognitionResultGeneratedEventArgs *handler, + EventRegistrationToken *token) +{ + FIXME("iface %p, handler %p, token %p stub!\n", iface, handler, token); + return E_NOTIMPL; +} + +static HRESULT WINAPI session_remove_ResultGenerated( ISpeechContinuousRecognitionSession *iface, EventRegistrationToken token ) +{ + FIXME("iface %p, token.value %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static const struct ISpeechContinuousRecognitionSessionVtbl session_vtbl = +{ + /* IUnknown methods */ + session_QueryInterface, + session_AddRef, + session_Release, + /* IInspectable methods */ + session_GetIids, + session_GetRuntimeClassName, + session_GetTrustLevel, + /* ISpeechContinuousRecognitionSession methods */ + session_get_AutoStopSilenceTimeout, + session_set_AutoStopSilenceTimeout, + session_StartAsync, + session_StartWithModeAsync, + session_StopAsync, + session_CancelAsync, + session_PauseAsync, + session_Resume, + session_add_Completed, + session_remove_Completed, + session_add_ResultGenerated, + session_remove_ResultGenerated +}; + /* * * SpeechRecognizer @@ -35,6 +218,8 @@ struct recognizer IClosable IClosable_iface; ISpeechRecognizer2 ISpeechRecognizer2_iface; LONG ref; + + ISpeechContinuousRecognitionSession *session; }; /* @@ -96,7 +281,10 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) TRACE("iface %p, ref %lu.\n", iface, ref); if (!ref) + { + ISpeechContinuousRecognitionSession_Release(impl->session); free(impl); + } return ref; } @@ -433,21 +621,25 @@ DEFINE_IINSPECTABLE(recognizer_factory, ISpeechRecognizerFactory, struct recogni static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface, ILanguage *language, ISpeechRecognizer **speechrecognizer ) { struct recognizer *impl; + struct session *session; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); - if (!(impl = calloc(1, sizeof(*impl)))) - { - *speechrecognizer = NULL; - return E_OUTOFMEMORY; - } + *speechrecognizer = NULL; + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; if (language) FIXME("language parameter unused. Stub!\n"); + session->ISpeechContinuousRecognitionSession_iface.lpVtbl = &session_vtbl; + session->ref = 1; + impl->ISpeechRecognizer_iface.lpVtbl = &speech_recognizer_vtbl; impl->IClosable_iface.lpVtbl = &closable_vtbl; impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; + impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; TRACE("created SpeechRecognizer %p.\n", impl);

1 0

Bernhard Kölbl : windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: be725a5e0db5999c031a1b391e8d57b4d93615b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be725a5e0db5999c031a1b39… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:00 2022 +0100 windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled. 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/listconstraint.c | 14 ++++++++++---- dlls/windows.media.speech/tests/speech.c | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index 33fe9d4ae51..d641902f4bc 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -34,6 +34,8 @@ struct list_constraint ISpeechRecognitionListConstraint ISpeechRecognitionListConstraint_iface; ISpeechRecognitionConstraint ISpeechRecognitionConstraint_iface; LONG ref; + + BOOLEAN enabled; }; /* @@ -142,14 +144,18 @@ DEFINE_IINSPECTABLE(constraint, ISpeechRecognitionConstraint, struct list_constr static HRESULT WINAPI constraint_get_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN *value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->enabled; + return S_OK; } static HRESULT WINAPI constraint_put_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN value ) { - FIXME("iface %p, value %u stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %u.\n", iface, value); + impl->enabled = value; + return S_OK; } static HRESULT WINAPI constraint_get_Tag( ISpeechRecognitionConstraint *iface, HSTRING *value ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index a88b8aae3d2..66869a164d2 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -797,13 +797,13 @@ static void test_SpeechRecognitionListConstraint(void) hr = WindowsDeleteString(tag_out); todo_wine ok(hr == S_OK, "WindowsDeleteString failed, hr %#lx.\n", hr); +skip_tests: hr = ISpeechRecognitionConstraint_put_IsEnabled(constraint, TRUE); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); + ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); hr = ISpeechRecognitionConstraint_get_IsEnabled(constraint, &enabled); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); - todo_wine ok(enabled, "ListConstraint didn't get enabled.\n"); + ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); + ok(enabled, "ListConstraint didn't get enabled.\n"); -skip_tests: ref = ISpeechRecognitionConstraint_Release(constraint); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0

Bernhard Kölbl : windows.media.speech: Implement ISpeechRecognizer2_get_ContinuousRecognitionSession.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 0ff960b737d0a475e98e63ea9868f5d18a95a336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ff960b737d0a475e98e63ea… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:02 2022 +0100 windows.media.speech: Implement ISpeechRecognizer2_get_ContinuousRecognitionSession. 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 | 6 ++++-- dlls/windows.media.speech/tests/speech.c | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 8819a46d5ba..47c6e62f417 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -443,8 +443,10 @@ DEFINE_IINSPECTABLE(recognizer2, ISpeechRecognizer2, struct recognizer, ISpeechR static HRESULT WINAPI recognizer2_get_ContinuousRecognitionSession( ISpeechRecognizer2 *iface, ISpeechContinuousRecognitionSession **session ) { - FIXME("iface %p, session %p stub!\n", iface, session); - return E_NOTIMPL; + struct recognizer *impl = impl_from_ISpeechRecognizer2(iface); + TRACE("iface %p, session %p.\n", iface, session); + ISpeechContinuousRecognitionSession_QueryInterface(impl->session, &IID_ISpeechContinuousRecognitionSession, (void **)session); + return S_OK; } static HRESULT WINAPI recognizer2_get_State( ISpeechRecognizer2 *iface, SpeechRecognizerState *state ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 66869a164d2..e22ab35928e 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -569,6 +569,7 @@ static void test_VoiceInformation(void) static void test_SpeechRecognizer(void) { static const WCHAR *speech_recognition_name = L"Windows.Media.SpeechRecognition.SpeechRecognizer"; + ISpeechContinuousRecognitionSession *session = NULL; ISpeechRecognizerFactory *sr_factory = NULL; ISpeechRecognizerStatics *sr_statics = NULL; ISpeechRecognizerStatics2 *sr_statics2 = NULL; @@ -648,6 +649,14 @@ static void test_SpeechRecognizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer2, (void **)&recognizer2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ISpeechRecognizer2_get_ContinuousRecognitionSession(recognizer2, &session); + ok(hr == S_OK, "ISpeechRecognizer2_get_ContinuousRecognitionSession failed, hr %#lx.\n", hr); + check_refcount(session, 2); + check_refcount(inspectable, 3); + + ref = ISpeechContinuousRecognitionSession_Release(session); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); + hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Jacek Caban : win32u: Move NtUserKillTimer implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: e520e29ca4a0d03125e82a8654596a4b212d1ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e520e29ca4a0d03125e82a86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:30 2022 +0100 win32u: Move NtUserKillTimer 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/edit.c | 2 +- dlls/user32/message.c | 19 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 18 ++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 9bbfa2727b2..28d93b98b83 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3633,7 +3633,7 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - KillTimer(es->hwndSelf, 0); + NtUserKillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eee4759513a..7fe9df68508 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4417,25 +4417,6 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) } -/*********************************************************************** - * KillTimer (USER32.@) - */ -BOOL WINAPI KillTimer( HWND hwnd, UINT_PTR id ) -{ - BOOL ret; - - SERVER_START_REQ( kill_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_TIMER; - req->id = id; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * KillSystemTimer (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c5ea5e6c4c0..7c27d9400db 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -484,7 +484,7 @@ @ stdcall IsWindowVisible(long) @ stdcall IsZoomed(long) @ stdcall KillSystemTimer(long long) -@ stdcall KillTimer(long long) +@ stdcall KillTimer(long long) NtUserKillTimer @ stdcall LoadAcceleratorsA(long str) @ stdcall LoadAcceleratorsW(long wstr) @ stdcall LoadBitmapA(long str) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5fb238566f3..d70984dbe2b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -192,6 +192,24 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME return ret; } +/*********************************************************************** + * NtUserKillTimer (win32u.@) + */ +BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ) +{ + BOOL ret; + + SERVER_START_REQ( kill_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_TIMER; + req->id = id; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5dbf6f43ac6..2be2cfce3bf 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -142,6 +142,7 @@ static void * const syscalls[] = NtUserGetWindowRgnEx, NtUserInitializeClientPfnArrays, NtUserInternalGetWindowText, + NtUserKillTimer, NtUserNotifyWinEvent, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9c6103b84f8..96d8d4833b0 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1059,7 +1059,7 @@ @ stub NtUserIsTouchWindow @ stub NtUserIsWindowBroadcastingDpiToChildren @ stub NtUserIsWindowGDIScaledDpiMessageEnabled -@ stub NtUserKillTimer +@ stdcall -syscall NtUserKillTimer(long long) @ stub NtUserLayoutCompleted @ stub NtUserLinkDpiCursor @ stub NtUserLoadKeyboardLayoutEx diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 4b181ecba89..7b6bbb5eda6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -127,6 +127,7 @@ SYSCALL_ENTRY( NtUserGetWindowRgnEx ) \ SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \ SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ + SYSCALL_ENTRY( NtUserKillTimer ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 2af7f9a3115..1a43b4793fb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -554,6 +554,14 @@ NTSTATUS WINAPI wow64_NtUserSetTimer( UINT *args ) return NtUserSetTimer( hwnd, id, timeout, proc, tolerance ); } +NTSTATUS WINAPI wow64_NtUserKillTimer( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + UINT_PTR id = get_ulong( &args ); + + return NtUserKillTimer( hwnd, id ); +} + NTSTATUS WINAPI wow64_NtUserCopyAcceleratorTable( UINT *args ) { HACCEL src = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index afa4d0d561f..3352a63e1ea 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -365,6 +365,7 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs const void *client_workers, HINSTANCE user_module ); INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); +BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ); 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 );

1 0

Jacek Caban : win32u: Move NtUserSetTimer implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: ac8e0ce2554b17aea03043b974ab3bad11ae549f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac8e0ce2554b17aea03043b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:55 2022 +0100 win32u: Move NtUserSetTimer 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 | 35 +---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ include/ntuser.h | 1 + 8 files changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5bdc0efccc..da0abef9469 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4408,45 +4408,12 @@ BOOL WINAPI MessageBeep( UINT i ) } -/*********************************************************************** - * SetCoalescableTimer (USER32.@) - */ -UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) -{ - UINT_PTR ret; - WNDPROC winproc = 0; - - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - - timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); - - SERVER_START_REQ( set_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_TIMER; - req->id = id; - req->rate = timeout; - req->lparam = (ULONG_PTR)winproc; - if (!wine_server_call_err( req )) - { - ret = reply->id; - if (!ret) ret = TRUE; - } - else ret = 0; - } - SERVER_END_REQ; - - TRACE("Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout ); - return ret; -} - - /****************************************************************** * SetTimer (USER32.@) */ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) { - return SetCoalescableTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); + return NtUserSetTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a70ac8605d7..7f27a0731a2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -655,7 +655,7 @@ @ stdcall SetClassWord(long long long) NtUserSetClassWord @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) -@ stdcall SetCoalescableTimer(long long long ptr long) +@ stdcall SetCoalescableTimer(long long long ptr long) NtUserSetTimer # @ stub SetConsoleReserveKeys @ stdcall -import SetCursor(long) NtUserSetCursor @ stub SetCursorContents diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c28114668b8..e895f65c652 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -128,6 +128,38 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) return ret; } +/*********************************************************************** + * NtUserSetTimer (win32u.@) + */ +UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) +{ + UINT_PTR ret; + WNDPROC winproc = 0; + + if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE ); + + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); + + SERVER_START_REQ( set_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_TIMER; + req->id = id; + req->rate = timeout; + req->lparam = (ULONG_PTR)winproc; + if (!wine_server_call_err( req )) + { + ret = reply->id; + if (!ret) ret = TRUE; + } + else ret = 0; + } + SERVER_END_REQ; + + TRACE( "Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout ); + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index abe32b8d70c..b167ecc9680 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -154,6 +154,7 @@ static void * const syscalls[] = NtUserSetProcessWindowStation, NtUserSetProp, NtUserSetThreadDesktop, + NtUserSetTimer, NtUserSetWinEventHook, NtUserSetWindowsHookEx, NtUserUnhookWinEvent, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2b5e4d71461..7d4599f0241 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1236,7 +1236,7 @@ @ stub NtUserSetThreadInputBlocked @ stub NtUserSetThreadLayoutHandles @ stub NtUserSetThreadState -@ stub NtUserSetTimer +@ stdcall -syscall NtUserSetTimer(long long long ptr long) @ stdcall -syscall NtUserSetWinEventHook(long long long ptr ptr long long long) @ stub NtUserSetWindowArrangement @ stub NtUserSetWindowBand diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index b6cdf5edfb2..3ded58962b8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -139,6 +139,7 @@ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserSetTimer ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b8c4a86a352..c9f81d86672 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -533,6 +533,17 @@ NTSTATUS WINAPI wow64_NtUserGetGUIThreadInfo( UINT *args ) return TRUE; } +NTSTATUS WINAPI wow64_NtUserSetTimer( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + UINT_PTR id = get_ulong( &args ); + UINT timeout = get_ulong( &args ); + TIMERPROC proc = get_ptr( &args ); + ULONG tolerance = get_ulong( &args ); + + return NtUserSetTimer( hwnd, id, timeout, proc, tolerance ); +} + NTSTATUS WINAPI wow64_NtUserCopyAcceleratorTable( UINT *args ) { HACCEL src = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 4ca4c063ef8..a055aa47905 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -403,6 +403,7 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ); LONG WINAPI NtUserSetWindowLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ); LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); BOOL WINAPI NtUserSetWindowPos( HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags );

1 0

Jacek Caban : win32u: Move __wine_set_pixel_format implementation from user32.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: ea764fbd3e21b53efd969ca1bc1745d2e3166d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea764fbd3e21b53efd969ca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:35 2022 +0100 win32u: Move __wine_set_pixel_format 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/win.c | 39 +-------------------------------------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2c241aad7d2..a21bdc62ed5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -258,32 +258,6 @@ static void send_parent_notify( HWND hwnd, UINT msg ) } -/******************************************************************* - * update_window_state - * - * Trigger an update of the window's driver state and surface. - */ -static void update_window_state( HWND hwnd ) -{ - DPI_AWARENESS_CONTEXT context; - RECT window_rect, client_rect, valid_rects[2]; - - if (!WIN_IsCurrentThread( hwnd )) - { - PostMessageW( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); - return; - } - - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - valid_rects[0] = valid_rects[1] = client_rect; - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, valid_rects ); - SetThreadDpiAwarenessContext( context ); -} - - /******************************************************************* * get_hwnd_message_parent * @@ -2726,18 +2700,7 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { - WND *win = WIN_GetPtr( hwnd ); - - if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) - { - WARN( "setting format %d on win %p not supported\n", format, hwnd ); - return FALSE; - } - win->pixel_format = format; - WIN_ReleasePtr( win ); - - update_window_state( hwnd ); - return TRUE; + return NtUserCallHwndParam( hwnd, format, NtUserSetWindowPixelFormat ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e4311b49608..2700df862ca 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1421,6 +1421,22 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } +static BOOL set_window_pixel_format( HWND hwnd, int format ) +{ + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "setting format %d on win %p not supported\n", format, hwnd ); + return FALSE; + } + win->pixel_format = format; + release_win_ptr( win ); + + update_window_state( hwnd ); + return TRUE; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -3322,6 +3338,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return set_capture_window( hwnd, param, NULL ); case NtUserSetForegroundWindow: return set_foreground_window( hwnd, param ); + case NtUserSetWindowPixelFormat: + return set_window_pixel_format( hwnd, param ); /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 0e48aea0f9c..4ca4c063ef8 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -181,6 +181,7 @@ enum NtUserMonitorFromWindow, NtUserSetCaptureWindow, NtUserSetForegroundWindow, + NtUserSetWindowPixelFormat, /* temporary exports */ NtUserIsWindowDrawable, NtUserSetWindowStyle,

1 0

Bernhard Kölbl : windows.media.speech: Implement ResultGenerated event.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 3549bb80d085be36a10c9102d366ae90ed0520ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=3549bb80d085be36a10c9102… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:03 2022 +0100 windows.media.speech: Implement ResultGenerated event. Also add helpers to manage typed event handlers. 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/Makefile.in | 1 + dlls/windows.media.speech/event_handlers.c | 108 +++++++++++++++++++++++++++++ dlls/windows.media.speech/private.h | 7 ++ dlls/windows.media.speech/recognizer.c | 17 +++-- dlls/windows.media.speech/tests/speech.c | 90 +++++++++++++++++++++++- include/windows.foundation.idl | 1 + 6 files changed, 218 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3549bb80d085be36a10c…

1 0

Dmitry Timoshkov : combase: Execute dllhost.exe for correct architecture in a WoW64 setup.
by Alexandre Julliard March 16, 2022

March 16, 2022

Module: wine Branch: master Commit: 13064f991408ea5fa5e999705b13bda7bbd50e5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13064f991408ea5fa5e99970… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 16 13:14:47 2022 +0300 combase: Execute dllhost.exe for correct architecture in a WoW64 setup. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/rpc.c | 48 +++++++++++++++++++++++++++++++++++----------- programs/dllhost/dllhost.c | 2 ++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 40f900175dd..f620339f19e 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -526,18 +526,24 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR processidW[] = L" /PROCESSID:"; HKEY key; + int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; + REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64 = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; DWORD size; - STARTUPINFOW sinfo; - PROCESS_INFORMATION pinfo; + STARTUPINFOW si; + PROCESS_INFORMATION pi; LONG ret; TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); - if (FAILED(hr)) - return hr; + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key); + if (FAILED(hr)) return hr; + } size = (MAX_PATH + 1) * sizeof(WCHAR); ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); @@ -545,25 +551,45 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) if (ret || !size || !command[0]) { TRACE("No value for DllSurrogate key\n"); - wcscpy(command, L"dllhost.exe"); + + if ((sizeof(void *) == 8 || is_wow64) && opposite == KEY_WOW64_32KEY) + GetSystemWow64DirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe")); + else + GetSystemDirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe")); + + wcscat(command, L"\\dllhost.exe"); } /* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */ wcscat(command, processidW); StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); - memset(&sinfo, 0, sizeof(sinfo)); - sinfo.cb = sizeof(sinfo); + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); TRACE("Activating surrogate local server %s\n", debugstr_w(command)); - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + if (is_wow64 && arch == 64) + { + void *cookie; + Wow64DisableWow64FsRedirection(&cookie); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + Wow64RevertWow64FsRedirection(cookie); + } + else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) { WARN("failed to run surrogate local server %s\n", debugstr_w(command)); - return HRESULT_FROM_WIN32(GetLastError()); + hr = HRESULT_FROM_WIN32(GetLastError()); } - *process = pinfo.hProcess; - CloseHandle(pinfo.hThread); + + if (FAILED(hr)) return hr; + + *process = pi.hProcess; + CloseHandle(pi.hThread); return S_OK; } diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index dc89c978510..83700826f8b 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -327,6 +327,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho CLSID clsid; struct surrogate surrogate; + TRACE("Running as %u-bit\n", (int)sizeof(void *) * 8); + if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) return 0;

1 0