May 2022 - Wine-commits - list.winehq.org

Chip Davis : wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 16bfa3b6d2fea8b2931c22fd2b7e6dc336504e36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16bfa3b6d2fea8b2931c22fd… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:20 2022 -0500 wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 7 +-- dlls/wined3d/resource.c | 9 ++-- dlls/wined3d/surface.c | 11 ++-- dlls/wined3d/texture.c | 8 +-- dlls/wined3d/utils.c | 115 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 6 +-- 6 files changed, 93 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16bfa3b6d2fea8b2931c…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: c24ca3409913d793afc5ac0e4756f70ed672df70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c24ca3409913d793afc5ac0e… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:22 2022 -0500 wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 7 ++----- dlls/wined3d/texture.c | 31 +++++++++++++-------------- dlls/wined3d/utils.c | 44 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +++--- 6 files changed, 45 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c24ca3409913d793afc5…

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 03196b9ff9cb54fdb4024aa5cd2dc30db8cfe0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=03196b9ff9cb54fdb4024aa5… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:24 2022 -0500 wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/resource.c | 2 +- dlls/wined3d/utils.c | 12 ++++-------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4ad8745f109..72a0914026f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -195,7 +195,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->bind_flags = bind_flags; - if (resource->format_flags & WINED3DFMT_FLAG_MAPPABLE) + if (resource->format_attrs & WINED3D_FORMAT_ATTR_MAPPABLE) access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; resource->access = access; resource->width = width; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c472f94160..9308848ce97 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -315,14 +315,10 @@ struct wined3d_format_base_flags * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { - {WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_BROKEN_PITCH, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_D16_LOCKABLE, 0, - WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_INTZ, 0, - WINED3DFMT_FLAG_MAPPABLE}, + {WINED3DFMT_ATI1N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH}, + {WINED3DFMT_ATI2N, WINED3D_FORMAT_ATTR_MAPPABLE | WINED3D_FORMAT_ATTR_BROKEN_PITCH}, + {WINED3DFMT_D16_LOCKABLE, WINED3D_FORMAT_ATTR_MAPPABLE}, + {WINED3DFMT_INTZ, WINED3D_FORMAT_ATTR_MAPPABLE}, {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3D_FORMAT_ATTR_FLOAT}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a5e718950a..7145c0ca64b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6118,6 +6118,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_COMPRESSED 0x00000080 #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 +#define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6136,7 +6137,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 -#define WINED3DFMT_FLAG_MAPPABLE 0x04000000 #define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000

1 0

Chip Davis : wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: ea4de99fad4f35f33201965abe5336a416d88c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4de99fad4f35f33201965a… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:25 2022 -0500 wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/device.c | 4 +-- dlls/wined3d/utils.c | 55 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 72c5167131a..33ae584f817 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4723,9 +4723,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou if (src_resource->device->cs->c.state->feature_level < WINED3D_FEATURE_LEVEL_10_1) return false; if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS) - && (dst_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK)) + && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK)) return src_resource->format->block_byte_count == dst_resource->format->byte_count; - if ((src_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK) + if ((src_resource->format_attrs & WINED3D_FORMAT_ATTR_CAST_TO_BLOCK) && (dst_resource->format_attrs & WINED3D_FORMAT_ATTR_BLOCKS)) return src_resource->format->byte_count == dst_resource->format->block_byte_count; return false; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9308848ce97..5b62ae0f542 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -328,42 +328,25 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_NVDB, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_ATOC, WINED3D_FORMAT_ATTR_EXTENSION}, {WINED3DFMT_RESZ, WINED3D_FORMAT_ATTR_EXTENSION}, - {WINED3DFMT_R32G32B32A32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32B32A32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SNORM, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R16G16B16A16_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32G32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_TYPELESS, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_FLOAT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, - {WINED3DFMT_R32_UINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER}, - {WINED3DFMT_R32_SINT, 0, - WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_TYPELESS, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_FLOAT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, + {WINED3DFMT_R32_UINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK, + WINED3DFMT_FLAG_INDEX_BUFFER}, + {WINED3DFMT_R32_SINT, WINED3D_FORMAT_ATTR_CAST_TO_BLOCK}, {WINED3DFMT_R16_UINT, 0, WINED3DFMT_FLAG_INDEX_BUFFER}, {WINED3DFMT_A8_UNORM, WINED3D_FORMAT_ATTR_NORMALISED}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7145c0ca64b..3d9d19dd880 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6119,6 +6119,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3D_FORMAT_ATTR_BROKEN_PITCH 0x00000100 #define WINED3D_FORMAT_ATTR_HEIGHT_SCALE 0x00000200 #define WINED3D_FORMAT_ATTR_MAPPABLE 0x00000400 +#define WINED3D_FORMAT_ATTR_CAST_TO_BLOCK 0x00000800 /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 @@ -6137,7 +6138,6 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_GEN_MIPMAP 0x00400000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 -#define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 #define WINED3DFMT_FLAG_INDEX_BUFFER 0x10000000 struct wined3d_rational

1 0

Chip Davis : wined3d: Rename format flags to caps.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 06b19322187e5ef8ffc06504c322ce9bcdaaa6ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b19322187e5ef8ffc06504… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:37:26 2022 -0500 wined3d: Rename format flags to caps. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 3 +- dlls/wined3d/directx.c | 51 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/resource.c | 10 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 +- dlls/wined3d/texture.c | 28 +- dlls/wined3d/utils.c | 606 +++++++++++++++++++-------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 48 ++-- 13 files changed, 387 insertions(+), 385 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06b19322187e5ef8ffc0…

1 0

Eric Pouech : winedbg: Simplify character output.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 66c3b8176b74dc933e21786010bb88b789baa6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c3b8176b74dc933e217860… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Simplify character output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/memory.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 16d322cd82c..aa5c32b42f2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -500,7 +500,6 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btInt: case btLong: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - if (size == 1) goto print_char; dbg_print_hex(size, val_int); break; case btUInt: @@ -513,17 +512,18 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%f", val_real); break; case btChar: - case btWChar: - /* sometimes WCHAR is defined as btChar with size = 2, so discrimate - * Ansi/Unicode based on size, not on basetype - */ if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; - print_char: - if ((size == 1 && isprint((char)val_int)) || - (size == 2 && val_int < 127 && isprint((char)val_int))) + if (size == 1 && isprint((char)val_int)) dbg_printf("'%c'", (char)val_int); else - dbg_printf("%d", (int)val_int); + dbg_print_hex(size, val_int); + break; + case btWChar: + if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; + if (size == 2 && iswprint((WCHAR)val_int)) + dbg_printf("L'%lc'", (WCHAR)val_int); + else + dbg_print_hex(size, val_int); break; case btBool: if (!memory_fetch_integer(lvalue, size, TRUE, &val_int)) return; @@ -549,11 +549,11 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) char buffer[1024]; if (!val_ptr) dbg_printf("0x0"); - else if (((bt == btChar || bt == btInt) && size64 == 1) || (bt == btUInt && size64 == 2)) + else if ((bt == btChar && size64 == 1) || (bt == btWChar && size64 == 2)) { if (memory_get_string(dbg_curr_process, val_ptr, sub_lvalue.in_debuggee, - size64 == 2, buffer, sizeof(buffer))) - dbg_printf("\"%s\"", buffer); + bt == btWChar, buffer, sizeof(buffer))) + dbg_printf("%s\"%s\"", bt == btWChar ? "L" : "", buffer); else dbg_printf("*** invalid address %p ***", val_ptr); break;

1 0

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

24 May '22

Module: wine Branch: master Commit: 38bf1a70ae6b769b5ca4d8298483b230578dc0f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38bf1a70ae6b769b5ca4d829… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 30 12:19:39 2022 +0200 windows.media.speech: Add IAsyncAction iface. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/async.c | 126 +++++++++++++++++++++++++++++++ dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/recognizer.c | 2 +- dlls/windows.media.speech/tests/speech.c | 14 ++-- 4 files changed, 135 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index eceda4338b3..1abb88528ef 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -26,6 +26,132 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); #define Closed 4 #define HANDLER_NOT_SET ((void *)~(ULONG_PTR)0) +/* + * + * IAsyncAction + * + */ + +struct async_void +{ + IAsyncAction IAsyncAction_iface; + LONG ref; +}; + +static inline struct async_void *impl_from_IAsyncAction( IAsyncAction *iface ) +{ + return CONTAINING_RECORD(iface, struct async_void, IAsyncAction_iface); +} + +HRESULT WINAPI async_void_QueryInterface( IAsyncAction *iface, REFIID iid, void **out ) +{ + struct async_void *impl = impl_from_IAsyncAction(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IAsyncAction)) + { + IInspectable_AddRef((*out = &impl->IAsyncAction_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI async_void_AddRef( IAsyncAction *iface ) +{ + struct async_void *impl = impl_from_IAsyncAction(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +ULONG WINAPI async_void_Release( IAsyncAction *iface ) +{ + struct async_void *impl = impl_from_IAsyncAction(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +HRESULT WINAPI async_void_GetIids( IAsyncAction *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +HRESULT WINAPI async_void_GetRuntimeClassName( IAsyncAction *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +HRESULT WINAPI async_void_GetTrustLevel( IAsyncAction *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +HRESULT WINAPI async_void_put_Completed( IAsyncAction *iface, IAsyncActionCompletedHandler *handler ) +{ + FIXME("iface %p, handler %p stub!\n", iface, handler); + return E_NOTIMPL; +} + +HRESULT WINAPI async_void_get_Completed( IAsyncAction *iface, IAsyncActionCompletedHandler **handler ) +{ + FIXME("iface %p, handler %p stub!\n", iface, handler); + return E_NOTIMPL; +} + +HRESULT WINAPI async_void_GetResults( IAsyncAction *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static const struct IAsyncActionVtbl async_void_vtbl = +{ + /* IUnknown methods */ + async_void_QueryInterface, + async_void_AddRef, + async_void_Release, + /* IInspectable methods */ + async_void_GetIids, + async_void_GetRuntimeClassName, + async_void_GetTrustLevel, + /* IAsyncAction methods */ + async_void_put_Completed, + async_void_get_Completed, + async_void_GetResults +}; + + +HRESULT async_action_create( IAsyncAction **out ) +{ + struct async_void *impl; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + impl->IAsyncAction_iface.lpVtbl = &async_void_vtbl; + impl->ref = 1; + + *out = &impl->IAsyncAction_iface; + TRACE("created %p\n", *out); + return S_OK; +} + /* * * IAsyncOperation<IInspectable*> diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 97afa4d3499..ba8e942fe5f 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -71,6 +71,7 @@ struct vector_iids typedef HRESULT (WINAPI *async_operation_inspectable_callback)( IInspectable *invoker, IInspectable **result ); +HRESULT async_action_create( 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 c78f69b0a67..853e9eb9830 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -247,7 +247,7 @@ static HRESULT WINAPI session_set_AutoStopSilenceTimeout( ISpeechContinuousRecog static HRESULT WINAPI session_StartAsync( ISpeechContinuousRecognitionSession *iface, IAsyncAction **action ) { FIXME("iface %p, action %p stub!\n", iface, action); - return E_NOTIMPL; + return async_action_create(action); } static HRESULT WINAPI session_StartWithModeAsync( ISpeechContinuousRecognitionSession *iface, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 91d8704f2c8..f3b28c40f51 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1577,20 +1577,20 @@ static void test_Recognition(void) IAsyncOperation_IInspectable_Release((IAsyncOperation_IInspectable *)operation); hr = ISpeechContinuousRecognitionSession_StartAsync(session, &action); - todo_wine ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StartAsync failed, hr %#lx.\n", hr); - - if (FAILED(hr)) goto skip_action; - - await_async_void(action, &action_handler); - check_async_info((IInspectable *)action, 1, Completed, S_OK); + ok(hr == S_OK, "ISpeechContinuousRecognitionSession_StartAsync failed, hr %#lx.\n", hr); 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; + + 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); + 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); @@ -1660,9 +1660,9 @@ static void test_Recognition(void) todo_wine ok(action != action2, "actions were the same!\n"); IAsyncAction_Release(action2); +skip_action: IAsyncAction_Release(action); -skip_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: 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

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: 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