March 2020 - Wine-commits - list.winehq.org

Dmitry Timoshkov : adsldp/tests: Add some tests for IDirectorySearch.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 032d848ac4b31838158b4f9d9dbcd424f2949d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032d848ac4b31838158b4f9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 16:04:26 2020 +0800 adsldp/tests: Add some tests for IDirectorySearch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 245 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=032d848ac4b31838158b…

1 0

Rémi Bernon : winegstreamer: Check the callback list before waiting.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: b3a33f065d7e96cb24624560ce05733860e3ecba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a33f065d7e96cb24624560… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 26 00:03:18 2020 +0100 winegstreamer: Check the callback list before waiting. Some callbacks may be pushed during pipeline initialization and before the dispatch thread is actually started and waiting for them, which sometimes causes some hangs. This fixes Fallout 3 and Panzer Corps -and possibly others- intro videos hanging forever. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index a0618798d8..bf7103b160 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -66,15 +66,11 @@ static DWORD WINAPI dispatch_thread(void *user) while (1) { - pthread_cond_wait(&cb_list_cond, &cb_list_lock); + while (list_empty(&cb_list)) pthread_cond_wait(&cb_list_cond, &cb_list_lock); - while (!list_empty(&cb_list)) - { - cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); - list_remove(&cbdata->entry); - - TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); - } + cbdata = LIST_ENTRY(list_head(&cb_list), struct cb_data, entry); + list_remove(&cbdata->entry); + TrySubmitThreadpoolCallback(&perform_cb, cbdata, NULL); } pthread_mutex_unlock(&cb_list_lock);

1 0

Jeff Smith : gdiplus/tests: Add tests for multi-figure lines to test_widen_cap.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 15e8adfcfc8930b97adbfad6827a034ba53a3837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e8adfcfc8930b97adbfad6… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Mar 5 23:15:48 2020 -0600 gdiplus/tests: Add tests for multi-figure lines to test_widen_cap. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 78 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 99f25930ca..91c2406bf1 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1375,6 +1375,52 @@ static path_test_t widenline_capsquareanchor_thin_path[] = { {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ }; +static path_test_t widenline_capsquareanchor_dashed_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {35.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {35.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {45.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ + {45.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*12*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*13*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*14*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*15*/ + }; + +static path_test_t widenline_capsquareanchor_multifigure_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {25.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {25.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {30.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ + {30.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ + {17.928930, 17.071068, PathPointTypeStart, 0, 1}, /*12*/ + {17.928930, 2.928932, PathPointTypeLine, 0, 1}, /*13*/ + {32.071068, 2.928932, PathPointTypeLine, 0, 1}, /*14*/ + {32.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*15*/ + {37.071068, 2.928932, PathPointTypeStart, 0, 0}, /*16*/ + {37.071068, 17.071066, PathPointTypeLine, 0, 0}, /*17*/ + {22.928930, 17.071066, PathPointTypeLine, 0, 0}, /*18*/ + {22.928930, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*19*/ + {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*20*/ + {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*21*/ + {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*22*/ + {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*23*/ + }; + static void test_widen_cap(void) { struct @@ -1383,6 +1429,7 @@ static void test_widen_cap(void) REAL line_width; const path_test_t *expected; INT expected_size; + BOOL dashed; BOOL todo_size; } caps[] = @@ -1404,9 +1451,11 @@ static void test_widen_cap(void) { LineCapDiamondAnchor, 10.0, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path) }, { LineCapArrowAnchor, 10.0, widenline_caparrowanchor_path, - ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + ARRAY_SIZE(widenline_caparrowanchor_path), FALSE, TRUE }, { LineCapSquareAnchor, 0.0, widenline_capsquareanchor_thin_path, - ARRAY_SIZE(widenline_capsquareanchor_thin_path), TRUE }, + ARRAY_SIZE(widenline_capsquareanchor_thin_path), FALSE, TRUE }, + { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_dashed_path, + ARRAY_SIZE(widenline_capsquareanchor_dashed_path), TRUE }, }; GpStatus status; GpPath *path; @@ -1420,6 +1469,11 @@ static void test_widen_cap(void) { status = GdipCreatePen1(0xffffffff, caps[i].line_width, UnitPixel, &pen); expect(Ok, status); + if (caps[i].dashed) + { + status = GdipSetPenDashStyle(pen, DashStyleDash); + expect(Ok, status); + } status = GdipResetPath(path); expect(Ok, status); @@ -1437,6 +1491,26 @@ static void test_widen_cap(void) GdipDeletePen(pen); } + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 25.0, 10.0); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + status = GdipAddPathLine(path, 30.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipSetPenStartCap(pen, LineCapSquareAnchor); + expect(Ok, status); + status = GdipSetPenEndCap(pen, LineCapSquareAnchor); + expect(Ok, status); + status = GdipWidenPath(path, pen, NULL, FlatnessDefault); + expect(Ok, status); + ok_path_fudge(path, widenline_capsquareanchor_multifigure_path, + ARRAY_SIZE(widenline_capsquareanchor_multifigure_path), FALSE, 0.000005); + GdipDeletePen(pen); + GdipDeletePath(path); }

1 0

Jeff Smith : gdiplus: Caps are added at the end of a path.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 260fb550be205a098ffa9831b357d3dfa1fee035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260fb550be205a098ffa9831… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Mar 5 23:15:49 2020 -0600 gdiplus: Caps are added at the end of a path. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 47 +++++++++++++++++++++++++-------------- dlls/gdiplus/tests/graphicspath.c | 40 ++++++++++++++++----------------- 2 files changed, 50 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 0e62d7db7d..af0d6500f8 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1984,10 +1984,8 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, - GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) + REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) { - REAL pen_width = max(pen->width, 2.0); - switch (cap) { default: @@ -2130,14 +2128,6 @@ static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; - - if (start_cap & LineCapAnchorMask) - add_anchor(&points[start], &points[start+1], - pen, start_cap, start_custom, last_point); - - if (end_cap & LineCapAnchorMask) - add_anchor(&points[end], &points[end-1], - pen, end_cap, end_custom, last_point); } static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, @@ -2327,7 +2317,6 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, GpStatus status; path_list_node_t *points=NULL, *last_point=NULL; int i, subpath_start=0, new_length; - BYTE type; TRACE("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness); @@ -2347,6 +2336,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (status == Ok) { + REAL anchor_pen_width = max(pen->width, 2.0); + BYTE *types = flat_path->pathdata.Types; + last_point = points; if (pen->endcap > LineCapDiamondAnchor) @@ -2366,12 +2358,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, for (i=0; i < flat_path->pathdata.Count; i++) { - type = flat_path->pathdata.Types[i]; - - if ((type&PathPointTypePathTypeMask) == PathPointTypeStart) + if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) subpath_start = i; - if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point); @@ -2379,7 +2369,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); } else if (i == flat_path->pathdata.Count-1 || - (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) { if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point); @@ -2388,6 +2378,29 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, } } + for (i=0; i < flat_path->pathdata.Count; i++) + { + if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + continue; + + if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) + subpath_start = i; + + if (i == flat_path->pathdata.Count-1 || + (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + { + if (pen->startcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[subpath_start], + &flat_path->pathdata.Points[subpath_start+1], + anchor_pen_width, pen->startcap, pen->customstart, &last_point); + + if (pen->endcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[i], + &flat_path->pathdata.Points[i-1], + anchor_pen_width, pen->endcap, pen->customend, &last_point); + } + } + new_length = path_list_count(points)-1; if (!lengthen_path(path, new_length)) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 91c2406bf1..83a5e99138 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1380,14 +1380,14 @@ static path_test_t widenline_capsquareanchor_dashed_path[] = { {35.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ {35.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ - {45.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ - {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ - {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ - {45.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ - {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ - {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ - {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ - {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ + {45.0, 5.0, PathPointTypeStart, 0, 0}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*6*/ + {45.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 0}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 0}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 0}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ {42.928928, 17.071068, PathPointTypeStart, 0, 0}, /*12*/ {42.928928, 2.928932, PathPointTypeLine, 0, 0}, /*13*/ {57.071068, 2.928932, PathPointTypeLine, 0, 0}, /*14*/ @@ -1399,18 +1399,18 @@ static path_test_t widenline_capsquareanchor_multifigure_path[] = { {25.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ {25.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ - {30.0, 5.0, PathPointTypeStart, 0, 1}, /*4*/ - {50.0, 5.0, PathPointTypeLine, 0, 1}, /*5*/ - {50.0, 15.0, PathPointTypeLine, 0, 1}, /*6*/ - {30.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ - {12.071068, 2.928932, PathPointTypeStart, 0, 1}, /*8*/ - {12.071068, 17.071066, PathPointTypeLine, 0, 1}, /*9*/ - {-2.071068, 17.071066, PathPointTypeLine, 0, 1}, /*10*/ - {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*11*/ - {17.928930, 17.071068, PathPointTypeStart, 0, 1}, /*12*/ - {17.928930, 2.928932, PathPointTypeLine, 0, 1}, /*13*/ - {32.071068, 2.928932, PathPointTypeLine, 0, 1}, /*14*/ - {32.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*15*/ + {30.0, 5.0, PathPointTypeStart, 0, 0}, /*4*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*5*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*6*/ + {30.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + {12.071068, 2.928932, PathPointTypeStart, 0, 0}, /*8*/ + {12.071068, 17.071066, PathPointTypeLine, 0, 0}, /*9*/ + {-2.071068, 17.071066, PathPointTypeLine, 0, 0}, /*10*/ + {-2.071068, 2.928932, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*11*/ + {17.928930, 17.071068, PathPointTypeStart, 0, 0}, /*12*/ + {17.928930, 2.928932, PathPointTypeLine, 0, 0}, /*13*/ + {32.071068, 2.928932, PathPointTypeLine, 0, 0}, /*14*/ + {32.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*15*/ {37.071068, 2.928932, PathPointTypeStart, 0, 0}, /*16*/ {37.071068, 17.071066, PathPointTypeLine, 0, 0}, /*17*/ {22.928930, 17.071066, PathPointTypeLine, 0, 0}, /*18*/

1 0

Alistair Leslie-Hughes : dmime: Store flags when parsing track data.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 7dd53d89c33781089619d40281f332d910527415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd53d89c33781089619d402… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 26 19:09:25 2020 +0100 dmime: Store flags when parsing track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 1 + dlls/dmime/segment.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 576ebc1ae8..9759039a03 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -77,6 +77,7 @@ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSo typedef struct _DMUS_PRIVATE_SEGMENT_TRACK { struct list entry; /* for listing elements */ DWORD dwGroupBits; + DWORD flags; IDirectMusicTrack* pTrack; } DMUS_PRIVATE_SEGMENT_TRACK, *LPDMUS_PRIVATE_SEGMENT_TRACK; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 0455b6c5dd..f5dbf4b995 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -614,8 +614,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, IPersistStream *ps = NULL; IStream *clone; DMUS_IO_TRACK_HEADER thdr; - DMUS_IO_TRACK_EXTRAS_HEADER txhdr; + DMUS_IO_TRACK_EXTRAS_HEADER txhdr = {0}; HRESULT hr; + DMUS_PRIVATE_SEGMENT_TRACK *item; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -647,7 +648,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { - FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); } } @@ -672,6 +673,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, goto done; hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); + if (FAILED(hr)) + goto done; + + item = LIST_ENTRY(list_tail(&This->Tracks), DMUS_PRIVATE_SEGMENT_TRACK, entry); + item->flags = txhdr.dwFlags; done: if (ps)

1 0

Alistair Leslie-Hughes : dmime: Reimplement IDirectMusicAudioPath Activate.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f0d35a96b2eef4bd35674c59f2adc1665eb98797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0d35a96b2eef4bd35674c59… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 26 19:09:26 2020 +0100 dmime: Reimplement IDirectMusicAudioPath Activate. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/audiopath.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 1aadba92ae..078d843d46 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -216,21 +216,23 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud return E_INVALIDARG; } -static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate (IDirectMusicAudioPath *iface, BOOL fActivate) +static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath *iface, BOOL activate) { - struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d): stub\n", This, fActivate); - if (!fActivate) { - if (!This->fActive) return S_OK; - This->fActive = FALSE; - } else { - if (This->fActive) return S_OK; - This->fActive = TRUE; - if (NULL != This->pDSBuffer) { - IDirectSoundBuffer_Stop(This->pDSBuffer); + struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); + + FIXME("(%p, %d): semi-stub\n", This, activate); + + if (!!activate == This->fActive) + return S_FALSE; + + if (!activate && This->pDSBuffer) { + /* Path is being deactivated */ + IDirectSoundBuffer_Stop(This->pDSBuffer); } - } - return S_OK; + + This->fActive = !!activate; + + return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration)

1 0

Nikolay Sivov : mfplat: Add more event types to trace.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 1d047928b10d78b23fff7aa5633d99690c3c674c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d047928b10d78b23fff7aa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 16:16:28 2020 +0300 mfplat: Add more event types to trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 13 +++++++++++++ include/mfobjects.idl | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8d9dffe075..e3cb35d866 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2056,6 +2056,19 @@ static const char *debugstr_eventid(DWORD event) X(MEWMDRMProximityCompleted), X(MEWMDRMLicenseStoreCleaned), X(MEWMDRMRevocationDownloadCompleted), + X(METransformUnknown), + X(METransformNeedInput), + X(METransformHaveOutput), + X(METransformDrainComplete), + X(METransformMarker), + X(METransformInputStreamStateChanged), + X(MEByteStreamCharacteristicsChanged), + X(MEVideoCaptureDeviceRemoved), + X(MEVideoCaptureDevicePreempted), + X(MEStreamSinkFormatInvalidated), + X(MEEncodingParameters), + X(MEContentProtectionMetadata), + X(MEDeviceThermalStateChanged), #undef X }; diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 8e3d65c77c..ee49be35af 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -567,6 +567,19 @@ enum { MEWMDRMLicenseStoreCleaned = 515, MEWMDRMRevocationDownloadCompleted = 516, MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, + METransformUnknown = 600, + METransformNeedInput = 601, + METransformHaveOutput = 602, + METransformDrainComplete = 603, + METransformMarker = 604, + METransformInputStreamStateChanged = 605, + MEByteStreamCharacteristicsChanged = 700, + MEVideoCaptureDeviceRemoved = 800, + MEVideoCaptureDevicePreempted = 801, + MEStreamSinkFormatInvalidated = 802, + MEEncodingParameters = 803, + MEContentProtectionMetadata = 900, + MEDeviceThermalStateChanged = 950, MEReservedMax = 10000 };

1 0

Nikolay Sivov : mfreadwrite: Forward some source events to async reader callback.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 88299b0edc2cbd99fdde49952bc38d552dd4ec42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88299b0edc2cbd99fdde4995… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 16:16:29 2020 +0300 mfreadwrite: Forward some source events to async reader callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index aa7f6855f4..138a5adc28 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -478,6 +478,18 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba case MESourceStopped: hr = source_reader_source_state_handler(reader, event_type); break; + case MEBufferingStarted: + case MEBufferingStopped: + case MEConnectStart: + case MEConnectEnd: + case MEExtendedType: + case MESourceCharacteristicsChanged: + case MESourceMetadataChanged: + case MEContentProtectionMetadata: + case MEDeviceThermalStateChanged: + if (reader->async_callback) + IMFSourceReaderCallback_OnEvent(reader->async_callback, MF_SOURCE_READER_MEDIASOURCE, event); + break; default: ; }

1 0

Paul Gofman : ddraw/tests: Test locking lost surface for ddraw4.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: d79f5a2a9f4ad18dd4c83dce30c09f9df11c4fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d79f5a2a9f4ad18dd4c83dce… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:42 2020 +0300 ddraw/tests: Test locking lost surface for ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1e6cf4c446..fc3a415433 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1111,6 +1111,7 @@ static void test_coop_level_d3d_state(void) IDirect3DViewport3 *viewport; IDirect3DDevice3 *device; IDirectDraw4 *ddraw; + DDSURFACEDESC2 lock; IDirect3D3 *d3d; D3DCOLOR color; DWORD value; @@ -1146,43 +1147,56 @@ static void test_coop_level_d3d_state(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface4_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + hr = IDirectDraw4_RestoreAllSurfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface4_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color);

1 0

Paul Gofman : ddraw/tests: Test locking lost surface for ddraw2.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 98b8f680b18a1c073ae6ec9eb07826789a6e68b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b8f680b18a1c073ae6ec9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 26 16:09:43 2020 +0300 ddraw/tests: Test locking lost surface for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b472b3d588..5bb5b1baad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -924,6 +924,7 @@ static void test_coop_level_d3d_state(void) IDirect3DDevice2 *device; D3DMATERIAL material; IDirectDraw2 *ddraw; + DDSURFACEDESC lock; D3DCOLOR color; DWORD value; HWND window; @@ -958,26 +959,39 @@ static void test_coop_level_d3d_state(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + lock.lpSurface = (void *)0xdeadbeef; + hr = IDirectDrawSurface2_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(lock.lpSurface == (void *)0xdeadbeef, "Got unexpected lock.lpSurface %p.\n", lock.lpSurface); + hr = restore_surfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface2_Lock(rt, NULL, &lock, DDLOCK_READONLY, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface2_Unlock(rt, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); material.dwSize = sizeof(material); @@ -986,19 +1000,19 @@ static void test_coop_level_d3d_state(void) U3(U(material).diffuse).b = 0.0f; U4(U(material).diffuse).a = 1.0f; hr = IDirect3DMaterial2_SetMaterial(background, &material); - ok(SUCCEEDED(hr), "Failed to set material data, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER); - ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), "Got unexpected color 0x%08x.\n", color);

1 0