wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : amstream: Implement IMediaStreamFilter::EnumMediaStreams().
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: c6d436f7fde6534489e7a1a4c83aaf9e986e78b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d436f7fde6534489e7a1a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:14 2020 -0600 amstream: Implement IMediaStreamFilter::EnumMediaStreams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 15 ++++++++++++--- dlls/amstream/tests/amstream.c | 23 +++++++++++------------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 4b0951cb6a..80a885de24 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -474,11 +474,20 @@ static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID return MS_E_NOSTREAM; } -static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG Index, IMediaStream **ppMediaStream) +static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG index, IMediaStream **stream) { - FIXME("(%p)->(%d,%p): Stub!\n", iface, Index, ppMediaStream); + struct filter *filter = impl_from_IMediaStreamFilter(iface); - return E_NOTIMPL; + TRACE("filter %p, index %d, stream %p.\n", filter, index, stream); + + if (index >= filter->nb_streams) + return S_FALSE; + + if (!stream) + return E_POINTER; + + IMediaStream_AddRef(*stream = (IMediaStream *)filter->streams[index]); + return S_OK; } static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL bRenderer) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 0a344f412e..5c700140e3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -573,19 +573,18 @@ static void check_enum_stream_(int line, IAMMultiMediaStream *mmstream, HRESULT hr; hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, index, &stream); - todo_wine ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), + ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), "IAMMultiMediaStream::EnumMediaStreams() returned %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(filter, index, &stream2); - todo_wine ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), + ok_(__FILE__, line)(hr == (expect ? S_OK : S_FALSE), "IMediaStreamFilter::EnumMediaStreams() returned %#x.\n", hr); if (hr == S_OK) { ok_(__FILE__, line)(stream == expect, "Expected stream %p, got %p.\n", expect, stream); ok_(__FILE__, line)(stream2 == expect, "Expected stream %p, got %p.\n", expect, stream2); + IMediaStream_Release(stream); + IMediaStream_Release(stream2); } - - if (stream) IMediaStream_Release(stream); - if (stream2) IMediaStream_Release(stream2); } #define check_get_stream(a,b,c,d) check_get_stream_(__LINE__,a,b,c,d) @@ -629,9 +628,9 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 0, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 0, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryAudio, NULL); todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -655,13 +654,13 @@ static void test_add_stream(void) ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 0, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 0, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 1, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_EnumMediaStreams(stream_filter, 1, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, NULL); @@ -694,7 +693,7 @@ static void test_add_stream(void) check_enum_stream(mmstream, stream_filter, 0, video_stream); check_enum_stream(mmstream, stream_filter, 1, audio_stream); - check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); + todo_wine check_enum_stream(mmstream, stream_filter, 2, (IMediaStream *)&teststream); check_enum_stream(mmstream, stream_filter, 3, NULL); check_get_stream(mmstream, stream_filter, &MSPID_PrimaryVideo, video_stream);

1 0

Zebediah Figura : amstream: Check for an existing stream in IAMMultiMediaStream::AddMediaStream().
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: ca4f624e0377ea266e022aa72637dde95cdb6f97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4f624e0377ea266e022aa7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:13 2020 -0600 amstream: Check for an existing stream in IAMMultiMediaStream::AddMediaStream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 7 +++++++ dlls/amstream/tests/amstream.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index c3c806b36f..6643d5d141 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -289,6 +289,7 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr; IAMMediaStream* pStream; + IMediaStream *stream; TRACE("mmstream %p, stream_object %p, id %s, flags %#x, ret_stream %p.\n", This, stream_object, debugstr_guid(PurposeId), dwFlags, ret_stream); @@ -296,6 +297,12 @@ static HRESULT WINAPI multimedia_stream_AddMediaStream(IAMMultiMediaStream *ifac if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; + if (IMediaStreamFilter_GetMediaStream(This->filter, PurposeId, &stream) == S_OK) + { + IMediaStream_Release(stream); + return MS_E_PURPOSEID; + } + if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 80fb138a90..0a344f412e 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -652,7 +652,7 @@ static void test_add_stream(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); - todo_wine ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); + ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_EnumMediaStreams(mmstream, 0, NULL); todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -702,7 +702,7 @@ static void test_add_stream(void) todo_wine check_get_stream(mmstream, stream_filter, &test_mspid, (IMediaStream *)&teststream); hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); - todo_wine ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); + ok(hr == MS_E_PURPOSEID, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : amstream: Implement IAMMultiMediaStream::EnumMediaStreams().
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 6b04ca02c01d3c086607e618df10193993cfa8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b04ca02c01d3c086607e618… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:19:12 2020 -0600 amstream: Implement IAMMultiMediaStream::EnumMediaStreams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 515c713b32..c3c806b36f 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -125,13 +125,13 @@ static HRESULT WINAPI multimedia_stream_GetMediaStream(IAMMultiMediaStream *ifac } static HRESULT WINAPI multimedia_stream_EnumMediaStreams(IAMMultiMediaStream *iface, - LONG Index, IMediaStream **ppMediaStream) + LONG index, IMediaStream **stream) { - struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); + struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, Index, ppMediaStream); + TRACE("mmstream %p, index %d, stream %p.\n", mmstream, index, stream); - return E_NOTIMPL; + return IMediaStreamFilter_EnumMediaStreams(mmstream->filter, index, stream); } static HRESULT WINAPI multimedia_stream_GetState(IAMMultiMediaStream *iface, STREAM_STATE *pCurrentState)

1 0

Jeff Smith : gdiplus: Caps do not shrink for line width < 2.0.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 0022b7a6cfd38cf0b8c5d98145f7e7f6e254d65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0022b7a6cfd38cf0b8c5d981… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 3 07:21:46 2020 -0600 gdiplus: Caps do not shrink for line width < 2.0. 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 | 16 +++++++++------- dlls/gdiplus/tests/graphicspath.c | 16 ++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 249f584089..0e62d7db7d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1986,6 +1986,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 = max(pen->width, 2.0); + switch (cap) { default: @@ -1996,7 +1998,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, REAL segment_dy = nextpoint->Y-endpoint->Y; REAL segment_dx = nextpoint->X-endpoint->X; REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); - REAL distance = pen->width / sqrtf(2.0); + REAL distance = pen_width / sqrtf(2.0); REAL par_dx, par_dy; REAL perp_dx, perp_dy; @@ -2024,8 +2026,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, REAL dx, dy, dx2, dy2; const REAL control_point_distance = 0.55228475; /* 4/3 * (sqrt(2) - 1) */ - dx = -pen->width * segment_dx / segment_length; - dy = -pen->width * segment_dy / segment_length; + dx = -pen_width * segment_dx / segment_length; + dy = -pen_width * segment_dy / segment_length; dx2 = dx * control_point_distance; dy2 = dy * control_point_distance; @@ -2076,11 +2078,11 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, REAL par_dx, par_dy; REAL perp_dx, perp_dy; - par_dx = -pen->width * segment_dx / segment_length; - par_dy = -pen->width * segment_dy / segment_length; + par_dx = -pen_width * segment_dx / segment_length; + par_dy = -pen_width * segment_dy / segment_length; - perp_dx = -pen->width * segment_dy / segment_length; - perp_dy = pen->width * segment_dx / segment_length; + perp_dx = -pen_width * segment_dy / segment_length; + perp_dy = pen_width * segment_dx / segment_length; *last_point = add_path_list_node(*last_point, endpoint->X + par_dx, endpoint->Y + par_dy, PathPointTypeStart); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 3495e4d08e..99f25930ca 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1365,14 +1365,14 @@ static path_test_t widenline_caparrowanchor_path[] = { }; static path_test_t widenline_capsquareanchor_thin_path[] = { - {6.414213, 8.585786, PathPointTypeStart, 4, 1}, /*0*/ - {6.414213, 11.414213, PathPointTypeLine, 0, 1}, /*1*/ - {3.585786, 11.414213, PathPointTypeLine, 0, 1}, /*2*/ - {3.585786, 8.585786, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*3*/ - {48.585785, 11.414213, PathPointTypeStart, 0, 1}, /*4*/ - {48.585785, 8.585786, PathPointTypeLine, 0, 1}, /*5*/ - {51.414211, 8.585786, PathPointTypeLine, 0, 1}, /*6*/ - {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + {6.414213, 8.585786, PathPointTypeStart, 4, 0}, /*0*/ + {6.414213, 11.414213, PathPointTypeLine, 0, 0}, /*1*/ + {3.585786, 11.414213, PathPointTypeLine, 0, 0}, /*2*/ + {3.585786, 8.585786, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {48.585785, 11.414213, PathPointTypeStart, 0, 0}, /*4*/ + {48.585785, 8.585786, PathPointTypeLine, 0, 0}, /*5*/ + {51.414211, 8.585786, PathPointTypeLine, 0, 0}, /*6*/ + {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ }; static void test_widen_cap(void)

1 0

Jeff Smith : gdiplus/tests: Add thin-line test to test_widen_cap.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 2d4befd4bc79c11b14d23d4164be272b50796d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4befd4bc79c11b14d23d41… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 3 07:21:45 2020 -0600 gdiplus/tests: Add thin-line test 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 | 40 +++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 8c025a4eca..3495e4d08e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1364,35 +1364,49 @@ static path_test_t widenline_caparrowanchor_path[] = { {32.679489, 0.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*9*/ }; +static path_test_t widenline_capsquareanchor_thin_path[] = { + {6.414213, 8.585786, PathPointTypeStart, 4, 1}, /*0*/ + {6.414213, 11.414213, PathPointTypeLine, 0, 1}, /*1*/ + {3.585786, 11.414213, PathPointTypeLine, 0, 1}, /*2*/ + {3.585786, 8.585786, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*3*/ + {48.585785, 11.414213, PathPointTypeStart, 0, 1}, /*4*/ + {48.585785, 8.585786, PathPointTypeLine, 0, 1}, /*5*/ + {51.414211, 8.585786, PathPointTypeLine, 0, 1}, /*6*/ + {51.414211, 11.414213, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1}, /*7*/ + }; + static void test_widen_cap(void) { struct { LineCap type; + REAL line_width; const path_test_t *expected; INT expected_size; BOOL todo_size; } caps[] = { - { LineCapFlat, widenline_capflat_path, + { LineCapFlat, 10.0, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, - { LineCapSquare, widenline_capsquare_path, + { LineCapSquare, 10.0, widenline_capsquare_path, ARRAY_SIZE(widenline_capsquare_path) }, - { LineCapRound, widenline_capround_path, + { LineCapRound, 10.0, widenline_capround_path, ARRAY_SIZE(widenline_capround_path) }, - { LineCapTriangle, widenline_captriangle_path, + { LineCapTriangle, 10.0, widenline_captriangle_path, ARRAY_SIZE(widenline_captriangle_path) }, - { LineCapNoAnchor, widenline_capflat_path, + { LineCapNoAnchor, 10.0, widenline_capflat_path, ARRAY_SIZE(widenline_capflat_path) }, - { LineCapSquareAnchor, widenline_capsquareanchor_path, + { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_path, ARRAY_SIZE(widenline_capsquareanchor_path) }, - { LineCapRoundAnchor, widenline_caproundanchor_path, + { LineCapRoundAnchor, 10.0, widenline_caproundanchor_path, ARRAY_SIZE(widenline_caproundanchor_path) }, - { LineCapDiamondAnchor, widenline_capdiamondanchor_path, + { LineCapDiamondAnchor, 10.0, widenline_capdiamondanchor_path, ARRAY_SIZE(widenline_capdiamondanchor_path) }, - { LineCapArrowAnchor, widenline_caparrowanchor_path, + { LineCapArrowAnchor, 10.0, widenline_caparrowanchor_path, ARRAY_SIZE(widenline_caparrowanchor_path), TRUE }, + { LineCapSquareAnchor, 0.0, widenline_capsquareanchor_thin_path, + ARRAY_SIZE(widenline_capsquareanchor_thin_path), TRUE }, }; GpStatus status; GpPath *path; @@ -1401,11 +1415,12 @@ static void test_widen_cap(void) status = GdipCreatePath(FillModeAlternate, &path); expect(Ok, status); - status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); - expect(Ok, status); for (i = 0; i < ARRAY_SIZE(caps); i++) { + status = GdipCreatePen1(0xffffffff, caps[i].line_width, UnitPixel, &pen); + expect(Ok, status); + status = GdipResetPath(path); expect(Ok, status); status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); @@ -1418,9 +1433,10 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); + + GdipDeletePen(pen); } - GdipDeletePen(pen); GdipDeletePath(path); }

1 0

Jeff Smith : gdiplus/tests: Use much smaller fudge factor in test_widen_cap.
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: c147f8e3d7fbd8b72943795316ef210dc26ff339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c147f8e3d7fbd8b729437953… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Mar 2 13:02:34 2020 -0600 gdiplus/tests: Use much smaller fudge factor in 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index aabacef3aa..8c025a4eca 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,7 +75,8 @@ typedef struct int todo; } path_test_t; -static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size) +#define ok_path(a,b,c,d) ok_path_fudge(a,b,c,d,2.0) +static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge) { BYTE * types; INT size, idx = 0, eidx = 0, numskip; @@ -104,8 +105,8 @@ static void ok_path(GpPath* path, const path_test_t *expected, INT expected_size /* We allow a few pixels fudge in matching X and Y coordinates to account for imprecision in * floating point to integer conversion */ BOOL match = (types[idx] == expected[eidx].type) && - fabs(points[idx].X - expected[eidx].X) <= 2.0 && - fabs(points[idx].Y - expected[eidx].Y) <= 2.0; + fabs(points[idx].X - expected[eidx].X) <= fudge && + fabs(points[idx].Y - expected[eidx].Y) <= fudge; stringify_point_type(expected[eidx].type, ename); stringify_point_type(types[idx], name); @@ -1416,7 +1417,7 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); - ok_path(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size); + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); } GdipDeletePen(pen);

1 0

Henri Verbeet : d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: a3ad73f9b62e9b6e713d765a958296962729076f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ad73f9b62e9b6e713d765a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 19:24:15 2020 +0330 d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8d85a43523..a651a63f02 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3688,17 +3688,18 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, const struct wined3d_stream_state *stream; state = wined3d_stateblock_get_state(device->state); stream = &state->streams[stream_idx]; - wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride; - } - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) + { wined3d_buffer = buffer_impl->draw_buffer; + } else + { wined3d_buffer = buffer_impl->wined3d_buffer; + } hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride); if (SUCCEEDED(hr) && !device->recording)

1 0

Henri Verbeet : d3d8: Avoid checking the stage index in d3d8_device_GetTextureStageState() (Coverity).
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 7622d97f784f654e99d72614e2288ef0fae1b618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7622d97f784f654e99d72614… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 19:24:14 2020 +0330 d3d8: Avoid checking the stage index in d3d8_device_GetTextureStageState() (Coverity). The correct limit for d3d8 would be WINED3D_MAX_TEXTURES, since that's the size of the "texture_states" array. However, the original code didn't check the stage index at all, so simply remove it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9793eda0c3..2850b93fd1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2250,13 +2250,6 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) - { - WARN("Invalid stage %u.\n", stage); - *value = 0; - return D3D_OK; - } - if (state >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid state %#x.\n", state);

1 0

Zhiyi Zhang : d3d9: Enumerate wined3d outputs in d3d9_init().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: e531d89a390a6a6463fe08d47afc0ce32d225182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e531d89a390a6a6463fe08d4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:18:46 2020 +0800 d3d9: Enumerate wined3d outputs in d3d9_init(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/directx.c | 51 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index bc9a3b98b2..a9f3f47596 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -66,6 +66,8 @@ struct d3d9 IDirect3D9Ex IDirect3D9Ex_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + unsigned int wined3d_output_count; BOOL extended; }; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index effaf3be25..3e9fabf758 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -85,6 +85,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) wined3d_decref(d3d9->wined3d); wined3d_mutex_unlock(); + heap_free(d3d9->wined3d_outputs); heap_free(d3d9); } @@ -108,22 +109,10 @@ static HRESULT WINAPI d3d9_RegisterSoftwareDevice(IDirect3D9Ex *iface, void *ini static UINT WINAPI d3d9_GetAdapterCount(IDirect3D9Ex *iface) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - struct wined3d_adapter *wined3d_adapter; - unsigned int adapter_idx, adapter_count; - unsigned int output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d9->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d9->wined3d_output_count; } static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapter, @@ -601,6 +590,8 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NORMALIZED_DEPTH_BIAS; + unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; @@ -612,9 +603,41 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) wined3d_mutex_lock(); d3d9->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d9->wined3d) + { + wined3d_mutex_unlock(); return FALSE; + } + + adapter_count = wined3d_get_adapter_count(d3d9->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d9->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d9->wined3d_outputs)); + if (!d3d9->wined3d_outputs) + { + wined3d_decref(d3d9->wined3d); + wined3d_mutex_unlock(); + return FALSE; + } + + d3d9->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d9->wined3d, adapter_idx); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + d3d9->wined3d_outputs[d3d9->wined3d_output_count] = + wined3d_adapter_get_output(wined3d_adapter, output_idx); + ++d3d9->wined3d_output_count; + } + } + + wined3d_mutex_unlock(); d3d9->extended = extended; return TRUE;

1 0

Zhiyi Zhang : d3d8: Enumerate wined3d outputs in d3d8_init().
by Alexandre Julliard 03 Mar '20

03 Mar '20

Module: wine Branch: master Commit: 2e848c18d91c93c98601b18684ea54de2a22c42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e848c18d91c93c98601b186… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 3 22:18:30 2020 +0800 d3d8: Enumerate wined3d outputs in d3d8_init(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/directx.c | 50 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9bf92af7c9..e49087fcd5 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -57,6 +57,8 @@ struct d3d8 IDirect3D8 IDirect3D8_iface; LONG refcount; struct wined3d *wined3d; + struct wined3d_output **wined3d_outputs; + unsigned int wined3d_output_count; }; BOOL d3d8_init(struct d3d8 *d3d8) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index ab3a9e6810..0f283b5535 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -70,6 +70,7 @@ static ULONG WINAPI d3d8_Release(IDirect3D8 *iface) wined3d_decref(d3d8->wined3d); wined3d_mutex_unlock(); + heap_free(d3d8->wined3d_outputs); heap_free(d3d8); } @@ -93,22 +94,10 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_ static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - struct wined3d_adapter *wined3d_adapter; - unsigned int adapter_idx, adapter_count; - unsigned int output_count = 0; TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - adapter_count = wined3d_get_adapter_count(d3d8->wined3d); - for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) - { - wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); - output_count += wined3d_adapter_get_output_count(wined3d_adapter); - } - wined3d_mutex_unlock(); - - return output_count; + return d3d8->wined3d_output_count; } static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, @@ -425,15 +414,48 @@ BOOL d3d8_init(struct d3d8 *d3d8) | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; + unsigned int adapter_idx, output_idx, adapter_count, output_count = 0; + struct wined3d_adapter *wined3d_adapter; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; wined3d_mutex_lock(); d3d8->wined3d = wined3d_create(flags); - wined3d_mutex_unlock(); if (!d3d8->wined3d) + { + wined3d_mutex_unlock(); + return FALSE; + } + + adapter_count = wined3d_get_adapter_count(d3d8->wined3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count += wined3d_adapter_get_output_count(wined3d_adapter); + } + + d3d8->wined3d_outputs = heap_calloc(output_count, sizeof(*d3d8->wined3d_outputs)); + if (!d3d8->wined3d_outputs) + { + wined3d_decref(d3d8->wined3d); + wined3d_mutex_unlock(); return FALSE; + } + + d3d8->wined3d_output_count = 0; + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + wined3d_adapter = wined3d_get_adapter(d3d8->wined3d, adapter_idx); + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + d3d8->wined3d_outputs[d3d8->wined3d_output_count] = + wined3d_adapter_get_output(wined3d_adapter, output_idx); + ++d3d8->wined3d_output_count; + } + } + wined3d_mutex_unlock(); return TRUE; }

1 0

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 March 2020