September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Use the dispex's invoke for all nodes.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 5b59ba0cc1384b99aa734ab0deb2c964fdd1f280 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b59ba0cc1384b99aa734ab0deb2c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's invoke for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 13 ------------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 6 +++--- dlls/mshtml/htmlframe.c | 12 ++++++------ dlls/mshtml/htmlobject.c | 6 +++--- dlls/mshtml/htmlselect.c | 11 +++-------- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 15 insertions(+), 36 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the event_target vtbl's handle_event for all nodes.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: ee80f1a07854479c443e6b409e9c759dcfae1410 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee80f1a07854479c443e6b409e9c75… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:31 2023 +0300 mshtml: Use the event_target vtbl's handle_event for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 13 ++++--------- dlls/mshtml/htmlarea.c | 13 ++++--------- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlelem.c | 16 +++++----------- dlls/mshtml/htmlevent.c | 5 ++--- dlls/mshtml/htmlevent.h | 5 ++--- dlls/mshtml/htmlform.c | 13 ++++--------- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlobject.c | 4 ++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 2 +- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/svg.c | 4 ++++ 22 files changed, 49 insertions(+), 70 deletions(-)

1 0

Piotr Caban : msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 3b155ea637c024096ee8300b4667503b97a219ba URL: https://gitlab.winehq.org/wine/wine/-/commit/3b155ea637c024096ee8300b466750… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 20 19:00:39 2023 +0200 msvcp90: Silence FIXME in _Locinfo::_Locinfo_ctor and _Locinfo::_Locinfo_Addcats functions. --- dlls/msvcp90/locale.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6be2bad1a38..6f2288bce1c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -516,8 +516,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor { const char *locale = NULL; - /* This function is probably modifying more global objects */ - FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + TRACE("(%p %d %s)\n", locinfo, category, locstr); if(!locstr) _Xruntime_error("bad locale name"); @@ -622,8 +621,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con { const char *locale = NULL; - /* This function is probably modifying more global objects */ - FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + TRACE("(%p %d %s)\n", locinfo, category, locstr); if(!locstr) _Xruntime_error("bad locale name");

1 0

Rémi Bernon : dmime/tests: Add some DMUS_NOTIFICATION_PMSG tests.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: b1bf0f0296da6b1df5b5f58c9b232db730d93464 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1bf0f0296da6b1df5b5f58c9b232d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 15:43:03 2023 +0200 dmime/tests: Add some DMUS_NOTIFICATION_PMSG tests. --- dlls/dmime/tests/dmime.c | 284 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 277 insertions(+), 7 deletions(-)

1 0

Rémi Bernon : dmime/tests: Test wave segments and DMUS_WAVE_PMSG.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: c04e686ad5801b581b43ca58926692075eb39e89 URL: https://gitlab.winehq.org/wine/wine/-/commit/c04e686ad5801b581b43ca58926692… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 17:28:30 2023 +0200 dmime/tests: Test wave segments and DMUS_WAVE_PMSG. --- dlls/dmime/tests/Makefile.in | 2 + dlls/dmime/tests/dmime.c | 168 +++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/resource.rc | 23 ++++++ dlls/dmime/tests/test.wav | Bin 0 -> 4488 bytes 4 files changed, 193 insertions(+) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f4c47038e54..2491f9ff1b8 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = user32 ole32 dsound C_SRCS = \ dmime.c \ performance.c + +RC_SRCS = resource.rc diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e011488d126..e76949e71c7 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -55,6 +55,28 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO } } +static void load_resource(const WCHAR *name, WCHAR *filename) +{ + static WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(path), path); + GetTempFileNameW(path, name, 0, filename); + + file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %lu\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, name, (const WCHAR *)RT_RCDATA); + ok(res != 0, "couldn't find resource\n"); + ptr = LockResource(LoadResource(GetModuleHandleW(NULL ), res )); + WriteFile(file, ptr, SizeofResource(GetModuleHandleW(NULL ), res ), &written, NULL); + ok(written == SizeofResource(GetModuleHandleW(NULL ), res ), "couldn't write resource\n"); + CloseHandle(file); +} + struct test_tool { IDirectMusicTool IDirectMusicTool_iface; @@ -2244,6 +2266,151 @@ static void test_notification_pmsg(void) IDirectMusicTool_Release(tool); } +static void test_wave_pmsg(void) +{ + static const DWORD message_types[] = + { + DMUS_PMSGT_DIRTY, + DMUS_PMSGT_WAVE, + }; + IDirectMusicPerformance *performance; + IDirectMusicSegment *segment; + IDirectMusicLoader8 *loader; + IDirectMusicGraph *graph; + WCHAR test_wav[MAX_PATH]; + IDirectMusicTool *tool; + DMUS_WAVE_PMSG *wave; + MUSIC_TIME length; + DMUS_PMSG *msg; + HRESULT hr; + DWORD ret; + + hr = test_tool_create(message_types, ARRAY_SIZE(message_types), &tool); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicPerformance, (void **)&performance); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void **)&graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_SetGraph(performance, graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicGraph_Release(graph); + + hr = IDirectMusicPerformance8_InitAudio((IDirectMusicPerformance8 *)performance, NULL, NULL, NULL, + DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + + load_resource(L"test.wav", test_wav); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader8, (void **)&loader); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicLoader8_LoadObjectFromFile(loader, &CLSID_DirectMusicSegment, + &IID_IDirectMusicSegment, test_wav, (void **)&segment); + ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicLoader8_Release(loader); + + + length = 0xdeadbeef; + hr = IDirectMusicSegment_GetLength(segment, &length); + ok(hr == S_OK, "got %#lx\n", hr); + todo_wine ok(length == 1, "got %lu\n", length); + + + /* without Download, no DMUS_PMSGT_WAVE is sent */ + + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 100, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + ok(!msg, "got %p\n", msg); + + + /* a single DMUS_PMSGT_WAVE message is sent with punkUser set */ + + hr = IDirectMusicSegment8_Download((IDirectMusicSegment8 *)segment, (IUnknown *)performance); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); + ok(!!wave->punkUser, "got %p\n", wave->punkUser); + ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); + ok(wave->rtDuration == 1000000, "got %I64d\n", wave->rtDuration); + ok(wave->lOffset == 0, "got %lu\n", wave->lOffset); + ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); + ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); + ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); + hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); + ok(hr == S_OK, "got %#lx\n", hr); + } + + ret = test_tool_wait_message(tool, 500, &msg); + todo_wine ok(!ret, "got %#lx\n", ret); + if (!ret) + { + ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); + hr = IDirectMusicPerformance_FreePMsg(performance, msg); + ok(hr == S_OK, "got %#lx\n", hr); + } + + hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); + ok(hr == S_OK, "got %#lx\n", hr); + + ret = test_tool_wait_message(tool, 100, &msg); + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + ok(!msg, "got %p\n", msg); + + + IDirectMusicSegment_Release(segment); + + + hr = IDirectMusicPerformance_CloseDown(performance); + ok(hr == S_OK, "got %#lx\n", hr); + + IDirectMusicPerformance_Release(performance); + IDirectMusicTool_Release(tool); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -2272,6 +2439,7 @@ START_TEST(dmime) test_performance_time(); test_performance_pmsg(); test_notification_pmsg(); + test_wave_pmsg(); CoUninitialize(); } diff --git a/dlls/dmime/tests/resource.rc b/dlls/dmime/tests/resource.rc new file mode 100644 index 00000000000..d49b647b934 --- /dev/null +++ b/dlls/dmime/tests/resource.rc @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ +/* @makedep: test.wav */ +test.wav RCDATA test.wav diff --git a/dlls/dmime/tests/test.wav b/dlls/dmime/tests/test.wav new file mode 100644 index 00000000000..51d23936196 Binary files /dev/null and b/dlls/dmime/tests/test.wav differ

1 0

Rémi Bernon : dmime/tests: Test sequence track and DMUS_NOTE_PMSG.
by Alexandre Julliard 20 Sep '23

20 Sep '23

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 : dmime/tests: Test band track and DMUS_PATCH_PMSG.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 4ea18f87cc2e4184a30d0ee01885811b3d9deb5f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ea18f87cc2e4184a30d0ee0188581… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 19:16:35 2023 +0200 dmime/tests: Test band track and DMUS_PATCH_PMSG. --- dlls/dmime/tests/dmime.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+)

1 0

Rémi Bernon : dmusic/tests: Fixup chunk alignment in steam_end_chunk.
by Alexandre Julliard 20 Sep '23

20 Sep '23

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 : dmusic: Keep the original instrument patch in the entry.
by Alexandre Julliard 20 Sep '23

20 Sep '23

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

Henri Verbeet : wined3d: Don't validate the frontbuffer's DRAWABLE location in wined3d_swapchain_resize_buffers() when NO3D is set.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: da574ed9f320cd8d768096931f5d51ac7e984242 URL: https://gitlab.winehq.org/wine/wine/-/commit/da574ed9f320cd8d768096931f5d51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 14 16:29:48 2023 +0200 wined3d: Don't validate the frontbuffer's DRAWABLE location in wined3d_swapchain_resize_buffers() when NO3D is set. In general, NO3D surfaces are always in SYSMEM. More importantly though, validating DRAWABLE will evict SYSMEM, but a subsequent wined3d_texture_no3d_load_location() won't recreate it because it's always supposed to be current. This fixes a regression introduced by commit ebaa0a9426864cfa6e36955f26ff4c66c1d5af76, and exposed by running the ddraw tests with the "no3d" renderer. --- dlls/wined3d/swapchain.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 84dcdb5b110..99d717641e1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2004,8 +2004,11 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha ERR("Something's still holding the front buffer (%p).\n", swapchain->front_buffer); swapchain->front_buffer = new_texture; - wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); - wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); + if (!(swapchain->device->wined3d->flags & WINED3D_NO3D)) + { + wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); + wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); + } for (i = 0; i < desc->backbuffer_count; ++i) {

1 0