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

Gabriel Ivăncescu : jscript: Retrieve the item's dispatch in a helper function.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 70d8c011d205f5f91939524fe79b14307016e8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d8c011d205f5f91939524f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:56 2020 +0200 jscript: Retrieve the item's dispatch in a helper function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 31277c6fec..d6fa7c9ea1 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -129,6 +129,30 @@ static void release_named_item_script_obj(named_item_t *item) item->script_obj = NULL; } +static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *item) +{ + IUnknown *unk; + HRESULT hr; + + if(!site) + return E_UNEXPECTED; + + hr = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hr)) { + WARN("GetItemInfo failed: %08x\n", hr); + return hr; + } + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hr)) { + WARN("object does not implement IDispatch\n"); + return hr; + } + + return S_OK; +} + named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsigned flags) { named_item_t *item; @@ -140,25 +164,10 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig hr = create_named_item_script_obj(ctx, item); if(FAILED(hr)) return NULL; } + if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { - IUnknown *unk; - - if(!ctx->site) - return NULL; - - hr = IActiveScriptSite_GetItemInfo(ctx->site, item_name, - SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hr)) { - WARN("GetItemInfo failed: %08x\n", hr); - continue; - } - - hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hr)) { - WARN("object does not implement IDispatch\n"); - continue; - } + hr = retrieve_named_item_disp(ctx->site, item); + if(FAILED(hr)) continue; } return item;

1 0

Gabriel Ivăncescu : jscript: Implement persistent named items.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: f2c4594505d101dfc336be1c085c68b30f5c5563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c4594505d101dfc336be1c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:57 2020 +0200 jscript: Implement persistent named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d6fa7c9ea1..3fcaab0858 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -414,6 +414,15 @@ static void release_persistent_script_objs(JScript *This) release_named_item_script_obj(iter->named_item); } +static void release_named_item_list(JScript *This) +{ + while(!list_empty(&This->ctx->named_items)) { + named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); + list_remove(&iter->entry); + release_named_item(iter); + } +} + static void exec_queued_code(JScript *This) { bytecode_t *iter; @@ -433,6 +442,8 @@ static void exec_queued_code(JScript *This) static void decrease_state(JScript *This, SCRIPTSTATE state) { + named_item_t *item, *item_next; + if(This->ctx) { switch(This->ctx->state) { case SCRIPTSTATE_CONNECTED: @@ -453,14 +464,19 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) clear_script_queue(This); release_persistent_script_objs(This); - while(!list_empty(&This->ctx->named_items)) { - named_item_t *iter = LIST_ENTRY(list_head(&This->ctx->named_items), named_item_t, entry); - - list_remove(&iter->entry); - if(iter->disp) - IDispatch_Release(iter->disp); - release_named_item_script_obj(iter); - release_named_item(iter); + LIST_FOR_EACH_ENTRY_SAFE(item, item_next, &This->ctx->named_items, named_item_t, entry) + { + if(item->disp) + { + IDispatch_Release(item->disp); + item->disp = NULL; + } + release_named_item_script_obj(item); + if(!(item->flags & SCRIPTITEM_ISPERSISTENT)) + { + list_remove(&item->entry); + release_named_item(item); + } } if(This->ctx->secmgr) { @@ -688,6 +704,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { JScript *This = impl_from_IActiveScript(iface); + named_item_t *item; LCID lcid; HRESULT hres; @@ -732,6 +749,16 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, } } + /* Retrieve new dispatches for persistent named items */ + LIST_FOR_EACH_ENTRY(item, &This->ctx->named_items, named_item_t, entry) + { + if(!item->disp) + { + hres = retrieve_named_item_disp(pass, item); + if(FAILED(hres)) return hres; + } + } + This->site = pass; IActiveScriptSite_AddRef(This->site); @@ -829,6 +856,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) decrease_state(This, SCRIPTSTATE_CLOSED); clear_persistent_code_list(This); + release_named_item_list(This); return S_OK; }

1 0

Gabriel Ivăncescu : jscript/tests: Add tests for persistent named items.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 8baf4a2a556d0e82663f882801093cf2b82c1223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8baf4a2a556d0e82663f8828… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 24 18:49:58 2020 +0200 jscript/tests: Add tests for persistent named items. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 96 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index d79b974e9b..64b3588997 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -105,10 +105,12 @@ DEFINE_EXPECT(OnEnterScript); DEFINE_EXPECT(OnLeaveScript); DEFINE_EXPECT(OnScriptError); DEFINE_EXPECT(GetIDsOfNames); +DEFINE_EXPECT(GetIDsOfNames_persistent); DEFINE_EXPECT(GetItemInfo_global); DEFINE_EXPECT(GetItemInfo_global_code); DEFINE_EXPECT(GetItemInfo_visible); DEFINE_EXPECT(GetItemInfo_visible_code); +DEFINE_EXPECT(GetItemInfo_persistent); DEFINE_EXPECT(testCall); static const CLSID *engine_clsid = &CLSID_JScript; @@ -146,7 +148,7 @@ static ULONG WINAPI Dispatch_Release(IDispatch *iface) return 1; } -static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref; +static ULONG global_named_item_ref, visible_named_item_ref, visible_code_named_item_ref, persistent_named_item_ref; static ULONG WINAPI global_AddRef(IDispatch *iface) { @@ -178,6 +180,16 @@ static ULONG WINAPI visible_code_Release(IDispatch *iface) return --visible_code_named_item_ref; } +static ULONG WINAPI persistent_AddRef(IDispatch *iface) +{ + return ++persistent_named_item_ref; +} + +static ULONG WINAPI persistent_Release(IDispatch *iface) +{ + return --persistent_named_item_ref; +} + static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) { ok(0, "unexpected call\n"); @@ -202,6 +214,15 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOL return DISP_E_UNKNOWNNAME; } +static HRESULT WINAPI persistent_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, UINT name_cnt, + LCID lcid, DISPID *ids) +{ + ok(name_cnt == 1, "name_cnt = %u\n", name_cnt); + + CHECK_EXPECT2(GetIDsOfNames_persistent); + return DISP_E_UNKNOWNNAME; +} + static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID id, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, UINT *err) { @@ -261,6 +282,18 @@ static const IDispatchVtbl visible_code_named_item_vtbl = { static IDispatch visible_code_named_item = { &visible_code_named_item_vtbl }; +static const IDispatchVtbl persistent_named_item_vtbl = { + Dispatch_QueryInterface, + persistent_AddRef, + persistent_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + persistent_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch persistent_named_item = { &persistent_named_item_vtbl }; + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -320,6 +353,12 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC *ppiunkItem = (IUnknown*)&visible_code_named_item; return S_OK; } + if(!wcscmp(pstrName, L"persistent")) { + CHECK_EXPECT(GetItemInfo_persistent); + IDispatch_AddRef(&persistent_named_item); + *ppiunkItem = (IUnknown*)&persistent_named_item; + return S_OK; + } ok(0, "unexpected call %s\n", wine_dbgstr_w(pstrName)); return E_NOTIMPL; } @@ -1163,6 +1202,8 @@ static void test_named_items(void) ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); + hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY); + ok(hr == E_UNEXPECTED, "AddNamedItem returned: %08x\n", hr); SET_EXPECT(GetLCID); hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); @@ -1180,10 +1221,13 @@ static void test_named_items(void) ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); + hr = IActiveScript_AddNamedItem(script, L"persistent", SCRIPTITEM_ISPERSISTENT | SCRIPTITEM_CODEONLY); + ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_GetScriptDispatch(script, L"noContext", &disp); ok(hr == E_INVALIDARG, "GetScriptDispatch returned: %08x\n", hr); @@ -1267,6 +1311,7 @@ static void test_named_items(void) ok(global_named_item_ref > 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref > 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref > 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); SET_EXPECT(testCall); parse_script(parse, L"visibleItem.testCall();"); @@ -1433,6 +1478,28 @@ static void test_named_items(void) IDispatchEx_Release(dispex2); IDispatchEx_Release(dispex); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"var x = 13;\n", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISPERSISTENT, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"x = 10;\n", L"persistent", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 10, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var)); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + + dispex = get_script_dispatch(script, L"persistent"); + /* reinitialize script engine */ SET_EXPECT(OnStateChange_DISCONNECTED); @@ -1448,30 +1515,48 @@ static void test_named_items(void) ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_GetScriptDispatch(script, L"codeOnlyItem", &disp); ok(hr == E_UNEXPECTED, "hr = %08x, expected E_UNEXPECTED\n", hr); SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(GetItemInfo_persistent); hr = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); CHECK_CALLED(GetLCID); CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(GetItemInfo_persistent); + ok(persistent_named_item_ref > 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); hr = IActiveScript_AddNamedItem(script, L"codeOnlyItem", SCRIPTITEM_CODEONLY); ok(hr == S_OK, "AddNamedItem failed: %08x\n", hr); SET_EXPECT(OnStateChange_CONNECTED); - SET_EXPECT_MULTI(OnEnterScript, 4); - SET_EXPECT_MULTI(OnLeaveScript, 4); + SET_EXPECT_MULTI(OnEnterScript, 5); + SET_EXPECT_MULTI(OnLeaveScript, 5); + SET_EXPECT(GetIDsOfNames_persistent); hr = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); CHECK_CALLED(OnStateChange_CONNECTED); - CHECK_CALLED_MULTI(OnEnterScript, 4); - CHECK_CALLED_MULTI(OnLeaveScript, 4); + CHECK_CALLED_MULTI(OnEnterScript, 5); + CHECK_CALLED_MULTI(OnLeaveScript, 5); + todo_wine CHECK_CALLED(GetIDsOfNames_persistent); test_state(script, SCRIPTSTATE_CONNECTED); + dispex2 = get_script_dispatch(script, L"persistent"); + ok(dispex != dispex2, "Same script dispatch returned for \"persistent\" named item\n"); + IDispatchEx_Release(dispex2); + IDispatchEx_Release(dispex); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hr = IActiveScriptParse_ParseScriptText(parse, L"x", L"persistent", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 13, "Unexpected 'x': V_VT = %d, V_I4 = %d\n", V_VT(&var), V_I4(&var)); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + dispex = get_script_dispatch(script, NULL); for (i = 0; i < ARRAY_SIZE(global_idents); i++) { @@ -1592,6 +1677,7 @@ static void test_named_items(void) ok(global_named_item_ref == 0, "global_named_item_ref = %u\n", global_named_item_ref); ok(visible_named_item_ref == 0, "visible_named_item_ref = %u\n", visible_named_item_ref); ok(visible_code_named_item_ref == 0, "visible_code_named_item_ref = %u\n", visible_code_named_item_ref); + ok(persistent_named_item_ref == 0, "persistent_named_item_ref = %u\n", persistent_named_item_ref); test_state(script, SCRIPTSTATE_CLOSED); IActiveScriptParse_Release(parse);

1 0

Dmitry Timoshkov : adsldp: Fix a memory leak.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 381b1396b9330b45782daad5a5bc1f2652b91b12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=381b1396b9330b45782daad5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:08:54 2020 +0800 adsldp: Fix a memory leak. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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];

1 0

Dmitry Timoshkov : adsldp: Add a trace.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 7758d7a11c9295dc19b9e1c16946a5f90c811423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7758d7a11c9295dc19b9e1c1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:01 2020 +0800 adsldp: Add a trace. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Dmitry Timoshkov : adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: d2ab8296d48e4c0148ab48bf61aa719d39af7bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ab8296d48e4c0148ab48bf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:20 2020 +0800 adsldp: Improve IDirectorySearch::GetNextRow() end of entries detection logic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetNextColumnName().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 3adc9c5b215aac869cff7e36aeeddc9bc2ace670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3adc9c5b215aac869cff7e36… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:09:39 2020 +0800 adsldp: Implement IDirectorySearch::GetNextColumnName(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 }

1 0

Dmitry Timoshkov : adsldp: Add special column "ADsPath" at the end of the entry.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: e53a00944e1f494e36fdb72356463f038af5de23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e53a00944e1f494e36fdb723… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:04 2020 +0800 adsldp: Add special column "ADsPath" at the end of the entry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetColumn().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 889e66c2fea2a05845a01a40e626330d495430a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889e66c2fea2a05845a01a40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:16 2020 +0800 adsldp: Implement IDirectorySearch::GetColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Dmitry Timoshkov : adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: e5ecd3b465ec9667f167166804393806c343d0db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5ecd3b465ec9667f1671668… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 26 15:10:40 2020 +0800 adsldp: Add support for special column name "ADsPath" to IDirectorySearch::GetColumn(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0