wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Matteo Bruni : wined3d: Add some state table consistency checking to context_invalidate_state().
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 80eef0039b0e5bdb11a9343312325d1745bfcc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80eef0039b0e5bdb11a93433… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:31:43 2022 +0200 wined3d: Add some state table consistency checking to context_invalidate_state(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/context.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8c4277bc7ca..f9af58936a6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -78,6 +78,9 @@ void context_invalidate_state(struct wined3d_context *context, unsigned int stat unsigned int representative = context->state_table[state_id].representative; unsigned int index, shift; + if (!representative) + ERR("Invalidating representative 0, state_id %u.\n", state_id); + index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); context->dirty_graphics_states[index] |= (1u << shift);

1 0

Matteo Bruni : wined3d: Assert that the CS queue size is a power of two.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 192695d1db4ceefff8c91e2743f9bb36353e940e URL: https://source.winehq.org/git/wine.git/?a=commit;h=192695d1db4ceefff8c91e27… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 6 13:00:58 2022 +0200 wined3d: Assert that the CS queue size is a power of two. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00d2cfea8e4..4d208260fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4976,6 +4976,8 @@ enum wined3d_push_constants #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) +C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1))); + struct wined3d_cs_queue { ULONG head, tail;

1 0

Matteo Bruni : wined3d: Allow blits with fixups in the FFP blitter without a shader backend.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6247bee483b31b1ea0ad49f85f1cffde7433fed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6247bee483b31b1ea0ad49f8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 17 19:54:09 2022 +0200 wined3d: Allow blits with fixups in the FFP blitter without a shader backend. Along the lines of d37146885801ae384a1cae54edea426b7b58a6a9 but for the no shader backend case. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/texture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 595baf07788..c952f366a68 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5753,10 +5753,13 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup)) { - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER - && dst_format->id == src_format->id && dst_location == WINED3D_LOCATION_DRAWABLE) + if (dst_format->id == src_format->id && dst_location == WINED3D_LOCATION_DRAWABLE) { - WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + else if (context->device->shader_backend == &none_shader_backend) + WARN("Claiming fixup support because of no shader backend.\n"); + return true; } else {

1 0

Matteo Bruni : d3d9/tests: Fix typo.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 89011e6f0a3ef888d6faaa4ad2ae0cebb714cc4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=89011e6f0a3ef888d6faaa4a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:31:15 2022 +0200 d3d9/tests: Fix typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f20f1ecb369..2913583916a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1193,7 +1193,7 @@ static void clear_test(void) ok(color == 0x0000ff00, "(322,242) has color %08x\n", color); color = getPixelColor(device, 478, 358); - ok(color == 0x0000ff00, "(478,358 has color %08x\n", color); + ok(color == 0x0000ff00, "(478,358) has color %08x\n", color); color = getPixelColor(device, 482, 358); ok(color == 0x00ffffff, "(482,358) has color %08x\n", color); color = getPixelColor(device, 478, 362);

1 0

Matteo Bruni : wined3d: Don't touch GL sRGB decode state when not supported.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6c820bbcf07c8efd558abfafbb294f90b595e405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c820bbcf07c8efd558abfaf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:30:00 2022 +0200 wined3d: Don't touch GL sRGB decode state when not supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index dbd385219f0..c502fcba992 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1306,7 +1306,8 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(context_gl->active_texture, 0)); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); - if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT);

1 0

Huw Davies : gdi32: Free the client-side emf dc info.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6a9a80679d7b0cfe2b83727caf48809ba2280ea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9a80679d7b0cfe2b83727c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 24 12:25:08 2022 +0100 gdi32: Free the client-side emf dc info. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index d215162d8d0..56327abff8a 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2321,6 +2321,8 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) if (emf->handles[index]) GDI_hdc_not_using_object( emf->handles[index], emf->dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); + HeapFree( GetProcessHeap(), 0, emf ); + dc_attr->emf = NULL; } /*******************************************************************

1 0

Huw Davies : gdi32: Remove second initialization of emf->dc_attr.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 0c8a076e78c033768cbb259f3220a3a64b4ed686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8a076e78c033768cbb259f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 24 12:23:15 2022 +0100 gdi32: Remove second initialization of emf->dc_attr. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index eec700de327..d215162d8d0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2426,7 +2426,6 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, DeleteDC( ret ); return 0; } - emf->dc_attr = dc_attr; emf->handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(emf->handles[0]) );

1 0

Bernhard Kölbl : windows.media.speech: Make IAsyncAction concurrent.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: c6ab933bc3433dfa86d6a05c7a8b7d2bc7ef19de URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6ab933bc3433dfa86d6a05c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 16:34:55 2022 +0200 windows.media.speech: Make IAsyncAction concurrent. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/async.c | 75 ++++++++++++++++++++++++++++++++-- dlls/windows.media.speech/private.h | 3 +- dlls/windows.media.speech/recognizer.c | 7 +++- 3 files changed, 80 insertions(+), 5 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 3d67b90060e..5d20fe482f1 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -40,6 +40,11 @@ struct async_void IAsyncActionCompletedHandler *handler; + async_action_callback callback; + TP_WORK *async_run_work; + IInspectable *invoker; + + CRITICAL_SECTION cs; AsyncStatus status; HRESULT hr; }; @@ -116,6 +121,7 @@ HRESULT WINAPI async_void_put_Completed( IAsyncAction *iface, IAsyncActionComple TRACE("iface %p, handler %p.\n", iface, handler); + EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; else if (impl->handler != HANDLER_NOT_SET) @@ -133,11 +139,15 @@ HRESULT WINAPI async_void_put_Completed( IAsyncAction *iface, IAsyncActionComple IAsyncAction *action = &impl->IAsyncAction_iface; AsyncStatus status = impl->status; impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection(&impl->cs); IAsyncActionCompletedHandler_Invoke(handler, action, status); IAsyncActionCompletedHandler_Release(handler); + + return S_OK; } } + LeaveCriticalSection(&impl->cs); return hr; } @@ -149,9 +159,11 @@ HRESULT WINAPI async_void_get_Completed( IAsyncAction *iface, IAsyncActionComple FIXME("iface %p, handler %p semi stub!\n", iface, handler); + EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; *handler = (impl->handler != HANDLER_NOT_SET) ? impl->handler : NULL; + LeaveCriticalSection(&impl->cs); return hr; } @@ -200,9 +212,11 @@ static HRESULT WINAPI async_void_info_get_Status( IAsyncInfo *iface, AsyncStatus TRACE("iface %p, status %p.\n", iface, status); + EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; *status = impl->status; + LeaveCriticalSection(&impl->cs); return hr; } @@ -214,10 +228,12 @@ static HRESULT WINAPI async_void_info_get_ErrorCode( IAsyncInfo *iface, HRESULT TRACE("iface %p, error_code %p.\n", iface, error_code); + EnterCriticalSection(&impl->cs); if (impl->status == Closed) *error_code = hr = E_ILLEGAL_METHOD_CALL; else *error_code = impl->hr; + LeaveCriticalSection(&impl->cs); return hr; } @@ -229,10 +245,12 @@ static HRESULT WINAPI async_void_info_Cancel( IAsyncInfo *iface ) TRACE("iface %p.\n", iface); + EnterCriticalSection(&impl->cs); if (impl->status == Closed) hr = E_ILLEGAL_METHOD_CALL; else if (impl->status == Started) impl->status = Canceled; + LeaveCriticalSection(&impl->cs); return hr; } @@ -244,10 +262,16 @@ static HRESULT WINAPI async_void_info_Close( IAsyncInfo *iface ) TRACE("iface %p.\n", iface); + EnterCriticalSection(&impl->cs); if (impl->status == Started) hr = E_ILLEGAL_STATE_CHANGE; else if (impl->status != Closed) + { + CloseThreadpoolWork(impl->async_run_work); + impl->async_run_work = NULL; impl->status = Closed; + } + LeaveCriticalSection(&impl->cs); return hr; } @@ -270,11 +294,40 @@ static const struct IAsyncInfoVtbl async_void_info_vtbl = async_void_info_Close }; -HRESULT async_action_create( IAsyncAction **out ) +static void CALLBACK async_void_run_cb(TP_CALLBACK_INSTANCE *instance, void *data, TP_WORK *work) +{ + IAsyncAction *action = data; + struct async_void *impl = impl_from_IAsyncAction(action); + HRESULT hr; + + hr = impl->callback(impl->invoker); + + EnterCriticalSection(&impl->cs); + if (impl->status < Closed) + impl->status = FAILED(hr) ? Error : Completed; + + impl->hr = hr; + + if (impl->handler != NULL && impl->handler != HANDLER_NOT_SET) + { + IAsyncActionCompletedHandler*handler = impl->handler; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + LeaveCriticalSection(&impl->cs); + + IAsyncActionCompletedHandler_Invoke(handler, action, status); + IAsyncActionCompletedHandler_Release(handler); + } + else LeaveCriticalSection(&impl->cs); + + IAsyncAction_Release(action); +} + +HRESULT async_action_create( IInspectable *invoker, async_action_callback callback, IAsyncAction **out ) { struct async_void *impl; - TRACE("out %p.\n", out); + TRACE("invoker %p, callback %p, out %p.\n", invoker, callback, out); if (!(impl = calloc(1, sizeof(*impl)))) { @@ -287,7 +340,23 @@ HRESULT async_action_create( IAsyncAction **out ) impl->ref = 1; impl->handler = HANDLER_NOT_SET; - impl->status = Completed; + impl->callback = callback; + impl->status = Started; + + if (!(impl->async_run_work = CreateThreadpoolWork(async_void_run_cb, &impl->IAsyncAction_iface, NULL))) + { + free(impl); + return HRESULT_FROM_WIN32(GetLastError()); + } + + if (invoker) IInspectable_AddRef((impl->invoker = invoker)); + + InitializeCriticalSection(&impl->cs); + impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_action.cs"); + + /* AddRef to keep the obj alive in the callback. */ + IAsyncAction_AddRef(&impl->IAsyncAction_iface); + SubmitThreadpoolWork(impl->async_run_work); *out = &impl->IAsyncAction_iface; TRACE("created %p\n", *out); diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index ba8e942fe5f..13964329697 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -69,9 +69,10 @@ struct vector_iids const GUID *view; }; +typedef HRESULT (WINAPI *async_action_callback)( IInspectable *invoker ); typedef HRESULT (WINAPI *async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result ); -HRESULT async_action_create( IAsyncAction **out ); +HRESULT async_action_create( IInspectable *invoker, async_action_callback callback, IAsyncAction **out ); HRESULT async_operation_inspectable_create( const GUID *iid, IInspectable *invoker, async_operation_inspectable_callback callback, IAsyncOperation_IInspectable **out ); diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 853e9eb9830..6a058df86e5 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -244,10 +244,15 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog return E_NOTIMPL; } +static HRESULT WINAPI start_callback( IInspectable *invoker ) +{ + return S_OK; +} + static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { FIXME("iface %p, action %p stub!\n", iface, action); - return async_action_create(action); + return async_action_create(NULL, start_callback, action); } static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface,

1 0

Bernhard Kölbl : windows.media.speech: Partially implement IAsyncAction.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 1438b1b6636f5c821b0545d43d9de4343a45eece URL: https://source.winehq.org/git/wine.git/?a=commit;h=1438b1b6636f5c821b0545d4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon May 2 22:56:13 2022 +0200 windows.media.speech: Partially implement IAsyncAction. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/async.c | 103 +++++++++++++++++++++++++++---- dlls/windows.media.speech/tests/speech.c | 16 ++--- 2 files changed, 99 insertions(+), 20 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index d7ac090be78..3d67b90060e 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -37,6 +37,11 @@ struct async_void IAsyncAction IAsyncAction_iface; IAsyncInfo IAsyncInfo_iface; LONG ref; + + IAsyncActionCompletedHandler *handler; + + AsyncStatus status; + HRESULT hr; }; static inline struct async_void *impl_from_IAsyncAction( IAsyncAction *iface ) @@ -106,20 +111,56 @@ HRESULT WINAPI async_void_GetTrustLevel( IAsyncAction *iface, TrustLevel *trust_ HRESULT WINAPI async_void_put_Completed( IAsyncAction *iface, IAsyncActionCompletedHandler *handler ) { - FIXME("iface %p, handler %p stub!\n", iface, handler); - return E_NOTIMPL; + struct async_void *impl = impl_from_IAsyncAction(iface); + HRESULT hr = S_OK; + + TRACE("iface %p, handler %p.\n", iface, handler); + + if (impl->status == Closed) + hr = E_ILLEGAL_METHOD_CALL; + else if (impl->handler != HANDLER_NOT_SET) + hr = E_ILLEGAL_DELEGATE_ASSIGNMENT; + /* + impl->handler can only be set once with async_operation_put_Completed, + so by default we set a non HANDLER_NOT_SET value, in this case handler. + */ + else if ((impl->handler = handler)) + { + IAsyncActionCompletedHandler_AddRef(impl->handler); + + if (impl->status > Started) + { + IAsyncAction *action = &impl->IAsyncAction_iface; + AsyncStatus status = impl->status; + impl->handler = NULL; /* Prevent concurrent invoke. */ + + IAsyncActionCompletedHandler_Invoke(handler, action, status); + IAsyncActionCompletedHandler_Release(handler); + } + } + + return hr; } HRESULT WINAPI async_void_get_Completed( IAsyncAction *iface, IAsyncActionCompletedHandler **handler ) { - FIXME("iface %p, handler %p stub!\n", iface, handler); - return E_NOTIMPL; + struct async_void *impl = impl_from_IAsyncAction(iface); + HRESULT hr = S_OK; + + FIXME("iface %p, handler %p semi stub!\n", iface, handler); + + if (impl->status == Closed) + hr = E_ILLEGAL_METHOD_CALL; + *handler = (impl->handler != HANDLER_NOT_SET) ? impl->handler : NULL; + + return hr; } HRESULT WINAPI async_void_GetResults( IAsyncAction *iface ) { - FIXME("iface %p stub!\n", iface); - return E_NOTIMPL; + /* According to the docs, this function doesn't return anything, so it's left empty. */ + TRACE("iface %p.\n", iface); + return S_OK; } static const struct IAsyncActionVtbl async_void_vtbl = @@ -154,26 +195,61 @@ static HRESULT WINAPI async_void_info_get_Id( IAsyncInfo *iface, UINT32 *id ) static HRESULT WINAPI async_void_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) { - FIXME("iface %p, status %p.\n", iface, status); - return E_NOTIMPL; + struct async_void *impl = impl_from_async_void_IAsyncInfo(iface); + HRESULT hr = S_OK; + + TRACE("iface %p, status %p.\n", iface, status); + + if (impl->status == Closed) + hr = E_ILLEGAL_METHOD_CALL; + *status = impl->status; + + return hr; } static HRESULT WINAPI async_void_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) { - FIXME("iface %p, error_code %p.\n", iface, error_code); - return E_NOTIMPL; + struct async_void *impl = impl_from_async_void_IAsyncInfo(iface); + HRESULT hr = S_OK; + + TRACE("iface %p, error_code %p.\n", iface, error_code); + + if (impl->status == Closed) + *error_code = hr = E_ILLEGAL_METHOD_CALL; + else + *error_code = impl->hr; + + return hr; } static HRESULT WINAPI async_void_info_Cancel( IAsyncInfo *iface ) { + struct async_void *impl = impl_from_async_void_IAsyncInfo(iface); + HRESULT hr = S_OK; + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + + if (impl->status == Closed) + hr = E_ILLEGAL_METHOD_CALL; + else if (impl->status == Started) + impl->status = Canceled; + + return hr; } static HRESULT WINAPI async_void_info_Close( IAsyncInfo *iface ) { + struct async_void *impl = impl_from_async_void_IAsyncInfo(iface); + HRESULT hr = S_OK; + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + + if (impl->status == Started) + hr = E_ILLEGAL_STATE_CHANGE; + else if (impl->status != Closed) + impl->status = Closed; + + return hr; } static const struct IAsyncInfoVtbl async_void_info_vtbl = @@ -210,6 +286,9 @@ HRESULT async_action_create( IAsyncAction **out ) impl->IAsyncInfo_iface.lpVtbl = &async_void_info_vtbl; impl->ref = 1; + impl->handler = HANDLER_NOT_SET; + impl->status = Completed; + *out = &impl->IAsyncAction_iface; TRACE("created %p\n", *out); return S_OK; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index f3b28c40f51..5e74b90bf9a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1581,27 +1581,25 @@ static void test_Recognition(void) handler = (void *)0xdeadbeef; hr = IAsyncAction_get_Completed(action, &handler); - todo_wine ok(hr == S_OK, "IAsyncAction_put_Completed failed, hr %#lx.\n", hr); - todo_wine ok(handler == NULL, "Handler was %p.\n", handler); - - if (FAILED(hr)) goto skip_action; + ok(hr == S_OK, "IAsyncAction_put_Completed failed, hr %#lx.\n", hr); + ok(handler == NULL, "Handler was %p.\n", handler); await_async_void(action, &action_handler); hr = IAsyncAction_QueryInterface(action, &IID_IAsyncInfo, (void **)&info); - todo_wine ok(hr == S_OK, "IAsyncAction_QueryInterface failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncAction_QueryInterface failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action, 1, Completed, S_OK); hr = IAsyncInfo_Cancel(info); - todo_wine ok(hr == S_OK, "IAsyncInfo_Cancel failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncInfo_Cancel failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action, 1, Completed, S_OK); hr = IAsyncInfo_Close(info); - todo_wine ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action, 1, AsyncStatus_Closed, S_OK); hr = IAsyncInfo_Close(info); - todo_wine ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); + ok(hr == S_OK, "IAsyncInfo_Close failed, hr %#lx.\n", hr); check_async_info((IInspectable *)action, 1, AsyncStatus_Closed, S_OK); hr = IAsyncInfo_Cancel(info); @@ -1617,6 +1615,8 @@ static void test_Recognition(void) hr = ISpeechContinuousRecognitionSession_StopAsync(session, &action2); todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StopAsync failed, hr %#lx.\n", hr); + if (FAILED(hr)) goto skip_action; + async_void_handler_create_static(&action_handler); action_handler.event_block = CreateEventW(NULL, FALSE, FALSE, NULL); action_handler.event_finished = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

Bernhard Kölbl : windows.media.speech: Add IAsyncInfo to IAsyncAction.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: a01fa46146842bb53830073731a8747ddda15476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a01fa46146842bb538300737… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue May 3 13:37:10 2022 +0200 windows.media.speech: Add IAsyncInfo to IAsyncAction. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/async.c | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 1abb88528ef..d7ac090be78 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); struct async_void { IAsyncAction IAsyncAction_iface; + IAsyncInfo IAsyncInfo_iface; LONG ref; }; @@ -58,6 +59,12 @@ HRESULT WINAPI async_void_QueryInterface( IAsyncAction *iface, REFIID iid, void return S_OK; } + if (IsEqualGUID(iid, &IID_IAsyncInfo)) + { + IInspectable_AddRef((*out = &impl->IAsyncInfo_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -131,6 +138,61 @@ static const struct IAsyncActionVtbl async_void_vtbl = async_void_GetResults }; +/* + * + * IAsyncInfo for IAsyncAction + * + */ + +DEFINE_IINSPECTABLE_(async_void_info, IAsyncInfo, struct async_void, impl_from_async_void_IAsyncInfo, IAsyncInfo_iface, &impl->IAsyncAction_iface) + +static HRESULT WINAPI async_void_info_get_Id( IAsyncInfo *iface, UINT32 *id ) +{ + FIXME("iface %p, id %p stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_void_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) +{ + FIXME("iface %p, status %p.\n", iface, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_void_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) +{ + FIXME("iface %p, error_code %p.\n", iface, error_code); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_void_info_Cancel( IAsyncInfo *iface ) +{ + TRACE("iface %p.\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_void_info_Close( IAsyncInfo *iface ) +{ + TRACE("iface %p.\n", iface); + return E_NOTIMPL; +} + +static const struct IAsyncInfoVtbl async_void_info_vtbl = +{ + /* IUnknown methods */ + async_void_info_QueryInterface, + async_void_info_AddRef, + async_void_info_Release, + /* IInspectable methods */ + async_void_info_GetIids, + async_void_info_GetRuntimeClassName, + async_void_info_GetTrustLevel, + /* IAsyncInfo */ + async_void_info_get_Id, + async_void_info_get_Status, + async_void_info_get_ErrorCode, + async_void_info_Cancel, + async_void_info_Close +}; HRESULT async_action_create( IAsyncAction **out ) { @@ -145,6 +207,7 @@ HRESULT async_action_create( IAsyncAction **out ) } impl->IAsyncAction_iface.lpVtbl = &async_void_vtbl; + impl->IAsyncInfo_iface.lpVtbl = &async_void_info_vtbl; impl->ref = 1; *out = &impl->IAsyncAction_iface;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022