January 2023 - Wine-Commits

Bernhard Kölbl : windows.media.speech: Return IAsyncAction from session_PauseAsync.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 4e88f093b011ee70165d026a5233ce7b1445470e URL: https://gitlab.winehq.org/wine/wine/-/commit/4e88f093b011ee70165d026a5233ce… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 20:04:11 2022 +0200 windows.media.speech: Return IAsyncAction from session_PauseAsync. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/recognizer.c | 7 ++++++- dlls/windows.media.speech/tests/speech.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index b4f68489bd0..54a0e165f5f 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -283,10 +283,15 @@ static HRESULT WINAPI session_CancelAsync( ISpeechContinuousRecognitionSession * return E_NOTIMPL; } +static HRESULT session_pause_async( IInspectable *invoker ) +{ + return S_OK; +} + static HRESULT WINAPI session_PauseAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { FIXME("iface %p, action %p stub!\n", iface, action); - return E_NOTIMPL; + return async_action_create(NULL, session_pause_async, action); } static HRESULT WINAPI session_Resume( ISpeechContinuousRecognitionSession *iface ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index b6355743a83..8b14221f487 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1761,6 +1761,15 @@ static void test_Recognition(void) * TODO: Use a loopback device together with prerecorded audio files to test the recognizer's functionality. */ + hr = ISpeechContinuousRecognitionSession_PauseAsync(session, &action2); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_PauseAsync failed, hr %#lx.\n", hr); + await_async_void(action2, &action_handler); + check_async_info((IInspectable *)action2, 3, Completed, S_OK); + IAsyncAction_Release(action2); + + hr = ISpeechContinuousRecognitionSession_Resume(session); + todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); + hr = ISpeechContinuousRecognitionSession_StopAsync(session, &action2); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); @@ -1792,7 +1801,7 @@ static void test_Recognition(void) hr = IAsyncInfo_Close(info); /* If IAsyncInfo_Close would wait for the handler to finish, the test would get stuck here. */ ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); - check_async_info((IInspectable *)action2, 3, AsyncStatus_Closed, S_OK); + check_async_info((IInspectable *)action2, 4, AsyncStatus_Closed, S_OK); set = SetEvent(action_handler.event_block); ok(set == TRUE, "Event 'event_block' wasn't set.\n");

1 0

Bernhard Kölbl : windows.media.speech/tests: Test starting, stopping, pausing and resuming the recognition session.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 86fb17c8fbffd8bcc039ca4412393d26cef73278 URL: https://gitlab.winehq.org/wine/wine/-/commit/86fb17c8fbffd8bcc039ca4412393d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jan 3 12:15:05 2023 +0100 windows.media.speech/tests: Test starting, stopping, pausing and resuming the recognition session. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 155382fa76d..a8ed8cff1e7 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -18,6 +18,7 @@ #define COBJMACROS #include <stdarg.h> +#include "corerror.h" #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -1741,6 +1742,11 @@ static void test_Recognition(void) await_async_void(action, &action_handler); + action2 = (void *)0xdeadbeef; + hr = ISpeechContinuousRecognitionSession_StartAsync(session, &action2); + todo_wine ok(hr == COR_E_INVALIDOPERATION, "ISpeechContinuousRecognitionSession_StartAsync failed, hr %#lx.\n", hr); + todo_wine ok(action2 == NULL, "action2 was %p.\n", action2); + hr = IAsyncAction_QueryInterface(action, &IID_IAsyncInfo, (void **)&info); ok(hr == S_OK, "IAsyncAction_QueryInterface failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action, 1, Completed, S_OK); @@ -1784,6 +1790,17 @@ static void test_Recognition(void) todo_wine ok(recog_state == SpeechRecognizerState_Paused || /* Broken on Win10 1507 */ broken(recog_state == SpeechRecognizerState_Capturing) , "recog_state was %u.\n", recog_state); + /* Check what happens if we try to pause again, when the session is already paused. */ + hr = ISpeechContinuousRecognitionSession_PauseAsync(session, &action2); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_PauseAsync failed, hr %#lx.\n", hr); + await_async_void(action2, &action_handler); + check_async_info((IInspectable *)action2, 4, Completed, S_OK); + IAsyncAction_Release(action2); + + hr = ISpeechContinuousRecognitionSession_Resume(session); + todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); + + /* Resume when already resumed. */ hr = ISpeechContinuousRecognitionSession_Resume(session); todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); @@ -1823,7 +1840,7 @@ static void test_Recognition(void) hr = IAsyncInfo_Close(info); /* If IAsyncInfo_Close would wait for the handler to finish, the test would get stuck here. */ ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); - check_async_info((IInspectable *)action2, 4, AsyncStatus_Closed, S_OK); + check_async_info((IInspectable *)action2, 5, AsyncStatus_Closed, S_OK); set = SetEvent(action_handler.event_block); ok(set == TRUE, "Event 'event_block' wasn't set.\n"); @@ -1844,6 +1861,11 @@ static void test_Recognition(void) todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); todo_wine ok(recog_state == SpeechRecognizerState_Idle, "recog_state was %u.\n", recog_state); + /* Try stopping, when already stopped. */ + hr = ISpeechContinuousRecognitionSession_StopAsync(session, &action); + todo_wine ok(hr == COR_E_INVALIDOPERATION, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); + todo_wine ok(action == NULL, "action was %p.\n", action); + hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr);

1 0

Bernhard Kölbl : windows.media.speech/tests: Test the recognizer state.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: b36871b85a40c0da6c56f8d9f06303d42ce75095 URL: https://gitlab.winehq.org/wine/wine/-/commit/b36871b85a40c0da6c56f8d9f06303… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon May 16 18:40:22 2022 +0200 windows.media.speech/tests: Test the recognizer state. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 8b14221f487..155382fa76d 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1619,6 +1619,7 @@ static void test_Recognition(void) struct iterator_hstring iterator_hstring; struct iterable_hstring iterable_hstring; EventRegistrationToken token = { .value = 0 }; + SpeechRecognizerState recog_state; HSTRING commands[3], hstr, tag; HANDLE put_thread; LONG ref, old_ref; @@ -1717,6 +1718,11 @@ static void test_Recognition(void) ok(hr == S_OK, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); ok(token.value != 0xdeadbeef, "Got unexpexted token: %#I64x.\n", token.value); + recog_state = 0xdeadbeef; + hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); + todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); + todo_wine ok(recog_state == SpeechRecognizerState_Idle, "recog_state was %u.\n", recog_state); + hr = ISpeechRecognizer_CompileConstraintsAsync(recognizer, &operation); ok(hr == S_OK, "ISpeechRecognizer_CompileConstraintsAsync failed, hr %#lx.\n", hr); await_async_inspectable((IAsyncOperation_IInspectable *)operation, @@ -1757,6 +1763,11 @@ static void test_Recognition(void) IAsyncInfo_Release(info); + recog_state = 0xdeadbeef; + hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); + todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); + todo_wine ok(recog_state == SpeechRecognizerState_Capturing, "recog_state was %u.\n", recog_state); + /* * TODO: Use a loopback device together with prerecorded audio files to test the recognizer's functionality. */ @@ -1767,9 +1778,20 @@ static void test_Recognition(void) check_async_info((IInspectable *)action2, 3, Completed, S_OK); IAsyncAction_Release(action2); + recog_state = 0xdeadbeef; + hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); + todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); + todo_wine ok(recog_state == SpeechRecognizerState_Paused || /* Broken on Win10 1507 */ + broken(recog_state == SpeechRecognizerState_Capturing) , "recog_state was %u.\n", recog_state); + hr = ISpeechContinuousRecognitionSession_Resume(session); todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_Resume failed, hr %#lx.\n", hr); + recog_state = 0xdeadbeef; + hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); + todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); + todo_wine ok(recog_state == SpeechRecognizerState_Capturing, "recog_state was %u.\n", recog_state); + hr = ISpeechContinuousRecognitionSession_StopAsync(session, &action2); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); @@ -1817,6 +1839,11 @@ static void test_Recognition(void) IAsyncAction_Release(action2); IAsyncAction_Release(action); + recog_state = 0xdeadbeef; + hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); + todo_wine ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); + todo_wine ok(recog_state == SpeechRecognizerState_Idle, "recog_state was %u.\n", recog_state); + hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr);

1 0

Bernhard Kölbl : windows.media.speech: Move constraints vector to the recognition session.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: e203d3be0ae022fae376bb6f1499dc875ad5c7b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e203d3be0ae022fae376bb6f1499dc… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jun 7 12:51:22 2022 +0200 windows.media.speech: Move constraints vector to the recognition session. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/recognizer.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index bdcc57f883e..105ed2b0b05 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -156,6 +156,8 @@ struct session ISpeechContinuousRecognitionSession ISpeechContinuousRecognitionSession_iface; LONG ref; + IVector_ISpeechRecognitionConstraint *constraints; + struct list completed_handlers; struct list result_handlers; }; @@ -208,6 +210,7 @@ static ULONG WINAPI session_Release( ISpeechContinuousRecognitionSession *iface { typed_event_handlers_clear(&impl->completed_handlers); typed_event_handlers_clear(&impl->result_handlers); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -360,7 +363,6 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; - IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -424,7 +426,6 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); - IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -452,8 +453,11 @@ static HRESULT WINAPI recognizer_GetTrustLevel( ISpeechRecognizer *iface, TrustL static HRESULT WINAPI recognizer_get_Constraints( ISpeechRecognizer *iface, IVector_ISpeechRecognitionConstraint **vector ) { struct recognizer *impl = impl_from_ISpeechRecognizer(iface); + struct session *session = impl_from_ISpeechContinuousRecognitionSession(impl->session); + TRACE("iface %p, operation %p.\n", iface, vector); - IVector_ISpeechRecognitionConstraint_AddRef((*vector = impl->constraints)); + + IVector_ISpeechRecognitionConstraint_AddRef((*vector = session->constraints)); return S_OK; } @@ -797,18 +801,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface if (language) FIXME("language parameter unused. Stub!\n"); + /* Init ISpeechContinuousRecognitionSession */ session->ISpeechContinuousRecognitionSession_iface.lpVtbl = &session_vtbl; session->ref = 1; + list_init(&session->completed_handlers); list_init(&session->result_handlers); + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&session->constraints))) + goto error; + + /* Init ISpeechRecognizer */ 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; - if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) - goto error; TRACE("created SpeechRecognizer %p.\n", impl); @@ -816,6 +824,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface return S_OK; error: + if (session->constraints) IVector_ISpeechRecognitionConstraint_Release(session->constraints); free(session); free(impl);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix EventObj leak in onclick test.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 5f031f2c877fb6ccbd186941ecf6d3243affc9d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f031f2c877fb6ccbd186941ecf6d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix EventObj leak in onclick test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cd6006805d4..30b6d8799b6 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1270,6 +1270,7 @@ static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, D ok(event != NULL, "event == NULL\n"); test_event_cancelbubble(event, VARIANT_TRUE); + IHTMLEventObj_Release(event); return S_OK; }

1 0

Zebediah Figura : rpcrt4: Use a CONTAINING_RECORD helper to retrieve CInterfaceStubHeader from CStdStubBuffer.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 4ad5de28419228868b734e29d915e450de83c1b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad5de28419228868b734e29d915e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:46:56 2022 -0600 rpcrt4: Use a CONTAINING_RECORD helper to retrieve CInterfaceStubHeader from CStdStubBuffer. --- dlls/rpcrt4/cstub.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c03335e2821..b420b008065 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define STUB_HEADER(This) (((const CInterfaceStubHeader*)((This)->lpVtbl))[-1]) - static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) { if (eptr->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) @@ -57,6 +55,13 @@ static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer return CONTAINING_RECORD(impl_from_IRpcStubBuffer(iface), cstdstubbuffer_delegating_t, stub_buffer); } +static const CInterfaceStubHeader *get_stub_header(const CStdStubBuffer *stub) +{ + const CInterfaceStubVtbl *vtbl = CONTAINING_RECORD(stub->lpVtbl, CInterfaceStubVtbl, Vtbl); + + return &vtbl->header; +} + HRESULT CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, @@ -473,7 +478,7 @@ HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, TRACE("(%p)->Connect(%p)\n",This,lpUnkServer); - r = IUnknown_QueryInterface(lpUnkServer, STUB_HEADER(This).piid, (void**)&new); + r = IUnknown_QueryInterface(lpUnkServer, get_stub_header(This)->piid, (void**)&new); new = InterlockedExchangePointer((void**)&This->pvServerObject, new); if(new) IUnknown_Release(new); @@ -497,6 +502,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCCHANNELBUFFER pChannel) { CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); + const CInterfaceStubHeader *header = get_stub_header(This); DWORD dwPhase = STUB_UNMARSHAL; HRESULT hr = S_OK; @@ -504,8 +510,8 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, __TRY { - if (STUB_HEADER(This).pDispatchTable) - STUB_HEADER(This).pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); + if (header->pDispatchTable) + header->pDispatchTable[pMsg->iMethod](iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); else /* pure interpreted */ NdrStubCall2(iface, pChannel, (PRPC_MESSAGE)pMsg, &dwPhase); } @@ -526,9 +532,13 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { - CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); - TRACE("(%p)->IsIIDSupported(%s)\n",This,debugstr_guid(riid)); - return IsEqualGUID(STUB_HEADER(This).piid, riid) ? iface : NULL; + CStdStubBuffer *stub = impl_from_IRpcStubBuffer(iface); + + TRACE("(%p)->IsIIDSupported(%s)\n", stub, debugstr_guid(riid)); + + if (IsEqualGUID(get_stub_header(stub)->piid, riid)) + return iface; + return NULL; } ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) @@ -618,8 +628,9 @@ const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl = const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) { - CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); - return STUB_HEADER(This).pServerInfo; + CStdStubBuffer *stub = impl_from_IRpcStubBuffer(iface); + + return get_stub_header(stub)->pServerInfo; } /************************************************************************ @@ -666,7 +677,7 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, pStubMsg->RpcMsg->BufferLength = pStubMsg->BufferLength; hr = IRpcChannelBuffer_GetBuffer(pRpcChannelBuffer, - (RPCOLEMESSAGE *)pStubMsg->RpcMsg, STUB_HEADER(This).piid); + (RPCOLEMESSAGE *)pStubMsg->RpcMsg, get_stub_header(This)->piid); if (FAILED(hr)) { RpcRaiseException(hr);

1 0

Zebediah Figura : rpcrt4: Rename "ref_counted_vtbl" to "struct delegating_vtbl".
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: e85afda3b5212a0398cb2dd105e232cfdbfc1329 URL: https://gitlab.winehq.org/wine/wine/-/commit/e85afda3b5212a0398cb2dd105e232… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:54:58 2022 -0600 rpcrt4: Rename "ref_counted_vtbl" to "struct delegating_vtbl". Get rid of the typedef, and give it a slightly more salient name (and one that matches more of the surrounding code). --- dlls/rpcrt4/cstub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index b420b008065..42bdb51cc27 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -110,15 +110,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION delegating_vtbl_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef struct +struct delegating_vtbl { DWORD ref; DWORD size; IUnknownVtbl vtbl; /* remaining entries in vtbl */ -} ref_counted_vtbl; +}; -static ref_counted_vtbl *current_vtbl; +static struct delegating_vtbl *current_vtbl; static HRESULT WINAPI delegating_QueryInterface(IUnknown *pUnk, REFIID iid, void **ppv) @@ -306,7 +306,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) if(!current_vtbl || num_methods > current_vtbl->size) { - ref_counted_vtbl *table = malloc(FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void *)); + struct delegating_vtbl *table = malloc(FIELD_OFFSET(struct delegating_vtbl, vtbl) + num_methods * sizeof(void *)); if (!table) { LeaveCriticalSection(&delegating_vtbl_section); @@ -333,7 +333,7 @@ IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) void release_delegating_vtbl(IUnknownVtbl *vtbl) { - ref_counted_vtbl *table = (ref_counted_vtbl*)((DWORD *)vtbl - 1); + struct delegating_vtbl *table = (struct delegating_vtbl *)((DWORD *)vtbl - 1); EnterCriticalSection(&delegating_vtbl_section); table->ref--;

1 0

Gabriel Ivăncescu : mshtml/tests: Fix window leaks in dom tests.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: bdc67e95b5be27dec97d49bbe5da1e71ae00ce24 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc67e95b5be27dec97d49bbe5da1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml/tests: Fix window leaks in dom tests. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6a960bfa21f..c9c52776fa9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1350,6 +1350,7 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) hres = IHTMLWindow2_get_document(window, &ret); ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08lx\n", hres); ok_(__FILE__,line)(ret != NULL, "document = NULL\n"); + IHTMLWindow2_Release(window); return ret; } @@ -6313,6 +6314,7 @@ static void test_location(IHTMLDocument2 *doc) ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); + IHTMLWindow2_Release(window); test_ifaces((IUnknown*)location, location_iids); test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation, NULL, L"about:blank"); @@ -7564,6 +7566,7 @@ static void test_xhr(IHTMLDocument2 *doc) SysFreeString(str); IHTMLWindow2_Release(window); + IDispatchEx_Release(dispex); } static void test_defaults(IHTMLDocument2 *doc)

1 0

Zebediah Figura : rpcrt4: Use a CONTAINING_RECORD helper to retrieve CStdStubBuffer from IRpcStubBuffer.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 180edc5a4f31e1e2846c25fd9788dbda1648e659 URL: https://gitlab.winehq.org/wine/wine/-/commit/180edc5a4f31e1e2846c25fd9788db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 13:39:40 2022 -0600 rpcrt4: Use a CONTAINING_RECORD helper to retrieve CStdStubBuffer from IRpcStubBuffer. --- dlls/rpcrt4/cstub.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 47d5e301c0f..c03335e2821 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -47,9 +47,14 @@ static LONG WINAPI stub_filter(EXCEPTION_POINTERS *eptr) return EXCEPTION_EXECUTE_HANDLER; } +static CStdStubBuffer *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface) +{ + return CONTAINING_RECORD(&iface->lpVtbl, CStdStubBuffer, lpVtbl); +} + static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); + return CONTAINING_RECORD(impl_from_IRpcStubBuffer(iface), cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid, @@ -392,7 +397,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *obj) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); if (IsEqualIID(&IID_IUnknown, riid) || @@ -408,7 +413,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface, ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->AddRef()\n",This); return InterlockedIncrement(&This->RefCount); } @@ -416,7 +421,7 @@ ULONG WINAPI CStdStubBuffer_AddRef(LPRPCSTUBBUFFER iface) ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface, LPPSFACTORYBUFFER pPSF) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); ULONG refs; TRACE("(%p)->Release()\n",This); @@ -462,7 +467,7 @@ ULONG WINAPI NdrCStdStubBuffer2_Release(LPRPCSTUBBUFFER iface, HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN lpUnkServer) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); HRESULT r; IUnknown *new = NULL; @@ -477,7 +482,7 @@ HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface, void WINAPI CStdStubBuffer_Disconnect(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); IUnknown *old; TRACE("(%p)->Disconnect()\n",This); @@ -491,7 +496,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, PRPCOLEMESSAGE pMsg, LPRPCCHANNELBUFFER pChannel) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); DWORD dwPhase = STUB_UNMARSHAL; HRESULT hr = S_OK; @@ -521,14 +526,14 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, LPRPCSTUBBUFFER WINAPI CStdStubBuffer_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->IsIIDSupported(%s)\n",This,debugstr_guid(riid)); return IsEqualGUID(STUB_HEADER(This).piid, riid) ? iface : NULL; } ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->CountRefs()\n",This); return This->RefCount; } @@ -536,7 +541,7 @@ ULONG WINAPI CStdStubBuffer_CountRefs(LPRPCSTUBBUFFER iface) HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface, LPVOID *ppv) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->DebugServerQueryInterface(%p)\n",This,ppv); return S_OK; } @@ -544,7 +549,7 @@ HRESULT WINAPI CStdStubBuffer_DebugServerQueryInterface(LPRPCSTUBBUFFER iface, void WINAPI CStdStubBuffer_DebugServerRelease(LPRPCSTUBBUFFER iface, LPVOID pv) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->DebugServerRelease(%p)\n",This,pv); } @@ -613,7 +618,7 @@ const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl = const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); return STUB_HEADER(This).pServerInfo; } @@ -654,7 +659,7 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, LPRPCCHANNELBUFFER pRpcChannelBuffer, PMIDL_STUB_MESSAGE pStubMsg) { - CStdStubBuffer *This = (CStdStubBuffer *)iface; + CStdStubBuffer *This = impl_from_IRpcStubBuffer(iface); HRESULT hr; TRACE("(%p, %p, %p)\n", This, pRpcChannelBuffer, pStubMsg);

1 0

Shaun Ren : winegstreamer: Map MF_SD_LANGUAGE to ISO 639-1 for QuickTime media.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 2eecb04ca75407765253998c70ca69a0fee32356 URL: https://gitlab.winehq.org/wine/wine/-/commit/2eecb04ca75407765253998c70ca69… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Dec 2 22:04:13 2022 -0500 winegstreamer: Map MF_SD_LANGUAGE to ISO 639-1 for QuickTime media. For QuickTime media, MF_SD_LANGUAGE contains the ISO 639-1-mapped language code. Some games such as Borderlands 3 expect this behaviour. In order to determine the type of the media, we store the demuxer caps in the wg_parser structure. --- configure | 14 +++++++------- configure.ac | 2 +- dlls/winegstreamer/wg_parser.c | 28 +++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/configure b/configure index bdffe3e28b2..4c1b2f1da04 100755 --- a/configure +++ b/configure @@ -2563,10 +2563,10 @@ Some influential environment variables: PULSE_LIBS Linker flags for libpulse, overriding pkg-config GSTREAMER_CFLAGS C compiler flags for gstreamer-1.0 gstreamer-video-1.0 - gstreamer-audio-1.0, overriding pkg-config + gstreamer-audio-1.0 gstreamer-tag-1.0, overriding pkg-config GSTREAMER_LIBS Linker flags for gstreamer-1.0 gstreamer-video-1.0 - gstreamer-audio-1.0, overriding pkg-config + gstreamer-audio-1.0 gstreamer-tag-1.0, overriding pkg-config UDEV_CFLAGS C compiler flags for libudev, overriding pkg-config UDEV_LIBS Linker flags for libudev, overriding pkg-config UNWIND_CFLAGS @@ -16919,7 +16919,7 @@ if ${GSTREAMER_CFLAGS:+false} : then : if test ${PKG_CONFIG+y} then : - GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 2>conftest.err` + GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 2>conftest.err` fi fi @@ -16927,15 +16927,15 @@ if ${GSTREAMER_LIBS:+false} : then : if test ${PKG_CONFIG+y} then : - GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 2>/dev/null` + GSTREAMER_LIBS=`$PKG_CONFIG --libs gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 2>/dev/null` fi fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 cflags: $GSTREAMER_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 cflags: $GSTREAMER_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 libs: $GSTREAMER_LIBS" >&5 if test -s conftest.err; then - printf %s "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 errors: " >&5 + printf %s "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0 errors: " >&5 cat conftest.err >&5 fi rm -f conftest.err diff --git a/configure.ac b/configure.ac index 3c30db8fd45..54f2b00fe76 100644 --- a/configure.ac +++ b/configure.ac @@ -1570,7 +1570,7 @@ WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"], dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then - WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, + WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-tag-1.0],,,, [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 281013162aa..f2c59488ef3 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -33,6 +33,7 @@ #include <gst/gst.h> #include <gst/video/video.h> #include <gst/audio/audio.h> +#include <gst/tag/tag.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -93,6 +94,8 @@ struct wg_parser bool sink_connected; bool unlimited_buffering; + + gchar *sink_caps; }; struct wg_parser_stream @@ -476,7 +479,9 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { + struct wg_parser *parser = user; const char *name = gst_element_factory_get_longname(fact); + const char *klass = gst_element_factory_get_klass(fact); GST_INFO("Using \"%s\".", name); @@ -490,6 +495,10 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, GST_WARNING("Disabled video acceleration since it breaks in wine."); return GST_AUTOPLUG_SELECT_SKIP; } + + if (!parser->sink_caps && strstr(klass, GST_ELEMENT_FACTORY_KLASS_DEMUXER)) + parser->sink_caps = g_strdup(gst_structure_get_name(gst_caps_get_structure(caps, 0))); + return GST_AUTOPLUG_SELECT_TRY; } @@ -1326,7 +1335,18 @@ static void query_tags(struct wg_parser_stream *stream) if (!stream->tags[WG_PARSER_TAG_LANGUAGE]) { - gst_tag_list_get_string(tag_list, GST_TAG_LANGUAGE_CODE, &stream->tags[WG_PARSER_TAG_LANGUAGE]); + gchar *lang_code = NULL; + + gst_tag_list_get_string(tag_list, GST_TAG_LANGUAGE_CODE, &lang_code); + if (stream->parser->sink_caps && !strcmp(stream->parser->sink_caps, "video/quicktime")) + { + /* For QuickTime media, we convert the language tags to ISO 639-1. */ + const gchar *lang_code_iso_639_1 = lang_code ? gst_tag_get_language_code_iso_639_1(lang_code) : NULL; + stream->tags[WG_PARSER_TAG_LANGUAGE] = lang_code_iso_639_1 ? g_strdup(lang_code_iso_639_1) : NULL; + g_free(lang_code); + } + else + stream->tags[WG_PARSER_TAG_LANGUAGE] = lang_code; } gst_event_unref(tag_event); @@ -1493,6 +1513,9 @@ out: parser->container = NULL; } + g_free(parser->sink_caps); + parser->sink_caps = NULL; + pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; pthread_mutex_unlock(&parser->mutex); @@ -1536,6 +1559,9 @@ static NTSTATUS wg_parser_disconnect(void *args) gst_object_unref(parser->container); parser->container = NULL; + g_free(parser->sink_caps); + parser->sink_caps = NULL; + return S_OK; }

1 0