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

Jeff Smith : gdiplus: Handle some degenerate cases with GdipCreatePath2.
by Alexandre Julliard April 10, 2020

April 10, 2020

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

Dmitry Timoshkov : adsldp: Map 1.3.6.1.4.1.1466.115.121.1.26 to ADSTYPE_CASE_EXACT_STRING.
by Alexandre Julliard April 10, 2020

April 10, 2020

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

Dmitry Timoshkov : activeds: Implement some simple cases for IADsPathname::Retrieve().
by Alexandre Julliard April 10, 2020

April 10, 2020

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 April 10, 2020

April 10, 2020

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::Set(ADS_SETTYPE_FULL).
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 3656d57a9a4376131249a875bfe84450a678024f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3656d57a9a4376131249a875… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:16 2020 +0800 activeds: Implement IADsPathname::Set(ADS_SETTYPE_FULL). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 90 +++++++++++++++++++++++++++++++++++++++--- dlls/activeds/tests/activeds.c | 3 +- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 52a94cbb18..4733c5315f 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "iads.h" +#include "adserr.h" #include "wine/heap.h" #include "wine/debug.h" @@ -39,7 +40,7 @@ typedef struct { IADsPathname IADsPathname_iface; LONG ref; - BSTR adspath; + BSTR provider, server, dn; } Pathname; static inline Pathname *impl_from_IADsPathname(IADsPathname *iface) @@ -80,6 +81,9 @@ static ULONG WINAPI path_Release(IADsPathname *iface) if (!ref) { TRACE("destroying %p\n", iface); + SysFreeString(path->provider); + SysFreeString(path->server); + SysFreeString(path->dn); heap_free(path); } @@ -113,16 +117,88 @@ static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID rii return E_NOTIMPL; } +static HRESULT parse_path(BSTR path, BSTR *provider, BSTR *server, BSTR *dn) +{ + WCHAR *p, *p_server; + int server_len; + + *provider = NULL; + *server = NULL; + *dn = NULL; + + if (wcsnicmp(path, L"LDAP:", 5) != 0) + return E_ADS_BAD_PATHNAME; + + *provider = SysAllocStringLen(path, 4); + if (!*provider) return E_OUTOFMEMORY; + + p = path + 5; + if (!*p) return S_OK; + + if (*p++ != '/' || *p++ != '/' || !*p) + return E_ADS_BAD_PATHNAME; + + p_server = p; + server_len = 0; + while (*p && *p != '/') + { + p++; + server_len++; + } + if (server_len == 0) return E_ADS_BAD_PATHNAME; + + *server = SysAllocStringLen(p_server, server_len); + if (!*server) + { + SysFreeString(*provider); + return E_OUTOFMEMORY; + } + + if (!*p) return S_OK; + + if (*p++ != '/' || !*p) + { + SysFreeString(*provider); + SysFreeString(*server); + return E_ADS_BAD_PATHNAME; + } + + *dn = SysAllocString(p); + if (!*dn) + { + SysFreeString(*provider); + SysFreeString(*server); + return E_OUTOFMEMORY; + } + + return S_OK; +} + static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) { Pathname *path = impl_from_IADsPathname(iface); + HRESULT hr; + BSTR provider, server, dn; - FIXME("%p,%s,%d: stub\n", iface, debugstr_w(adspath), type); + TRACE("%p,%s,%d\n", iface, debugstr_w(adspath), type); if (!adspath) return E_INVALIDARG; - path->adspath = SysAllocString(adspath); - return path->adspath ? S_OK : E_OUTOFMEMORY; + if (type != ADS_SETTYPE_FULL) + FIXME("type %d not implemented\n", type); + + hr = parse_path(adspath, &provider, &server, &dn); + if (hr == S_OK) + { + SysFreeString(path->provider); + SysFreeString(path->server); + SysFreeString(path->dn); + + path->provider = provider; + path->server = server; + path->dn = dn; + } + return hr; } static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) @@ -139,7 +215,7 @@ static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspat if (!adspath) return E_INVALIDARG; - *adspath = SysAllocString(path->adspath); + *adspath = SysAllocString(path->provider); return *adspath ? S_OK : E_OUTOFMEMORY; } @@ -223,7 +299,9 @@ static HRESULT Pathname_create(REFIID riid, void **obj) path->IADsPathname_iface.lpVtbl = &IADsPathname_vtbl; path->ref = 1; - path->adspath = NULL; + path->provider = SysAllocString(L"LDAP"); + path->server = NULL; + path->dn = NULL; hr = IADsPathname_QueryInterface(&path->IADsPathname_iface, riid, obj); IADsPathname_Release(&path->IADsPathname_iface); diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 81fe754058..dff30bbbba 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -104,7 +104,6 @@ todo_wine bstr = NULL; hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); -todo_wine ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(bstr && !wcscmp(bstr, L"LDAP://"), "got %s\n", wine_dbgstr_w(bstr)); @@ -148,12 +147,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/tests: Add some IADsPathname tests.
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 18631864de0de879dc6966ca66e283c92bb942a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18631864de0de879dc6966ca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:14 2020 +0800 activeds/tests: Add some IADsPathname tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/tests/activeds.c | 98 ++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 23 ++++++++++ 2 files changed, 121 insertions(+) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index 6f469f9dc1..81fe754058 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -19,15 +19,20 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "initguid.h" #include "iads.h" #include "adshlp.h" #include "adserr.h" #include "wine/test.h" +DEFINE_GUID(CLSID_Pathname,0x080d0d78,0xf421,0x11d0,0xa3,0x6e,0x00,0xc0,0x4f,0xb9,0x50,0xdc); + static void test_ADsBuildVarArrayStr(void) { const WCHAR *props[] = { L"prop1", L"prop2" }; @@ -79,7 +84,100 @@ static void test_ADsBuildVarArrayStr(void) VariantClear(&var); } +static void test_Pathname(void) +{ + static const WCHAR * const elem[3] = { L"a=b",L"c=d",L"e=f" }; + HRESULT hr; + IADsPathname *path; + BSTR bstr; + LONG count, i; + + hr = CoCreateInstance(&CLSID_Pathname, 0, CLSCTX_INPROC_SERVER, &IID_IADsPathname, (void **)&path); + ok(hr == S_OK, "got %#x\n", hr); + + 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; + hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); +todo_wine + 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); + + bstr = SysAllocString(L"LDAP://sample"); + hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(bstr); + + 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); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_INDEX), "got %#x\n", hr); + SysFreeString(bstr); + + bstr = SysAllocString(L"LDAP://sample:123/a=b,c=d,e=f"); + hr = IADsPathname_Set(path, bstr, ADS_SETTYPE_FULL); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(bstr); + + 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); + ok(hr == S_OK, "got %#x\n", hr); + ok(!wcscmp(bstr, elem[i]), "%u: %s\n", i, wine_dbgstr_w(bstr)); + SysFreeString(bstr); + } + + hr = IADsPathname_Retrieve(path, ADS_FORMAT_X500, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + 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); + + 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); + + 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); + + IADsPathname_Release(path); +} + START_TEST(activeds) { + CoInitialize(NULL); + + test_Pathname(); test_ADsBuildVarArrayStr(); + + CoUninitialize(); } diff --git a/include/iads.idl b/include/iads.idl index e9eaab77be..6dfafce3a8 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -370,6 +370,29 @@ typedef enum ADS_SECURITY_INFO_SACL = 0x8 } ADS_SECURITY_INFO_ENUM; +typedef enum +{ + ADS_SETTYPE_FULL = 1, + ADS_SETTYPE_PROVIDER = 2, + ADS_SETTYPE_SERVER = 3, + ADS_SETTYPE_DN = 4 +} ADS_SETTYPE_ENUM; + +typedef enum +{ + ADS_FORMAT_WINDOWS = 1, + ADS_FORMAT_WINDOWS_NO_SERVER = 2, + ADS_FORMAT_WINDOWS_DN = 3, + ADS_FORMAT_WINDOWS_PARENT = 4, + ADS_FORMAT_X500 = 5, + ADS_FORMAT_X500_NO_SERVER = 6, + ADS_FORMAT_X500_DN = 7, + ADS_FORMAT_X500_PARENT = 8, + ADS_FORMAT_SERVER = 9, + ADS_FORMAT_PROVIDER = 10, + ADS_FORMAT_LEAF = 11 +} ADS_FORMAT_ENUM; + /***************************************************************************** * IADsContainer interface */

1 0

Zebediah Figura : maintainers: Take maintainership of DirectShow.
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 522b970815b120ae182b4717a3c411a2b392d7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=522b970815b120ae182b4717… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:13 2020 -0500 maintainers: Take maintainership of DirectShow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 88876773d2..f7b44e1b05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -103,8 +103,8 @@ F: dlls/dpnet/ F: dlls/dpwsockx/ DirectShow +M: Zebediah Figura <z.figura12(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/amstream/ F: dlls/mciqtz32/ F: dlls/qasf/

1 0

Zebediah Figura : user32: Also scan for mouse devices in GetRawInputDeviceList().
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 19c6524e48db1d785095953d25591f1e2d2872d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c6524e48db1d785095953d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:43 2020 -0500 user32: Also scan for mouse devices in GetRawInputDeviceList(). Halo: Spartan Strike attempts to discover input devices using rawinput. It expects to be able to open at least one device file with a zero access mask. It does not perform any other operations on the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 47 ++++++++++++++++++++++++++++++++++------------- dlls/user32/tests/input.c | 5 ++--- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e89bb027f3..2465262f74 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -37,13 +37,16 @@ #include "user_private.h" +#include "initguid.h" +#include "ntddmou.h" + WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device { WCHAR *path; HANDLE file; - RID_DEVICE_INFO_HID info; + RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; }; @@ -139,6 +142,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; + device->info.cbSize = sizeof(RID_DEVICE_INFO); return device; } @@ -161,8 +165,6 @@ static void find_devices(void) HidD_GetHidGuid(&hid_guid); - set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ @@ -171,8 +173,10 @@ static void find_devices(void) CloseHandle(rawinput_devices[idx].file); heap_free(rawinput_devices[idx].path); } - rawinput_devices_count = 0; + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -181,9 +185,11 @@ static void find_devices(void) attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes(device->file, &attr)) WARN("Failed to get attributes.\n"); - device->info.dwVendorId = attr.VendorID; - device->info.dwProductId = attr.ProductID; - device->info.dwVersionNumber = attr.VersionNumber; + + device->info.dwType = RIM_TYPEHID; + device->info.u.hid.dwVendorId = attr.VendorID; + device->info.u.hid.dwProductId = attr.ProductID; + device->info.u.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); @@ -191,12 +197,28 @@ static void find_devices(void) if (!HidP_GetCaps(device->data, &caps)) WARN("Failed to get caps.\n"); - device->info.usUsagePage = caps.UsagePage; - device->info.usUsage = caps.Usage; + device->info.u.hid.usUsagePage = caps.UsagePage; + device->info.u.hid.usUsage = caps.Usage; + } + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) + { + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + + if (!(device = add_device(set, &iface))) + continue; + + device->info.dwType = RIM_TYPEMOUSE; + device->info.u.mouse = mouse_info; } - LeaveCriticalSection(&rawinput_devices_cs); SetupDiDestroyDeviceInfoList(set); + + LeaveCriticalSection(&rawinput_devices_cs); } /*********************************************************************** @@ -243,7 +265,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun for (i = 0; i < rawinput_devices_count; ++i) { devices[2 + i].hDevice = &rawinput_devices[i]; - devices[2 + i].dwType = RIM_TYPEHID; + devices[2 + i].dwType = rawinput_devices[i].info.dwType; } return 2 + rawinput_devices_count; @@ -461,8 +483,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT } else { - info.dwType = RIM_TYPEHID; - info.u.hid = device->info; + info = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3fc84f6108..43fdd34191 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1686,7 +1686,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType != RIM_TYPEHID) + todo_wine_if(i == 0 || i == 1) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; @@ -1716,8 +1716,7 @@ static void test_GetRawInputDeviceList(void) { /* succeeds on hardware, fails in some VMs */ br = HidD_GetPreparsedData(file, &preparsed); - todo_wine - ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); } if (br)

1 0

Zebediah Figura : user32: Rename the "hid_device" structure to "device".
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 9e195ba9a64ab88a04e26c7f2a3c0837993f2581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e195ba9a64ab88a04e26c7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:41 2020 -0500 user32: Rename the "hid_device" structure to "device". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 85ff0c5e80..54d836b22b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -struct hid_device +struct device { WCHAR *path; HANDLE file; @@ -47,7 +47,7 @@ struct hid_device PHIDP_PREPARSED_DATA data; }; -static struct hid_device *hid_devices; +static struct device *hid_devices; static unsigned int hid_devices_count, hid_devices_max; static CRITICAL_SECTION hid_devices_cs; @@ -86,10 +86,10 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_device *device; + struct device *device; HANDLE file; WCHAR *path; DWORD size; @@ -147,7 +147,7 @@ static void find_hid_devices(void) static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct hid_device *device; + struct device *device; HIDD_ATTRIBUTES attr; HIDP_CAPS caps; GUID hid_guid; @@ -398,7 +398,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT /*********************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { /* FIXME: Most of this is made up. */ static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; @@ -407,12 +407,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; RID_DEVICE_INFO info; - struct hid_device *hid_device = device; + struct device *device = handle; const void *to_copy; UINT to_copy_bytes, avail_bytes; - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); + TRACE("handle %p, command %#x, data %p, data_size %p.\n", + handle, command, data, data_size); if (!data_size) return ~0U; @@ -427,20 +427,20 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { *data_size = ARRAY_SIZE(mouse_name); to_copy = mouse_name; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { *data_size = ARRAY_SIZE(keyboard_name); to_copy = keyboard_name; } else { - *data_size = strlenW(hid_device->path) + 1; - to_copy = hid_device->path; + *data_size = strlenW(device->path) + 1; + to_copy = device->path; } to_copy_bytes = *data_size * sizeof(WCHAR); break; @@ -448,12 +448,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { info.dwType = RIM_TYPEMOUSE; info.u.mouse = mouse_info; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { info.dwType = RIM_TYPEKEYBOARD; info.u.keyboard = keyboard_info; @@ -461,7 +461,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT else { info.dwType = RIM_TYPEHID; - info.u.hid = hid_device->info; + info.u.hid = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; @@ -470,8 +470,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (device == WINE_MOUSE_HANDLE || - device == WINE_KEYBOARD_HANDLE) + if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE) { to_copy_bytes = 0; *data_size = 0; @@ -479,9 +478,9 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; *data_size = to_copy_bytes; - to_copy = hid_device->data; + to_copy = device->data; } break;

1 0

Alistair Leslie-Hughes : secur32: Fix compile for older gnutls libraries.
by Alexandre Julliard April 10, 2020

April 10, 2020

Module: wine Branch: master Commit: 353c16f0d60f591b683ab75ab78d13cc94ee0891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=353c16f0d60f591b683ab75a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 10 13:30:44 2020 +1000 secur32: Fix compile for older gnutls libraries. GNUTLS_ALPN_SERVER_PRECEDENCE was introduced into 3.5. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index f177d90dfd..c4a36a899a 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -119,7 +119,7 @@ MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #define GNUTLS_KX_ECDHE_PSK 14 #endif -#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 2) +#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 5) #define GNUTLS_ALPN_SERVER_PRECEDENCE (1<<1) #endif

1 0