November 2019 - Wine-commits

Zebediah Figura : winegstreamer/gsttffilter: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 1b3d163208096993ec7e6603d4107bf1ee2ac13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b3d163208096993ec7e6603… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:32 2019 -0600 winegstreamer/gsttffilter: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 8619cc6b3f..baa4c0c2c5 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -205,7 +205,7 @@ GstFlowReturn got_data(GstPad *pad, GstObject *parent, GstBuffer *buf) IMediaSample_SetSyncPoint(sample, !GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT)); IMediaSample_SetActualDataLength(sample, gst_buffer_get_size(buf)); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, sample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, sample); IMediaSample_Release(sample); gst_buffer_unref(buf); if (FAILED(hr))

1 0

Zebediah Figura : wineqtdecoder/qtvdecoder: Call IMemInputPin::Receive() directly.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: b41b19ff7bda5d309ce5102fc6994c5d35c84f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41b19ff7bda5d309ce5102f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:33 2019 -0600 wineqtdecoder/qtvdecoder: Call IMemInputPin::Receive() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 8108133f97..379150d9a0 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -236,7 +236,7 @@ static void trackingCallback( } LeaveCriticalSection(&This->tf.csReceive); - hr = BaseOutputPinImpl_Deliver(&This->tf.source, pOutSample); + hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Zebediah Figura : wineqtdecoder/qtvdecoder: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: d45456cecba12fd9c468bf0e60934ca2cbd6e688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45456cecba12fd9c468bf0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 25 19:24:34 2019 -0600 wineqtdecoder/qtvdecoder: Don't drop the "csReceive" mutex while calling IMemInputPin::Receive(). There's no reason to do this, and there may never have been. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 379150d9a0..3da0738aec 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -235,9 +235,7 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } - LeaveCriticalSection(&This->tf.csReceive); hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); - EnterCriticalSection(&This->tf.csReceive); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr);

1 0

Chip Davis : ntoskrnl.exe: Add tests for METHOD_NEITHER ioctl behavior.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: a224824782473c077d24d867a72eec838782db7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a224824782473c077d24d867… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Nov 25 09:43:05 2019 -0600 ntoskrnl.exe: Add tests for METHOD_NEITHER ioctl behavior. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 13 +++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a0f63ade79..6827b74a3c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1855,6 +1855,34 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG return ZwUnloadDriver(&name); } +static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->UserBuffer; + + if (!buffer) + { + irp->IoStatus.Status = STATUS_ACCESS_VIOLATION; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_ACCESS_VIOLATION; + } + + if (length < sizeof(teststr)) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + memcpy(buffer, teststr, sizeof(teststr)); + + /* This is deliberate; some broken drivers do this */ + *info = 0; + irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -1916,6 +1944,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) IoDetachDevice(lower_device); status = STATUS_SUCCESS; break; + case IOCTL_WINETEST_MISMATCHED_STATUS: + return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 313d554a37..aa9de674e2 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -33,6 +33,7 @@ #define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 76bcf0d0ce..2535ed903e 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -208,6 +208,18 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } +static void test_mismatched_status_ioctl(void) +{ + DWORD written; + char buf[32]; + BOOL res; + + res = DeviceIoControl(device, IOCTL_WINETEST_MISMATCHED_STATUS, NULL, 0, buf, + sizeof(buf), &written, NULL); + todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + todo_wine ok(!strcmp(buf, teststr), "got '%s'\n", buf); +} + static void test_overlapped(void) { OVERLAPPED overlapped, overlapped2, *o; @@ -514,6 +526,7 @@ START_TEST(ntoskrnl) ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); + test_mismatched_status_ioctl(); main_test(); test_overlapped(); test_load_driver(service2);

1 0

Michael Stefaniuc : dmstyle: Avoid capitalized field names in IDirectMusicStyle8Impl.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 979e3069f25490496bd97bdf03a4547a5a2d4093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979e3069f25490496bd97bdf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:38 2019 +0100 dmstyle: Avoid capitalized field names in IDirectMusicStyle8Impl. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 4e84a3edc3..0884733894 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -32,8 +32,8 @@ typedef struct IDirectMusicStyle8Impl { struct dmobject dmobj; LONG ref; DMUS_IO_STYLE style; - struct list Motifs; - struct list Bands; + struct list motifs; + struct list bands; } IDirectMusicStyle8Impl; static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicStyle8 *iface) @@ -539,7 +539,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU ERR(": no more memory\n"); return E_OUTOFMEMORY; } - list_add_tail (&This->Motifs, &pNewMotif->entry); + list_add_tail(&This->motifs, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */ @@ -739,7 +739,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK } pNewBand->pBand = pBand; IDirectMusicBand_AddRef(pBand); - list_add_tail (&This->Bands, &pNewBand->entry); + list_add_tail(&This->bands, &pNewBand->entry); IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ @@ -893,8 +893,8 @@ HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) dmobject_init(&obj->dmobj, &CLSID_DirectMusicStyle, (IUnknown *)&obj->IDirectMusicStyle8_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init (&obj->Bands); - list_init (&obj->Motifs); + list_init(&obj->bands); + list_init(&obj->motifs); DMSTYLE_LockModule(); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj);

1 0

Michael Stefaniuc : dmstyle: Move 3 structs where they are used and get rid of typedefs.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: b9a50481089bf72003f9281ad93caa8d88e43030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a50481089bf72003f9281a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:39 2019 +0100 dmstyle: Move 3 structs where they are used and get rid of typedefs. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmstyle_private.h | 23 ----------------------- dlls/dmstyle/style.c | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 7d18e9c4ba..2956dad151 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -55,29 +55,6 @@ extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPE /***************************************************************************** * Auxiliary definitions */ -typedef struct _DMUS_PRIVATE_STYLE_BAND { - struct list entry; /* for listing elements */ - IDirectMusicBand* pBand; -} DMUS_PRIVATE_STYLE_BAND, *LPDMUS_PRIVATE_STYLE_BAND; - -typedef struct _DMUS_PRIVATE_STYLE_PARTREF_ITEM { - struct list entry; /* for listing elements */ - DMUS_OBJECTDESC desc; - DMUS_IO_PARTREF part_ref; -} DMUS_PRIVATE_STYLE_PARTREF_ITEM, *LPDMUS_PRIVATE_STYLE_PARTREF_ITEM; - -typedef struct _DMUS_PRIVATE_STYLE_MOTIF { - struct list entry; /* for listing elements */ - DWORD dwRhythm; - DMUS_IO_PATTERN pattern; - DMUS_OBJECTDESC desc; - /** optional for motifs */ - DMUS_IO_MOTIFSETTINGS settings; - IDirectMusicBand* pBand; - - struct list Items; -} DMUS_PRIVATE_STYLE_MOTIF, *LPDMUS_PRIVATE_STYLE_MOTIF; - typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct list entry; /* for listing elements */ DWORD dwTimeStamp; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 0884733894..7c835afe27 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -20,10 +20,33 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +struct style_band { + struct list entry; + IDirectMusicBand *pBand; +}; + +struct style_partref_item { + struct list entry; + DMUS_OBJECTDESC desc; + DMUS_IO_PARTREF part_ref; +}; + +struct style_motif { + struct list entry; + DWORD dwRhythm; + DMUS_IO_PATTERN pattern; + DMUS_OBJECTDESC desc; + /** optional for motifs */ + DMUS_IO_MOTIFSETTINGS settings; + IDirectMusicBand *pBand; + struct list Items; +}; + /***************************************************************************** * IDirectMusicStyleImpl implementation */ @@ -283,14 +306,13 @@ static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) } static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, - DMUS_PRIVATE_STYLE_MOTIF *pNewMotif) + struct style_motif *pNewMotif) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - - LPDMUS_PRIVATE_STYLE_PARTREF_ITEM pNewItem = NULL; + struct style_partref_item *pNewItem = NULL; if (pChunk->fccID != DMUS_FOURCC_PARTREF_LIST) { @@ -308,7 +330,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, switch (Chunk.fccID) { case DMUS_FOURCC_PARTREF_CHUNK: { TRACE_(dmfile)(": PartRef chunk\n"); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_PARTREF_ITEM)); + pNewItem = heap_alloc_zero(sizeof(*pNewItem)); if (!pNewItem) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -514,9 +536,8 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - IDirectMusicBand* pBand = NULL; - LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif = NULL; + struct style_motif *pNewMotif = NULL; if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); @@ -534,7 +555,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU case DMUS_FOURCC_PATTERN_CHUNK: { TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ - pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); + pNewMotif = heap_alloc_zero(sizeof(*pNewMotif)); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; @@ -715,7 +736,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { LPSTREAM pClonedStream = NULL; - LPDMUS_PRIVATE_STYLE_BAND pNewBand; + struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); @@ -731,8 +752,8 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK return hr; } IStream_Release (pClonedStream); - - pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_BAND)); + + pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { ERR(": no more memory\n"); return E_OUTOFMEMORY;

1 0

Michael Stefaniuc : dmstyle: Free lists when IDirectMusicStyleImpl is destroyed.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: e4e3c0b41727b42712960753c652e9cc780e05aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e3c0b41727b42712960753… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:40 2019 +0100 dmstyle: Free lists when IDirectMusicStyleImpl is destroyed. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 7c835afe27..b3bce9bba2 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -108,7 +108,25 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct style_band *band, *band2; + struct style_motif *motif, *motif2; + struct style_partref_item *item, *item2; + + LIST_FOR_EACH_ENTRY_SAFE(band, band2, &This->bands, struct style_band, entry) { + list_remove(&band->entry); + if (band->pBand) + IDirectMusicBand_Release(band->pBand); + heap_free(band); + } + LIST_FOR_EACH_ENTRY_SAFE(motif, motif2, &This->motifs, struct style_motif, entry) { + list_remove(&motif->entry); + LIST_FOR_EACH_ENTRY_SAFE(item, item2, &motif->Items, struct style_partref_item, entry) { + list_remove(&item->entry); + heap_free(item); + } + heap_free(motif); + } + heap_free(This); DMSTYLE_UnlockModule(); }

1 0

Michael Stefaniuc : dmstyle: Implement IDirectMusicStyle8_EnumMotif().
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: ce275f38a02dd5f809eea45ff3fa02f645b56a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce275f38a02dd5f809eea45f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 26 21:14:41 2019 +0100 dmstyle: Implement IDirectMusicStyle8_EnumMotif(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3bce9bba2..5ebe6589d4 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -158,12 +158,37 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, - WCHAR *pwszName) +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, + WCHAR *name) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + const struct style_motif *motif = NULL; + const struct list *cursor; + unsigned int i = 0; + + TRACE("(%p, %u, %p)\n", This, index, name); + + if (!name) + return E_POINTER; + + /* index is zero based */ + LIST_FOR_EACH(cursor, &This->motifs) { + if (i == index) { + motif = LIST_ENTRY(cursor, struct style_motif, entry); + break; + } + i++; + } + if (!motif) + return S_FALSE; + + if (motif->desc.dwValidData & DMUS_OBJ_NAME) + lstrcpynW(name, motif->desc.wszName, DMUS_MAX_NAME); + else + name[0] = 0; + + TRACE("returning name: %s\n", debugstr_w(name)); + return S_OK; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName,

1 0

Nikolay Sivov : user32/combo: Simplify rectangles sizing helper.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: b563ea018b196e4e7019beadaf5dfae4afed22a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b563ea018b196e4e7019bead… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 12:59:20 2019 +0300 user32/combo: Simplify rectangles sizing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 163 ++++++++++++++++++---------------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4ddccd6c95..07d53f7341 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -319,111 +319,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); - - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -479,7 +438,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1530,11 +1489,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); } @@ -1562,11 +1517,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1595,11 +1546,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2100,7 +2047,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH:

1 0

Nikolay Sivov : user32/combo: Simplify child controls position update helper.
by Alexandre Julliard 26 Nov '19

26 Nov '19

Module: wine Branch: master Commit: 13d7cad9dee194d750ec3829b167042cd3ff8d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d7cad9dee194d750ec3829… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 12:59:21 2019 +0300 user32/combo: Simplify child controls position update helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 67 +++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 07d53f7341..d0affc0618 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1408,45 +1408,36 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) * This function sets window positions according to the updated * component placement struct. */ -static void CBResetPos( - LPHEADCOMBO lphc, - const RECT *rectEdit, - const RECT *rectLB, - BOOL bRedraw) +static void CBResetPos(HEADCOMBO *combo, BOOL redraw) { - BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE); - - /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of - * sizing messages */ - - if( lphc->wState & CBF_EDIT ) - SetWindowPos( lphc->hWndEdit, 0, - rectEdit->left, rectEdit->top, - rectEdit->right - rectEdit->left, - rectEdit->bottom - rectEdit->top, - SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) ); - - SetWindowPos( lphc->hWndLBox, 0, - rectLB->left, rectLB->top, - rectLB->right - rectLB->left, - rectLB->bottom - rectLB->top, - SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) ); - - if( bDrop ) - { - if( lphc->wState & CBF_DROPPED ) - { - lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); - } + BOOL drop = CB_GETTYPE(combo) != CBS_SIMPLE; + + /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of + * sizing messages */ + if (combo->wState & CBF_EDIT) + SetWindowPos(combo->hWndEdit, 0, combo->textRect.left, combo->textRect.top, + combo->textRect.right - combo->textRect.left, + combo->textRect.bottom - combo->textRect.top, + SWP_NOZORDER | SWP_NOACTIVATE | (drop ? SWP_NOREDRAW : 0)); + + SetWindowPos(combo->hWndLBox, 0, combo->droppedRect.left, combo->droppedRect.top, + combo->droppedRect.right - combo->droppedRect.left, + combo->droppedRect.bottom - combo->droppedRect.top, + SWP_NOACTIVATE | SWP_NOZORDER | (drop ? SWP_NOREDRAW : 0)); + + if (drop) + { + if (combo->wState & CBF_DROPPED) + { + combo->wState &= ~CBF_DROPPED; + ShowWindow(combo->hWndLBox, SW_HIDE); + } - if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); - } + if (redraw && !(combo->wState & CBF_NOREDRAW)) + RedrawWindow(combo->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW); + } } - /*********************************************************************** * COMBO_Size */ @@ -1491,7 +1482,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); + CBResetPos(lphc, FALSE); } @@ -1519,7 +1510,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc, TRUE); } else { @@ -1548,7 +1539,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc, TRUE); } else {

1 0