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

[PATCH 7/8] adsldp: Implement IADs::Get().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 942c471dfb..7cc23438f1 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -551,8 +551,43 @@ static HRESULT WINAPI ldapns_SetInfo(IADs *iface) static HRESULT WINAPI ldapns_Get(IADs *iface, BSTR name, VARIANT *prop) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(name), prop); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + ULONG i; + + TRACE("%p,%s,%p\n", iface, debugstr_w(name), prop); + + if (!name || !prop) return E_ADS_BAD_PARAMETER; + + if (!ldap->attrs_count) + { + hr = IADs_GetInfo(iface); + if (hr != S_OK) return hr; + } + + for (i = 0; i < ldap->attrs_count; i++) + { + if (!wcsicmp(name, ldap->attrs[i].name)) + { + ULONG count = ldap_count_valuesW(ldap->attrs[i].values); + if (!count) + { + V_BSTR(prop) = NULL; + V_VT(prop) = VT_BSTR; + return S_OK; + } + + if (count > 1) + FIXME("attr %s has %u values\n", debugstr_w(ldap->attrs[i].name), count); + + V_BSTR(prop) = SysAllocString(ldap->attrs[i].values[0]); + if (!V_BSTR(prop)) return E_OUTOFMEMORY; + V_VT(prop) = VT_BSTR; + return S_OK; + } + } + + return E_ADS_PROPERTY_NOT_FOUND; } static HRESULT WINAPI ldapns_Put(IADs *iface, BSTR name, VARIANT prop) -- 2.25.1

2 1

[PATCH 6/8] adsldp: Implement IADs::GetInfoEx().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 142 ++++++++++++++++++++++++++++++++++- dlls/adsldp/adsldp_private.h | 10 +++ 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 58db41a094..942c471dfb 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -40,7 +40,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp); @@ -372,6 +371,12 @@ static HRESULT ADSystemInfo_create(REFIID riid, void **obj) return hr; } +struct ldap_attribute +{ + WCHAR *name; + WCHAR **values; +}; + typedef struct { IADs IADs_iface; @@ -381,6 +386,8 @@ typedef struct BSTR host; BSTR object; ULONG port; + ULONG attrs_count, attrs_count_allocated; + struct ldap_attribute *attrs; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -422,6 +429,23 @@ static ULONG WINAPI ldapns_AddRef(IADs *iface) return InterlockedIncrement(&ldap->ref); } +static void free_attributes(LDAP_namespace *ldap) +{ + ULONG i; + + if (!ldap->attrs) return; + + for (i = 0; i < ldap->attrs_count; i++) + { + ldap_memfreeW(ldap->attrs[i].name); + ldap_value_freeW(ldap->attrs[i].values); + } + + heap_free(ldap->attrs); + ldap->attrs = NULL; + ldap->attrs_count = 0; +} + static ULONG WINAPI ldapns_Release(IADs *iface) { LDAP_namespace *ldap = impl_from_IADs(iface); @@ -433,6 +457,7 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (ldap->ld) ldap_unbind(ldap->ld); SysFreeString(ldap->host); SysFreeString(ldap->object); + free_attributes(ldap); heap_free(ldap); } @@ -548,10 +573,118 @@ static HRESULT WINAPI ldapns_PutEx(IADs *iface, LONG code, BSTR name, VARIANT pr return E_NOTIMPL; } +static HRESULT add_attribute(LDAP_namespace *ldap, WCHAR *name, WCHAR **values) +{ + struct ldap_attribute *new_attrs; + + if (!ldap->attrs) + { + ldap->attrs = heap_alloc(256 * sizeof(ldap->attrs[0])); + if (!ldap->attrs) return E_OUTOFMEMORY; + ldap->attrs_count_allocated = 256; + } + else if (ldap->attrs_count_allocated < ldap->attrs_count + 1) + { + new_attrs = heap_realloc(ldap->attrs, (ldap->attrs_count_allocated * 2) * sizeof(*new_attrs)); + if (!new_attrs) return E_OUTOFMEMORY; + + ldap->attrs_count_allocated *= 2; + ldap->attrs = new_attrs; + } + + ldap->attrs[ldap->attrs_count].name = name; + ldap->attrs[ldap->attrs_count].values = values; + ldap->attrs_count++; + + return S_OK; +} + static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) { - FIXME("%p,%s,%d: stub\n", iface, wine_dbgstr_variant(&prop), reserved); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IADs(iface); + HRESULT hr; + SAFEARRAY *sa; + VARIANT *item; + WCHAR **props = NULL, *attr, **values; + DWORD i, count, err; + LDAPMessage *res = NULL, *entry; + BerElement *ber; + + TRACE("%p,%s,%d\n", iface, wine_dbgstr_variant(&prop), reserved); + + free_attributes(ldap); + + if (!ldap->ld) return E_NOTIMPL; + + if (V_VT(&prop) != (VT_ARRAY | VT_VARIANT)) + return E_ADS_BAD_PARAMETER; + + sa = V_ARRAY(&prop); + if (sa->cDims != 1) + return E_ADS_BAD_PARAMETER; + + hr = SafeArrayAccessData(sa, (void *)&item); + if (hr != S_OK) return hr; + + count = sa->rgsabound[0].cElements; + if (count) + { + props = heap_alloc((count + 1) * sizeof(props[0])); + if (!props) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + for (i = 0; i < count; i++) + { + if (V_VT(&item[i]) != VT_BSTR) + { + hr = E_ADS_BAD_PARAMETER; + goto exit; + } + props[i] = V_BSTR(&item[i]); + } + props[sa->rgsabound[0].cElements] = NULL; + } + + err = ldap_search_sW(ldap->ld, NULL, LDAP_SCOPE_BASE, (WCHAR *)L"(objectClass=*)", props, FALSE, &res); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_search_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + goto exit; + } + + entry = ldap_first_entry(ldap->ld, res); + while (entry) + { + attr = ldap_first_attributeW(ldap->ld, entry, &ber); + while (attr) + { + TRACE("attr: %s\n", debugstr_w(attr)); + + values = ldap_get_valuesW(ldap->ld, entry, attr); + + hr = add_attribute(ldap, attr, values); + if (hr != S_OK) + { + ldap_value_freeW(values); + ldap_memfreeW(attr); + goto exit; + } + + attr = ldap_next_attributeW(ldap->ld, entry, ber); + } + + entry = ldap_next_entry(ldap->ld, res); + } + +exit: + if (res) ldap_msgfree(res); + heap_free(props); + SafeArrayUnaccessData(sa); + return hr; } static const IADsVtbl IADs_vtbl = @@ -867,6 +1000,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->ld = NULL; ldap->host = NULL; ldap->object = NULL; + ldap->attrs_count = 0; + ldap->attrs_count_allocated = 0; + ldap->attrs = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 8748d0496d..0443ffbf6e 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -19,6 +19,16 @@ #ifndef _ADSLDP_PRIVATE_H #define _ADSLDP_PRIVATE_H +#include "wine/heap.h" + +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc((wcslen(src) + 1) * sizeof(WCHAR)))) wcscpy(dst, src); + return dst; +} + DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; #endif -- 2.25.1

2 1

[PATCH 5/8] adsldp: Implement IADs::GetInfo().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 3e5a5e310e..07f79a9993 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,5 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 uuid +IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b60d164515..58db41a094 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -29,6 +29,7 @@ #include "rpcproxy.h" #include "rpc.h" #include "iads.h" +#include "adshlp.h" #include "adserr.h" #define SECURITY_WIN32 #include "security.h" @@ -503,8 +504,18 @@ static HRESULT WINAPI ldapns_get_Schema(IADs *iface, BSTR *retval) static HRESULT WINAPI ldapns_GetInfo(IADs *iface) { - FIXME("%p: stub\n", iface); - return E_NOTIMPL; + HRESULT hr; + VARIANT var; + + TRACE("%p\n", iface); + + hr = ADsBuildVarArrayStr(NULL, 0, &var); + if (hr == S_OK) + { + hr = IADs_GetInfoEx(iface, var, 0); + VariantClear(&var); + } + return hr; } static HRESULT WINAPI ldapns_SetInfo(IADs *iface) -- 2.25.1

2 1

[PATCH 4/8] adsldp: Add support for ADS_SEARCHPREF_SEARCH_SCOPE to IDirectorySearch::SetSearchPreference().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 48 ++++++++++++++++++++++++++++++++++++++++++-- include/iads.idl | 9 ++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index caf404c3c6..6330ba2d9c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -389,6 +390,10 @@ typedef struct ULONG port; ULONG attrs_count, attrs_count_allocated; struct ldap_attribute *attrs; + struct + { + ADS_SCOPEENUM scope; + } search; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1091,8 +1096,46 @@ static ULONG WINAPI search_Release(IDirectorySearch *iface) static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) { - FIXME("%p,%p,%u: stub\n", iface, prefs, count); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + DWORD i; + + TRACE("%p,%p,%u\n", iface, prefs, count); + + for (i = 0; i < count; i++) + { + switch (prefs[i].dwSearchPref) + { + case ADS_SEARCHPREF_SEARCH_SCOPE: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + switch (prefs[i].vValue.u.Integer) + { + case ADS_SCOPE_BASE: + case ADS_SCOPE_ONELEVEL: + case ADS_SCOPE_SUBTREE: + ldap->search.scope = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + + default: + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + break; + + default: + FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + break; + } + } + + return S_OK; } static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, @@ -1186,6 +1229,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs_count = 0; ldap->attrs_count_allocated = 0; ldap->attrs = NULL; + ldap->search.scope = ADS_SCOPE_SUBTREE; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/include/iads.idl b/include/iads.idl index fdee17859d..6bb63afafb 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -139,6 +139,13 @@ typedef enum ADSTYPE_DN_WITH_STRING } ADSTYPEENUM; +typedef enum +{ + ADS_SCOPE_BASE, + ADS_SCOPE_ONELEVEL, + ADS_SCOPE_SUBTREE +} ADS_SCOPEENUM; + typedef enum { ADS_PASSWORD_ENCODE_REQUIRE_SSL, @@ -318,7 +325,7 @@ typedef struct _adsvalue ADS_NT_SECURITY_DESCRIPTOR SecurityDescriptor; PADS_DN_WITH_BINARY pDNWithBinary; PADS_DN_WITH_STRING pDNWithString; - }; + } DUMMYUNIONNAME; } ADSVALUE, *PADSVALUE; typedef struct ads_searchpref_info -- 2.25.1

2 1

[PATCH 3/8] adsldp: Add support for IADsOpenDSObject::OpenDSObject(ADS_SECURE_AUTHENTICATION).
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 23 +++++++++++++++++++---- include/winldap.h | 12 ++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index bc4e9780b0..b60d164515 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "rpcproxy.h" +#include "rpc.h" #include "iads.h" #include "adserr.h" #define SECURITY_WIN32 @@ -777,10 +778,24 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B if (flags & ADS_SECURE_AUTHENTICATION) { - FIXME("ADS_SECURE_AUTHENTICATION is not supported\n"); - hr = ERROR_DS_AUTH_METHOD_NOT_SUPPORTED; - ldap_unbind(ld); - goto fail; + SEC_WINNT_AUTH_IDENTITY_W id; + + id.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + id.Domain = (unsigned short *)host; + id.DomainLength = wcslen(host); + id.User = (unsigned short *)user; + id.UserLength = user ? wcslen(user) : 0; + id.Password = (unsigned short *)password; + id.PasswordLength = password ? wcslen(password) : 0; + + err = ldap_bind_sW(ld, NULL, (WCHAR *)&id, LDAP_AUTH_NEGOTIATE); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_bind_sW error %#x\n", err); + hr = HRESULT_FROM_WIN32(map_ldap_error(err)); + ldap_unbind(ld); + goto fail; + } } else { diff --git a/include/winldap.h b/include/winldap.h index e5c1faa3c1..bd5acab767 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -184,6 +184,18 @@ typedef struct berelement #define LDAP_RES_EXTENDED 0x78 #define LDAP_RES_ANY (-1) +#define LDAP_AUTH_SIMPLE 0x80 +#define LDAP_AUTH_SASL 0x83 +#define LDAP_AUTH_OTHERKIND 0x86 + +#define LDAP_AUTH_EXTERNAL (LDAP_AUTH_OTHERKIND | 0x0020) +#define LDAP_AUTH_SICILY (LDAP_AUTH_OTHERKIND | 0x0200) +#define LDAP_AUTH_NEGOTIATE (LDAP_AUTH_OTHERKIND | 0x0400) +#define LDAP_AUTH_MSN (LDAP_AUTH_OTHERKIND | 0x0800) +#define LDAP_AUTH_NTLM (LDAP_AUTH_OTHERKIND | 0x1000) +#define LDAP_AUTH_DPA (LDAP_AUTH_OTHERKIND | 0x2000) +#define LDAP_AUTH_DIGEST (LDAP_AUTH_OTHERKIND | 0x4000) + typedef struct ldap { struct -- 2.25.1

2 1

[PATCH 2/8] wldap32: Handle NULL return in ldap_get_values_lenW.
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/value.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index bcfa9a2f6b..4e1701c926 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -229,12 +229,14 @@ PWCHAR * CDECL ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, P if (!attrU) return NULL; bv = ldap_get_values_len( ld, entry, attrU ); + if (bv) + { + retU = bv2str_array( bv ); + ret = strarrayUtoW( retU ); - retU = bv2str_array( bv ); - ret = strarrayUtoW( retU ); - - ldap_value_free_len( bv ); - strarrayfreeU( retU ); + ldap_value_free_len( bv ); + strarrayfreeU( retU ); + } strfreeU( attrU ); #endif -- 2.25.1

2 1

[PATCH 8/8] adsldp: Implement IDirectorySearch::GetNextRow().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 264408c365..4957828391 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1216,8 +1216,31 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + if (!ldap_ctx->entry) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + } + else + { + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res); + ldap_ctx->pos++; + } + + return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; } static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) -- 2.25.1

1 0

[PATCH 7/8] adsldp: Implement IDirectorySearch::GetFirstRow().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 53f766565c..264408c365 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -398,7 +398,8 @@ typedef struct struct ldap_search_context { - LDAPMessage *res; + LDAPMessage *res, *entry; + ULONG count, pos; }; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1197,8 +1198,20 @@ static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_H static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + + return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; } static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) -- 2.25.1

1 0

[PATCH 6/8] adsldp: Implement IDirectorySearch::CloseSearchHandle().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9787102b17..53f766565c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1234,8 +1234,15 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_msgfree(ldap_ctx->res); + + return S_OK; } static const IDirectorySearchVtbl IDirectorySearch_vtbl = -- 2.25.1

1 0

[PATCH 5/8] adsldp: Implement IDirectorySearch::ExecuteSearch().
by Dmitry Timoshkov 25 Mar '20

25 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 48 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 6330ba2d9c..9787102b17 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -396,6 +396,11 @@ typedef struct } search; } LDAP_namespace; +struct ldap_search_context +{ + LDAPMessage *res; +}; + static inline LDAP_namespace *impl_from_IADs(IADs *iface) { return CONTAINING_RECORD(iface, LDAP_namespace, IADs_iface); @@ -1141,8 +1146,47 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, DWORD count, PADS_SEARCH_HANDLE res) { - FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(filter), names, count, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + ULONG err, i; + WCHAR **props; + struct ldap_search_context *ldap_ctx; + + TRACE("%p,%s,%p,%u,%p\n", iface, debugstr_w(filter), names, count, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_ctx = heap_alloc_zero(sizeof(*ldap_ctx)); + if (!ldap_ctx) return E_OUTOFMEMORY; + + if (count == 0xffffffff) + props = NULL; + else + { + if (count && !names) return E_ADS_BAD_PARAMETER; + + props = heap_alloc((count + 1) * sizeof(props[0])); + if (!props) + return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + props[i] = names[i]; + + props[count] = NULL; + } + + err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, FALSE, &ldap_ctx->res); + heap_free(props); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_search_sW error %#x\n", err); + heap_free(ldap_ctx); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + + *res = ldap_ctx; + return S_OK; } static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) -- 2.25.1

1 0