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

[PATCH v2 8/8] adsldp/tests: Add some tests for IDirectorySearch.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

v2: - Handle server down failures - Fix test failures under XP Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/ldap.c | 245 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 28e41e4d95..bd22be8e61 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -95,6 +95,12 @@ static void test_LDAP(void) password = test[i].password ? SysAllocString(test[i].password) : NULL; hr = IADsOpenDSObject_OpenDSObject(ads_open, path, user, password, test[i].flags, &disp); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IDispatch_Release(disp); @@ -150,6 +156,12 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = IParseDisplayName_ParseDisplayName(parse, bc, path, &count, &mk); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) { @@ -184,6 +196,238 @@ todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) IParseDisplayName_Release(parse); } +struct result +{ + const WCHAR *name; + ADSTYPEENUM type; + const WCHAR *values[16]; +}; + +struct search +{ + const WCHAR *dn; + ADS_SCOPEENUM scope; + struct result res[16]; +}; + +static void do_search(const struct search *s) +{ + HRESULT hr; + IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; + LPWSTR name; + const struct result *res; + + trace("search DN %s\n", wine_dbgstr_w(s->dn)); + + hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + if (hr != S_OK) return; + + pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref.vValue.dwType = ADSTYPE_INTEGER; + pref.vValue.Integer = s->scope; + pref.dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == S_OK, "got %#x\n", hr); + + res = s->res; + + while ((hr = IDirectorySearch_GetNextRow(ds, sh)) != S_ADS_NOMORE_ROWS) + { + ok(hr == S_OK, "got %#x\n", hr); + + while ((hr = IDirectorySearch_GetNextColumnName(ds, sh, &name)) != S_ADS_NOMORE_COLUMNS) + { + DWORD i; + + ok(hr == S_OK, "got %#x\n", hr); + ok(res->name != NULL, "got extra row %s\n", wine_dbgstr_w(name)); + ok(!wcscmp(res->name, name), "expected %s, got %s\n", wine_dbgstr_w(res->name), wine_dbgstr_w(name)); + + memset(&col, 0xde, sizeof(col)); + hr = IDirectorySearch_GetColumn(ds, sh, name, &col); + ok(hr == S_OK, "got %#x\n", hr); + + ok(col.dwADsType == res->type, "got %d for %s\n", col.dwADsType, wine_dbgstr_w(name)); + + for (i = 0; i < col.dwNumValues; i++) + { + ok(res->values[i] != NULL, "expected to have more values for %s\n", wine_dbgstr_w(name)); + if (!res->values[i]) break; + + ok(!wcscmp(res->values[i], col.pADsValues[i].CaseIgnoreString), + "expected %s, got %s\n", wine_dbgstr_w(res->values[i]), wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); + } + + ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); + + FreeADsMem(name); + res++; + } + } + + ok(res->name == NULL, "there are more rows in test data: %s\n", wine_dbgstr_w(res->name)); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); +} + +static void test_DirectorySearch(void) +{ + static const struct search root_base = + { + L"LDAP://ldap.forumsys.com", ADS_SCOPE_BASE, + { + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"top", L"OpenLDAProotDSE", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/", NULL } }, + { NULL } + } + }; + static const struct search scientists_base = + { + L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", ADS_SCOPE_BASE, + { + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=einstein,dc=example,dc=com", + L"uid=galieleo,dc=example,dc=com", L"uid=tesla,dc=example,dc=com", L"uid=newton,dc=example,dc=com", + L"uid=training,dc=example,dc=com", L"uid=jmacy,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"scientists", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Scientists", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=scientists,dc=example,dc=com", NULL } }, + { NULL } + } + }; + static const struct search scientists_subtree = + { + L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", ADS_SCOPE_SUBTREE, + { + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=einstein,dc=example,dc=com", + L"uid=galieleo,dc=example,dc=com", L"uid=tesla,dc=example,dc=com", L"uid=newton,dc=example,dc=com", + L"uid=training,dc=example,dc=com", L"uid=jmacy,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"scientists", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Scientists", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=scientists,dc=example,dc=com", NULL } }, + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=tesla,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"italians", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Italians", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=italians,ou=scientists,dc=example,dc=com", NULL } }, + { NULL } + } + }; + HRESULT hr; + IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; + LPWSTR name; + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/rootDSE", &IID_IDirectorySearch, (void **)&ds); +todo_wine + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + if (hr != S_OK) return; + + pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref.vValue.dwType = ADSTYPE_INTEGER; + pref.vValue.Integer = ADS_SCOPE_BASE; + pref.dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, NULL); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + if (0) /* crashes under XP */ + { + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, 1, &sh); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + } + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + hr = IDirectorySearch_GetPreviousRow(ds, sh); +todo_wine + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + while (IDirectorySearch_GetNextRow(ds, sh) != S_ADS_NOMORE_ROWS) + { + while (IDirectorySearch_GetNextColumnName(ds, sh, &name) != S_ADS_NOMORE_COLUMNS) + { + DWORD i; + + hr = IDirectorySearch_GetColumn(ds, sh, name, &col); + ok(hr == S_OK, "got %#x for column %s\n", hr, wine_dbgstr_w(name)); + + if (winetest_debug > 1) /* useful to create test arrays */ + { + printf("Column %s (values type %d):\n", wine_dbgstr_w(name), col.dwADsType); + printf("{ "); + for (i = 0; i < col.dwNumValues; i++) + printf("%s, ", wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); + printf("NULL }\n"); + } + + hr = IDirectorySearch_FreeColumn(ds, &col); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); + } + + name = (void *)0xdeadbeef; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#x\n", hr); + ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + } + + hr = IDirectorySearch_GetNextRow(ds, sh); + ok(hr == S_ADS_NOMORE_ROWS, "got %#x\n", hr); + + name = NULL; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); +todo_wine + ok(hr == S_OK || broken(hr == S_ADS_NOMORE_COLUMNS) /* XP */, "got %#x\n", hr); +todo_wine + ok((name && !wcscmp(name, L"ADsPath")) || broken(!name) /* XP */, "got %s\n", wine_dbgstr_w(name)); + FreeADsMem(name); + + name = (void *)0xdeadbeef; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#x\n", hr); + ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + + if (0) /* crashes under XP */ + { + hr = IDirectorySearch_GetColumn(ds, sh, NULL, &col); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + } + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); + + do_search(&root_base); + do_search(&scientists_base); + do_search(&scientists_subtree); +} + START_TEST(ldap) { HRESULT hr; @@ -193,6 +437,7 @@ START_TEST(ldap) test_LDAP(); test_ParseDisplayName(); + test_DirectorySearch(); CoUninitialize(); } -- 2.25.1

1 0

[PATCH 1/8] adsldp: Fix memory leak.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 4957828391..76a3f285c4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1169,7 +1169,10 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) + { + heap_free(ldap_ctx); return E_OUTOFMEMORY; + } for (i = 0; i < count; i++) props[i] = names[i]; -- 2.25.1

2 2

[PATCH 8/8] adsldp/tests: Add some tests for IDirectorySearch.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/ldap.c | 233 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 28e41e4d95..9251cab4e1 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -184,6 +184,238 @@ todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) IParseDisplayName_Release(parse); } +struct result +{ + const WCHAR *name; + ADSTYPEENUM type; + const WCHAR *values[16]; +}; + +struct search +{ + const WCHAR *dn; + ADS_SCOPEENUM scope; + struct result res[16]; +}; + +static void do_search(const struct search *s) +{ + HRESULT hr; + IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; + LPWSTR name; + const struct result *res; + + trace("search DN %s\n", wine_dbgstr_w(s->dn)); + + hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + if (hr != S_OK) return; + + pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref.vValue.dwType = ADSTYPE_INTEGER; + pref.vValue.Integer = s->scope; + pref.dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == S_OK, "got %#x\n", hr); + + res = s->res; + + while ((hr = IDirectorySearch_GetNextRow(ds, sh)) != S_ADS_NOMORE_ROWS) + { + ok(hr == S_OK, "got %#x\n", hr); + + while ((hr = IDirectorySearch_GetNextColumnName(ds, sh, &name)) != S_ADS_NOMORE_COLUMNS) + { + DWORD i; + + ok(hr == S_OK, "got %#x\n", hr); + ok(res->name != NULL, "got extra row %s\n", wine_dbgstr_w(name)); + ok(!wcscmp(res->name, name), "expected %s, got %s\n", wine_dbgstr_w(res->name), wine_dbgstr_w(name)); + + memset(&col, 0xde, sizeof(col)); + hr = IDirectorySearch_GetColumn(ds, sh, name, &col); + ok(hr == S_OK, "got %#x\n", hr); + + ok(col.dwADsType == res->type, "got %d for %s\n", col.dwADsType, wine_dbgstr_w(name)); + + for (i = 0; i < col.dwNumValues; i++) + { + ok(res->values[i] != NULL, "expected to have more values for %s\n", wine_dbgstr_w(name)); + if (!res->values[i]) break; + + ok(!wcscmp(res->values[i], col.pADsValues[i].CaseIgnoreString), + "expected %s, got %s\n", wine_dbgstr_w(res->values[i]), wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); + } + + ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); + + FreeADsMem(name); + res++; + } + } + + ok(res->name == NULL, "there are more rows in test data: %s\n", wine_dbgstr_w(res->name)); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); +} + +static void test_DirectorySearch(void) +{ + static const struct search root_base = + { + L"LDAP://ldap.forumsys.com", ADS_SCOPE_BASE, + { + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"top", L"OpenLDAProotDSE", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/", NULL } }, + { NULL } + } + }; + static const struct search scientists_base = + { + L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", ADS_SCOPE_BASE, + { + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=einstein,dc=example,dc=com", + L"uid=galieleo,dc=example,dc=com", L"uid=tesla,dc=example,dc=com", L"uid=newton,dc=example,dc=com", + L"uid=training,dc=example,dc=com", L"uid=jmacy,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"scientists", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Scientists", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=scientists,dc=example,dc=com", NULL } }, + { NULL } + } + }; + static const struct search scientists_subtree = + { + L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", ADS_SCOPE_SUBTREE, + { + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=einstein,dc=example,dc=com", + L"uid=galieleo,dc=example,dc=com", L"uid=tesla,dc=example,dc=com", L"uid=newton,dc=example,dc=com", + L"uid=training,dc=example,dc=com", L"uid=jmacy,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"scientists", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Scientists", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=scientists,dc=example,dc=com", NULL } }, + { L"uniqueMember", ADSTYPE_CASE_IGNORE_STRING, { L"uid=tesla,dc=example,dc=com", NULL } }, + { L"ou", ADSTYPE_CASE_IGNORE_STRING, { L"italians", NULL } }, + { L"cn", ADSTYPE_CASE_IGNORE_STRING, { L"Italians", NULL } }, + { L"objectClass", ADSTYPE_CASE_IGNORE_STRING, { L"groupOfUniqueNames", L"top", NULL } }, + { L"ADsPath", ADSTYPE_CASE_IGNORE_STRING, { L"LDAP://ldap.forumsys.com/ou=italians,ou=scientists,dc=example,dc=com", NULL } }, + { NULL } + } + }; + HRESULT hr; + IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; + LPWSTR name; + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/rootDSE", &IID_IDirectorySearch, (void **)&ds); +todo_wine + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + if (hr != S_OK) return; + + pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref.vValue.dwType = ADSTYPE_INTEGER; + pref.vValue.Integer = ADS_SCOPE_BASE; + pref.dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, NULL); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + if (0) /* crashes under XP */ + { + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, 1, &sh); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + } + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + hr = IDirectorySearch_GetPreviousRow(ds, sh); +todo_wine + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + + while (IDirectorySearch_GetNextRow(ds, sh) != S_ADS_NOMORE_ROWS) + { + while (IDirectorySearch_GetNextColumnName(ds, sh, &name) != S_ADS_NOMORE_COLUMNS) + { + DWORD i; + + hr = IDirectorySearch_GetColumn(ds, sh, name, &col); + ok(hr == S_OK, "got %#x for column %s\n", hr, wine_dbgstr_w(name)); + + if (winetest_debug > 1) /* useful to create test arrays */ + { + printf("Column %s (values type %d):\n", wine_dbgstr_w(name), col.dwADsType); + printf("{ "); + for (i = 0; i < col.dwNumValues; i++) + printf("%s, ", wine_dbgstr_w(col.pADsValues[i].CaseIgnoreString)); + printf("NULL }\n"); + } + + hr = IDirectorySearch_FreeColumn(ds, &col); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); + } + + name = (void *)0xdeadbeef; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#x\n", hr); + ok(name == NULL, "got %p\n", name); + } + + hr = IDirectorySearch_GetNextRow(ds, sh); + ok(hr == S_ADS_NOMORE_ROWS, "got %#x\n", hr); + + name = NULL; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); +todo_wine + ok(name && !wcscmp(name, L"ADsPath"), "got %s\n", wine_dbgstr_w(name)); + FreeADsMem(name); + + name = (void *)0xdeadbeef; + hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#x\n", hr); + ok(name == NULL, "got %p\n", name); + + if (0) /* crashes under XP */ + { + hr = IDirectorySearch_GetColumn(ds, sh, NULL, &col); + ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); + } + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); + + do_search(&root_base); + do_search(&scientists_base); + do_search(&scientists_subtree); +} + START_TEST(ldap) { HRESULT hr; @@ -193,6 +425,7 @@ START_TEST(ldap) test_LDAP(); test_ParseDisplayName(); + test_DirectorySearch(); CoUninitialize(); } -- 2.25.1

2 1

[PATCH 5/8] adsldp: Add special column "ADsPath" at the end of the entry.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b59b31b21a..859d42546f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ struct ldap_search_context LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; + BOOL add_ADsPath; }; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1274,7 +1275,10 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; if (!ldap_ctx->ber) + { attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber); + ldap_ctx->add_ADsPath = TRUE; + } else attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber); @@ -1285,6 +1289,13 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR ldap_memfreeW(attr); return *name ? S_OK : E_OUTOFMEMORY; } + else if (ldap_ctx->add_ADsPath) + { + ldap_ctx->add_ADsPath = FALSE; + *name = AllocADsStr((WCHAR *)L"ADsPath"); + TRACE("=> %s\n", debugstr_w(*name)); + return *name ? S_OK : E_OUTOFMEMORY; + } *name = NULL; return S_ADS_NOMORE_COLUMNS; -- 2.25.1

2 1

[PATCH 3/8] adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e3b0bce9a2..350523222a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1211,11 +1211,9 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN 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); + ldap_ctx->entry = NULL; - return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; + return IDirectorySearch_GetNextRow(iface, res); } static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) @@ -1233,6 +1231,10 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND { ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); } else @@ -1241,10 +1243,14 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND 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; + if (!ldap_ctx->entry) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->pos++; + + return S_OK; } static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) -- 2.25.1

2 1

[PATCH 2/8] adsldp: Add a trace.
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 76a3f285c4..e3b0bce9a2 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1124,6 +1124,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SCOPE_BASE: case ADS_SCOPE_ONELEVEL: case ADS_SCOPE_SUBTREE: + TRACE("SEARCH_SCOPE: %d\n", prefs[i].vValue.u.Integer); ldap->search.scope = prefs[i].vValue.u.Integer; prefs[i].dwStatus = ADS_STATUS_S_OK; break; -- 2.25.1

2 1

[PATCH 7/8] adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn().
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index fed9a8afca..7385a40e25 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1342,6 +1342,42 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + if (!wcsicmp(name, L"ADsPath")) + { + WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry); + + col->pADsValues = heap_alloc(sizeof(col->pADsValues[0])); + if (!col->pADsValues) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + count = sizeof(L"LDAP://") + (wcslen(ldap->host) + 1 /* '/' */) * sizeof(WCHAR); + if (dn) count += wcslen(dn) * sizeof(WCHAR); + + col->pADsValues[0].u.CaseIgnoreString = heap_alloc(count); + if (!col->pADsValues[0].u.CaseIgnoreString) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + wcscpy(col->pADsValues[0].u.CaseIgnoreString, L"LDAP://"); + wcscat(col->pADsValues[0].u.CaseIgnoreString, ldap->host); + wcscat(col->pADsValues[0].u.CaseIgnoreString, L"/"); + if (dn) wcscat(col->pADsValues[0].u.CaseIgnoreString, dn); + col->dwADsType = ADSTYPE_CASE_IGNORE_STRING; + col->dwNumValues = 1; + col->pszAttrName = strdupW(name); + + TRACE("=> %s\n", debugstr_w(col->pADsValues[0].u.CaseIgnoreString)); + hr = S_OK; +exit: + ldap_memfreeW(dn); + return hr; + } + values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; -- 2.25.1

1 0

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

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 51 ++++++++++++++++++++++++++++++++++-- dlls/adsldp/adsldp_private.h | 17 ++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 859d42546f..fed9a8afca 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1301,11 +1301,58 @@ static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEAR return S_ADS_NOMORE_COLUMNS; } +static HRESULT add_column_values(ADS_SEARCH_COLUMN *col, struct berval **values, DWORD count) +{ + DWORD i; + + col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + if (!col->pADsValues) + return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + DWORD outlen; + TRACE("=> %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + col->pADsValues[i].u.CaseIgnoreString = strnAtoW(values[i]->bv_val, values[i]->bv_len, &outlen); + if (!col->pADsValues[i].u.CaseIgnoreString) + { + heap_free(col->pADsValues); + return E_OUTOFMEMORY; + } + } + + col->dwADsType = ADSTYPE_CASE_IGNORE_STRING; + col->dwNumValues = count; + + return S_OK; +} + static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR name, PADS_SEARCH_COLUMN col) { - FIXME("%p,%p,%s,%p: stub\n", iface, res, debugstr_w(name), col); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + HRESULT hr; + struct berval **values; + ULONG count; + + TRACE("%p,%p,%s,%p\n", iface, res, debugstr_w(name), col); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + + values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); + if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + + count = ldap_count_values_len(values); + + hr = add_column_values(col, values, count); + ldap_value_free_len(values); + if (hr == S_OK) + col->pszAttrName = strdupW(name); + + return hr; } static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) diff --git a/dlls/adsldp/adsldp_private.h b/dlls/adsldp/adsldp_private.h index 0443ffbf6e..149d52eb63 100644 --- a/dlls/adsldp/adsldp_private.h +++ b/dlls/adsldp/adsldp_private.h @@ -29,6 +29,23 @@ static inline WCHAR *strdupW(const WCHAR *src) return dst; } +static inline LPWSTR strnAtoW( LPCSTR str, DWORD inlen, DWORD *outlen ) +{ + LPWSTR ret = NULL; + *outlen = 0; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, inlen, NULL, 0 ); + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, str, inlen, ret, len ); + ret[len] = 0; + *outlen = len; + } + } + return ret; +} + DWORD map_ldap_error(DWORD) DECLSPEC_HIDDEN; #endif -- 2.25.1

1 0

[PATCH 4/8] adsldp: Implement IDirectorySearch::GetNextColumnName().
by Dmitry Timoshkov 26 Mar '20

26 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 31 ++++++++++++++++++++++++++++--- include/adshlp.h | 2 ++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 350523222a..b59b31b21a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -399,6 +399,7 @@ typedef struct struct ldap_search_context { LDAPMessage *res, *entry; + BerElement *ber; ULONG count, pos; }; @@ -1249,6 +1250,7 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND return S_ADS_NOMORE_ROWS; ldap_ctx->pos++; + ldap_ctx->ber = NULL; return S_OK; } @@ -1259,10 +1261,33 @@ static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_ return E_NOTIMPL; } -static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names) +static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *name) { - FIXME("%p,%p,%p: stub\n", iface, res, names); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + WCHAR *attr; + + TRACE("%p,%p,%p\n", iface, res, name); + + if (!ldap->ld) return E_NOTIMPL; + + if (!name || !ldap_ctx || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + + if (!ldap_ctx->ber) + attr = ldap_first_attributeW(ldap->ld, ldap_ctx->entry, &ldap_ctx->ber); + else + attr = ldap_next_attributeW(ldap->ld, ldap_ctx->entry, ldap_ctx->ber); + + if (attr) + { + TRACE("=> %s\n", debugstr_w(attr)); + *name = AllocADsStr(attr); + ldap_memfreeW(attr); + return *name ? S_OK : E_OUTOFMEMORY; + } + + *name = NULL; + return S_ADS_NOMORE_COLUMNS; } static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, diff --git a/include/adshlp.h b/include/adshlp.h index 0b08c1a99c..dac57857ed 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -28,7 +28,9 @@ HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); +LPWSTR WINAPI AllocADsStr(LPWSTR); BOOL WINAPI FreeADsMem(LPVOID); +BOOL WINAPI FreeADsStr(LPWSTR); #ifdef __cplusplus } -- 2.25.1

1 0

[PATCH alternate] kernelbase: Zero out retkey in the ERROR_INVALID_HANDLE case
by Jefferson Carpenter 26 Mar '20

26 Mar '20

Alternate implementation that branches on windows version. Submitting mainly to see whether it passes on all VMs. thanks, Jefferson

1 0