September 2023 - Wine-commits

Lorenzo Ferrillo : ole32: Leave the RunningObjectTable Critical Section before umarshalling object.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 7860dd06419e1d124f9f1389b39e3e79f26d551b URL: https://gitlab.winehq.org/wine/wine/-/commit/7860dd06419e1d124f9f1389b39e3e… Author: Lorenzo Ferrillo <lorenzofersteam(a)live.it> Date: Sun Sep 10 18:02:56 2023 +0200 ole32: Leave the RunningObjectTable Critical Section before umarshalling object. Sometimes umarshalling an object from the RunningObjectTable can cause the routine to access the table back inside another thread, causing a deadlock. Visual Studio 2019 is an example of this behaviour. Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/ole32/moniker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ec026758b2f..f9f266044e4 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -541,13 +541,14 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); + LeaveCriticalSection(&This->lock); + if (hr == S_OK) { hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)ppunkObject); IStream_Release(pStream); } - LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, moniker_data); return hr;

1 0

Lorenzo Ferrillo : ole32: Add debug info to RunningObjectTable critical section.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 516f68b64f78c26adc2005b03528cf3336d4a115 URL: https://gitlab.winehq.org/wine/wine/-/commit/516f68b64f78c26adc2005b03528cf… Author: Lorenzo Ferrillo <lorenzofersteam(a)live.it> Date: Sun Sep 10 18:15:21 2023 +0200 ole32: Add debug info to RunningObjectTable critical section. So it's possible to easily debug deadlocks involving the Internal ROT object Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/ole32/moniker.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f9f266044e4..b81033c6c4e 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -707,10 +707,19 @@ static const IRunningObjectTableVtbl VT_RunningObjectTableImpl = RunningObjectTableImpl_EnumRunning }; +static RunningObjectTableImpl rot; + +static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &rot.lock, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": RunningObjectTable_section") } +}; + static RunningObjectTableImpl rot = { .IRunningObjectTable_iface.lpVtbl = &VT_RunningObjectTableImpl, - .lock.LockCount = -1, + .lock = { &critsect_debug, -1, 0, 0, 0, 0 }, .rot = LIST_INIT(rot.rot), };

1 0

Mohamad Al-Jaf : appxdeploymentclient: Add stub DLL.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 0617824e0a8ab781cc41b8d09685cd8af1e8932d URL: https://gitlab.winehq.org/wine/wine/-/commit/0617824e0a8ab781cc41b8d09685cd… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 19:25:32 2023 -0400 appxdeploymentclient: Add stub DLL. --- configure | 2 + configure.ac | 1 + dlls/appxdeploymentclient/Makefile.in | 9 ++ .../appxdeploymentclient/appxdeploymentclient.spec | 82 +++++++++++++++ dlls/appxdeploymentclient/classes.idl | 23 +++++ dlls/appxdeploymentclient/main.c | 46 +++++++++ dlls/appxdeploymentclient/package.c | 115 +++++++++++++++++++++ dlls/appxdeploymentclient/private.h | 40 +++++++ dlls/windows.applicationmodel/tests/model.c | 9 +- 9 files changed, 322 insertions(+), 5 deletions(-)

1 0

Mohamad Al-Jaf : appxdeploymentclient: Implement IActivationFactory::ActivateInstance().
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: ec1b83ad9d14370bb827361d89aa486b895338c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec1b83ad9d14370bb827361d89aa48… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:28:46 2023 -0400 appxdeploymentclient: Implement IActivationFactory::ActivateInstance(). --- dlls/appxdeploymentclient/package.c | 221 +++++++++++++++++++++++++++- dlls/appxdeploymentclient/private.h | 1 + dlls/windows.applicationmodel/tests/model.c | 41 ++++-- 3 files changed, 251 insertions(+), 12 deletions(-)

1 0

Mohamad Al-Jaf : include: Add Windows.Management.Deployment.IPackageManager2 interface definition.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 0eb9e723367aa62a216b90d6f6c9c5f007b53bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0eb9e723367aa62a216b90d6f6c9c5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:40:42 2023 -0400 include: Add Windows.Management.Deployment.IPackageManager2 interface definition. --- include/windows.management.deployment.idl | 70 +++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/windows.management.deployment.idl b/include/windows.management.deployment.idl index d78c64680f3..bdb115b924e 100644 --- a/include/windows.management.deployment.idl +++ b/include/windows.management.deployment.idl @@ -29,11 +29,14 @@ namespace Windows.Management.Deployment { typedef enum DeploymentProgressState DeploymentProgressState; typedef enum PackageInstallState PackageInstallState; typedef enum PackageState PackageState; + typedef enum PackageTypes PackageTypes; + typedef enum RemovalOptions RemovalOptions; typedef struct DeploymentProgress DeploymentProgress; interface IDeploymentResult; interface IPackageManager; + interface IPackageManager2; interface IPackageUserInformation; runtimeclass DeploymentResult; @@ -99,6 +102,35 @@ namespace Windows.Management.Deployment { Tampered = 3, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [flags] + enum PackageTypes + { + None = 0x0, + Main = 0x1, + Framework = 0x2, + Resource = 0x4, + Bundle = 0x8, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Xap = 0x10, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Optional = 0x20, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + All = 0xffffffff, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [flags] + enum RemovalOptions + { + None = 0x0, + PreserveApplicationData = 0x1000, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + PreserveRoamableApplicationData = 0x80, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + RemoveForAllUsers = 0x80000, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct DeploymentProgress { @@ -157,6 +189,44 @@ namespace Windows.Management.Deployment { HRESULT FindPackageByUserSecurityIdPackageFullName([in] HSTRING sid, [in] HSTRING name, [out, retval] Windows.ApplicationModel.Package **package); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Management.Deployment.PackageManager), + uuid(f7aad08d-0840-46f2-b5d8-cad47693a095) + ] + interface IPackageManager2 : IInspectable + { + [overload("RemovePackageAsync")] + HRESULT RemovePackageWithOptionsAsync([in] HSTRING name, [in] Windows.Management.Deployment.RemovalOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + [overload("StagePackageAsync")] + HRESULT StagePackageWithOptionsAsync([in] Windows.Foundation.Uri *uri, [in] Windows.Foundation.Collections.IIterable<Windows.Foundation.Uri *> *dependencies, + [in] Windows.Management.Deployment.DeploymentOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + HRESULT RegisterPackageByFullNameAsync([in] HSTRING name, [in] Windows.Foundation.Collections.IIterable<HSTRING> *dependencies, + [in] Windows.Management.Deployment.DeploymentOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesWithPackageTypes([in] Windows.Management.Deployment.PackageTypes types, [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdWithPackageTypes([in] HSTRING sid, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesByNamePublisherWithPackageTypes([in] HSTRING name, [in] HSTRING publisher, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdNamePublisherWithPackageTypes([in] HSTRING sid, [in] HSTRING name, [in] HSTRING publisher, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesByPackageFamilyNameWithPackageTypes([in] HSTRING family_name, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdPackageFamilyNameWithPackageTypes([in] HSTRING sid, [in] HSTRING family_name, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("StageUserDataAsync")] + HRESULT StageUserDataAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Management.Deployment.PackageUserInformation),

1 0

Mohamad Al-Jaf : appxdeploymentclient: Add IPackageManager2 stub interface.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 5de4010eb9957b9060bbabf3ff9fa4ecb33fd07c URL: https://gitlab.winehq.org/wine/wine/-/commit/5de4010eb9957b9060bbabf3ff9fa4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:52:44 2023 -0400 appxdeploymentclient: Add IPackageManager2 stub interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55403 --- dlls/appxdeploymentclient/package.c | 102 ++++++++++++++++++++++++++++ dlls/appxdeploymentclient/private.h | 38 +++++++++++ dlls/windows.applicationmodel/tests/model.c | 12 ++++ 3 files changed, 152 insertions(+)

1 0

Rémi Bernon : dmusic: Rewrite instrument lrgn list parsing.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 9e9b5d2980c28d1a7c126f3ba59257c7cdd2f9d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9b5d2980c28d1a7c126f3ba59257… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 09:58:34 2023 +0200 dmusic: Rewrite instrument lrgn list parsing. --- dlls/dmusic/dmobject.c | 2 +- dlls/dmusic/dmobject.h | 2 + dlls/dmusic/instrument.c | 176 ++++++++++++++++++++--------------------------- 3 files changed, 77 insertions(+), 103 deletions(-)

1 0

Rémi Bernon : dmusic: Rewrite instrument lart list parsing.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: b5fd6187198f9b15e2ce3795c6dce798e7f0f3d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5fd6187198f9b15e2ce3795c6dce7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 10:10:40 2023 +0200 dmusic: Rewrite instrument lart list parsing. --- dlls/dmusic/instrument.c | 63 +++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 5941042caa1..1e171048008 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -192,14 +192,16 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes) return ret; } -static HRESULT load_articulation(struct instrument *This, IStream *stream, ULONG length) +static HRESULT parse_art1_chunk(struct instrument *This, IStream *stream, struct chunk_entry *chunk) { struct articulation *articulation; CONNECTIONLIST list; HRESULT hr; UINT size; - if (FAILED(hr = read_from_stream(stream, &list, sizeof(list)))) return hr; + if (chunk->size < sizeof(list)) return E_INVALIDARG; + if (FAILED(hr = stream_read(stream, &list, sizeof(list)))) return hr; + if (chunk->size != list.cbSize + sizeof(CONNECTION) * list.cConnections) return E_INVALIDARG; if (list.cbSize != sizeof(list)) return E_INVALIDARG; size = offsetof(struct articulation, connections[list.cConnections]); @@ -207,11 +209,31 @@ static HRESULT load_articulation(struct instrument *This, IStream *stream, ULONG articulation->list = list; size = sizeof(CONNECTION) * list.cConnections; - if (FAILED(hr = read_from_stream(stream, articulation->connections, size))) free(articulation); - else + if (FAILED(hr = stream_read(stream, articulation->connections, size))) free(articulation); + else list_add_tail(&This->articulations, &articulation->entry); + + return hr; +} + +static HRESULT parse_lart_list(struct instrument *This, IStream *stream, struct chunk_entry *parent) +{ + struct chunk_entry chunk = {.parent = parent}; + HRESULT hr; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { - subtract_bytes(length, sizeof(list) + sizeof(CONNECTION) * list.cConnections); - list_add_tail(&This->articulations, &articulation->entry); + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case FOURCC_ART1: + hr = parse_art1_chunk(This, stream, &chunk); + break; + + default: + FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + break; + } + + if (FAILED(hr)) break; } return hr; @@ -352,30 +374,15 @@ HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream) } case FOURCC_LART: + { + static const LARGE_INTEGER zero = {0}; + struct chunk_entry list_chunk = {.id = FOURCC_LIST, .size = chunk.dwSize, .type = chunk.fccID}; TRACE("LART chunk (articulations list): %lu bytes\n", size); - - while (size) - { - hr = read_from_stream(stream, &chunk, sizeof(chunk)); - if (FAILED(hr)) - goto error; - - if (chunk.fccID == FOURCC_ART1) - { - TRACE("ART1 chunk (level 1 articulation): %lu bytes\n", chunk.dwSize); - hr = load_articulation(This, stream, chunk.dwSize); - } - else - { - TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); - hr = advance_stream(stream, chunk.dwSize); - } - if (FAILED(hr)) - goto error; - - size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); - } + IStream_Seek(stream, zero, STREAM_SEEK_CUR, &list_chunk.offset); + list_chunk.offset.QuadPart -= 12; + hr = parse_lart_list(This, stream, &list_chunk); break; + } default: TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize);

1 0

Rémi Bernon : dmusic: Rewrite instrument ins chunk parsing.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: 01127ce4746d3960241a05db53e73f92d828e3ef URL: https://gitlab.winehq.org/wine/wine/-/commit/01127ce4746d3960241a05db53e73f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 31 21:58:49 2023 +0200 dmusic: Rewrite instrument ins chunk parsing. --- dlls/dmusic/instrument.c | 163 +++++++++++++---------------------------------- 1 file changed, 45 insertions(+), 118 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 1e171048008..cbcebcb5902 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -151,47 +151,6 @@ HRESULT instrument_create(IDirectMusicInstrument **ret_iface) return S_OK; } -static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) -{ - ULONG bytes_read; - HRESULT hr; - - hr = IStream_Read(stream, data, size, &bytes_read); - if(FAILED(hr)){ - TRACE("IStream_Read failed: %08lx\n", hr); - return hr; - } - if (bytes_read < size) { - TRACE("Didn't read full chunk: %lu < %lu\n", bytes_read, size); - return E_FAIL; - } - - return S_OK; -} - -static inline DWORD subtract_bytes(DWORD len, DWORD bytes) -{ - if(bytes > len){ - TRACE("Apparent mismatch in chunk lengths? %lu bytes remaining, %lu bytes read\n", len, bytes); - return 0; - } - return len - bytes; -} - -static inline HRESULT advance_stream(IStream *stream, ULONG bytes) -{ - LARGE_INTEGER move; - HRESULT ret; - - move.QuadPart = bytes; - - ret = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); - if (FAILED(ret)) - WARN("IStream_Seek failed: %08lx\n", ret); - - return ret; -} - static HRESULT parse_art1_chunk(struct instrument *This, IStream *stream, struct chunk_entry *chunk) { struct articulation *articulation; @@ -308,13 +267,45 @@ static HRESULT parse_lrgn_list(struct instrument *This, IStream *stream, struct return hr; } +static HRESULT parse_ins_chunk(struct instrument *This, IStream *stream, struct chunk_entry *parent) +{ + struct chunk_entry chunk = {.parent = parent}; + HRESULT hr; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case FOURCC_INSH: + case FOURCC_DLID: + /* Instrument header and id are already set so just skip */ + break; + + case MAKE_IDTYPE(FOURCC_LIST, FOURCC_LRGN): + hr = parse_lrgn_list(This, stream, &chunk); + break; + + case MAKE_IDTYPE(FOURCC_LIST, FOURCC_LART): + hr = parse_lart_list(This, stream, &chunk); + break; + + default: + FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + break; + } + + if (FAILED(hr)) break; + } + + return hr; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream) { struct instrument *This = impl_from_IDirectMusicInstrument(iface); + struct chunk_entry chunk = {0}; HRESULT hr; - DMUS_PRIVATE_CHUNK chunk; - ULONG length = This->length; TRACE("(%p, %p): offset = 0x%s, length = %lu)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); @@ -328,90 +319,26 @@ HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream) return DMUS_E_UNSUPPORTED_STREAM; } - while (length) + if ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { - hr = read_from_stream(stream, &chunk, sizeof(chunk)); - if (FAILED(hr)) - goto error; - - length = subtract_bytes(length, sizeof(chunk) + chunk.dwSize); - - switch (chunk.fccID) + switch (MAKE_IDTYPE(chunk.id, chunk.type)) { - case FOURCC_INSH: - case FOURCC_DLID: - TRACE("Chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); - - /* Instrument header and id are already set so just skip */ - hr = advance_stream(stream, chunk.dwSize); - if (FAILED(hr)) - goto error; - - break; - - case FOURCC_LIST: { - DWORD size = chunk.dwSize; - - TRACE("LIST chunk: %lu bytes\n", chunk.dwSize); - - hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); - if (FAILED(hr)) - goto error; - - size = subtract_bytes(size, sizeof(chunk.fccID)); - - switch (chunk.fccID) - { - case FOURCC_LRGN: - { - static const LARGE_INTEGER zero = {0}; - struct chunk_entry list_chunk = {.id = FOURCC_LIST, .size = chunk.dwSize, .type = chunk.fccID}; - TRACE("LRGN chunk (regions list): %lu bytes\n", size); - IStream_Seek(stream, zero, STREAM_SEEK_CUR, &list_chunk.offset); - list_chunk.offset.QuadPart -= 12; - hr = parse_lrgn_list(This, stream, &list_chunk); - break; - } - - case FOURCC_LART: - { - static const LARGE_INTEGER zero = {0}; - struct chunk_entry list_chunk = {.id = FOURCC_LIST, .size = chunk.dwSize, .type = chunk.fccID}; - TRACE("LART chunk (articulations list): %lu bytes\n", size); - IStream_Seek(stream, zero, STREAM_SEEK_CUR, &list_chunk.offset); - list_chunk.offset.QuadPart -= 12; - hr = parse_lart_list(This, stream, &list_chunk); - break; - } - - default: - TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); - - hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); - if (FAILED(hr)) - goto error; - - size = subtract_bytes(size, chunk.dwSize - sizeof(chunk.fccID)); - break; - } - break; - } - - default: - TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); - - hr = advance_stream(stream, chunk.dwSize); - if (FAILED(hr)) - goto error; + case MAKE_IDTYPE(FOURCC_LIST, FOURCC_INS): + hr = parse_ins_chunk(This, stream, &chunk); + break; - break; + default: + WARN("Invalid instrument chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + goto error; } } - This->loaded = TRUE; + if (FAILED(hr)) goto error; + This->loaded = TRUE; return S_OK; error: + stream_skip_chunk(stream, &chunk); return DMUS_E_UNSUPPORTED_STREAM; }

1 0

Rémi Bernon : dmusic: Allocate and parse instruments in a single pass.
by Alexandre Julliard 11 Sep '23

11 Sep '23

Module: wine Branch: master Commit: ff4cb785cbb4f9a5ab2fc16293edc7ea9fb097fc URL: https://gitlab.winehq.org/wine/wine/-/commit/ff4cb785cbb4f9a5ab2fc16293edc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 10:12:29 2023 +0200 dmusic: Allocate and parse instruments in a single pass. --- dlls/dmusic/collection.c | 68 ++++---------------------------------------- dlls/dmusic/dmusic_private.h | 7 +---- dlls/dmusic/instrument.c | 46 +++++++++++++++++++----------- 3 files changed, 35 insertions(+), 86 deletions(-)

1 0