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

[PATCH] winex11: Build helper functions only when needed
by André Hentschel 27 Mar '18

27 Mar '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winex11.drv/bitblt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 6a858c1..165633c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1588,6 +1588,7 @@ static inline UINT get_color_component( UINT color, UINT mask ) return (color * mask / 255) << shift; } +#ifdef HAVE_LIBXSHAPE static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) { HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); @@ -1609,6 +1610,7 @@ static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) if (data->rdh.nCount * sizeof(RECT) > data->rdh.nRgnSize - sizeof(RECT)) flush_rgn_data( rgn, data ); } +#endif /*********************************************************************** * update_surface_region -- 2.7.4

1 0

[PATCH 2/2] msxml3/tests: Added invalid host XHR tests.
by Jacek Caban 27 Mar '18

27 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)

2 2

[PATCH 1/2] msxml3/tests: Added IServerXMLHTTPRequest tests.
by Jacek Caban 27 Mar '18

27 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

2 2

Questiion of GSOC
by Hua Meng 27 Mar '18

27 Mar '18

Hi, Alex~ After getting more familiar with Wine, I'm also interested in project: Implement Unicode string normalization. But there is a question. I found the project has a conflict with Sergio' work. So I wonder whether the project is suitable for gsoc if Sergio complete his work. Thanks for your reply~ Best regards Hua Meng

3 2

[PATCH 3/3] ddraw: Take the flip interval into account in ddraw_surface7_Flip().
by Henri Verbeet 27 Mar '18

27 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 59 +++++++++++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 3cf9b768099..a9632de502f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -219,7 +219,7 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, - const RECT *rect, BOOL read) DECLSPEC_HIDDEN; + const RECT *rect, BOOL read, unsigned int swap_interval) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 5148832cab6..87aec96443a 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -176,7 +176,7 @@ static HRESULT WINAPI ddraw_palette_SetEntries(IDirectDrawPalette *iface, hr = wined3d_palette_set_entries(palette->wined3d_palette, flags, start, count, entries); if (SUCCEEDED(hr) && palette->flags & DDPCAPS_PRIMARYSURFACE) - ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE); + ddraw_surface_update_frontbuffer(palette->ddraw->primary, NULL, FALSE, 0); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 30276b4a0de..2d200493c95 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -40,8 +40,10 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs * to support windowless rendering first. */ -HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) +HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, + const RECT *rect, BOOL read, unsigned int swap_interval) { + struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; HRESULT hr; @@ -69,8 +71,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - return wined3d_texture_blt(surface->ddraw->wined3d_frontbuffer, 0, rect, - surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); + if (swap_interval) + dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + else + dst_texture = surface->ddraw->wined3d_frontbuffer; + + if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, + surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) + hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + return hr; } if (FAILED(hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, &surface_dc))) @@ -473,7 +482,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; wined3d_swapchain_set_palette(surface->ddraw->wined3d_swapchain, palette_impl ? palette_impl->wined3d_palette : NULL); - ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); @@ -989,7 +998,7 @@ static HRESULT surface_lock(struct ddraw_surface *surface, } if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, @@ -1178,7 +1187,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface wined3d_mutex_lock(); hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); if (SUCCEEDED(hr) && surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, &surface->ddraw->primary_lock, FALSE, 0); wined3d_mutex_unlock(); return hr; @@ -1223,6 +1232,24 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); } +static unsigned int ddraw_swap_interval_from_flags(DWORD flags) +{ + if (flags & DDFLIP_NOVSYNC) + return 0; + + switch (flags & (DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) + { + case DDFLIP_INTERVAL2: + return 2; + case DDFLIP_INTERVAL3: + return 3; + case DDFLIP_INTERVAL4: + return 4; + default: + return 1; + } +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) { @@ -1336,7 +1363,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; - if (flags) + if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) { static UINT once; if (!once++) @@ -1346,7 +1373,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE, ddraw_swap_interval_from_flags(flags)); else hr = DD_OK; @@ -1487,11 +1514,11 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (!dst_surface->clipper) { if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = ddraw_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fill_colour, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE, 0); return hr; } @@ -1534,7 +1561,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE, 0))) break; } } @@ -1545,7 +1572,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE, 0))) break; } } @@ -2218,7 +2245,7 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) if (surface->dc) hr = DDERR_DCALREADYCREATED; else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); @@ -2320,7 +2347,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h { surface->dc = NULL; if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE, 0); } wined3d_mutex_unlock(); @@ -4288,12 +4315,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac } if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); + hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE, 0); if (SUCCEEDED(hr)) hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, flags, NULL, WINED3D_TEXF_POINT); if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); + hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE, 0); wined3d_mutex_unlock(); switch(hr) -- 2.11.0

1 0

[PATCH 2/3] ddraw: Create swapchains with back-buffers.
by Henri Verbeet 27 Mar '18

27 Mar '18

As preparation for the next patch. Note that we drop WINED3DUSAGE_RENDERTARGET here. We never render directly to the back-buffer in ddraw, since ddraw back-buffers don't directly correspond to wined3d back-buffers. Moreover, ddraw may create WINED3DFMT_P8_UINT swapchains, for which WINED3DUSAGE_RENDERTARGET wouldn't be valid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 791e1498f5c..32f01722630 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -629,8 +629,9 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - swapchain_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; - swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_COPY; + swapchain_desc.backbuffer_usage = 0; + swapchain_desc.backbuffer_count = 1; + swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; @@ -4853,25 +4854,26 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic struct wined3d_texture **texture) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + const struct wined3d_parent_ops *parent_ops; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (ddraw->wined3d_frontbuffer) - { - ERR("Frontbuffer already created.\n"); - return E_FAIL; - } + if (!ddraw->wined3d_frontbuffer) + parent_ops = &ddraw_frontbuffer_parent_ops; + else + parent_ops = &ddraw_null_wined3d_parent_ops; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, desc, 1, 1, - texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, &ddraw_frontbuffer_parent_ops, texture))) + texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, ddraw, parent_ops, texture))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - ddraw->wined3d_frontbuffer = *texture; + if (!ddraw->wined3d_frontbuffer) + ddraw->wined3d_frontbuffer = *texture; return hr; } -- 2.11.0

1 0

[PATCH 1/3] wined3d: Only create back-buffer views for swapchains with WINED3DUSAGE_RENDERTARGET set.
by Henri Verbeet 27 Mar '18

27 Mar '18

Since without it the view wouldn't be usable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b66b3946c46..b17effefd5a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1077,7 +1077,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, goto err_out; } - if (swapchain_desc->backbuffer_count) + if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_usage & WINED3DUSAGE_RENDERTARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; struct wined3d_view_desc view_desc; @@ -1113,7 +1113,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, TRACE("All defaults now set up.\n"); /* Clear the screen */ - if (swapchain->back_buffers && swapchain->back_buffers[0]) + if (device->back_buffer_view) clear_flags |= WINED3DCLEAR_TARGET; if (swapchain_desc->enable_auto_depth_stencil) clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; @@ -4893,7 +4893,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_rendertarget_view_decref(device->back_buffer_view); device->back_buffer_view = NULL; } - if (swapchain->desc.backbuffer_count) + if (swapchain->desc.backbuffer_count && swapchain->desc.backbuffer_usage & WINED3DUSAGE_RENDERTARGET) { struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; -- 2.11.0

1 0

Re: Student preparing for GSoC
by Kieran Duggan 27 Mar '18

27 Mar '18

(This is a little long, but I wanted to show my steps so I could be corrected) So after spending a very long time looking at it (probably too long), I think I have a solution. Looking at the code snippet from /dlls/atl100/tests/atl.c hwnd = create_container_window(); SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); container = NULL; hr = AtlAxAttachControl(control, hwnd, &container); ok(1==0, "Leaving AtlAxAttachControl second 0x%08x, 0x%08x\n",container, &container); ok(container != NULL, "Expected not NULL!\n"); val = GetWindowLongW(hwnd, GWLP_USERDATA); ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); DestroyWindow(hwnd); The data that was never freed in this case was the container which got assigned in the AtlAxAttatchControl function ==8187== 64 bytes in 1 blocks are definitely lost in loss record 271 of 577 ==8187== at 0x7BC519A5: RtlAllocateHeap (heap.c:260) ==8187== by 0x4D27844: IOCS_Create (atl_ax.c:953) ==8187== by 0x4D27844: AtlAxAttachControl (???:0) ==8187== by 0x487D35A: func_atl (in /home/kduggan15/Documents/Wine/wine-valgrind/wine/dlls/atl100/tests/ atl100_test-stripped.exe.so) ==8187== by 0x487D66E: ??? (in /home/kduggan15/Documents/Wine/wine-valgrind/wine/dlls/atl100/tests/ atl100_test-stripped.exe.so) ==8187== by 0x487CDD8: main (in /home/kduggan15/Documents/Wine/wine-valgrind/wine/dlls/atl100/tests/ atl100_test-stripped.exe.so) ==8187== The hard part of this for me was figuring out who was responsible for freeing container. After some time I came to the conclusion that the caller of the AtlAxAttachControl function was intended to free container. I namely came to this conclusion because I couldn't really see how the DestroyWindow function would be able to free the container. If DestoyWindow is supposed to be responsible for freeing container, I just wasn't smart enough to figure it out and will have too look again. To fix it, I just added "IUnknown_Release(container);" after DestroyWindow(hwnd) so the new code would look like this hwnd = create_container_window(); SetWindowLongW(hwnd, GWLP_USERDATA, 0xdeadbeef); container = NULL; hr = AtlAxAttachControl(control, hwnd, &container); ok(1==0, "Leaving AtlAxAttachControl second 0x%08x, 0x%08x\n",container, &container); ok(container != NULL, "Expected not NULL!\n"); val = GetWindowLongW(hwnd, GWLP_USERDATA); ok(val == 0xdeadbeef, "Expected unchanged, returned %08x\n", val); DestroyWindow(hwnd); + IUnknown_Release(container); Valgrind shows that this does remove the memory leak If this looks good enough, then I'll go ahead and submit it as a patch. I just wanted to get opinions here before I did Thank you all for your assistance up to this point. I've never worked with a project as large as Wine so exploring the source code and learning the debugging tools has been onerous, but I feel like I've learned a lot and feel accomplished (even if this attempt is incorrect). On Sat, Mar 24, 2018 at 5:14 PM, Austin English <austinenglish(a)gmail.com> wrote: > On mobile, so can't verify, but look at: > ==9846== by 0x4B07572: AtlAxAttachControl (atl_ax.c:1156) > Line 1156 in atl_ax. > And > ==9846== by 0x4804025: test_AtlAxAttachControl (atl.c:902) > Line 902 atl.c > > You can use `find -name atl.c` to find its location in the source checkout. > > On Sat, Mar 24, 2018, 13:52 Kieran Duggan <kieranduggan15(a)gmail.com> > wrote: > >> If that's the case, Is there a way that I can see where the >> AtlAxAttachControl was called from? It's not necessary technically, but >> knowing which test case caused a memory leak would be useful >> When I ran the full test suite I got something like this >> >> ==9846== 64 bytes in 1 blocks are definitely lost in loss record 1,255 of >> 2,380 >> ==9846== at 0x7BC46859: notify_alloc (heap.c:260) >> ==9846== by 0x7BC49D56: RtlAllocateHeap (heap.c:1726) >> ==9846== by 0x4B06D40: IOCS_Create (atl_ax.c:952) >> ==9846== by 0x4B07572: AtlAxAttachControl (atl_ax.c:1156) >> ==9846== by 0x4804025: test_AtlAxAttachControl (atl.c:902) >> ==9846== by 0x4805130: func_atl (atl.c:1092) >> ==9846== by 0x4805485: run_test (test.h:603) >> ==9846== by 0x4805EDC: main (test.h:687) >> ==9846== >> >> Because I can see what parameters the method was called with I get a >> little more useful information >> For example this one shows that a specific test case is where the >> function causes >> If a leak f I look around the logs a little more I don't see the other >> test cases breaking. >> So if there is a way to see where AtlAxAttachControl is being called from >> while running the test that would be useful. >> >> On Sat, Mar 24, 2018 at 2:49 AM, Austin English <austinenglish(a)gmail.com> >> wrote: >> >>> On Sat, Mar 24, 2018 at 1:34 AM, Kieran Duggan <kieranduggan15(a)gmail.com> >>> wrote: >>> > So I'm attempting to run individual tests now. What exactly should I do >>> > after I "make service.ok"? I tried just running valgrind the way I >>> would >>> > expect to use it i.e. >>> > >>> > valgrind --trace-children=yes --track-origins=yes --leak-check=full >>> > --num-callers=20 --workaround-gcc296-bugs=yes --log-file="filename.log" >>> > ./wine >>> > /home/kduggan15/Documents/Wine/wine-valgrind/dlls/atl100/tests/ >>> atl100_test-stripped.exe.so >>> > >>> > I get >>> > >>> > 64 bytes in 1 blocks are definitely lost in loss record 1,250 of 2,380 >>> > ==11711== at 0x7BC46859: notify_alloc (heap.c:260) >>> > ==11711== by 0x7BC49D56: RtlAllocateHeap (heap.c:1726) >>> > ==11711== by 0x4D16D40: IOCS_Create (atl_ax.c:952) >>> > ==11711== by 0x4D17572: AtlAxAttachControl (atl_ax.c:1156) >>> > ==11711== by 0x4804025: ??? (in >>> > /home/kduggan15/Documents/Wine/wine-valgrind/dlls/atl100/tests/ >>> atl100_test-stripped.exe.so) >>> > >>> > The issue being that the atl100_test-stripped.exe.so doesn't have any >>> debug >>> > symbols >>> > Also I initially tried make service.ok and I just get something >>> likemake >>> > service is up to date or it just builds the tests without running >>> valgrind. >>> > If it does run valgrind, then I don't know where the log is going (and >>> I >>> > checked wine-valgrind/logs of course) >>> > >>> > That's basically all I got. Sorry if these questions are a bit basic. >>> I'm >>> > just running into a few roadblocks and could use the assistance. I >>> really >>> > appreciate the help >>> >>> Hi Kieran, >>> >>> You've got it. Notice how the output is prefixed with the pid of the >>> wine process; that's valgrind's output. The source code lines on the >>> end of the line, like a backtrace. >>> >>> So that output shows that there's a leak in atl100, allocated via >>> heap.c's notify_alloc, then RtlAllocateHeap, then IOCS_Create, then >>> AtlAxAttachControl). >>> >>> Your task would be to find that leak, then fix it, i.e., free the >>> memory where it should have been, but wasn't. >>> >>> FYI, after running the tests, you may need to run 'rm service.ok', >>> otherwise the test won't run (only if it succeeded beforehand). >>> >> >>

4 6

[PATCH] crypt32: Add MS root CA 2010/2011.
by Alistair Leslie-Hughes 27 Mar '18

27 Mar '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/crypt32/rootstore.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 73d954f..d6c0dfb 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -666,6 +666,103 @@ static const BYTE rootcertauthority[] = { 0x7e,0x6c,0x9e,0xdb,0x73,0x13,0x64,0x62,0x69,0xa5,0x2f,0x7d,0xca,0x96,0x6d,0x9f, 0xf8,0x04,0x4d,0x30,0x92,0x3d,0x6e,0x21,0x14,0x21,0xc9,0x3d,0xe0,0xc3,0xfd,0x8a, 0x6b,0x9d,0x4a,0xfd,0xd1,0xa1,0x9d,0x99,0x43,0x77,0x3f,0xb0,0xda }; +static const BYTE rootcertauthority2010[] = { +0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x28, +0xcc,0x3a,0x25,0xbf,0xba,0x44,0xac,0x44,0x9a,0x9b,0x58,0x6b,0x43,0x39,0xaa,0x30, +0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x30,0x81, +0x88,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13, +0x30,0x11,0x06,0x03,0x55,0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67, +0x74,0x6f,0x6e,0x31,0x10,0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65, +0x64,0x6d,0x6f,0x6e,0x64,0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72, +0x61,0x74,0x69,0x6f,0x6e,0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29, +0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43, +0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f, +0x72,0x69,0x74,0x79,0x20,0x32,0x30,0x31,0x30,0x30,0x1e,0x17,0x0d,0x31,0x30,0x30, +0x36,0x32,0x33,0x32,0x31,0x35,0x37,0x32,0x34,0x5a,0x17,0x0d,0x33,0x35,0x30,0x36, +0x32,0x33,0x32,0x32,0x30,0x34,0x30,0x31,0x5a,0x30,0x81,0x88,0x31,0x0b,0x30,0x09, +0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x08,0x13,0x0a,0x57,0x61,0x73,0x68,0x69,0x6e,0x67,0x74,0x6f,0x6e,0x31,0x10, +0x30,0x0e,0x06,0x03,0x55,0x04,0x07,0x13,0x07,0x52,0x65,0x64,0x6d,0x6f,0x6e,0x64, +0x31,0x1e,0x30,0x1c,0x06,0x03,0x55,0x04,0x0a,0x13,0x15,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x43,0x6f,0x72,0x70,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e, +0x31,0x32,0x30,0x30,0x06,0x03,0x55,0x04,0x03,0x13,0x29,0x4d,0x69,0x63,0x72,0x6f, +0x73,0x6f,0x66,0x74,0x20,0x52,0x6f,0x6f,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66, +0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6f,0x72,0x69,0x74,0x79,0x20, +0x32,0x30,0x31,0x30,0x30,0x82,0x02,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x02,0x0f,0x00,0x30,0x82,0x02,0x0a, +0x02,0x82,0x02,0x01,0x00,0xb9,0x08,0x9e,0x28,0xe4,0xe4,0xec,0x06,0x4e,0x50,0x68, +0xb3,0x41,0xc5,0x7b,0xeb,0xae,0xb6,0x8e,0xaf,0x81,0xba,0x22,0x44,0x1f,0x65,0x34, +0x69,0x4c,0xbe,0x70,0x40,0x17,0xf2,0x16,0x7b,0xe2,0x79,0xfd,0x86,0xed,0x0d,0x39, +0xf4,0x1b,0xa8,0xad,0x92,0x90,0x1e,0xcb,0x3d,0x76,0x8f,0x5a,0xd9,0xb5,0x91,0x10, +0x2e,0x3c,0x05,0x8d,0x8a,0x6d,0x24,0x54,0xe7,0x1f,0xed,0x56,0xad,0x83,0xb4,0x50, +0x9c,0x15,0xa5,0x17,0x74,0x88,0x59,0x20,0xfc,0x08,0xc5,0x84,0x76,0xd3,0x68,0xd4, +0x6f,0x28,0x78,0xce,0x5c,0xb8,0xf3,0x50,0x90,0x44,0xff,0xe3,0x63,0x5f,0xbe,0xa1, +0x9a,0x2c,0x96,0x15,0x04,0xd6,0x07,0xfe,0x1e,0x84,0x21,0xe0,0x42,0x31,0x11,0xc4, +0x28,0x36,0x94,0xcf,0x50,0xa4,0x62,0x9e,0xc9,0xd6,0xab,0x71,0x00,0xb2,0x5b,0x0c, +0xe6,0x96,0xd4,0x0a,0x24,0x96,0xf5,0xff,0xc6,0xd5,0xb7,0x1b,0xd7,0xcb,0xb7,0x21, +0x62,0xaf,0x12,0xdc,0xa1,0x5d,0x37,0xe3,0x1a,0xfb,0x1a,0x46,0x98,0xc0,0x9b,0xc0, +0xe7,0x63,0x1f,0x2a,0x08,0x93,0x02,0x7e,0x1e,0x6a,0x8e,0xf2,0x9f,0x18,0x89,0xe4, +0x22,0x85,0xa2,0xb1,0x84,0x57,0x40,0xff,0xf5,0x0e,0xd8,0x6f,0x9c,0xed,0xe2,0x45, +0x31,0x01,0xcd,0x17,0xe9,0x7f,0xb0,0x81,0x45,0xe3,0xaa,0x21,0x40,0x26,0xa1,0x72, +0xaa,0xa7,0x4f,0x3c,0x01,0x05,0x7e,0xee,0x83,0x58,0xb1,0x5e,0x06,0x63,0x99,0x62, +0x91,0x78,0x82,0xb7,0x0d,0x93,0x0c,0x24,0x6a,0xb4,0x1b,0xdb,0x27,0xec,0x5f,0x95, +0x04,0x3f,0x93,0x4a,0x30,0xf5,0x97,0x18,0xb3,0xa7,0xf9,0x19,0xa7,0x93,0x33,0x1d, +0x01,0xc8,0xdb,0x22,0x52,0x5c,0xd7,0x25,0xc9,0x46,0xf9,0xa2,0xfb,0x87,0x59,0x43, +0xbe,0x9b,0x62,0xb1,0x8d,0x2d,0x86,0x44,0x1a,0x46,0xac,0x78,0x61,0x7e,0x30,0x09, +0xfa,0xae,0x89,0xc4,0x41,0x2a,0x22,0x66,0x03,0x91,0x39,0x45,0x9c,0xc7,0x8b,0x0c, +0xa8,0xca,0x0d,0x2f,0xfb,0x52,0xea,0x0c,0xf7,0x63,0x33,0x23,0x9d,0xfe,0xb0,0x1f, +0xad,0x67,0xd6,0xa7,0x50,0x03,0xc6,0x04,0x70,0x63,0xb5,0x2c,0xb1,0x86,0x5a,0x43, +0xb7,0xfb,0xae,0xf9,0x6e,0x29,0x6e,0x21,0x21,0x41,0x26,0x06,0x8c,0xc9,0xc3,0xee, +0xb0,0xc2,0x85,0x93,0xa1,0xb9,0x85,0xd9,0xe6,0x32,0x6c,0x4b,0x4c,0x3f,0xd6,0x5d, +0xa3,0xe5,0xb5,0x9d,0x77,0xc3,0x9c,0xc0,0x55,0xb7,0x74,0x00,0xe3,0xb8,0x38,0xab, +0x83,0x97,0x50,0xe1,0x9a,0x42,0x24,0x1d,0xc6,0xc0,0xa3,0x30,0xd1,0x1a,0x5a,0xc8, +0x52,0x34,0xf7,0x73,0xf1,0xc7,0x18,0x1f,0x33,0xad,0x7a,0xec,0xcb,0x41,0x60,0xf3, +0x23,0x94,0x20,0xc2,0x48,0x45,0xac,0x5c,0x51,0xc6,0x2e,0x80,0xc2,0xe2,0x77,0x15, +0xbd,0x85,0x87,0xed,0x36,0x9d,0x96,0x91,0xee,0x00,0xb5,0xa3,0x70,0xec,0x9f,0xe3, +0x8d,0x80,0x68,0x83,0x76,0xba,0xaf,0x5d,0x70,0x52,0x22,0x16,0xe2,0x66,0xfb,0xba, +0xb3,0xc5,0xc2,0xf7,0x3e,0x2f,0x77,0xa6,0xca,0xde,0xc1,0xa6,0xc6,0x48,0x4c,0xc3, +0x37,0x51,0x23,0xd3,0x27,0xd7,0xb8,0x4e,0x70,0x96,0xf0,0xa1,0x44,0x76,0xaf,0x78, +0xcf,0x9a,0xe1,0x66,0x13,0x02,0x03,0x01,0x00,0x01,0xa3,0x51,0x30,0x4f,0x30,0x0b, +0x06,0x03,0x55,0x1d,0x0f,0x04,0x04,0x03,0x02,0x01,0x86,0x30,0x0f,0x06,0x03,0x55, +0x1d,0x13,0x01,0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x1d,0x06,0x03, +0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0xd5,0xf6,0x56,0xcb,0x8f,0xe8,0xa2,0x5c,0x62, +0x68,0xd1,0x3d,0x94,0x90,0x5b,0xd7,0xce,0x9a,0x18,0xc4,0x30,0x10,0x06,0x09,0x2b, +0x06,0x01,0x04,0x01,0x82,0x37,0x15,0x01,0x04,0x03,0x02,0x01,0x00,0x30,0x0d,0x06, +0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x0b,0x05,0x00,0x03,0x82,0x02,0x01, +0x00,0xac,0xa5,0x96,0x8c,0xbf,0xbb,0xae,0xa6,0xf6,0xd7,0x71,0x87,0x43,0x31,0x56, +0x88,0xfd,0x1c,0x32,0x71,0x5b,0x35,0xb7,0xd4,0xf0,0x91,0xf2,0xaf,0x37,0xe2,0x14, +0xf1,0xf3,0x02,0x26,0x05,0x3e,0x16,0x14,0x7f,0x14,0xba,0xb8,0x4f,0xfb,0x89,0xb2, +0xb2,0xe7,0xd4,0x09,0xcc,0x6d,0xb9,0x5b,0x3b,0x64,0x65,0x70,0x66,0xb7,0xf2,0xb1, +0x5a,0xdf,0x1a,0x02,0xf3,0xf5,0x51,0xb8,0x67,0x6d,0x79,0xf3,0xbf,0x56,0x7b,0xe4, +0x84,0xb9,0x2b,0x1e,0x9b,0x40,0x9c,0x26,0x34,0xf9,0x47,0x18,0x98,0x69,0xd8,0x1c, +0xd7,0xb6,0xd1,0xbf,0x8f,0x61,0xc2,0x67,0xc4,0xb5,0xef,0x60,0x43,0x8e,0x10,0x1b, +0x36,0x49,0xe4,0x20,0xca,0xad,0xa7,0xc1,0xb1,0x27,0x65,0x09,0xf8,0xcd,0xf5,0x5b, +0x2a,0xd0,0x84,0x33,0xf3,0xef,0x1f,0xf2,0xf5,0x9c,0x0b,0x58,0x93,0x37,0xa0,0x75, +0xa0,0xde,0x72,0xde,0x6c,0x75,0x2a,0x66,0x22,0xf5,0x8c,0x06,0x30,0x56,0x9f,0x40, +0xb9,0x30,0xaa,0x40,0x77,0x15,0x82,0xd7,0x8b,0xec,0xc0,0xd3,0xb2,0xbd,0x83,0xc5, +0x77,0x0c,0x1e,0xae,0xaf,0x19,0x53,0xa0,0x4d,0x79,0x71,0x9f,0x0f,0xaf,0x30,0xce, +0x67,0xf9,0xd6,0x2c,0xcc,0x22,0x41,0x7a,0x07,0xf2,0x97,0x42,0x18,0xce,0x59,0x79, +0x10,0x55,0xde,0x6f,0x10,0xe4,0xb8,0xda,0x83,0x66,0x40,0x16,0x09,0x68,0x23,0x5b, +0x97,0x2e,0x26,0x9a,0x02,0xbb,0x57,0x8c,0xc5,0xb8,0xba,0x69,0x62,0x32,0x80,0x89, +0x9e,0xa1,0xfd,0xc0,0x92,0x7c,0x7b,0x2b,0x33,0x19,0x84,0x2a,0x63,0xc5,0x00,0x68, +0x62,0xfa,0x9f,0x47,0x8d,0x99,0x7a,0x45,0x3a,0xa7,0xe9,0xed,0xee,0x69,0x42,0xb5, +0xf3,0x81,0x9b,0x47,0x56,0x10,0x7b,0xfc,0x70,0x36,0x84,0x18,0x73,0xea,0xef,0xf9, +0x97,0x4d,0x9e,0x33,0x23,0xdd,0x26,0x0b,0xba,0x2a,0xb7,0x3f,0x44,0xdc,0x83,0x27, +0xff,0xbd,0x61,0x59,0x2b,0x11,0xb7,0xca,0x4f,0xdb,0xc5,0x8b,0x0c,0x1c,0x31,0xae, +0x32,0xf8,0xf8,0xb9,0x42,0xf7,0x7f,0xdc,0x61,0x9a,0x76,0xb1,0x5a,0x04,0xe1,0x11, +0x3d,0x66,0x45,0xb7,0x18,0x71,0xbe,0xc9,0x24,0x85,0xd6,0xf3,0xd4,0xba,0x41,0x34, +0x5d,0x12,0x2d,0x25,0xb9,0x8d,0xa6,0x13,0x48,0x6d,0x4b,0xb0,0x07,0x7d,0x99,0x93, +0x09,0x61,0x81,0x74,0x57,0x26,0x8a,0xab,0x69,0xe3,0xe4,0xd9,0xc7,0x88,0xcc,0x24, +0xd8,0xec,0x52,0x24,0x5c,0x1e,0xbc,0x91,0x14,0xe2,0x96,0xde,0xeb,0x0a,0xda,0x9e, +0xdd,0x5f,0xb3,0x5b,0xdb,0xd4,0x82,0xec,0xc6,0x20,0x50,0x87,0x25,0x40,0x3a,0xfb, +0xc7,0xee,0xcd,0xfe,0x33,0xe5,0x6e,0xc3,0x84,0x09,0x55,0x03,0x25,0x39,0xc0,0xe9, +0x35,0x5d,0x65,0x31,0xa8,0xf6,0xbf,0xa0,0x09,0xcd,0x29,0xc7,0xb3,0x36,0x32,0x2e, +0xdc,0x95,0xf3,0x83,0xc1,0x5a,0xcf,0x8b,0x8d,0xf6,0xea,0xb3,0x21,0xf8,0xa4,0xed, +0x1e,0x31,0x0e,0xb6,0x4c,0x11,0xab,0x60,0x0b,0xa4,0x12,0x23,0x22,0x17,0xa3,0x36, +0x64,0x82,0x91,0x04,0x12,0xe0,0xab,0x6f,0x1e,0xcb,0x50,0x05,0x61,0xb4,0x40,0xff, +0x59,0x86,0x71,0xd1,0xd5,0x33,0x69,0x7c,0xa9,0x73,0x8a,0x38,0xd7,0x64,0x0c,0xf1, +0x69 }; static const BYTE rootcertauthority2011[] = { 0x30,0x82,0x05,0xed,0x30,0x82,0x03,0xd5,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x3f, 0x8b,0xc8,0xb5,0xfc,0x9f,0xb2,0x96,0x43,0xb5,0x69,0xd6,0x6c,0x42,0xe1,0x44,0x30, @@ -771,6 +868,7 @@ static const struct CONST_BLOB { { authenticode, sizeof(authenticode) }, { rootauthority, sizeof(rootauthority) }, { rootcertauthority, sizeof(rootcertauthority) }, + { rootcertauthority2010, sizeof(rootcertauthority2010) }, { rootcertauthority2011, sizeof(rootcertauthority2011) }, }; -- 1.9.1

2 1

[PATCH] secur32: GetComputerObjectName should not set domain part of the name if it is NULL.
by Dmitry Timoshkov 27 Mar '18

27 Mar '18

LsaQueryInformationPolicy(PolicyDnsDomainInformation) sets both Name and DnsDomainName to NULL when hostname is set to a very long name like "this_is_host.part21.part32.local" and supposedly can't be resolved due to this. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/secur32.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index bece2b7398..9240c108e5 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -921,7 +921,9 @@ BOOLEAN WINAPI GetComputerObjectNameA( BOOLEAN rc; LPWSTR bufferW = NULL; ULONG sizeW = *nSize; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); + if (lpNameBuffer) { bufferW = heap_alloc(sizeW * sizeof(WCHAR)); if (bufferW == NULL) { @@ -952,6 +954,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( PPOLICY_DNS_DOMAIN_INFO domainInfo; NTSTATUS ntStatus; BOOLEAN status; + TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize); if (NameFormat == NameUnknown) @@ -1000,8 +1003,13 @@ BOOLEAN WINAPI GetComputerObjectNameW( { WCHAR bs[] = { '\\', 0 }; WCHAR ds[] = { '$', 0 }; - lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); - lstrcatW(lpNameBuffer, bs); + if (domainInfo->Name.Buffer) + { + lstrcpyW(lpNameBuffer, domainInfo->Name.Buffer); + lstrcatW(lpNameBuffer, bs); + } + else + *lpNameBuffer = 0; lstrcatW(lpNameBuffer, name); lstrcatW(lpNameBuffer, ds); status = TRUE; @@ -1038,13 +1046,18 @@ BOOLEAN WINAPI GetComputerObjectNameW( } len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW); - suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); - if (suffix) + if (domainInfo->DnsDomainName.Buffer) { - *suffix++ = 0; - len += 1 + strlenW(dcW) + strlenW(suffix); + suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); + if (suffix) + { + *suffix++ = 0; + len += 1 + strlenW(dcW) + strlenW(suffix); + } + len += strlenW(domainInfo->DnsDomainName.Buffer); } - len += strlenW(domainInfo->DnsDomainName.Buffer); + else + suffix = NULL; if (lpNameBuffer && *nSize > len) { @@ -1052,14 +1065,17 @@ BOOLEAN WINAPI GetComputerObjectNameW( lstrcatW(lpNameBuffer, name); lstrcatW(lpNameBuffer, commaW); lstrcatW(lpNameBuffer, ComputersW); - lstrcatW(lpNameBuffer, commaW); - lstrcatW(lpNameBuffer, dcW); - lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer); - if (suffix) + if (domainInfo->DnsDomainName.Buffer) { lstrcatW(lpNameBuffer, commaW); lstrcatW(lpNameBuffer, dcW); - lstrcatW(lpNameBuffer, suffix); + lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer); + if (suffix) + { + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, suffix); + } } status = TRUE; } -- 2.16.2

1 0