October 2015 - Wine-commits

Matteo Bruni : wined3d: Fully initialize partially written varyings in SM3 shaders.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f4d9f8c212a03166a0ebd258a15e2ebe70632b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9f8c212a03166a0ebd258a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:04 2015 +0200 wined3d: Fully initialize partially written varyings in SM3 shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 5 ++--- dlls/wined3d/shader.c | 17 +++++++++++------ dlls/wined3d/wined3d_private.h | 32 ++++++++++++++++++-------------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3dff527..3d65fe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4317,7 +4317,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const char *one = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ONE); for(i = 0; i < MAX_REG_TEXCRD; i++) { - if (reg_maps->texcoord_mask[i] && reg_maps->texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) + if (reg_maps->u.texcoord_mask[i] && reg_maps->u.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) shader_addline(buffer, "MOV result.texcoord[%u].w, %s\n", i, one); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 042cd03..9b5b6e8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4858,9 +4858,8 @@ static void handle_ps3_input(struct shader_glsl_priv *priv, continue; if (set[in_idx] == ~0u) - set[in_idx] = mask; - else - set[in_idx] |= mask; + set[in_idx] = 0; + set[in_idx] |= mask & reg_maps_out->u.output_registers_mask[output->register_idx]; shader_glsl_write_mask_to_str(mask, reg_mask); shader_addline(buffer, "%s%s = vs_out[%u]%s;\n", diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f7136a9..c3a842e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -889,16 +889,15 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_version.type, constf_size)) return WINED3DERR_INVALIDCALL; - /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and - * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel - * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ - if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX && shader_version.major < 3) + if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX) { UINT idx = ins.dst[i].reg.idx[0].offset; switch (ins.dst[i].reg.type) { case WINED3DSPR_RASTOUT: + if (shader_version.major >= 3) + break; switch (idx) { case 0: /* oPos */ @@ -922,6 +921,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_ATTROUT: + if (shader_version.major >= 3) + break; if (idx < 2) { idx += 8; @@ -939,8 +940,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; case WINED3DSPR_TEXCRDOUT: - - reg_maps->texcoord_mask[idx] |= ins.dst[i].write_mask; + if (shader_version.major >= 3) + { + reg_maps->u.output_registers_mask[idx] |= ins.dst[i].write_mask; + break; + } + reg_maps->u.texcoord_mask[idx] |= ins.dst[i].write_mask; if (reg_maps->output_registers & (1u << idx)) { output_signature_elements[idx].mask |= ins.dst[i].write_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d75761e..70a8db8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -609,24 +609,28 @@ struct wined3d_shader_sampler_map struct wined3d_shader_reg_maps { struct wined3d_shader_version shader_version; - BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ - BYTE address; /* MAX_REG_ADDR, 1 */ - WORD labels; /* MAX_LABELS, 16 */ - DWORD temporary; /* MAX_REG_TEMP, 32 */ - DWORD *constf; /* pixel, vertex */ - DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ - DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ - WORD integer_constants; /* MAX_CONST_I, 16 */ - WORD boolean_constants; /* MAX_CONST_B, 16 */ - WORD local_int_consts; /* MAX_CONST_I, 16 */ - WORD local_bool_consts; /* MAX_CONST_B, 16 */ + BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ + BYTE address; /* MAX_REG_ADDR, 1 */ + WORD labels; /* MAX_LABELS, 16 */ + DWORD temporary; /* MAX_REG_TEMP, 32 */ + DWORD *constf; /* pixel, vertex */ + union + { + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + BYTE output_registers_mask[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ + } u; + DWORD input_registers; /* max(MAX_REG_INPUT, MAX_ATTRIBS), 32 */ + DWORD output_registers; /* MAX_REG_OUTPUT, 32 */ + WORD integer_constants; /* MAX_CONST_I, 16 */ + WORD boolean_constants; /* MAX_CONST_B, 16 */ + WORD local_int_consts; /* MAX_CONST_I, 16 */ + WORD local_bool_consts; /* MAX_CONST_B, 16 */ UINT cb_sizes[WINED3D_MAX_CBS]; struct wined3d_shader_resource_info resource_info[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; struct wined3d_shader_sampler_map sampler_map; - BYTE bumpmat; /* MAX_TEXTURES, 8 */ - BYTE luminanceparams; /* MAX_TEXTURES, 8 */ + BYTE bumpmat; /* MAX_TEXTURES, 8 */ + BYTE luminanceparams; /* MAX_TEXTURES, 8 */ WORD usesnrm : 1; WORD vpos : 1;

1 0

Matteo Bruni : d3d9/tests: Uninitialized varyings tests.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f63386f43e72494dd3f70ca71a906651045e5665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63386f43e72494dd3f70ca71… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:05 2015 +0200 d3d9/tests: Uninitialized varyings tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 302 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63386f43e72494dd3f70…

1 0

Matteo Bruni : d3d8/tests: Add helpers to avoid multiple readbacks of the render target surface.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 5cbf749eec5361febdadfa47f1bbac54eccbf6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbf749eec5361febdadfa47f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:06 2015 +0200 d3d8/tests: Add helpers to avoid multiple readbacks of the render target surface. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 113 ++++++++++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 41 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 318d3ca..772fd96 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -52,65 +52,96 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } -static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) +struct surface_readback { - DWORD ret; + IDirect3DSurface8 *surface; + D3DLOCKED_RECT locked_rect; +}; + +static void get_rt_readback(IDirect3DSurface8 *surface, struct surface_readback *rb) +{ + IDirect3DDevice8 *device; IDirect3DTexture8 *tex = NULL; - IDirect3DSurface8 *surf = NULL, *backbuf = NULL; HRESULT hr; - D3DLOCKED_RECT lockedRect; - RECT rectToLock = {x, y, x+1, y+1}; - hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1 /* Levels */, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); - if(FAILED(hr) || !tex ) /* This is not a test */ + memset(rb, 0, sizeof(*rb)); + IDirect3DSurface8_GetDevice(surface, &device); + hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &tex); + if (FAILED(hr) || !tex) { - trace("Can't create an offscreen plain surface to read the render target data, hr=%#08x\n", hr); - return 0xdeadbeef; + trace("Can't create an offscreen plain surface to read the render target data, hr %#x.\n", hr); + goto error; } - hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &surf); - if (FAILED(hr)) /* This is not a test */ + hr = IDirect3DTexture8_GetSurfaceLevel(tex, 0, &rb->surface); + if (FAILED(hr)) { - trace("Can't get surface from texture, hr=%#08x\n", hr); - ret = 0xdeadbeee; - goto out; + trace("Can't get surface from texture, hr %#x.\n", hr); + goto error; } - - hr = IDirect3DDevice8_GetRenderTarget(device, &backbuf); - if(FAILED(hr)) + hr = IDirect3DDevice8_CopyRects(device, surface, NULL, 0, rb->surface, NULL); + if (FAILED(hr)) { - trace("Can't get the render target, hr=%#08x\n", hr); - ret = 0xdeadbeed; - goto out; + trace("Can't read the render target, hr %#x.\n", hr); + goto error; } - hr = IDirect3DDevice8_CopyRects(device, backbuf, NULL, 0, surf, NULL); - if(FAILED(hr)) + hr = IDirect3DSurface8_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); + if (FAILED(hr)) { - trace("Can't read the render target, hr=%#08x\n", hr); - ret = 0xdeadbeec; - goto out; + trace("Can't lock the offscreen surface, hr %#x.\n", hr); + goto error; } + IDirect3DTexture8_Release(tex); + IDirect3DDevice8_Release(device); + return; + +error: + if (rb->surface) + IDirect3DSurface8_Release(rb->surface); + rb->surface = NULL; + if (tex) + IDirect3DTexture8_Release(tex); + IDirect3DDevice8_Release(device); +} + +static DWORD get_readback_color(struct surface_readback *rb, unsigned int x, unsigned int y) +{ + return rb->locked_rect.pBits + ? ((DWORD *)rb->locked_rect.pBits)[y * rb->locked_rect.Pitch / sizeof(DWORD) + x] : 0xdeadbeef; +} - hr = IDirect3DSurface8_LockRect(surf, &lockedRect, &rectToLock, D3DLOCK_READONLY); - if(FAILED(hr)) +static void release_surface_readback(struct surface_readback *rb) +{ + HRESULT hr; + + if (!rb->surface) + return; + if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface8_UnlockRect(rb->surface))) + trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + IDirect3DSurface8_Release(rb->surface); +} + +static DWORD getPixelColor(IDirect3DDevice8 *device, UINT x, UINT y) +{ + DWORD ret; + IDirect3DSurface8 *rt; + struct surface_readback rb; + HRESULT hr; + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + if (FAILED(hr)) { - trace("Can't lock the offscreen surface, hr=%#08x\n", hr); - ret = 0xdeadbeeb; - goto out; + trace("Can't get the render target, hr %#x.\n", hr); + return 0xdeadbeef; } + + get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't * really important for these tests */ - ret = ((DWORD *) lockedRect.pBits)[0] & 0x00ffffff; - hr = IDirect3DSurface8_UnlockRect(surf); - if(FAILED(hr)) - { - trace("Can't unlock the offscreen surface, hr=%#08x\n", hr); - } + ret = get_readback_color(&rb, x, y) & 0x00ffffff; + release_surface_readback(&rb); -out: - if(backbuf) IDirect3DSurface8_Release(backbuf); - if(surf) IDirect3DSurface8_Release(surf); - if(tex) IDirect3DTexture8_Release(tex); + IDirect3DSurface8_Release(rt); return ret; } @@ -6692,7 +6723,7 @@ static void test_updatetexture(void) color = getPixelColor(device, 320, 240); ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) - || broken(color == 0xdeadbeec), /* WARP device often just breaks down. */ + || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Matteo Bruni : d3d8/tests: Use the new readback helpers in test_pointsize( ).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 2e4aee0ee74a19f77fce15250ba0d9eade11456c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4aee0ee74a19f77fce15250… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:07 2015 +0200 d3d8/tests: Use the new readback helpers in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 772fd96..2748445 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7197,31 +7197,36 @@ static void test_pointsize(void) } else { - color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1); + struct surface_readback rb; + + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ffff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1); ok(color_match(color, 0x00000000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1); ok(color_match(color, 0x0000ff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); + + release_surface_readback(&rb); } } IDirect3DDevice8_SetVertexShader(device, 0);

1 0

Dmitry Timoshkov : mshtml: Handle memory allocation failure when creating IOleUndoManager.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: e8b9bda53ac39c913ddc93de0308f0c8b69605fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9bda53ac39c913ddc93de0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 12 11:21:20 2015 +0800 mshtml: Handle memory allocation failure when creating IOleUndoManager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 56744e6..8b2a6b7 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -197,6 +197,8 @@ static IOleUndoManager *create_undomgr(void) { UndoManager *ret = heap_alloc(sizeof(UndoManager)); + if (!ret) return NULL; + ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl; ret->ref = 1; @@ -246,6 +248,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG if(!This->doc_obj->undomgr) This->doc_obj->undomgr = create_undomgr(); + if (!This->doc_obj->undomgr) + return E_OUTOFMEMORY; + return IOleUndoManager_QueryInterface(This->doc_obj->undomgr, riid, ppv); }

1 0

Sebastian Lackner : ntdll: Implement RtlIsCriticalSectionLocked[ByThread].
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 7c46763ea786293ad93e44fe0658fbe1bf188a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c46763ea786293ad93e44fe0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:39:50 2015 +0200 ntdll: Implement RtlIsCriticalSectionLocked[ByThread]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/rtl.c | 2 +- include/winternl.h | 2 ++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 6e0332b..e2eb364 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -610,6 +610,43 @@ BOOL WINAPI RtlTryEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) /*********************************************************************** + * RtlIsCriticalSectionLocked (NTDLL.@) + * + * Checks if the critical section is locked by any thread. + * + * PARAMS + * crit [I/O] Critical section to check. + * + * RETURNS + * Success: TRUE. The critical section is locked. + * Failure: FALSE. The critical section is not locked. + */ +BOOL WINAPI RtlIsCriticalSectionLocked( RTL_CRITICAL_SECTION *crit ) +{ + return crit->RecursionCount != 0; +} + + +/*********************************************************************** + * RtlIsCriticalSectionLockedByThread (NTDLL.@) + * + * Checks if the critical section is locked by the current thread. + * + * PARAMS + * crit [I/O] Critical section to check. + * + * RETURNS + * Success: TRUE. The critical section is locked. + * Failure: FALSE. The critical section is not locked. + */ +BOOL WINAPI RtlIsCriticalSectionLockedByThread( RTL_CRITICAL_SECTION *crit ) +{ + return crit->OwningThread == ULongToHandle(GetCurrentThreadId()) && + crit->RecursionCount; +} + + +/*********************************************************************** * RtlLeaveCriticalSection (NTDLL.@) * * Leaves a critical section. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6b3fc65..7f07b14 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -719,6 +719,8 @@ # @ stub RtlIpv6StringToAddressExW # @ stub RtlIpv6StringToAddressW @ stdcall RtlIsActivationContextActive(ptr) +@ stdcall RtlIsCriticalSectionLocked(ptr) +@ stdcall RtlIsCriticalSectionLockedByThread(ptr) @ stdcall RtlIsDosDeviceName_U(wstr) @ stub RtlIsGenericTableEmpty # @ stub RtlIsGenericTableEmptyAvl diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 4ab3d1e..0f79f7d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2008,7 +2008,7 @@ static void test_RtlIsCriticalSectionLocked(void) if (!pRtlIsCriticalSectionLocked || !pRtlIsCriticalSectionLockedByThread) { - skip("skipping RtlIsCriticalSectionLocked tests, required functions not available\n"); + win_skip("skipping RtlIsCriticalSectionLocked tests, required functions not available\n"); return; } diff --git a/include/winternl.h b/include/winternl.h index 3e64b4d..e76114e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2483,6 +2483,8 @@ NTSYSAPI NTSTATUS WINAPI RtlInt64ToUnicodeString(ULONGLONG,ULONG,UNICODE_STRING NTSYSAPI NTSTATUS WINAPI RtlIntegerToChar(ULONG,ULONG,ULONG,PCHAR); NTSYSAPI NTSTATUS WINAPI RtlIntegerToUnicodeString(ULONG,ULONG,UNICODE_STRING *); NTSYSAPI BOOLEAN WINAPI RtlIsActivationContextActive(HANDLE); +NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLocked(RTL_CRITICAL_SECTION *); +NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTION *); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); NTSYSAPI BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3(const UNICODE_STRING*,POEM_STRING,PBOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlIsTextUnicode(LPCVOID,INT,INT *);

1 0

Sebastian Lackner : gdi32: Use RtlIsCriticalSectionLockedByThread to check lock owner.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 04bd68409afc4751dd9956247327c20062420fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bd68409afc4751dd9956247… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:40:07 2015 +0200 gdi32: Use RtlIsCriticalSectionLockedByThread to check lock owner. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index a255a4c..e861f24 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -867,7 +867,7 @@ void GDI_ReleaseObj( HGDIOBJ handle ) */ void GDI_CheckNotLock(void) { - if (gdi_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && gdi_section.RecursionCount) + if (RtlIsCriticalSectionLockedByThread(&gdi_section)) { ERR( "BUG: holding GDI lock\n" ); DebugBreak();

1 0

Sebastian Lackner : user32: Use RtlIsCriticalSectionLockedByThread to check lock owner.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 240cf962357c9844ef55e5a537e711c831f0ccfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=240cf962357c9844ef55e5a53… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:40:36 2015 +0200 user32: Use RtlIsCriticalSectionLockedByThread to check lock owner. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 718abe0..45aea81 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -81,7 +81,7 @@ void USER_Unlock(void) */ void USER_CheckNotLock(void) { - if (user_section.OwningThread == ULongToHandle(GetCurrentThreadId()) && user_section.RecursionCount) + if (RtlIsCriticalSectionLockedByThread(&user_section)) { ERR( "BUG: holding USER lock\n" ); DebugBreak();

1 0

Sebastian Lackner : vcomp: Use RtlIsCriticalSectionLockedByThread to check lock owner.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: 2964c2b34bfcedad045a7800b7d15aef6433fe21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2964c2b34bfcedad045a7800b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:40:56 2015 +0200 vcomp: Use RtlIsCriticalSectionLockedByThread to check lock owner. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 5aa0343..12fd2a5 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/list.h" @@ -1051,12 +1052,6 @@ static void destroy_critsect(CRITICAL_SECTION *critsect) HeapFree(GetProcessHeap(), 0, critsect); } -static BOOL critsect_is_locked(CRITICAL_SECTION *critsect) -{ - return critsect->OwningThread == ULongToHandle(GetCurrentThreadId()) && - critsect->RecursionCount; -} - void CDECL omp_init_lock(omp_lock_t *lock) { TRACE("(%p)\n", lock); @@ -1073,7 +1068,7 @@ void CDECL omp_set_lock(omp_lock_t *lock) { TRACE("(%p)\n", lock); - if (critsect_is_locked(*lock)) + if (RtlIsCriticalSectionLockedByThread(*lock)) { ERR("omp_set_lock called while holding lock %p\n", *lock); ExitProcess(1); @@ -1092,7 +1087,7 @@ int CDECL omp_test_lock(omp_lock_t *lock) { TRACE("(%p)\n", lock); - if (critsect_is_locked(*lock)) + if (RtlIsCriticalSectionLockedByThread(*lock)) return 0; return TryEnterCriticalSection(*lock);

1 0

Bruno Jesus : ws2_32/tests: Add WSAEnumNameSpaceProviders[A|W] tests.
by Alexandre Julliard 12 Oct '15

12 Oct '15

Module: wine Branch: master Commit: ad2405daa408e50a2d23e9af58503f40d91fbb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2405daa408e50a2d23e9af5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Oct 11 19:07:17 2015 +0800 ws2_32/tests: Add WSAEnumNameSpaceProviders[A|W] tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ include/winsock2.h | 27 ++++++++ 2 files changed, 187 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8ee3ce..7fbd67d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -72,6 +72,8 @@ static int (WINAPI *pInetPtonW)(INT,LPWSTR,LPVOID); static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); static int (WINAPI *pWSALookupServiceEnd)(HANDLE); static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); +static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); +static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); /**************** Structs and typedefs ***************/ @@ -1165,6 +1167,8 @@ static void Init (void) pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); + pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); + pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -8834,6 +8838,160 @@ todo_wine ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); } +static void test_WSAEnumNameSpaceProvidersA(void) +{ + LPWSANAMESPACE_INFOA name = NULL; + DWORD ret, error, blen = 0, i; + if (!pWSAEnumNameSpaceProvidersA) + { + win_skip("WSAEnumNameSpaceProvidersA not found\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(&blen, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + /* Invalid parameter tests */ + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(NULL, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(NULL, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersA(&blen, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + name = HeapAlloc(GetProcessHeap(), 0, blen); + if (!name) + { + skip("Failed to alloc memory\n"); + return; + } + + ret = pWSAEnumNameSpaceProvidersA(&blen, name); +todo_wine + ok(ret > 0, "Expected more than zero name space providers\n"); + + for (i = 0;i < ret; i++) + { + trace("Name space Identifier (%p): %s\n", name[i].lpszIdentifier, + name[i].lpszIdentifier); + switch (name[i].dwNameSpace) + { + case NS_DNS: + trace("\tName space ID: NS_DNS (%u)\n", name[i].dwNameSpace); + break; + case NS_NLA: + trace("\tName space ID: NS_NLA (%u)\n", name[i].dwNameSpace); + break; + default: + trace("\tName space ID: Unknown (%u)\n", name[i].dwNameSpace); + break; + } + trace("\tActive: %d\n", name[i].fActive); + trace("\tVersion: %d\n", name[i].dwVersion); + } + + HeapFree(GetProcessHeap(), 0, name); +} + +static void test_WSAEnumNameSpaceProvidersW(void) +{ + LPWSANAMESPACE_INFOW name = NULL; + DWORD ret, error, blen = 0, i; + if (!pWSAEnumNameSpaceProvidersW) + { + win_skip("WSAEnumNameSpaceProvidersW not found\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(&blen, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + /* Invalid parameter tests */ + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(NULL, name); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(NULL, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = pWSAEnumNameSpaceProvidersW(&blen, NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); +todo_wine + ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); + + name = HeapAlloc(GetProcessHeap(), 0, blen); + if (!name) + { + skip("Failed to alloc memory\n"); + return; + } + + ret = pWSAEnumNameSpaceProvidersW(&blen, name); +todo_wine + ok(ret > 0, "Expected more than zero name space providers\n"); + + for (i = 0;i < ret; i++) + { + trace("Name space Identifier (%p): %s\n", name[i].lpszIdentifier, + wine_dbgstr_w(name[i].lpszIdentifier)); + switch (name[i].dwNameSpace) + { + case NS_DNS: + trace("\tName space ID: NS_DNS (%u)\n", name[i].dwNameSpace); + break; + case NS_NLA: + trace("\tName space ID: NS_NLA (%u)\n", name[i].dwNameSpace); + break; + default: + trace("\tName space ID: Unknown (%u)\n", name[i].dwNameSpace); + break; + } + trace("\tActive: %d\n", name[i].fActive); + trace("\tVersion: %d\n", name[i].dwVersion); + } + + HeapFree(GetProcessHeap(), 0, name); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -8905,6 +9063,8 @@ START_TEST( sock ) test_sioAddressListChange(); test_WSALookupService(); + test_WSAEnumNameSpaceProvidersA(); + test_WSAEnumNameSpaceProvidersW(); test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName(); diff --git a/include/winsock2.h b/include/winsock2.h index fa3d26b..d871a23 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -211,6 +211,33 @@ extern "C" { #define LUP_RETURN_ALL (LUP_RETURN_ADDR|LUP_RETURN_BLOB|LUP_RETURN_ALIASES|LUP_RETURN_QUERY_STRING \ |LUP_RETURN_NAME|LUP_RETURN_TYPE|LUP_RETURN_VERSION|LUP_RETURN_COMMENT) +/* Constants for dwNameSpace from struct WSANAMESPACE_INFO */ +#define NS_ALL 0 +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 +#define NS_NLA 15 +#define NS_BTH 16 +#define NS_NBP 20 +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 +#define NS_EMAIL 37 +#define NS_PNRPNAME 38 +#define NS_PNRPCLOUD 39 +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 +#define NS_WRQ 50 +#define NS_NETDES 60 + #ifndef GUID_DEFINED #include <guiddef.h> #endif

1 0