wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Bartosz Kosiorek : gdiplus/tests: Add default tension tests for GdipAddPath*Curve.
by Alexandre Julliard 30 Oct '23

30 Oct '23

Module: wine Branch: master Commit: 375f7bfa964a3504bde6052eef33fd1db258b848 URL: https://gitlab.winehq.org/wine/wine/-/commit/375f7bfa964a3504bde6052eef33fd… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Oct 27 18:11:16 2023 +0200 gdiplus/tests: Add default tension tests for GdipAddPath*Curve. --- dlls/gdiplus/tests/graphicspath.c | 43 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 03122cdda5d..5e37d0a2f18 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,7 +75,7 @@ typedef struct int todo; } path_test_t; -#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,2.0,__LINE__) +#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,1.0,__LINE__) #define ok_path_fudge(a,b,c,d,e) _ok_path_fudge(a,b,c,d,e,__LINE__) static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge, int line) @@ -919,6 +919,18 @@ static path_test_t addcurve_path[] = { {23.3, 13.3, PathPointTypeBezier, 0, 0}, /*8*/ {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ }; +static path_test_t addcurve_path_default_tension[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {1.66, 1.66, PathPointTypeBezier, 0, 1}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ + {26.6, 11.6, PathPointTypeBezier, 0, 1}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0} /*9*/ + }; static path_test_t addcurve_path2[] = { {100.0,120.0,PathPointTypeStart, 0, 0}, /*0*/ {123.0,10.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -975,6 +987,13 @@ static void test_addcurve(void) ok_path(path, addcurve_path, ARRAY_SIZE(addcurve_path), FALSE); GdipDeletePath(path); + /* add to empty path with default tension */ + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathCurve(path, points, 4); + expect(Ok, status); + ok_path(path, addcurve_path_default_tension, ARRAY_SIZE(addcurve_path_default_tension), FALSE); + GdipDeletePath(path); + /* add to notempty path and opened figure */ GdipCreatePath(FillModeAlternate, &path); GdipAddPathLine(path, 100.0, 120.0, 123.0, 10.0); @@ -1030,6 +1049,21 @@ static path_test_t addclosedcurve_path[] = { {6.7, 0.0, PathPointTypeBezier, 0, 0}, /*11*/ {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ }; +static path_test_t addclosedcurve_path_default_tension[] = { + {0.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {-3.33, 0.0, PathPointTypeBezier, 0, 1}, /*1*/ + {8.33, 6.66, PathPointTypeBezier, 0, 1}, /*2*/ + {10.0, 10.0, PathPointTypeBezier, 0, 0}, /*3*/ + {11.6, 13.3, PathPointTypeBezier, 0, 1}, /*4*/ + {6.66, 20.0, PathPointTypeBezier, 0, 1}, /*5*/ + {10.0, 20.0, PathPointTypeBezier, 0, 0}, /*6*/ + {13.3, 20.0, PathPointTypeBezier, 0, 1}, /*7*/ + {31.6, 13.3, PathPointTypeBezier, 0, 1}, /*8*/ + {30.0, 10.0, PathPointTypeBezier, 0, 0}, /*9*/ + {28.3, 6.66, PathPointTypeBezier, 0, 1}, /*10*/ + {3.33, 0.0, PathPointTypeBezier, 0, 1}, /*11*/ + {0.0, 0.0, PathPointTypeBezier | PathPointTypeCloseSubpath, 0, 0} /*12*/ + }; static void test_addclosedcurve(void) { GpStatus status; @@ -1062,6 +1096,13 @@ static void test_addclosedcurve(void) expect(Ok, status); ok_path(path, addclosedcurve_path, ARRAY_SIZE(addclosedcurve_path), FALSE); GdipDeletePath(path); + + /* add to empty path with default tension */ + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathClosedCurve(path, points, 4); + expect(Ok, status); + ok_path(path, addclosedcurve_path_default_tension, ARRAY_SIZE(addclosedcurve_path_default_tension), FALSE); + GdipDeletePath(path); } static path_test_t reverse_path[] = {

1 0

Tag wine-8.19 : Alexandre Julliard : Release 8.19
by Alexandre Julliard 29 Oct '23

29 Oct '23

Module: wine Branch: refs/tags/wine-8.19 Tag: 455ce14a389a9672843ce237d3f7be13016a17e6 URL: https://gitlab.winehq.org/wine/wine/-/tags/455ce14a389a9672843ce237d3f7be13… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 29 14:44:03 2023 +0100 Release 8.19

1 0

Alexandre Julliard : Release 8.19.
by Alexandre Julliard 29 Oct '23

29 Oct '23

Module: wine Branch: master Commit: 8b5a60d2d73252e3796cc86fa14d4e549421a104 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5a60d2d73252e3796cc86fa14d4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 29 14:44:03 2023 +0100 Release 8.19. --- ANNOUNCE | 710 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 346 insertions(+), 384 deletions(-)

1 0

Rémi Bernon : dmstyle: Rewrite style pttn list parsing.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: d1d13e50ec505e2cf4e40b9293853975bf3945e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d13e50ec505e2cf4e40b92938539… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 22:50:48 2023 +0200 dmstyle: Rewrite style pttn list parsing. --- dlls/dmstyle/style.c | 248 ++++++++++++++++++--------------------------------- 1 file changed, 87 insertions(+), 161 deletions(-)

1 0

Rémi Bernon : dmstyle: Rename style_motif to style_pattern.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: e89cef0ea67ab9d818cd5a4b9014b44065de7821 URL: https://gitlab.winehq.org/wine/wine/-/commit/e89cef0ea67ab9d818cd5a4b9014b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 27 08:55:21 2023 +0200 dmstyle: Rename style_motif to style_pattern. Doc says "A motif is a special kind of pattern in a style". --- dlls/dmstyle/style.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 9080d73f943..d3477fbf12e 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -62,7 +62,8 @@ static void style_part_destroy(struct style_part *part) free(part); } -struct style_motif { +struct style_pattern +{ struct list entry; DWORD dwRhythm; DMUS_IO_PATTERN pattern; @@ -79,7 +80,7 @@ struct style struct dmobject dmobj; LONG ref; DMUS_IO_STYLE style; - struct list motifs; + struct list patterns; struct list bands; struct list parts; }; @@ -133,7 +134,7 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) if (!ref) { struct style_band *band, *band2; - struct style_motif *motif, *motif2; + struct style_pattern *pattern; struct style_part_ref *part_ref; struct style_part *part; void *next; @@ -144,14 +145,15 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) IDirectMusicBand_Release(band->pBand); free(band); } - LIST_FOR_EACH_ENTRY_SAFE(motif, motif2, &This->motifs, struct style_motif, entry) { - list_remove(&motif->entry); - LIST_FOR_EACH_ENTRY_SAFE(part_ref, next, &motif->part_refs, struct style_part_ref, entry) + LIST_FOR_EACH_ENTRY_SAFE(pattern, next, &This->patterns, struct style_pattern, entry) + { + list_remove(&pattern->entry); + LIST_FOR_EACH_ENTRY_SAFE(part_ref, next, &pattern->part_refs, struct style_part_ref, entry) { list_remove(&part_ref->entry); free(part_ref); } - free(motif); + free(pattern); } LIST_FOR_EACH_ENTRY_SAFE(part, next, &This->parts, struct style_part, entry) @@ -227,7 +229,7 @@ static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, WCHAR *name) { struct style *This = impl_from_IDirectMusicStyle8(iface); - const struct style_motif *motif = NULL; + const struct style_pattern *pattern = NULL; const struct list *cursor; unsigned int i = 0; @@ -237,18 +239,19 @@ static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, return E_POINTER; /* index is zero based */ - LIST_FOR_EACH(cursor, &This->motifs) { + LIST_FOR_EACH(cursor, &This->patterns) + { if (i == index) { - motif = LIST_ENTRY(cursor, struct style_motif, entry); + pattern = LIST_ENTRY(cursor, struct style_pattern, entry); break; } i++; } - if (!motif) + if (!pattern) return S_FALSE; - if (motif->desc.dwValidData & DMUS_OBJ_NAME) - lstrcpynW(name, motif->desc.wszName, DMUS_MAX_NAME); + if (pattern->desc.dwValidData & DMUS_OBJ_NAME) + lstrcpynW(name, pattern->desc.wszName, DMUS_MAX_NAME); else name[0] = 0; @@ -524,7 +527,7 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ IDirectMusicBand* pBand = NULL; - struct style_motif *pNewMotif = NULL; + struct style_pattern *pNewMotif = NULL; if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); @@ -543,7 +546,7 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ if (!(pNewMotif = calloc(1, sizeof(*pNewMotif)))) return E_OUTOFMEMORY; - list_add_tail(&This->motifs, &pNewMotif->entry); + list_add_tail(&This->patterns, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */ @@ -896,7 +899,7 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init(&obj->parts); list_init(&obj->bands); - list_init(&obj->motifs); + list_init(&obj->patterns); hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj); IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface);

1 0

Rémi Bernon : dmstyle: Rewrite style pref chunk parsing.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: ce8ec96a5f53ce21175f3326d47b631a842f17b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce8ec96a5f53ce21175f3326d47b63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:32:18 2023 +0200 dmstyle: Rewrite style pref chunk parsing. --- dlls/dmstyle/style.c | 135 ++++++++++++++++++--------------------------------- 1 file changed, 47 insertions(+), 88 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index f277499cbc5..9080d73f943 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -28,10 +28,11 @@ struct style_band { IDirectMusicBand *pBand; }; -struct style_partref_item { +struct style_part_ref +{ struct list entry; DMUS_OBJECTDESC desc; - DMUS_IO_PARTREF part_ref; + DMUS_IO_PARTREF header; }; struct style_part @@ -69,7 +70,7 @@ struct style_motif { /** optional for motifs */ DMUS_IO_MOTIFSETTINGS settings; IDirectMusicBand *pBand; - struct list Items; + struct list part_refs; }; struct style @@ -133,7 +134,7 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) if (!ref) { struct style_band *band, *band2; struct style_motif *motif, *motif2; - struct style_partref_item *item, *item2; + struct style_part_ref *part_ref; struct style_part *part; void *next; @@ -145,9 +146,10 @@ static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) } 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); - free(item); + LIST_FOR_EACH_ENTRY_SAFE(part_ref, next, &motif->part_refs, struct style_part_ref, entry) + { + list_remove(&part_ref->entry); + free(part_ref); } free(motif); } @@ -409,92 +411,45 @@ static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand) return S_OK; } -static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, - struct style_motif *pNewMotif) +static HRESULT parse_pref_list(struct style *This, IStream *stream, struct chunk_entry *parent, + struct list *list) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - struct style_partref_item *pNewItem = NULL; + struct chunk_entry chunk = {.parent = parent}; + struct style_part_ref *part_ref; + DMUS_OBJECTDESC desc; + HRESULT hr; + if (FAILED(hr = dmobj_parsedescriptor(stream, parent, &desc, DMUS_OBJ_NAME)) + || FAILED(hr = stream_reset_chunk_data(stream, parent))) + return hr; - if (pChunk->fccID != DMUS_FOURCC_PARTREF_LIST) { - ERR_(dmfile)(": %s chunk should be a PARTREF list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } + if (!(part_ref = calloc(1, sizeof(*part_ref)))) return E_OUTOFMEMORY; + part_ref->desc = desc; - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case DMUS_FOURCC_PARTREF_CHUNK: + hr = stream_chunk_get_data(stream, &chunk, &part_ref->header, sizeof(part_ref->header)); + break; - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_PARTREF_CHUNK: { - TRACE_(dmfile)(": PartRef chunk\n"); - if (!(pNewItem = calloc(1, sizeof(*pNewItem)))) return E_OUTOFMEMORY; - hr = IStream_Read (pStm, &pNewItem->part_ref, sizeof(DMUS_IO_PARTREF), NULL); - /*TRACE_(dmfile)(" - sizeof %lu\n", sizeof(DMUS_IO_PARTREF));*/ - list_add_tail (&pNewMotif->Items, &pNewItem->entry); - pNewItem->desc.dwSize = sizeof(pNewItem->desc); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - if (!pNewItem) { - ERR(": pNewItem not yet allocated, chunk order bad?\n"); - return E_OUTOFMEMORY; - } - hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &pNewItem->desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - } - TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]); - } while (ListCount[1] < ListSize[1]); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } + case MAKE_IDTYPE(FOURCC_LIST, DMUS_FOURCC_UNFO_LIST): + /* already parsed by dmobj_parsedescriptor */ + break; + + default: + FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + break; + } + + if (FAILED(hr)) break; } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - return S_OK; + if (FAILED(hr)) free(part_ref); + else list_add_tail(list, &part_ref->entry); + + return S_OK; } static HRESULT parse_part_list(struct style *This, IStream *stream, struct chunk_entry *parent) @@ -595,7 +550,7 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk /** reset all data, as a new pattern begin */ pNewMotif->desc.dwSize = sizeof(pNewMotif->desc); - list_init (&pNewMotif->Items); + list_init (&pNewMotif->part_refs); break; } case DMUS_FOURCC_RHYTHM_CHUNK: { @@ -691,8 +646,12 @@ static HRESULT parse_pattern_list(struct style *This, DMUS_PRIVATE_CHUNK *pChunk break; } case DMUS_FOURCC_PARTREF_LIST: { + static const LARGE_INTEGER zero = {0}; + struct chunk_entry chunk = {FOURCC_LIST, .size = Chunk.dwSize, .type = Chunk.fccID}; TRACE_(dmfile)(": PartRef list\n"); - hr = parse_part_ref_list(&Chunk, pStm, pNewMotif); + IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &chunk.offset); + chunk.offset.QuadPart -= 12; + hr = parse_pref_list(This, pStm, &chunk, &pNewMotif->part_refs); if (FAILED(hr)) return hr; break; }

1 0

Rémi Bernon : dmstyle: Rewrite style part list parsing.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 8e596f4ddba3d19d6eea645e59d54101f93aa2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/8e596f4ddba3d19d6eea645e59d541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:35:32 2023 +0200 dmstyle: Rewrite style part list parsing. --- dlls/dmstyle/style.c | 223 +++++++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 124 deletions(-)

1 0

Rémi Bernon : dmstyle: Get rid of the IDirectMusicStyle8Impl typedef.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 7996bc2c0b7f6a853d2ab0f16cbeb411ab35b994 URL: https://gitlab.winehq.org/wine/wine/-/commit/7996bc2c0b7f6a853d2ab0f16cbeb4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:25:45 2023 +0200 dmstyle: Get rid of the IDirectMusicStyle8Impl typedef. --- dlls/dmstyle/style.c | 121 ++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 63 deletions(-)

1 0

Rémi Bernon : dmstyle: Rename IDirectMusicStyle8Impl method prefix to style.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 717c278b6be46531549f533ef6353192cb01bd12 URL: https://gitlab.winehq.org/wine/wine/-/commit/717c278b6be46531549f533ef63531… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:25:18 2023 +0200 dmstyle: Rename IDirectMusicStyle8Impl method prefix to style. --- dlls/dmstyle/style.c | 65 ++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 6d4cf2e3b07..bac5a2ba839 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -63,8 +63,7 @@ static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); } -/* DirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, +static HRESULT WINAPI style_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, void **ret_iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -89,7 +88,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 * return S_OK; } -static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) +static ULONG WINAPI style_AddRef(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -99,7 +98,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) return ref; } -static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) +static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -131,8 +130,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) return ref; } -/* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *name, +static HRESULT WINAPI style_GetBand(IDirectMusicStyle8 *iface, WCHAR *name, IDirectMusicBand **band) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -167,7 +165,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -175,7 +173,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetDefaultBand(IDirectMusicStyle8 *iface, IDirectMusicBand **band) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -189,7 +187,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, +static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, WCHAR *name) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -222,7 +220,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, +static HRESULT WINAPI style_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -230,7 +228,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetDefaultChordMap(IDirectMusicStyle8 *iface, IDirectMusicChordMap **ppChordMap) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -238,7 +236,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyl return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -246,7 +244,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, +static HRESULT WINAPI style_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicChordMap **ppChordMap) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -254,7 +252,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *ifa return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetTimeSignature(IDirectMusicStyle8 *iface, DMUS_TIMESIGNATURE *pTimeSig) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -262,7 +260,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetEmbellishmentLength(IDirectMusicStyle8 *iface, DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -270,14 +268,14 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusic return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) +static HRESULT WINAPI style_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, DWORD dwPatternType, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -286,24 +284,23 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *ifa } static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { - IDirectMusicStyle8Impl_QueryInterface, - IDirectMusicStyle8Impl_AddRef, - IDirectMusicStyle8Impl_Release, - IDirectMusicStyle8Impl_GetBand, - IDirectMusicStyle8Impl_EnumBand, - IDirectMusicStyle8Impl_GetDefaultBand, - IDirectMusicStyle8Impl_EnumMotif, - IDirectMusicStyle8Impl_GetMotif, - IDirectMusicStyle8Impl_GetDefaultChordMap, - IDirectMusicStyle8Impl_EnumChordMap, - IDirectMusicStyle8Impl_GetChordMap, - IDirectMusicStyle8Impl_GetTimeSignature, - IDirectMusicStyle8Impl_GetEmbellishmentLength, - IDirectMusicStyle8Impl_GetTempo, - IDirectMusicStyle8Impl_EnumPattern + style_QueryInterface, + style_AddRef, + style_Release, + style_GetBand, + style_EnumBand, + style_GetDefaultBand, + style_EnumMotif, + style_GetMotif, + style_GetDefaultChordMap, + style_EnumChordMap, + style_GetChordMap, + style_GetTimeSignature, + style_GetEmbellishmentLength, + style_GetTempo, + style_EnumPattern }; -/* IDirectMusicStyle8Impl IDirectMusicObject part: */ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { @@ -344,7 +341,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { style_IDirectMusicObject_ParseDescriptor }; -/* IDirectMusicStyle8Impl IPersistStream part: */ static inline IDirectMusicStyle8Impl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, dmobj.IPersistStream_iface); @@ -958,7 +954,6 @@ static const IPersistStreamVtbl persiststream_vtbl = { unimpl_IPersistStream_GetSizeMax }; -/* for ClassFactory */ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj;

1 0

Rémi Bernon : dmime: Use an internal performance message for segment end.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 377ba8a7d17ff75a29c6d0f9cae73ed6a6ad01b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/377ba8a7d17ff75a29c6d0f9cae73e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 09:34:12 2023 +0200 dmime: Use an internal performance message for segment end. --- dlls/dmime/dmime_private.h | 2 ++ dlls/dmime/performance.c | 50 +++++++++++++++++++++++++++++++--------------- dlls/dmime/segmentstate.c | 5 ++++- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 860b4ef385c..28836694ed9 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -81,6 +81,8 @@ extern HRESULT wave_track_create_from_chunk(IStream *stream, struct chunk_entry IDirectMusicTrack8 **ret_iface); extern HRESULT performance_get_dsound(IDirectMusicPerformance8 *iface, IDirectSound **dsound); +extern HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, + IDirectMusicSegmentState *state); /***************************************************************************** * Auxiliary definitions diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8459de00b3f..942452d353e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); +enum dmus_internal_message_type +{ + DMUS_PMSGT_INTERNAL_FIRST = 0x10, + DMUS_PMSGT_INTERNAL_SEGMENT_END = DMUS_PMSGT_INTERNAL_FIRST, +}; + struct pchannel_block { DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ struct { @@ -158,7 +164,8 @@ static DWORD WINAPI message_thread_proc(void *args) return 0; } -static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME music_time) +static HRESULT performance_send_pmsg(struct performance *This, MUSIC_TIME music_time, DWORD flags, + DWORD type, IUnknown *object) { IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; IDirectMusicGraph *graph = &This->IDirectMusicGraph_iface; @@ -169,10 +176,11 @@ static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME return hr; msg->mtTime = music_time; - msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; - msg->dwType = DMUS_PMSGT_DIRTY; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | flags; + msg->dwType = type; + if ((msg->punkUser = object)) IUnknown_AddRef(object); - if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, msg)) + if ((type < DMUS_PMSGT_INTERNAL_FIRST && FAILED(hr = IDirectMusicGraph_StampPMsg(graph, msg))) || FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg))) IDirectMusicPerformance8_FreePMsg(performance, msg); @@ -252,6 +260,19 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface); } +HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, + IDirectMusicSegmentState *state) +{ + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr; + + if (FAILED(hr = performance_send_pmsg(This, music_time, DMUS_PMSGF_TOOL_ATTIME, + DMUS_PMSGT_INTERNAL_SEGMENT_END, (IUnknown *)state))) + return hr; + + return S_OK; +} + /* IDirectMusicPerformance8 IUnknown part: */ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { @@ -1050,8 +1071,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) list_remove(&message->entry); list_init(&message->entry); - /* process notifications to end any pending segment states */ - if (message->msg.dwType == DMUS_PMSGT_NOTIFICATION) + if (message->msg.dwType == DMUS_PMSGT_INTERNAL_SEGMENT_END) hr = IDirectMusicTool_ProcessPMsg(&This->IDirectMusicTool_iface, (IDirectMusicPerformance *)iface, &message->msg); else @@ -1210,7 +1230,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_dirty_pmsg(This, start_time); + hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); @@ -1222,7 +1242,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_dirty_pmsg(This, start_time + length); + hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); @@ -1764,14 +1784,6 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, struct message *previous; BOOL enabled = FALSE; - if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_SEGMENT) - && notif->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) - { - if (FAILED(hr = segment_state_end_play((IDirectMusicSegmentState *)notif->punkUser, - (IDirectMusicPerformance8 *)performance))) - WARN("Failed to end segment state %p, hr %#lx\n", notif->punkUser, hr); - } - if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_PERFORMANCE)) enabled = This->notification_performance; if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_SEGMENT)) @@ -1799,6 +1811,12 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, WARN("Failed to play wave buffer, hr %#lx\n", hr); break; + case DMUS_PMSGT_INTERNAL_SEGMENT_END: + if (FAILED(hr = segment_state_end_play((IDirectMusicSegmentState *)msg->punkUser, + (IDirectMusicPerformance8 *)performance))) + WARN("Failed to end segment state %p, hr %#lx\n", msg->punkUser, hr); + break; + default: FIXME("Unhandled message type %#lx\n", msg->dwType); break; diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index b4bb784de0d..21b98ccc14c 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -214,8 +214,8 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time IDirectMusicSegmentState *iface; struct segment_state *This; IDirectMusicTrack *track; + UINT i, duration; HRESULT hr; - UINT i; TRACE("(%p, %lu, %p)\n", segment, start_time, ret_iface); @@ -263,6 +263,9 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time } } + duration = This->end_point - This->start_point; + if (SUCCEEDED(hr)) hr = performance_send_segment_end(performance, start_time + duration, iface); + if (SUCCEEDED(hr)) *ret_iface = iface; else IDirectMusicSegmentState_Release(iface); return hr;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023