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

[tools] testbot/WineRunReconfig: Don't run WineTest on extra Wine VMs.
by Francois Gouget March 10, 2020

March 10, 2020

The role 'extra' means one can manually schedule a job on the VM but that nothing gets automatically run on it, including WineTest. This also means there will be no 'new failure' detection on these VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 24dcb6dbb1..7977fa569b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -539,7 +539,7 @@ if ($NewStatus eq 'completed') FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } - if ($VM->Type eq "wine") + if ($VM->Type eq "wine" and $VM->Role =~ /^(?:base|winetest)$/) { require WineTestBot::SpecialJobs; $ErrMessage = WineTestBot::SpecialJobs::AddWineTestJob([$VM], $VM->Name); -- 2.20.1

1 0

[PATCH v6 1/8] jscript: Lookup the named item and keep a ref to it from the associated bytecode.
by Gabriel Ivăncescu March 10, 2020

March 10, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/engine.h | 3 ++- dlls/jscript/function.c | 3 ++- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 22 ++++++++++++++++++++-- dlls/jscript/tests/jscript.c | 3 +++ 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 61db10c..5ac93c9 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2250,6 +2250,8 @@ void release_bytecode(bytecode_t *code) for(i=0; i < code->str_cnt; i++) jsstr_release(code->str_pool[i]); + if(code->named_item) + release_named_item(code->named_item); heap_free(code->source); heap_pool_free(&code->heap); heap_free(code->bstr_pool); @@ -2485,7 +2487,8 @@ static HRESULT compile_arguments(compiler_ctx_t *ctx, const WCHAR *args) } HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_context, unsigned start_line, - const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, bytecode_t **ret) + const WCHAR *args, const WCHAR *delimiter, BOOL from_eval, BOOL use_decode, + named_item_t *named_item, bytecode_t **ret) { compiler_ctx_t compiler = {0}; HRESULT hres; @@ -2526,6 +2529,11 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, UINT64 source_conte return DISP_E_EXCEPTION; } + if(named_item) { + compiler.code->named_item = named_item; + named_item->ref++; + } + *ret = compiler.code; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7be98c5..fe6b2a0 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -181,6 +181,7 @@ struct _bytecode_t { heap_pool_t heap; function_code_t global_code; + named_item_t *named_item; WCHAR *source; UINT64 source_context; @@ -197,7 +198,7 @@ struct _bytecode_t { struct list entry; }; -HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,named_item_t*,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; static inline bytecode_t *bytecode_addref(bytecode_t *code) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ef0de96..007aec0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -982,7 +982,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, &code); + hres = compile_script(ctx, str, 0, 0, NULL, NULL, FALSE, FALSE, + ctx->call_ctx ? ctx->call_ctx->bytecode->named_item : NULL, &code); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index e2758bf..2a1dcb2 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -204,7 +204,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a return E_OUTOFMEMORY; TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, 0, 0, NULL, NULL, TRUE, FALSE, frame ? frame->bytecode->named_item : NULL, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 36d9f84..694ea8b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -983,6 +983,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { JScript *This = impl_from_IActiveScriptParse(iface); + named_item_t *item = NULL; bytecode_t *code; jsexcept_t ei; HRESULT hres; @@ -994,9 +995,17 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLine, NULL, pstrDelimiter, - (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, &code); + (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, This->is_encode, item, &code); if(FAILED(hres)) return leave_script(This->ctx, hres); @@ -1075,6 +1084,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { JScript *This = impl_from_IActiveScriptParseProcedure2(iface); + named_item_t *item = NULL; bytecode_t *code; jsdisp_t *dispex; jsexcept_t ei; @@ -1087,9 +1097,17 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; + if(pstrItemName) { + item = lookup_named_item(This->ctx, pstrItemName, 0); + if(!item) { + WARN("Unknown context %s\n", debugstr_w(pstrItemName)); + return E_INVALIDARG; + } + } + enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, - pstrDelimiter, FALSE, This->is_encode, &code); + pstrDelimiter, FALSE, This->is_encode, item, &code); if(SUCCEEDED(hres)) hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8d4f6e1..56b8cff 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1267,6 +1267,9 @@ static void test_named_items(void) parse_script(parse, L"visibleItem.testCall();"); CHECK_CALLED(testCall); + hr = IActiveScriptParse_ParseScriptText(parse, L"function testFunc() { }", L"CodeOnlyItem", NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "ParseScriptText returned: %08x\n", hr); + SET_EXPECT(OnEnterScript); SET_EXPECT(GetIDsOfNames); SET_EXPECT(OnLeaveScript); -- 2.21.0

2 14

[PATCH v2] comctl32: Correctly draw disabled toolbar button which contains 32 bpp bitmap with alpha channel.
by Ziqing Hui March 10, 2020

March 10, 2020

v2: check has_alpha in imagelist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 5 +++++ dlls/comctl32/toolbar.c | 12 ++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 19 insertions(+)

1 0

[PATCH v2 1/5] d3d10core/tests: Add a test for independent blend.
by Zebediah Figura March 10, 2020

March 10, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 113 +++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index c793f21b08..6b19379900 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18177,6 +18177,118 @@ static void test_color_mask(void) release_test_context(&test_context); } +static void test_independent_blend(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtvs[8]; + ID3D10BlendState *blend_state; + struct resource_readback rb; + D3D10_BLEND_DESC blend_desc; + ID3D10Texture2D *rts[8]; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1, + out float4 t2 : SV_Target2, out float4 t3 : SV_Target3, + out float4 t4 : SV_Target4, out float4 t5 : SV_Target5, + out float4 t6 : SV_Target6, out float4 t7 : SV_Target7) + { + t0 = t1 = t2 = t3 = t4 = t5 = t6 = t7 = float4(0.0f, 1.0f, 0.0f, 0.5f); + } +#endif + 0x43425844, 0x77c86d8c, 0xc729bc00, 0xa7df8ead, 0xcc87ad10, 0x00000001, 0x000002b0, 0x00000003, + 0x0000002c, 0x00000060, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x000000d4, 0x00000008, 0x00000008, 0x000000c8, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x000000c8, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x000000c8, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x000000c8, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x000000c8, 0x00000004, 0x00000000, 0x00000003, + 0x00000004, 0x0000000f, 0x000000c8, 0x00000005, 0x00000000, 0x00000003, 0x00000005, 0x0000000f, + 0x000000c8, 0x00000006, 0x00000000, 0x00000003, 0x00000006, 0x0000000f, 0x000000c8, 0x00000007, + 0x00000000, 0x00000003, 0x00000007, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, + 0x0000016c, 0x00000040, 0x0000005b, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000003, 0x03000065, + 0x001020f2, 0x00000004, 0x03000065, 0x001020f2, 0x00000005, 0x03000065, 0x001020f2, 0x00000006, + 0x03000065, 0x001020f2, 0x00000007, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000004, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000005, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000006, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000007, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f000000, 0x0100003e, + }; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.SrcBlend = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + for (i = 0; i < 8; ++i) + { + blend_desc.BlendEnable[i] = i & 1; + blend_desc.RenderTargetWriteMask[i] = D3D10_COLOR_WRITE_ENABLE_ALL; + } + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + for (i = 0; i < 8; ++i) + { + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rts[i]); + ok(hr == S_OK, "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rts[i], NULL, &rtvs[i]); + ok(hr == S_OK, "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + ID3D10Device_OMSetRenderTargets(device, 8, rtvs, NULL); + + for (i = 0; i < 8; ++i) + ID3D10Device_ClearRenderTargetView(device, rtvs[i], red); + draw_quad(&test_context); + + for (i = 0; i < 8; ++i) + { + get_texture_readback(rts[i], 0, &rb); + color = get_readback_color(&rb, 320, 240); + todo_wine_if (i & 1) + ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + release_resource_readback(&rb); + + ID3D10Texture2D_Release(rts[i]); + ID3D10RenderTargetView_Release(rtvs[i]); + } + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18296,6 +18408,7 @@ START_TEST(d3d10core) queue_test(test_render_a8); queue_test(test_desktop_window); queue_test(test_color_mask); + queue_test(test_independent_blend); run_queued_tests(); -- 2.25.1

3 12

[v2 PATCH 1/3] wined3d: Move source texture resolve from texture2d_blt_fbo() to fbo_blitter_blit().
by Paul Gofman March 10, 2020

March 10, 2020

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - added patch. dlls/wined3d/surface.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a67a08042c..d2552bbd69 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,13 +175,6 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co break; } - /* Resolve the source surface first if needed. */ - if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) - && (src_texture->resource.format->id != dst_texture->resource.format->id - || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) - || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) - src_location = WINED3D_LOCATION_RB_RESOLVED; - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with @@ -944,6 +937,14 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_COLOR_BLIT) { TRACE("Colour blit.\n"); + + /* Resolve the source surface first if needed. */ + if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), src_location) + && (src_texture->resource.format->id != dst_texture->resource.format->id + || abs(src_rect->bottom - src_rect->top) != abs(dst_rect->bottom - dst_rect->top) + || abs(src_rect->right - src_rect->left) != abs(dst_rect->right - dst_rect->left))) + src_location = WINED3D_LOCATION_RB_RESOLVED; + texture2d_blt_fbo(device, context, filter, src_texture, src_sub_resource_idx, src_location, src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect); return dst_location; -- 2.24.1

2 7

[PATCH 4/4] adsldp: Implement IParseDisplayName::ParseDisplayName.
by Dmitry Timoshkov March 10, 2020

March 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 24 ++++++++++++++++++++++-- dlls/adsldp/tests/ldap.c | 3 +-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 536932c966..acebf717aa 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -101,8 +101,28 @@ static ULONG WINAPI ldap_Release(IParseDisplayName *iface) static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx *bc, LPOLESTR name, ULONG *eaten, IMoniker **mk) { - FIXME("%p,%p,%s,%p,%p: stub\n", iface, bc, debugstr_w(name), eaten, mk); - return E_NOTIMPL; + HRESULT hr; + IADsOpenDSObject *ads_open; + IDispatch *disp; + + TRACE("%p,%p,%s,%p,%p\n", iface, bc, debugstr_w(name), eaten, mk); + + hr = LDAPNamespace_create(&IID_IADsOpenDSObject, (void **)&ads_open); + if (hr != S_OK) return hr; + + hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + if (hr == S_OK) + { + hr = CreatePointerMoniker((IUnknown *)disp, mk); + if (hr == S_OK) + *eaten = wcslen(name); + + IDispatch_Release(disp); + } + + IADsOpenDSObject_Release(ads_open); + + return hr; } static const IParseDisplayNameVtbl LDAP_PARSE_vtbl = diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index c5d97b55df..0ecba26817 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -122,7 +122,6 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = IParseDisplayName_ParseDisplayName(parse, bc, path, &count, &mk); -todo_wine 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) { @@ -139,7 +138,7 @@ todo_wine count = 0xdeadbeef; hr = MkParseDisplayName(bc, test[i].path, &count, &mk); -todo_wine +todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) { -- 2.20.1

2 1

[PATCH 1/4] adsldp: Add IParseDisplayName stub interface.
by Dmitry Timoshkov March 10, 2020

March 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 96 ++++++++++++++++++++++++++++++++++++---- dlls/adsldp/adsldp.idl | 8 ++++ dlls/adsldp/tests/ldap.c | 92 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+), 9 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index 6d760c8682..cfa84c3fd0 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,5 @@ MODULE = adsldp.dll -IMPORTS = oleaut32 secur32 +IMPORTS = ole32 oleaut32 secur32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7281375e91..5432a0abe2 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -36,10 +36,95 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); static HMODULE adsldp_hinst; +static HRESULT LDAPNamespace_create(REFIID riid, void **obj); + +typedef struct +{ + IParseDisplayName IParseDisplayName_iface; + LONG ref; +} LDAP_PARSE; + +static inline LDAP_PARSE *impl_from_IParseDisplayName(IParseDisplayName *iface) +{ + return CONTAINING_RECORD(iface, LDAP_PARSE, IParseDisplayName_iface); +} + +static HRESULT WINAPI ldap_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IParseDisplayName)) + { + IParseDisplayName_AddRef(iface); + *obj = iface; + return S_OK; + } + + *obj = NULL; + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ldap_AddRef(IParseDisplayName *iface) +{ + LDAP_PARSE *ldap = impl_from_IParseDisplayName(iface); + return InterlockedIncrement(&ldap->ref); +} + +static ULONG WINAPI ldap_Release(IParseDisplayName *iface) +{ + LDAP_PARSE *ldap = impl_from_IParseDisplayName(iface); + LONG ref = InterlockedDecrement(&ldap->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(ldap); + } + + return ref; +} + +static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx *bc, + LPOLESTR name, ULONG *eaten, IMoniker **mk) +{ + FIXME("%p,%p,%s,%p,%p: stub\n", iface, bc, debugstr_w(name), eaten, mk); + return E_NOTIMPL; +} + +static const IParseDisplayNameVtbl LDAP_PARSE_vtbl = +{ + ldap_QueryInterface, + ldap_AddRef, + ldap_Release, + ldap_ParseDisplayName +}; + +static HRESULT LDAP_create(REFIID riid, void **obj) +{ + LDAP_PARSE *ldap; + HRESULT hr; + + ldap = heap_alloc(sizeof(*ldap)); + if (!ldap) return E_OUTOFMEMORY; + + ldap->IParseDisplayName_iface.lpVtbl = &LDAP_PARSE_vtbl; + ldap->ref = 1; + + hr = IParseDisplayName_QueryInterface(&ldap->IParseDisplayName_iface, riid, obj); + IParseDisplayName_Release(&ldap->IParseDisplayName_iface); + + return hr; +} + typedef struct { IADsADSystemInfo IADsADSystemInfo_iface; @@ -66,6 +151,7 @@ static HRESULT WINAPI sysinfo_QueryInterface(IADsADSystemInfo *iface, REFIID rii return S_OK; } + *obj = NULL; FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -560,6 +646,7 @@ static const struct class_info } class_info[] = { { &CLSID_ADSystemInfo, ADSystemInfo_create }, + { &CLSID_LDAP, LDAP_create }, { &CLSID_LDAPNamespace, LDAPNamespace_create }, }; @@ -666,7 +753,6 @@ static HRESULT factory_constructor(const struct class_info *info, REFIID riid, v HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { - const struct class_info *info = NULL; int i; TRACE("%s,%s,%p\n", debugstr_guid(clsid), debugstr_guid(iid), obj); @@ -678,15 +764,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) for (i = 0; i < ARRAY_SIZE(class_info); i++) { if (IsEqualCLSID(class_info[i].clsid, clsid)) - { - info = &class_info[i]; - break; - } + return factory_constructor(&class_info[i], iid, obj); } - if (info) - return factory_constructor(info, iid, obj); - FIXME("class %s/%s is not implemented\n", debugstr_guid(clsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/adsldp/adsldp.idl b/dlls/adsldp/adsldp.idl index b9549419e2..85190bc693 100644 --- a/dlls/adsldp/adsldp.idl +++ b/dlls/adsldp/adsldp.idl @@ -20,6 +20,14 @@ #pragma makedep register +[ + helpstring("LDAP Provider Object"), + progid("LDAP"), + uuid(228d9a81-c302-11cf-9aa4-00aa004a5691), + threading(both) +] +coclass LDAP { interface IParseDisplayName; } + [ helpstring("LDAP Namespace Object"), progid("LDAPNamespace"), diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e2ce9ee1a2..cc0b42c1c5 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -27,11 +27,36 @@ #include "winbase.h" #include "objbase.h" #include "iads.h" +#include "adserr.h" #include "wine/test.h" #include "initguid.h" +DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); +DEFINE_OLEGUID(CLSID_PointerMoniker,0x306,0,0); + +static const struct +{ + const WCHAR *path; + HRESULT hr, hr_ads_open, hr_ads_get; +} test[] = +{ + { L"invalid", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, + { L"LDAP", MK_E_SYNTAX, E_ADS_BAD_PATHNAME, E_FAIL }, + { L"LDAP:", S_OK }, + { L"LDAP:/", E_ADS_BAD_PATHNAME }, + { L"LDAP://", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com", S_OK }, + { L"LDAP:///ldap.forumsys.com", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com:389", S_OK }, + { L"LDAP://ldap.forumsys.com:389/DC=example,DC=com", S_OK }, + { L"LDAP://ldap.forumsys.com/", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE", S_OK }, + { L"LDAP://ldap.forumsys.com/rootDSE/", E_ADS_BAD_PATHNAME }, + { L"LDAP://ldap.forumsys.com/rootDSE/invalid", E_ADS_BAD_PATHNAME }, + /*{ L"LDAP://invalid", __HRESULT_FROM_WIN32(ERROR_DS_INVALID_DN_SYNTAX) }, takes way too much time */ +}; static void test_LDAP(void) { @@ -68,6 +93,72 @@ if (hr == S_OK) IUnknown_Release(unk); } +static void test_ParseDisplayName(void) +{ + HRESULT hr; + IBindCtx *bc; + IParseDisplayName *parse; + IMoniker *mk; + IUnknown *unk; + CLSID clsid; + BSTR path; + ULONG count; + int i; + + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&parse); + ok(hr == S_OK, "got %#x\n", hr); + IParseDisplayName_Release(parse); + + hr = CoCreateInstance(&CLSID_LDAP, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IParseDisplayName, (void **)&parse); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + + hr = CreateBindCtx(0, &bc); + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + path = SysAllocString(test[i].path); + + count = 0xdeadbeef; + hr = IParseDisplayName_ParseDisplayName(parse, bc, path, &count, &mk); +todo_wine + 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) + { + ok(count == lstrlenW(test[i].path), "%d: got %d\n", i, count); + + hr = IMoniker_GetClassID(mk, &clsid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "%d: got %s\n", i, wine_dbgstr_guid(&clsid)); + + IMoniker_Release(mk); + } + + SysFreeString(path); + + count = 0xdeadbeef; + hr = MkParseDisplayName(bc, test[i].path, &count, &mk); +todo_wine + ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + { + ok(count == lstrlenW(test[i].path), "%d: got %d\n", i, count); + + hr = IMoniker_GetClassID(mk, &clsid); + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "%d: got %s\n", i, wine_dbgstr_guid(&clsid)); + + IMoniker_Release(mk); + } + } + + IBindCtx_Release(bc); + IParseDisplayName_Release(parse); +} + START_TEST(ldap) { HRESULT hr; @@ -76,6 +167,7 @@ START_TEST(ldap) ok(hr == S_OK, "got %#x\n", hr); test_LDAP(); + test_ParseDisplayName(); CoUninitialize(); } -- 2.20.1

2 2

[PATCH 3/4] adsldp: Implement IADsOpenDSObject::OpenDSObject.
by Dmitry Timoshkov March 10, 2020

March 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 172 ++++++++++++++++++++++++++++++++++++++- dlls/adsldp/tests/ldap.c | 2 - 3 files changed, 171 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index cfa84c3fd0..e9c87e68f1 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,6 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 +IMPORTS = ole32 oleaut32 secur32 uuid +DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 5432a0abe2..536932c966 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,8 +28,13 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#include "adserr.h" #define SECURITY_WIN32 #include "security.h" +#include "dsgetdc.h" +#include "lmcons.h" +#include "lmapibuf.h" +#include "winldap.h" #include "wine/heap.h" #include "wine/debug.h" @@ -346,6 +351,10 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; + LDAP *ld; + BSTR host; + BSTR object; + ULONG port; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -395,6 +404,9 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (ldap->ld) ldap_unbind(ldap->ld); + SysFreeString(ldap->host); + SysFreeString(ldap->object); heap_free(ldap); } @@ -601,12 +613,163 @@ static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REF return E_NOTIMPL; } +static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) +{ + WCHAR *p, *p_host; + int host_len; + + if (host) *host = NULL; + if (port) *port = 0; + if (object) *object = NULL; + + if (wcsnicmp(path, L"LDAP:", 5) != 0) + return E_ADS_BAD_PATHNAME; + + p = path + 5; + if (!*p) return S_OK; + + if (*p++ != '/' || *p++ != '/' || !*p) + return E_ADS_BAD_PATHNAME; + + p_host = p; + host_len = 0; + while (*p && *p != '/') + { + if (*p == ':') + { + ULONG dummy; + if (!port) port = &dummy; + *port = wcstol(p + 1, &p, 10); + if (*p && *p != '/') return E_ADS_BAD_PATHNAME; + } + else + { + p++; + host_len++; + } + } + if (host_len == 0) return E_ADS_BAD_PATHNAME; + + if (host) + { + *host = SysAllocStringLen(p_host, host_len); + if (!*host) return E_OUTOFMEMORY; + } + + if (!*p) return S_OK; + + if (*p++ != '/' || !*p) + { + SysFreeString(*host); + return E_ADS_BAD_PATHNAME; + } + + if (object) + { + *object = SysAllocString(p); + if (!*object) + { + SysFreeString(*host); + return E_OUTOFMEMORY; + } + } + + return S_OK; +} + static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, LONG reserved, IDispatch **obj) { - FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), - reserved, obj); - return E_NOTIMPL; + BSTR host, object; + ULONG port; + IADs *ads; + LDAP *ld = NULL; + HRESULT hr; + ULONG err; + + FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + + hr = parse_path(path, &host, &port, &object); + if (hr != S_OK) return hr; + + TRACE("host %s, port %u, object %s\n", debugstr_w(host), port, debugstr_w(object)); + + if (host) + { + int version; + + if (!wcsicmp(host, L"rootDSE")) + { + DOMAIN_CONTROLLER_INFOW *dcinfo; + + if (object) + { + hr = E_ADS_BAD_PATHNAME; + goto fail; + } + + object = host; + + err = DsGetDcNameW(NULL, NULL, NULL, NULL, DS_RETURN_DNS_NAME, &dcinfo); + if (err != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + host = SysAllocString(dcinfo->DomainName); + NetApiBufferFree(dcinfo); + + if (!host) + { + hr = E_OUTOFMEMORY; + goto fail; + } + } + + ld = ldap_initW(host, port); + if (!ld) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + version = LDAP_VERSION3; + err = ldap_set_optionW(ld, LDAP_OPT_PROTOCOL_VERSION, &version); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + + err = ldap_connect(ld, NULL); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + } + + hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); + if (hr == S_OK) + { + LDAP_namespace *ldap = impl_from_IADs(ads); + ldap->ld = ld; + ldap->host = host; + ldap->port = port; + ldap->object = object; + hr = IADs_QueryInterface(ads, &IID_IDispatch, (void **)obj); + IADs_Release(ads); + return hr; + } + +fail: + SysFreeString(host); + SysFreeString(object); + + return hr; } static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = @@ -632,6 +795,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; + ldap->ld = NULL; + ldap->host = NULL; + ldap->object = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index cc0b42c1c5..c5d97b55df 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -85,9 +85,7 @@ static void test_LDAP(void) path = SysAllocString(L"LDAP:"); hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); SysFreeString(path); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -if (hr == S_OK) IDispatch_Release(disp); IUnknown_Release(unk); -- 2.20.1

2 1

[PATCH 2/4] netapi32: Implement DsGetDcNameW.
by Dmitry Timoshkov March 10, 2020

March 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/netapi32/Makefile.in | 2 +- dlls/netapi32/nbt.c | 3 + dlls/netapi32/netapi32.c | 149 ++++++++++++++++++++++++++++++++++++-- include/dsgetdc.h | 7 ++ 4 files changed, 153 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 23da4838f9..13065578ef 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll IMPORTLIB = netapi32 -IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 +IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi C_SRCS = \ nbcmdqueue.c \ diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 4816630334..9c2a731a94 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1437,12 +1437,15 @@ static const WCHAR Config_NetworkW[] = { 'S','o','f','t','w','a','r','e','\\', /* Initializes global variables and registers the NetBT transport */ void NetBTInit(void) { + WSADATA wsa_data; HKEY hKey; NetBIOSTransport transport; LONG ret; TRACE("\n"); + WSAStartup(MAKEWORD(2, 2), &wsa_data); + gEnableDNS = TRUE; gBCastQueries = BCAST_QUERIES; gBCastQueryTimeout = BCAST_QUERY_TIMEOUT; diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d6554aa676..f86e033c21 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -4,6 +4,7 @@ * Copyright 2005,2006 Paul Vriens * Copyright 2006 Robert Reif * Copyright 2013 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winsock2.h" +#include "ws2ipdef.h" +#include "windns.h" #include "lm.h" #include "lmaccess.h" #include "atsvc.h" @@ -56,9 +60,12 @@ #include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static char *strdup_unixcp( const WCHAR *str ) { char *ret; @@ -3033,14 +3040,142 @@ NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( return ERROR_NOT_SUPPORTED; } -DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, - GUID* DomainGuid, LPCWSTR SiteName, ULONG Flags, - PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo) +#define NS_MAXDNAME 1025 + +static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) { - FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_w(ComputerName), - debugstr_w(AvoidDCName), debugstr_guid(DomainGuid), - debugstr_w(SiteName), Flags, DomainControllerInfo); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR pfx[] = {'_','l','d','a','p','.','_','t','c','p','.','d','c','.','_','m','s','d','c','s','.',0}; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + + lstrcpyW(name, pfx); + lstrcatW(name, domain); + + ret = DnsQuery_W(name, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), ret); + if (ret == ERROR_SUCCESS) + { + TRACE("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + lstrcpynW(dc, rec->Data.Srv.pNameTarget, NS_MAXDNAME); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + ret = DnsQuery_W(dc, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + + return ret; + } + + /* IPv6 */ + ret = DnsQuery_W(dc, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + } + + return ret; +} + +DWORD WINAPI DsGetDcNameW(LPCWSTR computer, LPCWSTR domain, GUID *domain_guid, + LPCWSTR site, ULONG flags, PDOMAIN_CONTROLLER_INFOW *dc_info) +{ + static const WCHAR pfxW[] = {'\\','\\'}; + static const WCHAR default_site_nameW[] = {'D','e','f','a','u','l','t','-','F','i','r','s','t','-','S','i','t','e','-','N','a','m','e',0}; + NTSTATUS status; + POLICY_DNS_DOMAIN_INFO *dns_domain_info = NULL; + DOMAIN_CONTROLLER_INFOW *info; + WCHAR dc[NS_MAXDNAME], ip[IP6_ADDRESS_STRING_LENGTH]; + DWORD size; + + FIXME("(%s, %s, %s, %s, %08x, %p): semi-stub\n", debugstr_w(computer), + debugstr_w(domain), debugstr_guid(domain_guid), debugstr_w(site), flags, dc_info); + + if (!dc_info) return ERROR_INVALID_PARAMETER; + + if (!domain) + { + LSA_OBJECT_ATTRIBUTES attrs; + LSA_HANDLE lsa; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + status = LsaOpenPolicy(NULL, &attrs, POLICY_VIEW_LOCAL_INFORMATION, &lsa); + if (status) + return LsaNtStatusToWinError(status); + + status = LsaQueryInformationPolicy(lsa, PolicyDnsDomainInformation, (void **)&dns_domain_info); + LsaClose(lsa); + if (status) + return LsaNtStatusToWinError(status); + + domain = dns_domain_info->DnsDomainName.Buffer; + } + + status = get_dc_info(domain, dc, ip); + if (status) return status; + + size = sizeof(DOMAIN_CONTROLLER_INFOW) + lstrlenW(domain) * sizeof(WCHAR) + + sizeof(pfxW) * 2 + (lstrlenW(dc) + 1 + lstrlenW(ip) + 1) * sizeof(WCHAR) + + lstrlenW(domain) * sizeof(WCHAR) /* assume forest == domain */ + + sizeof(default_site_nameW) * 2; + status = NetApiBufferAllocate(size, (void **)&info); + if (status != NERR_Success) + { + LsaFreeMemory(dns_domain_info); + return ERROR_NOT_ENOUGH_MEMORY; + } + + info->DomainControllerName = (WCHAR *)(info + 1); + memcpy(info->DomainControllerName, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerName + 2, dc); + info->DomainControllerAddress = (WCHAR *)((char *)info->DomainControllerName + (strlenW(info->DomainControllerName) + 1) * sizeof(WCHAR)); + memcpy(info->DomainControllerAddress, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerAddress + 2, ip); + info->DomainControllerAddressType = DS_INET_ADDRESS; + info->DomainGuid = dns_domain_info ? dns_domain_info->DomainGuid : GUID_NULL /* FIXME */; + info->DomainName = (WCHAR *)((char *)info->DomainControllerAddress + (strlenW(info->DomainControllerAddress) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DomainName, domain); + info->DnsForestName = (WCHAR *)((char *)info->DomainName + (lstrlenW(info->DomainName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DnsForestName, domain); + info->DcSiteName = (WCHAR *)((char *)info->DnsForestName + (lstrlenW(info->DnsForestName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DcSiteName, default_site_nameW); + info->ClientSiteName = (WCHAR *)((char *)info->DcSiteName + sizeof(default_site_nameW)); + lstrcpyW(info->ClientSiteName, default_site_nameW); + info->Flags = DS_DNS_DOMAIN_FLAG | DS_DNS_FOREST_FLAG; + + LsaFreeMemory(dns_domain_info); + + *dc_info = info; + + return ERROR_SUCCESS; } DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, diff --git a/include/dsgetdc.h b/include/dsgetdc.h index c53fcc299a..856912212f 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -23,6 +23,13 @@ extern "C" { #endif +#define DS_INET_ADDRESS 1 +#define DS_NETBIOS_ADDRESS 2 + +#define DS_DNS_CONTROLLER_FLAG 0x20000000 +#define DS_DNS_DOMAIN_FLAG 0x40000000 +#define DS_DNS_FOREST_FLAG 0x80000000 + #define DS_FORCE_REDISCOVERY 0x00000001 #define DS_DIRECTORY_SERVICE_REQUIRED 0x00000010 #define DS_DIRECTORY_SERVICE_PREFERRED 0x00000020 -- 2.20.1

2 3

[PATCH] wldap32/tests: Add ldap_bind_s test.
by Dmitry Timoshkov March 10, 2020

March 10, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/tests/parse.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c4c97e1157..d96ae654bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -2,6 +2,7 @@ * test parsing functions * * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,10 @@ #include "wine/test.h" +#ifndef LDAP_AUTH_SIMPLE +#define LDAP_AUTH_SIMPLE 0x80 +#endif + static void test_ldap_parse_sort_control( LDAP *ld ) { ULONG ret, result; @@ -132,10 +137,39 @@ static void test_ldap_get_optionW( LDAP *ld ) ok( version == LDAP_VERSION3, "got %u\n", version ); } +static void test_ldap_bind_sA( void ) +{ + LDAP *ld; + ULONG ret; + int version; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + ret = ldap_connect( ld, NULL ); + ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + + ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); + ok( !ret, "ldap_bind_s failed 0x%08x\n", ret ); + + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_bind_sA(); + ld = ldap_initA((char *)"ldap.itd.umich.edu", 389 ); ok( ld != NULL, "ldap_init failed\n" ); -- 2.20.1

1 0