September 2023 - Wine-commits

Nikolay Sivov : vkd3d-shader/hlsl: Add tex1D() function.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: vkd3d Branch: master Commit: c5d680d141a1fa8bfc3c15c94f96933811e2c995 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5d680d141a1fa8bfc3c15c94f969… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 3 19:23:15 2023 +0200 vkd3d-shader/hlsl: Add tex1D() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++++ tests/hlsl/sampler.shader_test | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 161d1ab4..cb4b63a8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3466,6 +3466,12 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * return true; } +static bool intrinsic_tex1D(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "tex1D", HLSL_SAMPLER_DIM_1D); +} + static bool intrinsic_tex2D(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3652,6 +3658,7 @@ intrinsic_functions[] = {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, + {"tex1D", -1, false, intrinsic_tex1D}, {"tex2D", -1, false, intrinsic_tex2D}, {"tex3D", -1, false, intrinsic_tex3D}, {"texCUBE", -1, false, intrinsic_texCUBE}, diff --git a/tests/hlsl/sampler.shader_test b/tests/hlsl/sampler.shader_test index 8b1c550c..c4b38b32 100644 --- a/tests/hlsl/sampler.shader_test +++ b/tests/hlsl/sampler.shader_test @@ -60,3 +60,11 @@ float4 main() : sv_target { return texCUBE(s, float3(0.0, 0.0, 0.0)); } + +[pixel shader] +sampler1D s; + +float4 main() : sv_target +{ + return tex1D(s, 0.0); +}

1 0

Esme Povirk : user32/tests: Check all letters in test_hotkey.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 87b1cd12d609d8359dab10af976d20269912e196 URL: https://gitlab.winehq.org/wine/wine/-/commit/87b1cd12d609d8359dab10af976d20… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 6 13:56:14 2023 -0500 user32/tests: Check all letters in test_hotkey. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55317 --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c1f950e5cb9..ddc6ca90cb2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18629,7 +18629,7 @@ static void test_hotkey(void) "unexpected error %ld\n", GetLastError()); /* Search for a Windows Key + letter combination that hasn't been registered */ - for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + for (hotkey_letter = 'A'; hotkey_letter <= 'Z'; hotkey_letter ++) { SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 5, MOD_WIN, hotkey_letter); @@ -18645,7 +18645,7 @@ static void test_hotkey(void) } } - if (hotkey_letter == 0x52) + if (hotkey_letter > 'Z') { ok(0, "Couldn't find any free Windows Key + letter combination\n"); goto end; @@ -18845,7 +18845,7 @@ static void test_hotkey(void) ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); /* Search for an ALT + letter combination that hasn't been registered */ - for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + for (hotkey_letter = 'A'; hotkey_letter <= 'Z'; hotkey_letter ++) { SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 6, MOD_ALT, hotkey_letter); @@ -18861,7 +18861,7 @@ static void test_hotkey(void) } } - if (hotkey_letter == 0x52) + if (hotkey_letter > 'Z') { ok(0, "Couldn't find any free ALT + letter combination\n"); goto end;

1 0

Rémi Bernon : dmusic: Get rid of struct collection liCollectionPosition member.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: a614527524be0263d6605547a25cab3a176852c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a614527524be0263d6605547a25cab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 31 09:47:12 2023 +0200 dmusic: Get rid of struct collection liCollectionPosition member. --- dlls/dmusic/collection.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 7223aa23bdb..ca0f30db80a 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -31,7 +31,6 @@ struct collection LONG ref; IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ DLSHEADER *pHeader; @@ -214,12 +213,9 @@ static HRESULT WINAPI collection_stream_Load(IPersistStream *iface, DMUS_PRIVATE_CHUNK chunk; DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ - ULARGE_INTEGER dlibCollectionPosition, dlibInstrumentPosition, dlibWavePoolPosition; + ULARGE_INTEGER dlibInstrumentPosition, dlibWavePoolPosition; IStream_AddRef(stream); /* add count for later references */ - liMove.QuadPart = 0; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, &dlibCollectionPosition); /* store offset, in case it'll be needed later */ - This->liCollectionPosition.QuadPart = dlibCollectionPosition.QuadPart; This->pStm = stream; IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);

1 0

Rémi Bernon : dmusic: Get rid of struct collection liWavePoolTablePosition member.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 4a60c0f64fb8f659e02dde5de00e84a1d9cb03af URL: https://gitlab.winehq.org/wine/wine/-/commit/4a60c0f64fb8f659e02dde5de00e84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 31 09:48:05 2023 +0200 dmusic: Get rid of struct collection liWavePoolTablePosition member. --- dlls/dmusic/collection.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index ca0f30db80a..19fc48ce555 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -31,7 +31,6 @@ struct collection LONG ref; IStream *pStm; /* stream from which we load collection and later instruments */ - LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ DLSHEADER *pHeader; /* pool table */ @@ -213,7 +212,7 @@ static HRESULT WINAPI collection_stream_Load(IPersistStream *iface, DMUS_PRIVATE_CHUNK chunk; DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ - ULARGE_INTEGER dlibInstrumentPosition, dlibWavePoolPosition; + ULARGE_INTEGER dlibInstrumentPosition; IStream_AddRef(stream); /* add count for later references */ This->pStm = stream; @@ -357,9 +356,6 @@ static HRESULT WINAPI collection_stream_Load(IPersistStream *iface, } case FOURCC_WVPL: { TRACE_(dmfile)(": wave pool list (mark & skip)\n"); - liMove.QuadPart = 0; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, &dlibWavePoolPosition); /* store position */ - This->liWavePoolTablePosition.QuadPart = dlibWavePoolPosition.QuadPart; liMove.QuadPart = chunk.dwSize - sizeof(FOURCC); IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); break;

1 0

Rémi Bernon : dmusic: Simplify and cleanup IDirectMusicInstrument constructor.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: d6dc41c2efca6084e3e10619acf8758a273ec86c URL: https://gitlab.winehq.org/wine/wine/-/commit/d6dc41c2efca6084e3e10619acf875… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 10:56:55 2023 +0200 dmusic: Simplify and cleanup IDirectMusicInstrument constructor. --- dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic_private.h | 3 ++- dlls/dmusic/instrument.c | 28 +++++++++++----------------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 19fc48ce555..1331efbd05d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -377,7 +377,7 @@ static HRESULT WINAPI collection_stream_Load(IPersistStream *iface, DMUS_PRIVATE_INSTRUMENTENTRY *new_instrument = calloc(1, sizeof(DMUS_PRIVATE_INSTRUMENTENTRY)); TRACE_(dmfile)(": instrument list\n"); /* Only way to create this one... even M$ does it discretely */ - DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (void**)&new_instrument->pInstrument, NULL); + instrument_create(&new_instrument->pInstrument); { IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); /* Store offset and length, they will be needed when loading the instrument */ diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 003bbbb6544..05738c1fcf1 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -97,10 +97,11 @@ extern HRESULT collection_create(IUnknown **ret_iface); /* Internal */ extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface); extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); extern HRESULT download_create(DWORD size, IDirectMusicDownload **ret_iface); +extern HRESULT instrument_create(IDirectMusicInstrument **ret_iface); + /***************************************************************************** * IDirectMusic8Impl implementation structure */ diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 767c4419225..3d4d7478be6 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -119,24 +119,18 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Vtbl = IDirectMusicInstrumentImpl_SetPatch }; -/* for ClassFactory */ -HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicInstrumentImpl* dminst; - HRESULT hr; - - dminst = calloc(1, sizeof(IDirectMusicInstrumentImpl)); - if (NULL == dminst) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; - dminst->ref = 1; - - hr = IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, - ppobj); - IDirectMusicInstrument_Release(&dminst->IDirectMusicInstrument_iface); +HRESULT instrument_create(IDirectMusicInstrument **ret_iface) +{ + IDirectMusicInstrumentImpl *dminst; - return hr; + *ret_iface = NULL; + if (!(dminst = calloc(1, sizeof(*dminst)))) return E_OUTOFMEMORY; + dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; + dminst->ref = 1; + + TRACE("Created DirectMusicInstrument %p\n", dminst); + *ret_iface = &dminst->IDirectMusicInstrument_iface; + return S_OK; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Rémi Bernon : dmusic: Rename IDirectMusicInstrumentImpl method prefix to instrument.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 9abd659efdccfa7f29bd715d4f2a44ac0d62a6b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9abd659efdccfa7f29bd715d4f2a44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 31 09:54:45 2023 +0200 dmusic: Rename IDirectMusicInstrumentImpl method prefix to instrument. --- dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic_private.h | 3 +-- dlls/dmusic/instrument.c | 28 +++++++++++++--------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 1331efbd05d..8ec8cefad95 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -115,7 +115,7 @@ static HRESULT WINAPI collection_GetInstrument(IDirectMusicCollection *iface, if (patch == inst_patch) { *instrument = inst_entry->pInstrument; IDirectMusicInstrument_AddRef(inst_entry->pInstrument); - IDirectMusicInstrumentImpl_CustomLoad(inst_entry->pInstrument, This->pStm); + instrument_load(inst_entry->pInstrument, This->pStm); TRACE(": returning instrument %p\n", *instrument); return S_OK; } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 05738c1fcf1..3c910bb4593 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -201,8 +201,7 @@ static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDire return CONTAINING_RECORD(iface, IDirectMusicInstrumentImpl, IDirectMusicInstrument_iface); } -/* custom :) */ -extern HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream); +extern HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream); /***************************************************************************** * Misc. diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 3d4d7478be6..6a394290ebd 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -25,8 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } }; -/* IDirectMusicInstrument IUnknown part: */ -static HRESULT WINAPI IDirectMusicInstrumentImpl_QueryInterface(LPDIRECTMUSICINSTRUMENT iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI instrument_QueryInterface(LPDIRECTMUSICINSTRUMENT iface, REFIID riid, LPVOID *ret_iface) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); @@ -56,7 +55,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_QueryInterface(LPDIRECTMUSICINS return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT iface) +static ULONG WINAPI instrument_AddRef(LPDIRECTMUSICINSTRUMENT iface) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -66,7 +65,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if return ref; } -static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT iface) +static ULONG WINAPI instrument_Release(LPDIRECTMUSICINSTRUMENT iface) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -87,8 +86,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i return ref; } -/* IDirectMusicInstrumentImpl IDirectMusicInstrument part: */ -static HRESULT WINAPI IDirectMusicInstrumentImpl_GetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD* pdwPatch) +static HRESULT WINAPI instrument_GetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD* pdwPatch) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); @@ -99,7 +97,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_GetPatch(LPDIRECTMUSICINSTRUMEN return S_OK; } -static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD dwPatch) +static HRESULT WINAPI instrument_SetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD dwPatch) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); @@ -110,13 +108,13 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN return S_OK; } -static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Vtbl = +static const IDirectMusicInstrumentVtbl instrument_vtbl = { - IDirectMusicInstrumentImpl_QueryInterface, - IDirectMusicInstrumentImpl_AddRef, - IDirectMusicInstrumentImpl_Release, - IDirectMusicInstrumentImpl_GetPatch, - IDirectMusicInstrumentImpl_SetPatch + instrument_QueryInterface, + instrument_AddRef, + instrument_Release, + instrument_GetPatch, + instrument_SetPatch, }; HRESULT instrument_create(IDirectMusicInstrument **ret_iface) @@ -125,7 +123,7 @@ HRESULT instrument_create(IDirectMusicInstrument **ret_iface) *ret_iface = NULL; if (!(dminst = calloc(1, sizeof(*dminst)))) return E_OUTOFMEMORY; - dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; + dminst->IDirectMusicInstrument_iface.lpVtbl = &instrument_vtbl; dminst->ref = 1; TRACE("Created DirectMusicInstrument %p\n", dminst); @@ -278,7 +276,7 @@ static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stre } /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ -HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) +HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); HRESULT hr;

1 0

Rémi Bernon : dmusic: Get rid of the IDirectMusicInstrumentImpl typedef.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 0110dc24462761ba24b6c7bd9539a1232c11480c URL: https://gitlab.winehq.org/wine/wine/-/commit/0110dc24462761ba24b6c7bd9539a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 6 09:21:24 2023 +0200 dmusic: Get rid of the IDirectMusicInstrumentImpl typedef. --- dlls/dmusic/collection.c | 4 ++-- dlls/dmusic/dmusic_private.h | 14 ++++---------- dlls/dmusic/instrument.c | 26 +++++++++++++------------- dlls/dmusic/port.c | 2 +- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 8ec8cefad95..5332adff084 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -140,7 +140,7 @@ static HRESULT WINAPI collection_EnumInstrument(IDirectMusicCollection *iface, LIST_FOR_EACH(list_entry, &This->Instruments) { inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); if (i == index) { - IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); + struct instrument *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); if (name) { length = min(lstrlenW(instrument->wszName), name_length - 1); @@ -379,7 +379,7 @@ static HRESULT WINAPI collection_stream_Load(IPersistStream *iface, /* Only way to create this one... even M$ does it discretely */ instrument_create(&new_instrument->pInstrument); { - IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); + struct instrument *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); /* Store offset and length, they will be needed when loading the instrument */ liMove.QuadPart = 0; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, &dlibInstrumentPosition); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3c910bb4593..4eae993f259 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -49,8 +49,6 @@ typedef struct IDirectMusicBufferImpl IDirectMusicBufferImpl; typedef struct IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstrumentImpl; typedef struct IReferenceClockImpl IReferenceClockImpl; -typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; - /***************************************************************************** * Some stuff to make my life easier :=) */ @@ -175,15 +173,11 @@ typedef struct _DMUS_PRIVATE_POOLCUE { struct list entry; /* for listing elements */ } DMUS_PRIVATE_POOLCUE, *LPDMUS_PRIVATE_POOLCUE; -/***************************************************************************** - * IDirectMusicInstrumentImpl implementation structure - */ -struct IDirectMusicInstrumentImpl { - /* IUnknown fields */ +struct instrument +{ IDirectMusicInstrument IDirectMusicInstrument_iface; LONG ref; - /* IDirectMusicInstrumentImpl fields */ LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ ULONG length; /* Length of the instrument in the stream */ GUID id; @@ -196,9 +190,9 @@ struct IDirectMusicInstrumentImpl { instrument_articulation *articulations; }; -static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) +static inline struct instrument *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) { - return CONTAINING_RECORD(iface, IDirectMusicInstrumentImpl, IDirectMusicInstrument_iface); + return CONTAINING_RECORD(iface, struct instrument, IDirectMusicInstrument_iface); } extern HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream); diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 6a394290ebd..5677f128060 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -57,7 +57,7 @@ static HRESULT WINAPI instrument_QueryInterface(LPDIRECTMUSICINSTRUMENT iface, R static ULONG WINAPI instrument_AddRef(LPDIRECTMUSICINSTRUMENT iface) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + struct instrument *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p): new ref = %lu\n", iface, ref); @@ -67,7 +67,7 @@ static ULONG WINAPI instrument_AddRef(LPDIRECTMUSICINSTRUMENT iface) static ULONG WINAPI instrument_Release(LPDIRECTMUSICINSTRUMENT iface) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + struct instrument *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): new ref = %lu\n", iface, ref); @@ -88,7 +88,7 @@ static ULONG WINAPI instrument_Release(LPDIRECTMUSICINSTRUMENT iface) static HRESULT WINAPI instrument_GetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD* pdwPatch) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + struct instrument *This = impl_from_IDirectMusicInstrument(iface); TRACE("(%p)->(%p)\n", This, pdwPatch); @@ -99,7 +99,7 @@ static HRESULT WINAPI instrument_GetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD* static HRESULT WINAPI instrument_SetPatch(LPDIRECTMUSICINSTRUMENT iface, DWORD dwPatch) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + struct instrument *This = impl_from_IDirectMusicInstrument(iface); TRACE("(%p, %ld): stub\n", This, dwPatch); @@ -119,15 +119,15 @@ static const IDirectMusicInstrumentVtbl instrument_vtbl = HRESULT instrument_create(IDirectMusicInstrument **ret_iface) { - IDirectMusicInstrumentImpl *dminst; + struct instrument *instrument; *ret_iface = NULL; - if (!(dminst = calloc(1, sizeof(*dminst)))) return E_OUTOFMEMORY; - dminst->IDirectMusicInstrument_iface.lpVtbl = &instrument_vtbl; - dminst->ref = 1; + if (!(instrument = calloc(1, sizeof(*instrument)))) return E_OUTOFMEMORY; + instrument->IDirectMusicInstrument_iface.lpVtbl = &instrument_vtbl; + instrument->ref = 1; - TRACE("Created DirectMusicInstrument %p\n", dminst); - *ret_iface = &dminst->IDirectMusicInstrument_iface; + TRACE("Created DirectMusicInstrument %p\n", instrument); + *ret_iface = &instrument->IDirectMusicInstrument_iface; return S_OK; } @@ -172,7 +172,7 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes) return ret; } -static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, instrument_region *region, ULONG length) +static HRESULT load_region(struct instrument *This, IStream *stream, instrument_region *region, ULONG length) { HRESULT ret; DMUS_PRIVATE_CHUNK chunk; @@ -242,7 +242,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in return S_OK; } -static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stream, ULONG length) +static HRESULT load_articulation(struct instrument *This, IStream *stream, ULONG length) { HRESULT ret; instrument_articulation *articulation; @@ -278,7 +278,7 @@ static HRESULT load_articulation(IDirectMusicInstrumentImpl *This, IStream *stre /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT instrument_load(IDirectMusicInstrument *iface, IStream *stream) { - IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); + struct instrument *This = impl_from_IDirectMusicInstrument(iface); HRESULT hr; DMUS_PRIVATE_CHUNK chunk; ULONG i = 0; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d221fcbc102..94ab970ae76 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -266,7 +266,7 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi IDirectMusicDownloadedInstrument **downloaded_instrument, DMUS_NOTERANGE *note_ranges, DWORD num_note_ranges) { struct synth_port *This = synth_from_IDirectMusicPort(iface); - IDirectMusicInstrumentImpl *instrument_object; + struct instrument *instrument_object; HRESULT ret; BOOL on_heap; HANDLE download;

1 0

Dmitry Timoshkov : gdiplus/tests: Fix compilation with PSDK compiler.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 01aff6c9a01e7400d62ff2045b02c740d3d62947 URL: https://gitlab.winehq.org/wine/wine/-/commit/01aff6c9a01e7400d62ff2045b02c7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 6 15:13:32 2023 +0300 gdiplus/tests: Fix compilation with PSDK compiler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6f497e416b0..34a38cd980f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5733,7 +5733,7 @@ static void test_png_color_formats(void) GpImage *image; ImageType type; PixelFormat format; - ImageFlags flags; + UINT flags; BOOL valid; int i, j, PLTE_off = 0, tRNS_off = 0; const ImageFlags color_space_mask = ImageFlagsColorSpaceRGB | ImageFlagsColorSpaceCMYK | ImageFlagsColorSpaceGRAY | ImageFlagsColorSpaceYCBCR | ImageFlagsColorSpaceYCCK; @@ -5925,7 +5925,7 @@ static void test_png_unit_properties(void) ULONG unitY; } td[] = { - {}, + {0, 0, 0}, {1, 0, 0}, {0, 1000, 1000}, {1, 1000, 1000},

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for calling GdipImageSelectActiveFrame() with invalid frame on a memory bitmap.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 408972cb4d960225798f3c18e5d1f7be03eff40d URL: https://gitlab.winehq.org/wine/wine/-/commit/408972cb4d960225798f3c18e5d1f7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 6 15:19:07 2023 +0300 gdiplus/tests: Add a test for calling GdipImageSelectActiveFrame() with invalid frame on a memory bitmap. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/tests/image.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 34a38cd980f..724c4a16349 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -470,6 +470,9 @@ static void test_GdipImageGetFrameDimensionsCount(void) expect(Ok, stat); expect(0xffffffff, color); + stat = GdipImageSelectActiveFrame((GpImage*)bm, &dimension, 1); + todo_wine expect(Ok, stat); + GdipDisposeImage((GpImage*)bm); }

1 0

Dmitry Timoshkov : gdiplus: In GdipImageSelectActiveFrame rely on codec->select_func() to fail.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: e7b4e883d192d4b1a82f51a6d8f819f45b6c2609 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7b4e883d192d4b1a82f51a6d8f819… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 23 19:51:17 2023 +0300 gdiplus: In GdipImageSelectActiveFrame rely on codec->select_func() to fail. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/image.c | 5 +---- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9b66edbd22b..c6aa2ce5dd5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4553,11 +4553,8 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return ObjectBusy; if (frame >= image->frame_count) - { WARN("requested frame %u, but image has only %u\n", frame, image->frame_count); - image_unlock(image); - return InvalidParameter; - } + /* rely on codec->select_func() to fail */ if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 724c4a16349..cd409a0bad4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -471,7 +471,7 @@ static void test_GdipImageGetFrameDimensionsCount(void) expect(0xffffffff, color); stat = GdipImageSelectActiveFrame((GpImage*)bm, &dimension, 1); - todo_wine expect(Ok, stat); + expect(Ok, stat); GdipDisposeImage((GpImage*)bm); }

1 0