September 2023 - Wine-Commits

Zebediah Figura : vkd3d-shader: Add definitions for more fragment output system values.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: master Commit: 8c112709409589f9f70d674ac84186f5f7df1c84 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8c112709409589f9f70d674ac8418… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 20 13:06:23 2023 -0500 vkd3d-shader: Add definitions for more fragment output system values. --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7c45d410..892d4440 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1464,8 +1464,24 @@ enum vkd3d_shader_sysval_semantic VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, - /** Render target; SV_Target in Direct3D shader model 6 shaders. \since 1.9 */ + /** Render target; SV_Target in Direct3D. \since 1.9 */ VKD3D_SHADER_SV_TARGET = 0x40, + /** Depth; SV_Depth in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_DEPTH = 0x41, + /** Sample mask; SV_Coverage in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_COVERAGE = 0x42, + /** + * Depth, which is guaranteed to be greater than or equal to the current + * depth; SV_DepthGreaterEqual in Direct3D. \since 1.9 + */ + VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL = 0x43, + /** + * Depth, which is guaranteed to be less than or equal to the current + * depth; SV_DepthLessEqual in Direct3D. \since 1.9 + */ + VKD3D_SHADER_SV_DEPTH_LESS_EQUAL = 0x44, + /** Stencil reference; SV_StencilRef in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_STENCIL_REF = 0x45, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), };

1 0

Esme Povirk : user32/tests: Fix WM_WINDOWPOSCHANGED entries.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: ee17400c05d88fa29d0b895fa01902adfc91ba7f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee17400c05d88fa29d0b895fa01902… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 20 14:48:21 2023 -0500 user32/tests: Fix WM_WINDOWPOSCHANGED entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54031 --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90bbe6146cd..7bf3c14d9f0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19561,9 +19561,9 @@ static const struct message send_message_3[] = { { 0 } }; static const struct message send_message_5[] = { - { WM_WINDOWPOSCHANGING, sent|wparam|lparam|optional, 0, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ - { WM_WINDOWPOSCHANGING, sent|wparam|lparam|optional, 0, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ { 0 } };

1 0

Connor McAdams : uiautomationcore: Implement IRawElementProviderFragmentRoot::GetFocus for MSAA providers.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: c7e976f81989d7c301c3746a74c216cda07cc8b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e976f81989d7c301c3746a74c216… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 6 08:54:11 2023 -0400 uiautomationcore: Implement IRawElementProviderFragmentRoot::GetFocus for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 291 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 131 ++++++++++++- 2 files changed, 419 insertions(+), 3 deletions(-)

1 0

Connor McAdams : uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: ef1d5a0e0a70da93b11f55dd93b64b102f44203c URL: https://gitlab.winehq.org/wine/wine/-/commit/ef1d5a0e0a70da93b11f55dd93b64b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 5 14:40:33 2023 -0400 uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 ++++++ dlls/uiautomationcore/uia_provider.c | 42 +++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index f396adc1200..dc0048f0c73 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4476,6 +4476,14 @@ static void test_uia_prov_from_acc_properties(void) ok(check_variant_bool(&v, x), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); CHECK_ACC_METHOD_CALLED(&Accessible, get_accState); } + + /* Failure HRESULTs are passed through. */ + Accessible.state = 0; + SET_ACC_METHOD_EXPECT(&Accessible, get_accState); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, state->prop_id, &v); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_EMPTY, "Unexpected V_VT %d\n", V_VT(&v)); + CHECK_ACC_METHOD_CALLED(&Accessible, get_accState); } Accessible.state = 0; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 729dc7ab2c5..c6483ef5349 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -27,17 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); -static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) +/* Returns S_OK if flag is set, S_FALSE if it is not. */ +static HRESULT msaa_check_acc_state_hres(IAccessible *acc, VARIANT cid, ULONG flag) { HRESULT hr; VARIANT v; VariantInit(&v); hr = IAccessible_get_accState(acc, cid, &v); - if (SUCCEEDED(hr) && V_VT(&v) == VT_I4 && (V_I4(&v) & flag)) - return TRUE; + if (SUCCEEDED(hr)) + hr = ((V_VT(&v) == VT_I4) && (V_I4(&v) & flag)) ? S_OK : S_FALSE; - return FALSE; + return hr; +} + +static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) +{ + return msaa_check_acc_state_hres(acc, cid, flag) == S_OK; } static HRESULT msaa_acc_get_service(IAccessible *acc, REFGUID sid, REFIID riid, void **service) @@ -657,23 +663,35 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, break; case UIA_HasKeyboardFocusPropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_FOCUSED)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSED); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_IsKeyboardFocusablePropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_FOCUSABLE)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSABLE); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_IsEnabledPropertyId: - variant_init_bool(ret_val, !msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_UNAVAILABLE)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_UNAVAILABLE); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_FALSE); break; case UIA_IsPasswordPropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_PROTECTED)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_PROTECTED); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_NamePropertyId:

1 0

Connor McAdams : uiautomationcore: Handle EVENT_SYSTEM_ALERT in IProxyProviderWinEventHandler::RespondToWinEvent() for MSAA providers.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 05b4619d88dc63d745309d23b86615b249ef2c73 URL: https://gitlab.winehq.org/wine/wine/-/commit/05b4619d88dc63d745309d23b86615… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 13 12:39:18 2023 -0400 uiautomationcore: Handle EVENT_SYSTEM_ALERT in IProxyProviderWinEventHandler::RespondToWinEvent() for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +++++----- dlls/uiautomationcore/uia_provider.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7df2c9bb792..842525b78fa 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3543,16 +3543,16 @@ static void test_uia_prov_from_acc_winevent_handler(HWND hwnd) SET_EXPECT(ProxyEventSink_AddAutomationEvent); hr = IProxyProviderWinEventHandler_RespondToWinEvent(handler, EVENT_SYSTEM_ALERT, hwnd, OBJID_CLIENT, CHILDID_SELF, &ProxyEventSink.IProxyProviderWinEventSink_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine CHECK_CALLED(ProxyEventSink_AddAutomationEvent); - todo_wine ok(ProxyEventSink.event_id == UIA_SystemAlertEventId, "Unexpected event_id %d\n", ProxyEventSink.event_id); - todo_wine ok(ProxyEventSink.event_elprov == elprov, "Unexpected event_elprov %p\n", ProxyEventSink.event_elprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + CHECK_CALLED(ProxyEventSink_AddAutomationEvent); + ok(ProxyEventSink.event_id == UIA_SystemAlertEventId, "Unexpected event_id %d\n", ProxyEventSink.event_id); + ok(ProxyEventSink.event_elprov == elprov, "Unexpected event_elprov %p\n", ProxyEventSink.event_elprov); proxy_event_sink_clear(); /* EVENT_OBJECT_FOCUS is not handled. */ hr = IProxyProviderWinEventHandler_RespondToWinEvent(handler, EVENT_OBJECT_FOCUS, hwnd, OBJID_CLIENT, CHILDID_SELF, &ProxyEventSink.IProxyProviderWinEventSink_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* EVENT_OBJECT_NAMECHANGE. */ SET_EXPECT(ProxyEventSink_AddAutomationPropertyChangedEvent); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 6360430f403..269ce63a2fd 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1403,8 +1403,34 @@ static ULONG WINAPI msaa_winevent_handler_Release(IProxyProviderWinEventHandler static HRESULT WINAPI msaa_winevent_handler_RespondToWinEvent(IProxyProviderWinEventHandler *iface, DWORD event_id, HWND hwnd, LONG objid, LONG cid, IProxyProviderWinEventSink *event_sink) { - FIXME("%p, %ld, %p, %ld, %ld, %p: stub\n", iface, event_id, hwnd, objid, cid, event_sink); - return E_NOTIMPL; + struct msaa_provider *msaa_prov = impl_from_msaa_winevent_handler(iface); + HRESULT hr; + + TRACE("%p, %ld, %p, %ld, %ld, %p\n", iface, event_id, hwnd, objid, cid, event_sink); + + switch (event_id) + { + case EVENT_SYSTEM_ALERT: + hr = IProxyProviderWinEventSink_AddAutomationEvent(event_sink, &msaa_prov->IRawElementProviderSimple_iface, + UIA_SystemAlertEventId); + if (FAILED(hr)) + WARN("AddAutomationEvent failed with hr %#lx\n", hr); + break; + + case EVENT_OBJECT_REORDER: + case EVENT_OBJECT_SELECTION: + case EVENT_OBJECT_NAMECHANGE: + case EVENT_OBJECT_VALUECHANGE: + case EVENT_OBJECT_HELPCHANGE: + case EVENT_OBJECT_INVOKED: + FIXME("WinEvent %ld currently unimplemented\n", event_id); + return E_NOTIMPL; + + default: + break; + } + + return S_OK; } static const IProxyProviderWinEventHandlerVtbl msaa_winevent_handler_vtbl = {

1 0

Connor McAdams : uiautomationcore: Add stub IProxyProviderWinEventHandler implementation for MSAA providers.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: c22bd318b3bd4054a092cf74f7f63837d7bff7fc URL: https://gitlab.winehq.org/wine/wine/-/commit/c22bd318b3bd4054a092cf74f7f638… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 13 12:03:05 2023 -0400 uiautomationcore: Add stub IProxyProviderWinEventHandler implementation for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 208 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 46 +++++++ 2 files changed, 251 insertions(+), 3 deletions(-)

1 0

Connor McAdams : uiautomationcore/tests: Increase wait timeout for cross-process event with navigation.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 08f3de268a2c91d34da4de94e5ea5b3b54a4e210 URL: https://gitlab.winehq.org/wine/wine/-/commit/08f3de268a2c91d34da4de94e5ea5b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 20 08:56:28 2023 -0400 uiautomationcore/tests: Increase wait timeout for cross-process event with navigation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ec2e7e31d6b..f396adc1200 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -15312,7 +15312,7 @@ static void test_UiaAddEvent_client_proc(void) SET_EXPECT(uia_event_callback); post_event_message(hwnd, WM_UIA_TEST_RAISE_EVENT, 0, PROVIDER_CHILD_ID, ProviderOptions_ServerSideProvider); - ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); + ok(!WaitForSingleObject(EventData.event_handle, 5000), "Wait for event_handle failed.\n"); CHECK_CALLED(prov_callback_base_hwnd); CHECK_CALLED_MULTI(prov_callback_nonclient, 2); todo_wine CHECK_CALLED_MULTI(prov_callback_proxy, 2);

1 0

Rémi Bernon : dmusic/tests: Fixup chunk alignment in steam_end_chunk.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: b6f1a1a186c270b5643bfcc910be37663b30c98d URL: https://gitlab.winehq.org/wine/wine/-/commit/b6f1a1a186c270b5643bfcc910be37… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 17:28:30 2023 +0200 dmusic/tests: Fixup chunk alignment in steam_end_chunk. --- dlls/dmusic/tests/dmusic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 879a6f800cd..6210cb05e6c 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -85,17 +85,21 @@ static void stream_end_chunk(IStream *stream, ULARGE_INTEGER *offset) ok(hr == S_OK, "got %#lx\n", hr); hr = IStream_Seek(stream, *(LARGE_INTEGER *)&position, STREAM_SEEK_SET, NULL); ok(hr == S_OK, "got %#lx\n", hr); + hr = IStream_Write(stream, &zero, (position.QuadPart & 1), NULL); + ok(hr == S_OK, "got %#lx\n", hr); } #define CHUNK_BEGIN(stream, type) \ do { \ ULARGE_INTEGER __off; \ + IStream *__stream = (stream); \ stream_begin_chunk(stream, type, &__off); \ do #define CHUNK_RIFF(stream, form) \ do { \ ULARGE_INTEGER __off; \ + IStream *__stream = (stream); \ stream_begin_chunk(stream, "RIFF", &__off); \ IStream_Write(stream, form, 4, NULL); \ do @@ -103,13 +107,14 @@ static void stream_end_chunk(IStream *stream, ULARGE_INTEGER *offset) #define CHUNK_LIST(stream, form) \ do { \ ULARGE_INTEGER __off; \ + IStream *__stream = (stream); \ stream_begin_chunk(stream, "LIST", &__off); \ IStream_Write(stream, form, 4, NULL); \ do #define CHUNK_END \ while (0); \ - stream_end_chunk(stream, &__off); \ + stream_end_chunk(__stream, &__off); \ } while (0) #define CHUNK_DATA(stream, type, data) \

1 0

Rémi Bernon : dmime/tests: Test sequence track and DMUS_NOTE_PMSG.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 47c299ce17ff0c4f37df128302292658cb7499da URL: https://gitlab.winehq.org/wine/wine/-/commit/47c299ce17ff0c4f37df1283022926… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 15:43:03 2023 +0200 dmime/tests: Test sequence track and DMUS_NOTE_PMSG. --- dlls/dmime/tests/dmime.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+)

1 0

Rémi Bernon : dmusic: Keep the original instrument patch in the entry.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: ecb38bf1c9202f8621583dd41db7945c3523081b URL: https://gitlab.winehq.org/wine/wine/-/commit/ecb38bf1c9202f8621583dd41db794… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 23:00:56 2023 +0200 dmusic: Keep the original instrument patch in the entry. --- dlls/dmusic/collection.c | 10 ++++------ dlls/dmusic/tests/dmusic.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index b7c11dacb77..1074c4e2868 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); struct instrument_entry { struct list entry; + DWORD patch; DMUS_OBJECTDESC desc; IDirectMusicInstrument *instrument; }; @@ -176,15 +177,12 @@ static HRESULT WINAPI collection_GetInstrument(IDirectMusicCollection *iface, { struct collection *This = impl_from_IDirectMusicCollection(iface); struct instrument_entry *entry; - DWORD inst_patch; - HRESULT hr; TRACE("(%p, %lu, %p)\n", iface, patch, instrument); LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) { - if (FAILED(hr = IDirectMusicInstrument_GetPatch(entry->instrument, &inst_patch))) return hr; - if (patch == inst_patch) + if (patch == entry->patch) { *instrument = entry->instrument; IDirectMusicInstrument_AddRef(entry->instrument); @@ -202,14 +200,13 @@ static HRESULT WINAPI collection_EnumInstrument(IDirectMusicCollection *iface, { struct collection *This = impl_from_IDirectMusicCollection(iface); struct instrument_entry *entry; - HRESULT hr; TRACE("(%p, %ld, %p, %p, %ld)\n", iface, index, patch, name, name_length); LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) { if (index--) continue; - if (FAILED(hr = IDirectMusicInstrument_GetPatch(entry->instrument, patch))) return hr; + *patch = entry->patch; if (name) lstrcpynW(name, entry->desc.wszName, name_length); return S_OK; } @@ -239,6 +236,7 @@ static HRESULT parse_lins_list(struct collection *This, IStream *stream, struct case MAKE_IDTYPE(FOURCC_LIST, FOURCC_INS): if (!(entry = malloc(sizeof(*entry)))) return E_OUTOFMEMORY; hr = instrument_create_from_chunk(stream, &chunk, This, &entry->desc, &entry->instrument); + if (SUCCEEDED(hr)) hr = IDirectMusicInstrument_GetPatch(entry->instrument, &entry->patch); if (SUCCEEDED(hr)) list_add_tail(&This->instruments, &entry->entry); else free(entry); break; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 6210cb05e6c..703251bb9da 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -1184,7 +1184,7 @@ static void test_download_instrument(void) static const LARGE_INTEGER zero = {0}; IDirectMusicDownloadedInstrument *downloaded; IDirectMusicCollection *collection; - IDirectMusicInstrument *instrument; + IDirectMusicInstrument *instrument, *tmp_instrument; IPersistStream *persist; IDirectMusicPort *port; IDirectMusic *dmusic; @@ -1299,6 +1299,22 @@ static void test_download_instrument(void) hr = IDirectMusicCollection_GetInstrument(collection, 0x1234, &instrument); ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicInstrument_GetPatch(instrument, &patch); + ok(hr == S_OK, "got %#lx\n", hr); + ok(patch == 0x1234, "got %#lx\n", patch); + hr = IDirectMusicInstrument_SetPatch(instrument, 0x4321); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicInstrument_GetPatch(instrument, &patch); + ok(hr == S_OK, "got %#lx\n", hr); + ok(patch == 0x4321, "got %#lx\n", patch); + + hr = IDirectMusicCollection_GetInstrument(collection, 0x1234, &tmp_instrument); + ok(hr == S_OK, "got %#lx\n", hr); + ok(instrument == tmp_instrument, "got %p\n", tmp_instrument); + hr = IDirectMusicInstrument_GetPatch(tmp_instrument, &patch); + ok(hr == S_OK, "got %#lx\n", hr); + ok(patch == 0x4321, "got %#lx\n", patch); + IDirectMusicInstrument_Release(tmp_instrument); check_interface(instrument, &IID_IDirectMusicObject, FALSE); check_interface(instrument, &IID_IDirectMusicDownload, FALSE);

1 0