[PATCH v3 0/3] MR7752: activeds: Implement ADsBuildVarArrayInt.
Implementation and test function for ADsBuildVarArrayInt, using ADsBuildVarArrayStr as reference. - /dlls/activeds/activeds_main.c - /dlls/activeds/tests/activeds.c - /include/adshlp.h -- v3: activeds/tests: enable https://gitlab.winehq.org/wine/wine/-/merge_requests/7752
From: Daniel Martin <dm(a)xbostechnology.com> - /dlls/activeds/activeds_main.c - /dlls/activeds/tests/activeds.c - /include/adshlp.h --- dlls/activeds/activeds_main.c | 27 +++++++++++++++++-- dlls/activeds/tests/activeds.c | 47 ++++++++++++++++++++++++++++++++++ include/adshlp.h | 1 + 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 0f13a5629b6..344ded4a9a1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -128,8 +128,31 @@ fail: */ HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) { - FIXME("(%p, %ld, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); - return E_NOTIMPL; + HRESULT hr; + SAFEARRAY *sa; + LONG idx; + + TRACE("(%p, %lu, %p)\n", lpdwObjectTypes, dwObjectTypes, pvar); + + if (!pvar) return E_ADS_BAD_PARAMETER; + + sa = SafeArrayCreateVector(VT_UI4, 0, dwObjectTypes); + if (!sa) return E_OUTOFMEMORY; + + VariantInit(pvar); + for (idx = 0; idx < dwObjectTypes; idx++) + { + hr = SafeArrayPutElement(sa, &idx, &lpdwObjectTypes[idx]); + if (hr != S_OK) + { + SafeArrayDestroy(sa); + return hr; + } + } + + V_VT(pvar) = VT_ARRAY | VT_UI4; + V_ARRAY(pvar) = sa; + return S_OK; } /***************************************************** diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index bc6a6bfc568..f5a42406055 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -84,6 +84,53 @@ static void test_ADsBuildVarArrayStr(void) VariantClear(&var); } +static void test_ADsBuildVarArrayInt(void) +{ + const DWORD props[] = { 1, 2, 3, 4 }; + HRESULT hr; + VARIANT var, item; + LONG start, end, idx; + + hr = ADsBuildVarArrayInt(NULL, 0, NULL); + ok(hr == E_ADS_BAD_PARAMETER || hr == E_FAIL /* XP */, "got %#lx\n", hr); + + hr = ADsBuildVarArrayInt(NULL, 0, &var); + ok(hr == S_OK, "got %#lx\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_UI4), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == -1, "got %ld\n", end); + VariantClear(&var); + + hr = ADsBuildVarArrayInt(props, ARRAY_SIZE(props), &var); + ok(hr == S_OK, "got %#lx\n", hr); + ok(V_VT(&var) == (VT_ARRAY | VT_UI4), "got %d\n", V_VT(&var)); + start = 0xdeadbeef; + hr = SafeArrayGetLBound(V_ARRAY(&var), 1, &start); + ok(hr == S_OK, "got %#lx\n", hr); + ok(start == 0, "got %ld\n", start); + end = 0xdeadbeef; + hr = SafeArrayGetUBound(V_ARRAY(&var), 1, &end); + ok(hr == S_OK, "got %#lx\n", hr); + ok(end == 3, "got %ld\n", end); + + for (idx = 0; idx < ARRAY_SIZE(props); idx++) + { + hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); + ok(hr == S_OK, "got %#lx\n", hr); + ok(V_VT(&item) == VT_UI4, "got %d\n", V_VT(&item)); + ok(V_UI4(&item) == props[idx], "got %u\n", V_UI4(&item)); + VariantClear(&item); + } + + VariantClear(&var); +} + static void test_Pathname(void) { static const WCHAR * const elem[3] = { L"a=b",L"c=d",L"e=f" }; diff --git a/include/adshlp.h b/include/adshlp.h index 7366c077788..4e85c0efb5c 100644 --- a/include/adshlp.h +++ b/include/adshlp.h @@ -31,6 +31,7 @@ WCHAR* WINAPI AllocADsStr(WCHAR*) __WINE_DEALLOC(FreeADsStr) __WINE_MALLOC; HRESULT WINAPI ADsBuildEnumerator(IADsContainer*,IEnumVARIANT**); HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR*,DWORD,VARIANT*); +HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD,DWORD,VARIANT*); HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT*,ULONG,VARIANT*,ULONG*); HRESULT WINAPI ADsGetObject(LPCWSTR,REFIID,VOID**); HRESULT WINAPI ADsOpenObject(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,REFIID,VOID**); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7752
From: Daniel Martin <dm(a)xbostechnology.com> --- dlls/activeds/tests/activeds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index f5a42406055..f84747b947b 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -86,7 +86,7 @@ static void test_ADsBuildVarArrayStr(void) static void test_ADsBuildVarArrayInt(void) { - const DWORD props[] = { 1, 2, 3, 4 }; + DWORD props[] = { 1, 2, 3, 4 }; HRESULT hr; VARIANT var, item; LONG start, end, idx; @@ -124,7 +124,7 @@ static void test_ADsBuildVarArrayInt(void) hr = SafeArrayGetElement(V_ARRAY(&var), &idx, &item); ok(hr == S_OK, "got %#lx\n", hr); ok(V_VT(&item) == VT_UI4, "got %d\n", V_VT(&item)); - ok(V_UI4(&item) == props[idx], "got %u\n", V_UI4(&item)); + ok(V_UI4(&item) == props[idx], "got %lu\n", V_UI4(&item)); VariantClear(&item); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7752
From: Daniel Martin <dm(a)xbostechnology.com> --- dlls/activeds/tests/activeds.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/activeds/tests/activeds.c b/dlls/activeds/tests/activeds.c index f84747b947b..5b78f36e89f 100644 --- a/dlls/activeds/tests/activeds.c +++ b/dlls/activeds/tests/activeds.c @@ -214,6 +214,7 @@ START_TEST(activeds) test_Pathname(); test_ADsBuildVarArrayStr(); + test_ADsBuildVarArrayInt(); CoUninitialize(); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7752
participants (2)
-
Daniel Martin -
Daniel Martin (＠danlm)