Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/activeds/activeds_main.c | 5 ++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..b5b082073e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + return ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); }
/***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index d703874956..a5f1bff432 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads);
+ hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password);
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=66983
Your paranoid android.
=== wxppro (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072027, expected 0 ldap.c:103: Test failed: 13: got 0x80072027, expected 0
=== w2008s64 (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w8 (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w8adm (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w864 (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1507 (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809 (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809_2scr (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809_ar (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809_he (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809_ja (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809_zh_CN (32 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w2008s64 (64 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w864 (64 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1507 (64 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== w1064v1809 (64 bit report) ===
adsldp: ldap.c:98: Test failed: 13: got 0x80072032, expected 0 ldap.c:103: Test failed: 13: got 0x80072032, expected 0
=== debiant (32 bit report) ===
adsldp: ldap.c:103: Test failed: 14: got 0x80070051, expected 0 ldap.c:170: Test failed: 5: got 0x80070051, expected 0 ldap.c:170: Test failed: 7: got 0x80070051, expected 0 ldap.c:170: Test failed: 8: got 0x80070051, expected 0 ldap.c:170: Test failed: 10: got 0x80070051, expected 0 ldap.c:170: Test failed: 13: got 0x80070051, expected 0 ldap.c:170: Test failed: 14: got 0x80070051, expected 0
=== debiant (32 bit French report) ===
adsldp: ldap.c:103: Test failed: 5: got 0x80070051, expected 0 ldap.c:103: Test failed: 10: got 0x80070051, expected 0 ldap.c:98: Test failed: 11: got 0x80070051, expected 0x80005000 ldap.c:108: Test failed: 11: got 0x80070051, expected 0x80005000 ldap.c:103: Test failed: 12: got 0x80070051, expected 0x80005000 ldap.c:98: Test failed: 13: got 0x80070051, expected 0 ldap.c:153: Test failed: 13: got 0x80070051, expected 0 ldap.c:153: Test failed: 14: got 0x80070051, expected 0
=== debiant (64 bit WoW report) ===
adsldp: ldap.c:170: Test failed: 5: got 0x80070051, expected 0 ldap.c:170: Test failed: 7: got 0x80070051, expected 0 ldap.c:170: Test failed: 8: got 0x80070051, expected 0 ldap.c:170: Test failed: 10: got 0x80070051, expected 0 ldap.c:170: Test failed: 13: got 0x80070051, expected 0 ldap.c:170: Test failed: 14: got 0x80070051, expected 0