October 2015 - Wine-Commits

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

Oct. 12, 2015

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

Riccardo Bortolato : d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 9c00f968d61f772d6b772f2122dc23ecaaaf2e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c00f968d61f772d6b772f212… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:07 2015 +0200 d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect. Pass wined3d_texture and sub_resource idx to device_parent_surface_created callback. Store wined3d_texture and sub_resource in d3d8_surface. Also updated d3d9, d3d11, ddraw callbacks accordingly. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/surface.c | 11 +++++++---- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- include/wine/wined3d.h | 3 ++- 8 files changed, 29 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c00f968d61f772d6b772…

1 0

Matteo Bruni : d3d9/tests: Add helpers to avoid multiple readbacks of the render target surface.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: b8225d0a6a8aaf9ede81bbbaa747f9f4c9dfcbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8225d0a6a8aaf9ede81bbbaa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:41 2015 +0200 d3d9/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/d3d9/tests/visual.c | 95 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 32 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a8329e2..50149e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -117,59 +117,90 @@ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y return color; } -static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) +struct surface_readback { - DWORD ret; - IDirect3DSurface9 *surf = NULL, *target = NULL; + IDirect3DSurface9 *surface; + D3DLOCKED_RECT locked_rect; +}; + +static void get_rt_readback(IDirect3DSurface9 *surface, struct surface_readback *rb) +{ + IDirect3DDevice9 *device; HRESULT hr; - D3DLOCKED_RECT lockedRect; - RECT rectToLock = {x, y, x+1, y+1}; + memset(rb, 0, sizeof(*rb)); + IDirect3DSurface9_GetDevice(surface, &device); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surf, NULL); - if (FAILED(hr) || !surf) + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &rb->surface, NULL); + if (FAILED(hr) || !rb->surface) { - 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 = IDirect3DDevice9_GetRenderTarget(device, 0, &target); - if(FAILED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, rb->surface); + 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 data, hr %#x.\n", hr); + goto error; } - hr = IDirect3DDevice9_GetRenderTargetData(device, target, surf); + hr = IDirect3DSurface9_LockRect(rb->surface, &rb->locked_rect, NULL, D3DLOCK_READONLY); if (FAILED(hr)) { - trace("Can't read the render target data, hr=%08x\n", hr); - ret = 0xdeadbeec; - goto out; + trace("Can't lock the offscreen surface, hr %#x.\n", hr); + goto error; } + IDirect3DDevice9_Release(device); + + return; + +error: + if (rb->surface) + IDirect3DSurface9_Release(rb->surface); + rb->surface = NULL; + IDirect3DDevice9_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; +} + +static void release_surface_readback(struct surface_readback *rb) +{ + HRESULT hr; + + if (!rb->surface) + return; + if (rb->locked_rect.pBits && FAILED(hr = IDirect3DSurface9_UnlockRect(rb->surface))) + trace("Can't unlock the offscreen surface, hr %#x.\n", hr); + IDirect3DSurface9_Release(rb->surface); +} + +static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) +{ + DWORD ret; + IDirect3DSurface9 *rt; + struct surface_readback rb; + HRESULT hr; - hr = IDirect3DSurface9_LockRect(surf, &lockedRect, &rectToLock, D3DLOCK_READONLY); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &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 0xdeadbeed; } + 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 = IDirect3DSurface9_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(target) IDirect3DSurface9_Release(target); - if(surf) IDirect3DSurface9_Release(surf); + IDirect3DSurface9_Release(rt); return ret; } @@ -19633,7 +19664,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 : d3d9/tests: Test uninitialized texture varyings with transformed vertices.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 171352b90147bfd8b7c1c6c7f3eaff482830f0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171352b90147bfd8b7c1c6c7f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:40 2015 +0200 d3d9/tests: Test uninitialized texture varyings with transformed vertices. 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 | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 49f3ad4..a8329e2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7020,6 +7020,20 @@ static void pretransformed_varying_test(void) 0x0000ffff /* end */ }; /* sample: fails */ + static const DWORD texcoord1_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1, v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x0000ffff /* end */ + }; + static const DWORD texcoord1_alpha_code[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80010005, 0x900f0000, /* dcl_texcoord1, v0 */ + 0x02000001, 0x800f0800, 0x90ff0000, /* mov oC0, v0.w */ + 0x0000ffff /* end */ + }; static const struct { @@ -7027,19 +7041,22 @@ static void pretransformed_varying_test(void) const DWORD *shader_code; DWORD color; BOOL todo; + BOOL broken_warp; } tests[] = { - {"blendweight", blendweight_code, 0x00191919, TRUE }, - {"blendindices", blendindices_code, 0x00333333, TRUE }, - {"normal", normal_code, 0x004c4c4c, TRUE }, - {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, - {"tangent", tangent_code, 0x00999999, TRUE }, - {"binormal", binormal_code, 0x00b2b2b2, TRUE }, - {"color", color_code, 0x00e6e6e6, FALSE}, - {"fog", fog_code, 0x00666666, TRUE }, - {"depth", depth_code, 0x00cccccc, TRUE }, - {"specular", specular_code, 0x004488ff, FALSE}, + {"blendweight", blendweight_code, 0x00191919, TRUE }, + {"blendindices", blendindices_code, 0x00333333, TRUE }, + {"normal", normal_code, 0x004c4c4c, TRUE }, + {"texcoord0", texcoord0_code, 0x00808c8c, FALSE}, + {"tangent", tangent_code, 0x00999999, TRUE }, + {"binormal", binormal_code, 0x00b2b2b2, TRUE }, + {"color", color_code, 0x00e6e6e6, FALSE}, + {"fog", fog_code, 0x00666666, TRUE }, + {"depth", depth_code, 0x00cccccc, TRUE }, + {"specular", specular_code, 0x004488ff, FALSE}, + {"texcoord1", texcoord1_code, 0x00000000, FALSE}, + {"texcoord1 alpha", texcoord1_alpha_code, 0x00000000, FALSE, TRUE}, }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -7126,6 +7143,7 @@ static void pretransformed_varying_test(void) 0x224488ff, /* Nothing special */ }, }; + D3DADAPTER_IDENTIFIER9 identifier; IDirect3DVertexDeclaration9 *decl; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -7135,6 +7153,7 @@ static void pretransformed_varying_test(void) DWORD color; HWND window; HRESULT hr; + BOOL warp; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -7155,6 +7174,10 @@ static void pretransformed_varying_test(void) goto done; } + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); @@ -7190,7 +7213,7 @@ static void pretransformed_varying_test(void) "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", tests[i].name, color, tests[i].color); else - ok(color_match(color, tests[i].color, 1), + ok(color_match(color, tests[i].color, 1) || broken(warp && tests[i].broken_warp), "Test %s returned color 0x%08x, expected 0x%08x.\n", tests[i].name, color, tests[i].color);

1 0

Jactry Zeng : user32: Implement semi-stub for FlashWindowEx.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: f22760d2102cee7752720d43f72b5e8fad1c0547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22760d2102cee7752720d43f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 7 11:51:30 2015 +0800 user32: Implement semi-stub for FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 19 ++++++++-------- dlls/user32/win.c | 58 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96136c1..34366a7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7085,14 +7085,14 @@ static void test_FlashWindow(void) SetLastError( 0xdeadbeef ); ret = pFlashWindow( NULL, TRUE ); - todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindow returned with %d\n", GetLastError() ); DestroyWindow( hwnd ); SetLastError( 0xdeadbeef ); ret = pFlashWindow( hwnd, TRUE ); - todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindow returned with %d\n", GetLastError() ); } @@ -7119,13 +7119,13 @@ static void test_FlashWindowEx(void) finfo.hwnd = NULL; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "FlashWindowEx returned with %d\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindowEx returned with %d\n", GetLastError()); finfo.hwnd = hwnd; SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7135,13 +7135,13 @@ static void test_FlashWindowEx(void) finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO) + 1; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError()==ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx succeeded\n"); finfo.cbSize = sizeof(FLASHWINFO); @@ -7149,7 +7149,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "FlashWindowEx returned with %d\n", GetLastError()); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); @@ -7165,7 +7165,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_NOACCESS, + ok(!ret && GetLastError() == ERROR_NOACCESS, "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -7180,7 +7180,6 @@ static void test_FlashWindowEx(void) finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); -todo_wine ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e3650f5..fb320c7 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3413,17 +3413,45 @@ BOOL WINAPI AnyPopup(void) */ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) { + FLASHWINFO finfo; + + finfo.cbSize = sizeof(FLASHWINFO); + finfo.dwFlags = bInvert ? FLASHW_ALL : FLASHW_STOP; + finfo.uCount = 1; + finfo.dwTimeout = 0; + finfo.hwnd = hWnd; + return FlashWindowEx( &finfo ); +} + +/******************************************************************* + * FlashWindowEx (USER32.@) + */ +BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) +{ WND *wndPtr; - TRACE("%p\n", hWnd); + TRACE( "%p\n", pfinfo->hwnd ); + + if (!pfinfo) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + + if (!pfinfo->hwnd || pfinfo->cbSize != sizeof(FLASHWINFO) || !IsWindow( pfinfo->hwnd )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + FIXME( "%p - semi-stub\n", pfinfo ); - if (IsIconic( hWnd )) + if (IsIconic( pfinfo->hwnd )) { - RedrawWindow( hWnd, 0, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_FRAME ); + RedrawWindow( pfinfo->hwnd, 0, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_FRAME ); - wndPtr = WIN_GetPtr(hWnd); + wndPtr = WIN_GetPtr( pfinfo->hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - if (bInvert && !(wndPtr->flags & WIN_NCACTIVATED)) + if (pfinfo->dwFlags && !(wndPtr->flags & WIN_NCACTIVATED)) { wndPtr->flags |= WIN_NCACTIVATED; } @@ -3437,30 +3465,22 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) else { WPARAM wparam; + HWND hwnd = pfinfo->hwnd; - wndPtr = WIN_GetPtr(hWnd); + wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - hWnd = wndPtr->obj.handle; /* make it a full handle */ + hwnd = wndPtr->obj.handle; /* make it a full handle */ - if (bInvert) wparam = !(wndPtr->flags & WIN_NCACTIVATED); - else wparam = (hWnd == GetForegroundWindow()); + if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED); + else wparam = (hwnd == GetForegroundWindow()); WIN_ReleasePtr( wndPtr ); - SendMessageW( hWnd, WM_NCACTIVATE, wparam, 0 ); + SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); return wparam; } } /******************************************************************* - * FlashWindowEx (USER32.@) - */ -BOOL WINAPI FlashWindowEx( PFLASHWINFO pfwi ) -{ - FIXME("%p\n", pfwi); - return TRUE; -} - -/******************************************************************* * GetWindowContextHelpId (USER32.@) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd )

1 0

Dmitry Timoshkov : ntdll: Implement RtlValidRelativeSecurityDescriptor.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: af6610844669df27b10ef2611a1ef712f349ac7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6610844669df27b10ef2611… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 12 11:21:30 2015 +0800 ntdll: Implement RtlValidRelativeSecurityDescriptor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 40d3df5..38422ae 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -939,7 +939,7 @@ @ stub RtlUsageHeap @ cdecl -i386 -norelay RtlUshortByteSwap() NTDLL_RtlUshortByteSwap @ stdcall RtlValidAcl(ptr) -# @ stub RtlValidRelativeSecurityDescriptor +@ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @ stdcall RtlValidateHeap(long long ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 360a579..125c86e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -558,6 +558,16 @@ NTSTATUS WINAPI RtlValidSecurityDescriptor( } /************************************************************************** + * RtlValidRelativeSecurityDescriptor [NTDLL.@] + */ +BOOLEAN WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR descriptor, + ULONG length, SECURITY_INFORMATION info) +{ + FIXME("%p,%u,%d: semi-stub\n", descriptor, length, info); + return RtlValidSecurityDescriptor(descriptor) == STATUS_SUCCESS; +} + +/************************************************************************** * RtlLengthSecurityDescriptor [NTDLL.@] */ ULONG WINAPI RtlLengthSecurityDescriptor( diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 58ad879..1957a9a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1191,7 +1191,7 @@ @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) ntdll.RtlUpcaseUnicodeToOemN @ stdcall RtlUpperChar(long) ntdll.RtlUpperChar @ stdcall RtlUpperString(ptr ptr) ntdll.RtlUpperString -@ stub RtlValidRelativeSecurityDescriptor +@ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) ntdll.RtlValidRelativeSecurityDescriptor @ stdcall RtlValidSecurityDescriptor(ptr) ntdll.RtlValidSecurityDescriptor @ stdcall RtlValidSid(ptr) ntdll.RtlValidSid @ stdcall RtlVerifyVersionInfo(ptr long int64) ntdll.RtlVerifyVersionInfo diff --git a/include/winternl.h b/include/winternl.h index 61b144a..5420391 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2603,6 +2603,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUpdateTimer(HANDLE, HANDLE, DWORD, DWORD); NTSYSAPI CHAR WINAPI RtlUpperChar(CHAR); NTSYSAPI void WINAPI RtlUpperString(STRING *,const STRING *); NTSYSAPI NTSTATUS WINAPI RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR); +NTSYSAPI BOOLEAN WINAPI RtlValidRelativeSecurityDescriptor(PSECURITY_DESCRIPTOR,ULONG,SECURITY_INFORMATION); NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID);

1 0

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

Oct. 12, 2015

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

Sebastian Lackner : ntdll: Implement RtlIsCriticalSectionLocked[ByThread].
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

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 : ntdll/tests: Add tests for RtlIsCriticalSectionLocked[ ByThread].
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: b028f2c07697f75db7b93f940a320a30176f56d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b028f2c07697f75db7b93f940… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 10 05:39:35 2015 +0200 ntdll/tests: Add tests for RtlIsCriticalSectionLocked[ByThread]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index ce23310..4ab3d1e 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -96,6 +96,8 @@ static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULON static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); +static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(RTL_CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(RTL_CRITICAL_SECTION *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -147,6 +149,8 @@ static void InitFunctionPtrs(void) pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); + pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); + pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1956,6 +1960,102 @@ static void test_RtlDecompressBuffer(void) #undef DECOMPRESS_BROKEN_FRAGMENT #undef DECOMPRESS_BROKEN_TRUNCATED +struct critsect_locked_info +{ + CRITICAL_SECTION crit; + HANDLE semaphores[2]; +}; + +static DWORD WINAPI critsect_locked_thread(void *param) +{ + struct critsect_locked_info *info = param; + DWORD ret; + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + ReleaseSemaphore(info->semaphores[0], 1, NULL); + ret = WaitForSingleObject(info->semaphores[1], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + EnterCriticalSection(&info->crit); + + ret = pRtlIsCriticalSectionLocked(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info->crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + + ReleaseSemaphore(info->semaphores[0], 1, NULL); + ret = WaitForSingleObject(info->semaphores[1], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + LeaveCriticalSection(&info->crit); + return 0; +} + +static void test_RtlIsCriticalSectionLocked(void) +{ + struct critsect_locked_info info; + HANDLE thread; + BOOL ret; + + if (!pRtlIsCriticalSectionLocked || !pRtlIsCriticalSectionLockedByThread) + { + skip("skipping RtlIsCriticalSectionLocked tests, required functions not available\n"); + return; + } + + InitializeCriticalSection(&info.crit); + info.semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(info.semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + info.semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(info.semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + EnterCriticalSection(&info.crit); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + + thread = CreateThread(NULL, 0, critsect_locked_thread, &info, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + ret = WaitForSingleObject(info.semaphores[0], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + LeaveCriticalSection(&info.crit); + + ReleaseSemaphore(info.semaphores[1], 1, NULL); + ret = WaitForSingleObject(info.semaphores[0], 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + ret = pRtlIsCriticalSectionLocked(&info.crit); + ok(ret == TRUE, "expected TRUE, got %u\n", ret); + ret = pRtlIsCriticalSectionLockedByThread(&info.crit); + ok(ret == FALSE, "expected FALSE, got %u\n", ret); + + ReleaseSemaphore(info.semaphores[1], 1, NULL); + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret); + + CloseHandle(thread); + CloseHandle(info.semaphores[0]); + CloseHandle(info.semaphores[1]); + DeleteCriticalSection(&info.crit); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1985,4 +2085,5 @@ START_TEST(rtl) test_RtlCompressBuffer(); test_RtlGetCompressionWorkSpaceSize(); test_RtlDecompressBuffer(); + test_RtlIsCriticalSectionLocked(); }

1 0

Alistair Leslie-Hughes : include: Add gdipluseffects.h.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 447ee4cf46093242088034330bccc43a43379691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447ee4cf46093242088034330… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:07:49 2015 +1100 include: Add gdipluseffects.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/gdiplus.h | 2 ++ include/gdipluseffects.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3d2c97f..c5563a2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -345,6 +345,7 @@ SRCDIR_INCLUDES = \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ + gdipluseffects.h \ gdiplusenums.h \ gdiplusflat.h \ gdiplusgpstubs.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index f063b3e..e85343b 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -37,6 +37,7 @@ namespace Gdiplus #include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" +#include "gdipluseffects.h" namespace DllExports { @@ -57,6 +58,7 @@ namespace Gdiplus #include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" +#include "gdipluseffects.h" #include "gdiplusflat.h" diff --git a/include/gdipluseffects.h b/include/gdipluseffects.h new file mode 100644 index 0000000..d2d6a05 --- /dev/null +++ b/include/gdipluseffects.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2015 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GDIPLUSEFFECTS_H +#define _GDIPLUSEFFECTS_H + +DEFINE_GUID(BlurEffectGuid, 0x633c80a4, 0x1843, 0x482b, 0x9e, 0xf2, 0xbe, 0x28, 0x34, 0xc5, 0xfd, 0xd4); +DEFINE_GUID(SharpenEffectGuid, 0x63cbf3ee, 0xc526, 0x402c, 0x8f, 0x71, 0x62, 0xc5, 0x40, 0xbf, 0x51, 0x42); +DEFINE_GUID(ColorMatrixEffectGuid, 0x718f2615, 0x7933, 0x40e3, 0xa5, 0x11, 0x5f, 0x68, 0xfe, 0x14, 0xdd, 0x74); +DEFINE_GUID(ColorLUTEffectGuid, 0xa7ce72a9, 0x0f7f, 0x40d7, 0xb3, 0xcc, 0xd0, 0xc0, 0x2d, 0x5c, 0x32, 0x12); +DEFINE_GUID(BrightnessContrastEffectGuid, 0xd3a1dbe1, 0x8ec4, 0x4c17, 0x9f, 0x4c, 0xea, 0x97, 0xad, 0x1c, 0x34, 0x3d); +DEFINE_GUID(HueSaturationLightnessEffectGuid, 0x8b2dd6c3, 0xeb07, 0x4d87, 0xa5, 0xf0, 0x71, 0x08, 0xe2, 0x6a, 0x9c, 0x5f); +DEFINE_GUID(LevelsEffectGuid, 0x99c354ec, 0x2a31, 0x4f3a, 0x8c, 0x34, 0x17, 0xa8, 0x03, 0xb3, 0x3a, 0x25); +DEFINE_GUID(TintEffectGuid, 0x1077af00, 0x2848, 0x4441, 0x94, 0x89, 0x44, 0xad, 0x4c, 0x2d, 0x7a, 0x2c); +DEFINE_GUID(ColorBalanceEffectGuid, 0x537e597d, 0x251e, 0x48da, 0x96, 0x64, 0x29, 0xca, 0x49, 0x6b, 0x70, 0xf8); +DEFINE_GUID(RedEyeCorrectionEffectGuid, 0x74d29d05, 0x69a4, 0x4266, 0x95, 0x49, 0x3c, 0xc5, 0x28, 0x36, 0xb6, 0x32); +DEFINE_GUID(ColorCurveEffectGuid, 0xdd6a0022, 0x58e4, 0x4a67, 0x9d, 0x9b, 0xd4, 0x8e, 0xb8, 0x81, 0xa5, 0x3d); + +#ifdef __cplusplus +extern "C" { +#endif + +GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect); +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect); + +#ifdef __cplusplus +} +#endif + +#endif

1 0