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

[PATCH] secur32: Fix compile for older gnutls libraries
by Alistair Leslie-Hughes April 10, 2020

April 10, 2020

GNUTLS_ALPN_SERVER_PRECEDENCE was introduced into 3.5. https://lwn.net/Articles/687082/ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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 -- 2.25.1

2 1

[PATCH 9/9] adsldp: Map 1.3.6.1.4.1.1466.115.121.1.26 to ADSTYPE_CASE_EXACT_STRING.
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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")) -- 2.25.2

1 0

[PATCH 8/9] activeds: Implement IADsPathname::GetNumElements().
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 7/9] activeds: Implement IADsPathname::GetElement().
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 6/9] activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_LEAF).
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 5/9] activeds: Implement some simple cases for IADsPathname::Retrieve().
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 4/9] activeds: Implement IADsPathname::Retrieve(ADS_FORMAT_X500).
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 3/9] activeds: Implement remaining cases for IADsPathname::Set().
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/pathname.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 4733c5315f..cffaf3d8e6 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -184,8 +184,32 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) if (!adspath) return E_INVALIDARG; + if (type == ADS_SETTYPE_PROVIDER) + { + SysFreeString(path->provider); + path->provider = SysAllocString(adspath); + return path->provider ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_SERVER) + { + SysFreeString(path->server); + path->server = SysAllocString(adspath); + return path->server ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_DN) + { + SysFreeString(path->dn); + path->dn = SysAllocString(adspath); + return path->dn ? S_OK : E_OUTOFMEMORY; + } + if (type != ADS_SETTYPE_FULL) + { FIXME("type %d not implemented\n", type); + return E_INVALIDARG; + } hr = parse_path(adspath, &provider, &server, &dn); if (hr == S_OK) -- 2.25.2

1 0

[PATCH 2/9] activeds: Implement IADsPathname::Set(ADS_SETTYPE_FULL).
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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); -- 2.25.2

1 0

[PATCH 1/9] activeds/tests: Add some IADsPathname tests.
by Dmitry Timoshkov April 10, 2020

April 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 */ -- 2.25.2

1 0