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

Nikolay Sivov : include: Add newer D2D command sink interface definitions.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: bb83067bd797501f6ed308e18a0807cf28f2d5e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb83067bd797501f6ed308e18a0807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 23:35:54 2022 +0300 include: Add newer D2D command sink interface definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_2.idl | 12 +++++++++++ include/d2d1_3.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 1fc9111151c..982131667df 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -89,3 +89,15 @@ interface ID2D1Factory2 : ID2D1Factory1 [out] ID2D1Device1 **device ); } + +[ + object, + uuid(9eb767fd-4269-4467-b8c2-eb30cb305743), + local, +] +interface ID2D1CommandSink1 : ID2D1CommandSink +{ + HRESULT SetPrimitiveBlend1( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); +} diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 07dc98968f8..29bcc8df56d 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -19,6 +19,8 @@ import "d2d1_2.idl"; import "d2d1effects_2.idl"; +interface ID2D1SpriteBatch; + typedef enum D2D1_INK_NIB_SHAPE { D2D1_INK_NIB_SHAPE_ROUND = 0x0, @@ -69,6 +71,13 @@ typedef enum D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS; +typedef enum D2D1_SPRITE_OPTIONS +{ + D2D1_SPRITE_OPTIONS_NONE = 0x0, + D2D1_SPRITE_OPTIONS_CLAMP_TO_SOURCE_RECTANGLE = 0x1, + D2D1_SPRITE_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_SPRITE_OPTIONS; + typedef struct D2D1_INK_POINT { float x; @@ -356,3 +365,56 @@ interface ID2D1Factory3 : ID2D1Factory2 [out] ID2D1Device2 **d2d_device ); } + +[ + object, + uuid(3bab440e-417e-47df-a2e2-bc0be6a00916), + local, +] +interface ID2D1CommandSink2 : ID2D1CommandSink1 +{ + HRESULT DrawInk( + [in] ID2D1Ink *ink, + [in] ID2D1Brush *brush, + [in] ID2D1InkStyle *ink_style + ); + + HRESULT DrawGradientMesh( + [in] ID2D1GradientMesh *gradient_mesh + ); + + HRESULT DrawGdiMetafile( + [in] ID2D1GdiMetafile *gdi_metafile, + [in] const D2D1_RECT_F *dest_rect, + [in] const D2D1_RECT_F *src_rect + ); +} + +[ + object, + uuid(18079135-4cf3-4868-bc8e-06067e6d242d), + local, +] +interface ID2D1CommandSink3 : ID2D1CommandSink2 +{ + HRESULT DrawSpriteBatch( + [in] ID2D1SpriteBatch *sprite_batch, + [in] UINT32 start_index, + [in] UINT32 sprite_count, + [in] ID2D1Bitmap *bitmap, + [in] D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_SPRITE_OPTIONS sprite_options + ); +} + +[ + object, + uuid(c78a6519-40d6-4218-b2de-beeeb744bb3e), + local, +] +interface ID2D1CommandSink4 : ID2D1CommandSink3 +{ + HRESULT SetPrimitiveBlend2( + [in] D2D1_PRIMITIVE_BLEND primitive_blend + ); +}

1 0

Nikolay Sivov : d2d1: Implement setting primitive blend mode.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 4674e051557856a98e5d0a55142969e1b4773dce URL: https://gitlab.winehq.org/wine/wine/-/commit/4674e051557856a98e5d0a55142969… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 23:36:25 2022 +0300 d2d1: Implement setting primitive blend mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d25ad3a9d78..0d08ddd4cb5 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2414,14 +2414,29 @@ static void STDMETHODCALLTYPE d2d_device_context_GetRenderingControls(ID2D1Devic static void STDMETHODCALLTYPE d2d_device_context_SetPrimitiveBlend(ID2D1DeviceContext1 *iface, D2D1_PRIMITIVE_BLEND primitive_blend) { - FIXME("iface %p, primitive_blend %#x stub!\n", iface, primitive_blend); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, primitive_blend %u.\n", iface, primitive_blend); + + if (primitive_blend > D2D1_PRIMITIVE_BLEND_MAX) + { + WARN("Unknown blend mode %u.\n", primitive_blend); + return; + } + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_set_primitive_blend(context->target.command_list, primitive_blend); + + context->drawing_state.primitiveBlend = primitive_blend; } static D2D1_PRIMITIVE_BLEND STDMETHODCALLTYPE d2d_device_context_GetPrimitiveBlend(ID2D1DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p.\n", iface); - return D2D1_PRIMITIVE_BLEND_SOURCE_OVER; + return context->drawing_state.primitiveBlend; } static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext1 *iface, D2D1_UNIT_MODE unit_mode)

1 0

Nikolay Sivov : d2d1/commandlist: Fix primitive blend playback.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: d418657e2c76dcc5f780ca8695a1c71960c40e16 URL: https://gitlab.winehq.org/wine/wine/-/commit/d418657e2c76dcc5f780ca8695a1c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 23:50:27 2022 +0300 d2d1/commandlist: Fix primitive blend playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 0d40b59b2c1..664b2f1a412 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -297,7 +297,38 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface case D2D_COMMAND_SET_PRIMITIVE_BLEND: { const struct d2d_command_set_primitive_blend *c = data; - hr = ID2D1CommandSink_SetPrimitiveBlend(sink, c->primitive_blend); + ID2D1CommandSink1 *sink1; + ID2D1CommandSink4 *sink4; + + switch (c->primitive_blend) + { + case D2D1_PRIMITIVE_BLEND_SOURCE_OVER: + case D2D1_PRIMITIVE_BLEND_COPY: + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, c->primitive_blend); + break; + case D2D1_PRIMITIVE_BLEND_MIN: + case D2D1_PRIMITIVE_BLEND_ADD: + if (SUCCEEDED(ID2D1CommandSink_QueryInterface(sink, &IID_ID2D1CommandSink1, (void **)&sink1))) + { + hr = ID2D1CommandSink1_SetPrimitiveBlend1(sink1, c->primitive_blend); + ID2D1CommandSink1_Release(sink1); + } + else + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, D2D1_PRIMITIVE_BLEND_SOURCE_OVER); + break; + case D2D1_PRIMITIVE_BLEND_MAX: + if (SUCCEEDED(ID2D1CommandSink_QueryInterface(sink, &IID_ID2D1CommandSink4, (void **)&sink4))) + { + hr = ID2D1CommandSink4_SetPrimitiveBlend2(sink4, c->primitive_blend); + ID2D1CommandSink4_Release(sink4); + } + else + hr = ID2D1CommandSink_SetPrimitiveBlend(sink, D2D1_PRIMITIVE_BLEND_SOURCE_OVER); + break; + default: + FIXME("Unexpected blend mode %u.\n", c->primitive_blend); + hr = E_UNEXPECTED; + } break; } case D2D_COMMAND_SET_UNIT_MODE:

1 0

Nikolay Sivov : d2d1: Remove warning message for glyph run description.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 2dc847b6ec5c15edc10ef9cb983b279ae5848aa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dc847b6ec5c15edc10ef9cb983b27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 15:02:34 2022 +0300 d2d1: Remove warning message for glyph run description. Every DrawTextLayout() call will produce this warning, if there is any text to draw. Description is not required to draw a run, and is safe to ignore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0d08ddd4cb5..c502c5dc4e4 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2804,8 +2804,6 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende iface, ctx, baseline_origin_x, baseline_origin_y, measuring_mode, glyph_run, glyph_run_desc, effect); - if (glyph_run_desc) - WARN("Ignoring glyph run description %p.\n", glyph_run_desc); if (context->options & ~(D2D1_DRAW_TEXT_OPTIONS_NO_SNAP | D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT)) FIXME("Ignoring options %#x.\n", context->options);

1 0

Alistair Leslie-Hughes : xactengine3_7: Add helper function to add entries.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 2570be8ac19bf3af8765c55e112edfa46bcb9765 URL: https://gitlab.winehq.org/wine/wine/-/commit/2570be8ac19bf3af8765c55e112edf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 20 11:32:36 2022 +1000 xactengine3_7: Add helper function to add entries. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 101 ++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index ee559dd4b07..7500ab032de 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -71,8 +71,8 @@ typedef struct _XACT3EngineImpl { void *wb_prepared_context; void *wb_destroyed_context; - struct wine_rb_tree wb_wrapper_lookup; - CRITICAL_SECTION wb_wrapper_lookup_cs; + struct wine_rb_tree wrapper_lookup; + CRITICAL_SECTION wrapper_lookup_cs; } XACT3EngineImpl; static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry) @@ -94,26 +94,53 @@ static void wrapper_remove_entry(XACT3EngineImpl *engine, void *key) struct wrapper_lookup *lookup; struct wine_rb_entry *entry; - EnterCriticalSection(&engine->wb_wrapper_lookup_cs); + EnterCriticalSection(&engine->wrapper_lookup_cs); - entry = wine_rb_get(&engine->wb_wrapper_lookup, key); + entry = wine_rb_get(&engine->wrapper_lookup, key); if (!entry) { - LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + LeaveCriticalSection(&engine->wrapper_lookup_cs); WARN("cannot find key in wrapper lookup\n"); } else { - wine_rb_remove(&engine->wb_wrapper_lookup, entry); + wine_rb_remove(&engine->wrapper_lookup, entry); - LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + LeaveCriticalSection(&engine->wrapper_lookup_cs); lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); HeapFree(GetProcessHeap(), 0, lookup); } } +static HRESULT wrapper_add_entry(XACT3EngineImpl *engine, void *fact, void *xact) +{ + struct wrapper_lookup *lookup; + UINT ret; + + lookup = HeapAlloc(GetProcessHeap(), 0, sizeof(*lookup)); + if (!lookup) + { + ERR("Failed to allocate wrapper_lookup!\n"); + return E_OUTOFMEMORY; + } + lookup->fact = fact; + lookup->xact = xact; + + EnterCriticalSection(&engine->wrapper_lookup_cs); + ret = wine_rb_put(&engine->wrapper_lookup, lookup->fact, &lookup->entry); + LeaveCriticalSection(&engine->wrapper_lookup_cs); + + if (ret) + { + WARN("wrapper_lookup already present in the tree??\n"); + HeapFree(GetProcessHeap(), 0, lookup); + } + + return S_OK; +} + typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; FACTCue *fact_cue; @@ -849,8 +876,8 @@ static ULONG WINAPI IXACT3EngineImpl_Release(IXACT3Engine *iface) if (!ref) { - DeleteCriticalSection(&This->wb_wrapper_lookup_cs); - wine_rb_destroy(&This->wb_wrapper_lookup, wrapper_lookup_destroy, NULL); + DeleteCriticalSection(&This->wrapper_lookup_cs); + wine_rb_destroy(&This->wrapper_lookup, wrapper_lookup_destroy, NULL); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -945,8 +972,8 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) { - EnterCriticalSection(&engine->wb_wrapper_lookup_cs); - entry = wine_rb_get(&engine->wb_wrapper_lookup, notification->waveBank.pWaveBank); + EnterCriticalSection(&engine->wrapper_lookup_cs); + entry = wine_rb_get(&engine->wrapper_lookup, notification->waveBank.pWaveBank); if (!entry) { WARN("cannot find wave bank in wrapper lookup\n"); @@ -957,7 +984,7 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); xnotification.waveBank.pWaveBank = lookup->xact; } - LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + LeaveCriticalSection(&engine->wrapper_lookup_cs); if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED) xnotification.pvContext = engine->wb_prepared_context; else @@ -1095,9 +1122,9 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac DWORD dwAllocAttributes, IXACT3WaveBank **ppWaveBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - struct wrapper_lookup *lookup; XACT3WaveBankImpl *wb; FACTWaveBank *fwb; + HRESULT hr; UINT ret; TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p)\n", This, pvBuffer, dwSize, dwFlags, @@ -1119,27 +1146,12 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac return E_OUTOFMEMORY; } - lookup = HeapAlloc(GetProcessHeap(), 0, sizeof(*lookup)); - if (!lookup) + hr = wrapper_add_entry(This, fwb, &wb->IXACT3WaveBank_iface); + if (FAILED(hr)) { FACTWaveBank_Destroy(fwb); HeapFree(GetProcessHeap(), 0, wb); - ERR("Failed to allocate wrapper_lookup!\n"); - return E_OUTOFMEMORY; - } - lookup->fact = fwb; - lookup->xact = &wb->IXACT3WaveBank_iface; - - EnterCriticalSection(&This->wb_wrapper_lookup_cs); - - ret = wine_rb_put(&This->wb_wrapper_lookup, lookup->fact, &lookup->entry); - - LeaveCriticalSection(&This->wb_wrapper_lookup_cs); - - if (ret) - { - WARN("wrapper_lookup already present in the tree??\n"); - HeapFree(GetProcessHeap(), 0, lookup); + return hr; } wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; @@ -1158,11 +1170,11 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); FACTStreamingParameters fakeParms; - struct wrapper_lookup *lookup; wrap_readfile_struct *fake; XACT3WaveBankImpl *wb; FACTWaveBank *fwb; UINT ret; + HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, pParms, ppWaveBank); @@ -1192,27 +1204,12 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa return E_OUTOFMEMORY; } - lookup = HeapAlloc(GetProcessHeap(), 0, sizeof(*lookup)); - if (!lookup) + hr = wrapper_add_entry(This, fwb, &wb->IXACT3WaveBank_iface); + if (FAILED(hr)) { FACTWaveBank_Destroy(fwb); HeapFree(GetProcessHeap(), 0, wb); - ERR("Failed to allocate wrapper_lookup!\n"); - return E_OUTOFMEMORY; - } - lookup->fact = fwb; - lookup->xact = &wb->IXACT3WaveBank_iface; - - EnterCriticalSection(&This->wb_wrapper_lookup_cs); - - ret = wine_rb_put(&This->wb_wrapper_lookup, lookup->fact, &lookup->entry); - - LeaveCriticalSection(&This->wb_wrapper_lookup_cs); - - if (ret) - { - WARN("wrapper_lookup already present in the tree??\n"); - HeapFree(GetProcessHeap(), 0, lookup); + return hr; } wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; @@ -1618,8 +1615,8 @@ static HRESULT WINAPI XACT3CF_CreateInstance(IClassFactory *iface, IUnknown *pOu return hr; } - wine_rb_init(&object->wb_wrapper_lookup, wrapper_lookup_compare); - InitializeCriticalSection(&object->wb_wrapper_lookup_cs); + wine_rb_init(&object->wrapper_lookup, wrapper_lookup_compare); + InitializeCriticalSection(&object->wrapper_lookup_cs); return hr; }

1 0

Alistair Leslie-Hughes : xactengine3_7: Map SoundBank interfaces.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 33831cfce7e9bc5e0bd9f6a0f9244ce73a6a6981 URL: https://gitlab.winehq.org/wine/wine/-/commit/33831cfce7e9bc5e0bd9f6a0f9244c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 09:57:22 2022 +1000 xactengine3_7: Map SoundBank interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 7500ab032de..5dc857513f8 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -346,6 +346,7 @@ typedef struct _XACT3SoundBankImpl { IXACT3SoundBank IXACT3SoundBank_iface; FACTSoundBank *fact_soundbank; + XACT3EngineImpl *engine; } XACT3SoundBankImpl; static inline XACT3SoundBankImpl *impl_from_IXACT3SoundBank(IXACT3SoundBank *iface) @@ -482,6 +483,8 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Destroy(IXACT3SoundBank *iface) TRACE("(%p)\n", This); hr = FACTSoundBank_Destroy(This->fact_soundbank); + + wrapper_remove_entry(This->engine, This->fact_soundbank); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -1088,6 +1091,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, XACT3SoundBankImpl *sb; FACTSoundBank *fsb; UINT ret; + HRESULT hr; TRACE("(%p)->(%p, %lu, 0x%lx, 0x%lx, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppSoundBank); @@ -1108,8 +1112,17 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This, fsb, &sb->IXACT3SoundBank_iface); + if (FAILED(hr)) + { + FACTSoundBank_Destroy(fsb); + HeapFree(GetProcessHeap(), 0, sb); + return hr; + } + sb->IXACT3SoundBank_iface.lpVtbl = &XACT3SoundBank_Vtbl; sb->fact_soundbank = fsb; + sb->engine = This; *ppSoundBank = &sb->IXACT3SoundBank_iface; TRACE("Created SoundBank: %p\n", sb);

1 0

Alistair Leslie-Hughes : xactengine3_7: Map IXACT3Cue interfaces.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 8b65074dae203b367fdeb4f60258c7fb470a702e URL: https://gitlab.winehq.org/wine/wine/-/commit/8b65074dae203b367fdeb4f60258c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 21 08:04:13 2022 +1000 xactengine3_7: Map IXACT3Cue interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 5dc857513f8..eff0c8e5c4b 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -144,6 +144,7 @@ static HRESULT wrapper_add_entry(XACT3EngineImpl *engine, void *fact, void *xact typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; FACTCue *fact_cue; + XACT3EngineImpl *engine; } XACT3CueImpl; static inline XACT3CueImpl *impl_from_IXACT3Cue(IXACT3Cue *iface) @@ -188,6 +189,7 @@ static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface) ret = FACTCue_Destroy(This->fact_cue); if (ret != 0) WARN("FACTCue_Destroy returned %d\n", ret); + wrapper_remove_entry(This->engine, This->fact_cue); HeapFree(GetProcessHeap(), 0, This); return S_OK; } @@ -395,6 +397,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, XACT3CueImpl *cue; FACTCue *fcue; UINT ret; + HRESULT hr; TRACE("(%p)->(%u, 0x%lx, %lu, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); @@ -415,8 +418,17 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This->engine, fcue, &cue->IXACT3Cue_iface); + if (FAILED(hr)) + { + FACTCue_Destroy(fcue); + HeapFree(GetProcessHeap(), 0, cue); + return hr; + } + cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; + cue->engine = This->engine; *ppCue = &cue->IXACT3Cue_iface; TRACE("Created Cue: %p\n", cue); @@ -457,8 +469,17 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This->engine, fcue, &cue->IXACT3Cue_iface); + if (FAILED(hr)) + { + FACTCue_Destroy(fcue); + HeapFree(GetProcessHeap(), 0, cue); + return hr; + } + cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; + cue->engine = This->engine; *ppCue = &cue->IXACT3Cue_iface; }

1 0

Alistair Leslie-Hughes : xactengine3_7: Map IXACT3Wave interfaces.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: 6a7c02ac6ab9836059ad6243fd95b9d0916e69d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a7c02ac6ab9836059ad6243fd95b9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 08:50:57 2022 +1000 xactengine3_7: Map IXACT3Wave interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index eff0c8e5c4b..13a6133bb95 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -540,6 +540,7 @@ typedef struct _XACT3WaveImpl { IXACT3Wave IXACT3Wave_iface; FACTWave *fact_wave; + XACT3EngineImpl *engine; } XACT3WaveImpl; static inline XACT3WaveImpl *impl_from_IXACT3Wave(IXACT3Wave *iface) @@ -555,6 +556,7 @@ static HRESULT WINAPI IXACT3WaveImpl_Destroy(IXACT3Wave *iface) TRACE("(%p)\n", This); hr = FACTWave_Destroy(This->fact_wave); + wrapper_remove_entry(This->engine, This->fact_wave); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -720,6 +722,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, XACT3WaveImpl *wave; FACTWave *fwave; UINT ret; + HRESULT hr; TRACE("(%p)->(0x%x, %lu, 0x%lx, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, nLoopCount, ppWave); @@ -740,8 +743,17 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This->engine, fwave, &wave->IXACT3Wave_iface); + if (FAILED(hr)) + { + FACTWave_Destroy(fwave); + HeapFree(GetProcessHeap(), 0, wave); + return hr; + } + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; + wave->engine = This->engine; *ppWave = &wave->IXACT3Wave_iface; TRACE("Created Wave: %p\n", wave); @@ -782,8 +794,17 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This->engine, fwave, &wave->IXACT3Wave_iface); + if (FAILED(hr)) + { + FACTWave_Destroy(fwave); + HeapFree(GetProcessHeap(), 0, wave); + return hr; + } + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; + wave->engine = This->engine; *ppWave = &wave->IXACT3Wave_iface; } @@ -1288,6 +1309,7 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, XACT3WaveImpl *wave; FACTWave *fwave = NULL; UINT ret; + HRESULT hr; TRACE("(%p)->(0x%08lx, %s, %d, %ld, %ld, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave); @@ -1307,8 +1329,17 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, return E_OUTOFMEMORY; } + hr = wrapper_add_entry(This, fwave, &wave->IXACT3Wave_iface); + if (FAILED(hr)) + { + FACTWave_Destroy(fwave); + HeapFree(GetProcessHeap(), 0, wave); + return hr; + } + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; + wave->engine = This; *ppWave = &wave->IXACT3Wave_iface; TRACE("Created Wave: %p\n", wave);

1 0

Alistair Leslie-Hughes : xactengine3_7: Record context for each notications.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: a9486f7e7441085762631202a631377881f889ff URL: https://gitlab.winehq.org/wine/wine/-/commit/a9486f7e7441085762631202a63137… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 20 10:55:43 2022 +1000 xactengine3_7: Record context for each notications. This helps the first lockup but starting a game causes another freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49678 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 13a6133bb95..2576d14bb21 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -53,6 +53,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xact3); #define IXACT3WaveBankVtbl IXACTWaveBankVtbl #endif +#define XACTNOTIFICATIONTYPE_MAX 18 /* XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT + 1 */ + struct wrapper_lookup { struct wine_rb_entry entry; @@ -69,8 +71,7 @@ typedef struct _XACT3EngineImpl { XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; XACT_NOTIFICATION_CALLBACK notification_callback; - void *wb_prepared_context; - void *wb_destroyed_context; + void *contexts[XACTNOTIFICATIONTYPE_MAX]; struct wine_rb_tree wrapper_lookup; CRITICAL_SECTION wrapper_lookup_cs; } XACT3EngineImpl; @@ -1013,6 +1014,7 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) xnotification.type = xact_notification_type_from_fact(notification->type); xnotification.timeStamp = notification->timeStamp; + xnotification.pvContext = engine->contexts[notification->type]; if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) @@ -1030,10 +1032,6 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) xnotification.waveBank.pWaveBank = lookup->xact; } LeaveCriticalSection(&engine->wrapper_lookup_cs); - if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED) - xnotification.pvContext = engine->wb_prepared_context; - else - xnotification.pvContext = engine->wb_destroyed_context; } else { @@ -1482,12 +1480,8 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pNotificationDesc); - if (pNotificationDesc->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED) - This->wb_prepared_context = pNotificationDesc->pvContext; - else if (pNotificationDesc->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) - This->wb_destroyed_context = pNotificationDesc->pvContext; - unwrap_notificationdesc(&fdesc, pNotificationDesc); + This->contexts[pNotificationDesc->type] = pNotificationDesc->pvContext; fdesc.pvContext = This; return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc); }

1 0

Alistair Leslie-Hughes : xactengine3_7: Implement callback for supported messages.
by Alexandre Julliard 04 Aug '22

04 Aug '22

Module: wine Branch: master Commit: d1c08b1714527213b54144646e050c7878a4a400 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1c08b1714527213b54144646e050c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 09:17:06 2022 +1000 xactengine3_7: Implement callback for supported messages. --- dlls/xactengine3_7/xact_dll.c | 69 +++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 2576d14bb21..cd72f43949f 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -142,6 +142,23 @@ static HRESULT wrapper_add_entry(XACT3EngineImpl *engine, void *fact, void *xact return S_OK; } +/* Must be protected by engine->wrapper_lookup_cs */ +static void* wrapper_find_entry(XACT3EngineImpl *engine, void *faudio) +{ + struct wrapper_lookup *lookup; + struct wine_rb_entry *entry; + + entry = wine_rb_get(&engine->wrapper_lookup, faudio); + if (entry) + { + lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); + return lookup->xact; + } + + WARN("cannot find interface in wrapper lookup\n"); + return NULL; +} + typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; FACTCue *fact_cue; @@ -1000,10 +1017,8 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) { XACT3EngineImpl *engine = (XACT3EngineImpl *)notification->pvContext; XACT_NOTIFICATION xnotification; - struct wrapper_lookup *lookup; - struct wine_rb_entry *entry; - TRACE("notification %p\n", notification->pvContext); + TRACE("notification %d, context %p\n", notification->type, notification->pvContext); /* Older versions of FAudio don't pass through the context */ if (!engine) @@ -1016,28 +1031,50 @@ static void FACTCALL fact_notification_cb(const FACTNotification *notification) xnotification.timeStamp = notification->timeStamp; xnotification.pvContext = engine->contexts[notification->type]; + EnterCriticalSection(&engine->wrapper_lookup_cs); if (notification->type == XACTNOTIFICATIONTYPE_WAVEBANKPREPARED || notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) { - EnterCriticalSection(&engine->wrapper_lookup_cs); - entry = wine_rb_get(&engine->wrapper_lookup, notification->waveBank.pWaveBank); - if (!entry) - { - WARN("cannot find wave bank in wrapper lookup\n"); - xnotification.waveBank.pWaveBank = NULL; - } - else - { - lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); - xnotification.waveBank.pWaveBank = lookup->xact; - } - LeaveCriticalSection(&engine->wrapper_lookup_cs); + xnotification.waveBank.pWaveBank = wrapper_find_entry(engine, notification->waveBank.pWaveBank); + } + else if(notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + { + xnotification.soundBank.pSoundBank = wrapper_find_entry(engine, notification->soundBank.pSoundBank); + } + else if (notification->type == XACTNOTIFICATIONTYPE_WAVESTOP +#if XACT3_VER >= 0x0205 + || notification->type == XACTNOTIFICATIONTYPE_WAVEDESTROYED + || notification->type == XACTNOTIFICATIONTYPE_WAVELOOPED + || notification->type == XACTNOTIFICATIONTYPE_WAVEPLAY + || notification->type == XACTNOTIFICATIONTYPE_WAVEPREPARED) +#else + ) +#endif + { + xnotification.wave.cueIndex = notification->wave.cueIndex; + xnotification.wave.pCue = wrapper_find_entry(engine, notification->wave.pCue); + xnotification.wave.pSoundBank = wrapper_find_entry(engine, notification->wave.pSoundBank); +#if XACT3_VER >= 0x0205 + xnotification.wave.pWave = wrapper_find_entry(engine, notification->wave.pWave); +#endif + xnotification.wave.pWaveBank = wrapper_find_entry(engine, notification->wave.pWaveBank); + } + else if (notification->type == XACTNOTIFICATIONTYPE_CUEPLAY || + notification->type == XACTNOTIFICATIONTYPE_CUEPREPARED || + notification->type == XACTNOTIFICATIONTYPE_CUESTOP || + notification->type == XACTNOTIFICATIONTYPE_CUEDESTROYED) + { + xnotification.cue.pCue = wrapper_find_entry(engine, notification->cue.pCue); + xnotification.cue.cueIndex = notification->cue.cueIndex; + xnotification.cue.pSoundBank = wrapper_find_entry(engine, notification->cue.pSoundBank); } else { + LeaveCriticalSection(&engine->wrapper_lookup_cs); FIXME("Unsupported callback type %d\n", notification->type); return; } + LeaveCriticalSection(&engine->wrapper_lookup_cs); engine->notification_callback(&xnotification); }

1 0