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

Dmitry Timoshkov : activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500).
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 29967463ad26b4d1f935dc1db78994102c507a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29967463ad26b4d1f935dc1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:26 2020 +0800 activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 32 +++++++++++++++++++++++++++++--- dlls/activeds/tests/activeds.c | 3 +-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index cffaf3d8e6..3a1d9e8c16 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -234,13 +234,39 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspath) { Pathname *path = impl_from_IADsPathname(iface); + int len; - FIXME("%p,%d,%p: stub\n", iface, type, adspath); + TRACE("%p,%d,%p\n", iface, type, adspath); if (!adspath) return E_INVALIDARG; - *adspath = SysAllocString(path->provider); - return *adspath ? S_OK : E_OUTOFMEMORY; + switch (type) + { + default: + FIXME("type %d not implemented\n", type); + /* fall through */ + + case ADS_FORMAT_X500: + len = wcslen(path->provider) + 3; + if (path->server) len += wcslen(path->server) + 1; + if (path->dn) len += wcslen(path->dn); + + *adspath = SysAllocStringLen(NULL, len); + if (!*adspath) return E_OUTOFMEMORY; + + wcscpy(*adspath, path->provider); + wcscat(*adspath, L"://"); + if (path->server) + { + wcscat(*adspath, path->server); + wcscat(*adspath, L"/"); + } + if (path->dn) wcscat(*adspath, path->dn); + break; + } + + TRACE("=> %s\n", debugstr_w(*adspath)); + return S_OK; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index dff30bbbba..6e5ecdf573 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -105,7 +105,6 @@ todo_wine bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); @@ -147,12 +146,12 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"LDAP://sample:123/a=b,c=d,e=f"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); ok(hr == S_OK, "got %#x\n", hr); +todo_wine ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);

1 0

Dmitry Timoshkov : activeds: Implement some simple cases for IADsPathname::Retrieve().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 03e3800d89663c6d6a16c9d26a3ee07d11b8a8c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e3800d89663c6d6a16c9d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:29 2020 +0800 activeds: Implement some simple cases for IADsPathname::Retrieve(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 16 ++++++++++++++-- dlls/activeds/tests/activeds.c | 2 -- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 3a1d9e8c16..d89c4cb847 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -252,7 +252,7 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat if (path->dn) len += wcslen(path->dn); *adspath = SysAllocStringLen(NULL, len); - if (!*adspath) return E_OUTOFMEMORY; + if (!*adspath) break; wcscpy(*adspath, path->provider); wcscat(*adspath, L"://"); @@ -263,10 +263,22 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat } if (path->dn) wcscat(*adspath, path->dn); break; + + case ADS_FORMAT_PROVIDER: + *adspath = SysAllocString(path->provider); + break; + + case ADS_FORMAT_SERVER: + *adspath = path->provider ? SysAllocString(path->server) : SysAllocStringLen(NULL, 0); + break; + + case ADS_FORMAT_X500_DN: + *adspath = path->dn ? SysAllocString(path->dn) : SysAllocStringLen(NULL, 0); + break; } TRACE("=> %s\n", debugstr_w(*adspath)); - return S_OK; + return *adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 6e5ecdf573..9ecab56034 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -151,13 +151,11 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_PROVIDER, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"LDAP"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hr = IADsPathname_Retrieve(path, ADS_FORMAT_SERVER, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"sample:123"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);

1 0

Dmitry Timoshkov : activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_LEAF).
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: d0eaaea8556481628955fd675046cbecc2ebbee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0eaaea8556481628955fd67… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:33 2020 +0800 activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_LEAF). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 10 ++++++++++ dlls/activeds/tests/activeds.c | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index d89c4cb847..d68f1cb8e9 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -275,6 +275,16 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat case ADS_FORMAT_X500_DN: *adspath = path->dn ? SysAllocString(path->dn) : SysAllocStringLen(NULL, 0); break; + + case ADS_FORMAT_LEAF: + if (!path->dn) + *adspath = SysAllocStringLen(NULL, 0); + else + { + WCHAR *p = wcschr(path->dn, ','); + *adspath = p ? SysAllocStringLen(path->dn, p - path->dn) : SysAllocString(path->dn); + } + break; } TRACE("=> %s\n", debugstr_w(*adspath)); diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 9ecab56034..118c87634b 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -161,7 +161,6 @@ todo_wine hr = IADsPathname_Retrieve(path, ADS_FORMAT_LEAF, &bstr); ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(!wcscmp(bstr, L"a=b"), "got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr);

1 0

Dmitry Timoshkov : activeds: Implement IADsPathname::GetElement().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 0051bea4ece9273fef63e29329ee5fd5f86a6ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=0051bea4ece9273fef63e293… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:35 2020 +0800 activeds: Implement IADsPathname::GetElement(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 31 +++++++++++++++++++++++++++++-- dlls/activeds/tests/activeds.c | 1 - 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index d68f1cb8e9..a47a4e5343 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -299,8 +299,35 @@ static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) static HRESULT WINAPI path_GetElement(IADsPathname *iface, LONG index, BSTR *element) { - FIXME("%p,%d,%p: stub\n", iface, index, element); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + HRESULT hr; + WCHAR *p, *end; + LONG count; + + TRACE("%p,%d,%p\n", iface, index, element); + + if (!element) return E_INVALIDARG; + + count = 0; + hr = HRESULT_FROM_WIN32(ERROR_INVALID_INDEX); + + p = path->dn; + while (p) + { + end = wcschr(p, ','); + + if (index == count) + { + *element = end ? SysAllocStringLen(p, end - p) : SysAllocString(p); + hr = *element ? S_OK : E_OUTOFMEMORY; + break; + } + + p = end ? end + 1 : NULL; + count++; + } + + return hr; } static HRESULT WINAPI path_AddLeafElement(IADsPathname *iface, BSTR element) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 118c87634b..6df2d2bfd3 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -121,7 +121,6 @@ todo_wine ok(count == 0, "got %d\n", count); hr = IADsPathname_GetElement(path, 0, &bstr); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#x\n", hr); SysFreeString(bstr);

1 0

Dmitry Timoshkov : activeds: Implement IADsPathname::GetNumElements().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: d495541646bf8443f51f5b579193c35c84fe27f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d495541646bf8443f51f5b57… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:38 2020 +0800 activeds: Implement IADsPathname::GetNumElements(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 20 ++++++++++++++++++-- dlls/activeds/tests/activeds.c | 7 +------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index a47a4e5343..fbc7984f2e 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -293,8 +293,24 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) { - FIXME("%p,%p: stub\n", iface, count); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + WCHAR *p; + + TRACE("%p,%p\n", iface, count); + + if (!count) return E_INVALIDARG; + + *count = 0; + + p = path->dn; + while (p) + { + *count += 1; + p = wcschr(p, ','); + if (p) p++; + } + + return S_OK; } static HRESULT WINAPI path_GetElement(IADsPathname *iface, LONG index, BSTR *element) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 6df2d2bfd3..c2dc3d58c4 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -97,9 +97,7 @@ static void test_Pathname(void) count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(count == 0, "got %d\n", count); bstr = NULL; @@ -115,9 +113,7 @@ todo_wine count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(count == 0, "got %d\n", count); hr = IADsPathname_GetElement(path, 0, &bstr); @@ -131,10 +127,9 @@ todo_wine count = 0xdeadbeef; hr = IADsPathname_GetNumElements(path, &count); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); + for (i = 0; i < count; i++) { hr = IADsPathname_GetElement(path, i, &bstr);

1 0

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.26 to ADSTYPE_CASE_EXACT_STRING.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 4d68fcdb6867975ddf79cd10989fe15ebe568263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d68fcdb6867975ddf79cd10… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:53 2020 +0800 adsldp: Map 1.3.6.1.4.1.1466.115.121.1.26 to ADSTYPE_CASE_EXACT_STRING. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 7f1f193bea..0611dc2920 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -95,6 +95,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.24")) return ADSTYPE_UTC_TIME; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.26")) + return ADSTYPE_CASE_EXACT_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))

1 0

Jeff Smith : gdiplus: Handle some degenerate cases with GdipCreatePath2.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 09630fc92e8cd089bcb7e98ba9b235eb29fa884a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09630fc92e8cd089bcb7e98b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Apr 9 23:38:42 2020 -0500 gdiplus: Handle some degenerate cases with GdipCreatePath2. 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 | 24 ++++++++- dlls/gdiplus/tests/graphicspath.c | 103 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 55545a449a..df6a32d22d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1213,14 +1213,34 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) { + int i; + TRACE("(%p, %p, %d, %d, %p)\n", points, types, count, fill, path); - if(!path) + if(!points || !types || !path) return InvalidParameter; + if(count <= 0) { + *path = NULL; + return OutOfMemory; + } + *path = heap_alloc_zero(sizeof(GpPath)); if(!*path) return OutOfMemory; + for(i = 1; i < count; i++) { + if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier) { + if(i+2 < count && + (types[i+1] & PathPointTypePathTypeMask) == PathPointTypeBezier && + (types[i+2] & PathPointTypePathTypeMask) == PathPointTypeBezier) + i += 2; + else { + count = 0; + break; + } + } + } + (*path)->pathdata.Points = heap_alloc_zero(count * sizeof(PointF)); (*path)->pathdata.Types = heap_alloc_zero(count); @@ -1233,6 +1253,8 @@ GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, memcpy((*path)->pathdata.Points, points, count * sizeof(PointF)); memcpy((*path)->pathdata.Types, types, count); + if(count > 0) + (*path)->pathdata.Types[0] = PathPointTypeStart; (*path)->pathdata.Count = count; (*path)->datalen = count; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 17e6a7cafb..1b3a9a161f 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -174,6 +174,108 @@ static void test_getpathdata(void) GdipDeletePath(path); } +static void test_createpath2(void) +{ + GpStatus status; + GpPath* path = NULL; + GpPathData data; + INT i, count, expect_count; + + PointF test_line_points[] = {{1.0,1.0}, {2.0,1.0}}; + BYTE test_line_types[] = {PathPointTypeStart, PathPointTypeLine}; + + PointF test_bez_points[] = {{1.0,1.0}, {2.0,1.0}, {3.0,1.0}, {4.0,1.0}, + {5.0,1.0}, {6.0,1.0}, {7.0,1.0}}; + BYTE test_bez_types[] = {PathPointTypeStart, PathPointTypeBezier, + PathPointTypeBezier, PathPointTypeBezier, PathPointTypeBezier, + PathPointTypeBezier, PathPointTypeBezier}; + + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(2, count); + GdipDeletePath(path); + + status = GdipCreatePath2(test_line_points, test_line_types, 1, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(1, count); + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, test_line_types, 0, FillModeAlternate, &path); + expect(OutOfMemory, status); + ok(!path, "Expected NULL, got %p\n", path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, test_line_types, -1, FillModeAlternate, &path); + expect(OutOfMemory, status); + ok(!path, "Expected NULL, got %p\n", path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(NULL, test_line_types, 2, FillModeAlternate, &path); + expect(InvalidParameter, status); + ok(path == (void *)0xdeadbeef, "Expected %p, got %p\n", (void *)0xdeadbeef, path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + path = (void *)0xdeadbeef; + status = GdipCreatePath2(test_line_points, NULL, 2, FillModeAlternate, &path); + expect(InvalidParameter, status); + ok(path == (void *)0xdeadbeef, "Expected %p, got %p\n", (void *)0xdeadbeef, path); + if(path && path != (void *)0xdeadbeef) + GdipDeletePath(path); + + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, NULL); + expect(InvalidParameter, status); + + /* Zero-length line points do not get altered */ + path = NULL; + test_line_points[1].X = test_line_points[0].X; + test_line_points[1].Y = test_line_points[0].Y; + status = GdipCreatePath2(test_line_points, test_line_types, 2, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(2, count); + GdipDeletePath(path); + + /* The type of the first point is always converted to PathPointTypeStart */ + test_line_types[0] = PathPointTypeLine; + status = GdipCreatePath2(test_line_points, test_line_types, 1, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(1, count); + data.Count = count; + data.Types = GdipAlloc(sizeof(BYTE) * count); + data.Points = GdipAlloc(sizeof(PointF) * count); + status = GdipGetPathData(path, &data); + expect(Ok, status); + expect((data.Points[0].X == 1.0) && (data.Points[0].Y == 1.0), TRUE); + expect(data.Types[0], PathPointTypeStart); + GdipFree(data.Points); + GdipFree(data.Types); + GdipDeletePath(path); + + /* Bezier points must come in groups of three */ + for(i = 2; i <= 7; i++) { + expect_count = (i % 3 == 1) ? i : 0; + status = GdipCreatePath2(test_bez_points, test_bez_types, i, FillModeAlternate, &path); + expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(expect_count, count); + GdipDeletePath(path); + } +} + static path_test_t line2_path[] = { {0.0, 50.0, PathPointTypeStart, 0, 0}, /*0*/ {5.0, 45.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1663,6 +1765,7 @@ START_TEST(graphicspath) test_constructor_destructor(); test_getpathdata(); + test_createpath2(); test_line2(); test_arc(); test_worldbounds();

1 0

Nikolay Sivov : mf/tests: Add some more tests for SAR current type.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 5d09f46150569d97f61fb7fa059cc70161cd7651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d09f46150569d97f61fb7fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 10 17:06:22 2020 +0300 mf/tests: Add some more tests for SAR current type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 789b4d0494..6c44e4728e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2798,15 +2798,58 @@ if (SUCCEEDED(hr)) hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype2); ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype2, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(mediatype); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype2); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mediatype == mediatype2, "Unexpected instance.\n"); + IMFMediaType_Release(mediatype); + + IMFMediaType_Release(mediatype2); + + /* Set partial type. */ + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_GetGUID(mediatype2, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &guid); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mediatype == mediatype2, "Unexpected instance.\n"); IMFMediaType_Release(mediatype2); + + hr = IMFMediaType_GetCount(mediatype, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 2, "Unexpected attribute count %u.\n", count); + IMFMediaType_Release(mediatype); + /* Reset back to uninitialized state. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaTypeHandler_Release(handler); } IMFStreamSink_Release(stream_sink);

1 0

Nikolay Sivov : mf: Always queue set topologies.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 4aafa3c38da167a74a1f9ceab4d98b9401296aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aafa3c38da167a74a1f9cea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 10 17:06:23 2020 +0300 mf: Always queue set topologies. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index debb58de4d..47431c4968 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1240,6 +1240,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo static void session_set_topology(struct media_session *session, DWORD flags, IMFTopology *topology) { + IMFTopology *resolved_topology = NULL; HRESULT hr = S_OK; /* Resolve unless claimed to be full. */ @@ -1247,8 +1248,6 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF { if (!(flags & MFSESSION_SETTOPOLOGY_NORESOLUTION)) { - IMFTopology *resolved_topology = NULL; - hr = session_bind_output_nodes(topology); if (SUCCEEDED(hr)) @@ -1286,27 +1285,27 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF /* With no current topology set it right away, otherwise queue. */ if (topology) { - if (session->presentation.topo_status == MF_TOPOSTATUS_INVALID) - { - hr = session_set_current_topology(session, topology); - } - else + struct queued_topology *queued_topology; + + if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) { - struct queued_topology *queued_topology; + queued_topology->topology = topology; + IMFTopology_AddRef(queued_topology->topology); - if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) - { - queued_topology->topology = topology; - IMFTopology_AddRef(queued_topology->topology); + list_add_tail(&session->topologies, &queued_topology->entry); + } - list_add_tail(&session->topologies, &queued_topology->entry); - } + if (session->presentation.topo_status == MF_TOPOSTATUS_INVALID) + { + hr = session_set_current_topology(session, topology); + session_set_topo_status(session, hr, MF_TOPOSTATUS_READY); } } - session_set_topo_status(session, hr, MF_TOPOSTATUS_READY); - LeaveCriticalSection(&session->cs); + + if (resolved_topology) + IMFTopology_Release(resolved_topology); } static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out)

1 0

Nikolay Sivov : mf: Use original topology instance for both MESessionTopologySet and MESessionTopologyStatus.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 387bf24376ac7da9c72c22e1724a03f546a2d0c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=387bf24376ac7da9c72c22e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 10 17:06:24 2020 +0300 mf: Use original topology instance for both MESessionTopologySet and MESessionTopologyStatus. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 47431c4968..5b9f720815 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -539,10 +539,18 @@ static void session_set_topo_status(struct media_session *session, HRESULT statu if (topo_status == MF_TOPOSTATUS_INVALID) return; + if (list_empty(&session->topologies)) + { + FIXME("Unexpectedly empty topology queue.\n"); + return; + } + if (topo_status > session->presentation.topo_status) { + struct queued_topology *topology = LIST_ENTRY(list_head(&session->topologies), struct queued_topology, entry); + param.vt = VT_UNKNOWN; - param.punkVal = (IUnknown *)session->presentation.current_topology; + param.punkVal = (IUnknown *)topology->topology; if (FAILED(MFCreateMediaEvent(MESessionTopologyStatus, &GUID_NULL, status, &param, &event))) return;

1 0