April 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 27a3c43bb00fe69c4652b89cf723b5cb9e9fbec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a3c43bb00fe69c4652b89cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:46 2012 +0900 advapi32: Add distinct tests for Read, Write and Execute access rights for kernel objects. --- dlls/advapi32/tests/security.c | 49 +++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9db84a4..40691ad 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -38,6 +38,10 @@ /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +#ifndef EVENT_QUERY_STATE +#define EVENT_QUERY_STATE 0x0001 +#endif + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -3992,6 +3996,9 @@ static void validate_default_security_descriptor(SECURITY_DESCRIPTOR *sd) ACL *acl; void *sid; + ret = IsValidSecurityDescriptor(sd); + ok(ret, "security descriptor is not valid\n"); + present = -1; defaulted = -1; acl = (void *)0xdeadbeef; @@ -4041,12 +4048,12 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA length = needed; sd = HeapAlloc(GetProcessHeap(), 0, length); - needed = 0; + needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return required buffer length\n"); + ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4058,7 +4065,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA todo_wine { ok(ret, "AccessCheck error %d\n", GetLastError()); ok(status == 1, "expected 1, got %d\n", status); - ok(granted == mapping->GenericAll, "expected %#x, got %#x\n", mapping->GenericAll, granted); + ok(granted == mapping->GenericAll, "expected all access %#x, got %#x\n", mapping->GenericAll, granted); } priv_set_len = sizeof(priv_set); granted = 0xdeadbeef; @@ -4080,13 +4087,44 @@ todo_wine { ok(status == 0, "expected 0, got %d\n", status); ok(granted == 0, "expected 0, got %#x\n", granted); } + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericRead, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericRead, "expected read access %#x, got %#x\n", mapping->GenericRead, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericWrite, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericWrite, "expected write access %#x, got %#x\n", mapping->GenericWrite, granted); +} + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = AccessCheck(sd, token, mapping->GenericExecute, mapping, &priv_set, &priv_set_len, &granted, &status); +todo_wine { + ok(ret, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == mapping->GenericExecute, "expected execute access %#x, got %#x\n", mapping->GenericExecute, granted); +} HeapFree(GetProcessHeap(), 0, sd); } static void test_mutex_security(HANDLE token) { HANDLE mutex; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; @@ -4107,7 +4145,8 @@ static void test_mutex_security(HANDLE token) static void test_event_security(HANDLE token) { HANDLE event; - GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS };

1 0

Daniel Lehman : msvcrt: Add declarations to stdlib. h for _strtoui64 and _strtoi64.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 5afde5f37832aaff99276c6e9926cf510797886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afde5f37832aaff99276c6e9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 13 15:58:48 2012 -0800 msvcrt: Add declarations to stdlib.h for _strtoui64 and _strtoi64. --- include/msvcrt/stdlib.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c972156..5010949 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -201,6 +201,10 @@ void __cdecl srand(unsigned int); double __cdecl strtod(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); +__int64 __cdecl _strtoi64(const char*,char**,int); +__int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl _strtoui64(const char*,char**,int); +unsigned __int64 __cdecl _strtoui64_l(const char*,char**,int,_locale_t); int __cdecl system(const char*); void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*)); void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*));

1 0

Alexandre Julliard : user32: Don' t invalidate DCEs for sibling top-level windows since they are not clipped.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 1dba866e6175d5de4a33a81b26c415a646484e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dba866e6175d5de4a33a81b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 16:34:37 2012 +0200 user32: Don't invalidate DCEs for sibling top-level windows since they are not clipped. --- dlls/user32/painting.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c3a25fb..60252c6 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -425,18 +425,17 @@ void invalidate_dce( HWND hwnd, const RECT *extra_rect ) if (dce->hwnd == hwnd || IsChild( hwnd, dce->hwnd )) { make_dc_dirty( dce ); + continue; } - else /* otherwise check if the window rectangle intersects this DCE window */ + + /* otherwise check if the window rectangle intersects this DCE window */ + if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) { - if (hwndScope == GetDesktopWindow() || - hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) - { - RECT dce_rect, tmp; - GetWindowRect( dce->hwnd, &dce_rect ); - if (IntersectRect( &tmp, &dce_rect, &window_rect ) || - (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) - make_dc_dirty( dce ); - } + RECT dce_rect, tmp; + GetWindowRect( dce->hwnd, &dce_rect ); + if (IntersectRect( &tmp, &dce_rect, &window_rect ) || + (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) + make_dc_dirty( dce ); } } USER_Unlock();

1 0

Piotr Caban : jscript: Make parsing of double more accurate.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: b81e44f8d975013a1039772fcfb228488335ff55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e44f8d975013a1039772fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:30 2012 +0200 jscript: Make parsing of double more accurate. --- dlls/jscript/global.c | 4 +++- dlls/jscript/lex.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 13b2cc9..92c70bc 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -621,7 +621,9 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } V_VT(retv) = VT_R8; - V_R8(retv) = (double)(positive?d:-d)*pow(10, exp); + if(!positive) + d = -d; + V_R8(retv) = (exp>0 ? d*pow(10, exp) : d/pow(10, -exp)); return S_OK; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3bb2814..42e482f 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -474,7 +474,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } - *literal = new_double_literal(ctx, (DOUBLE)d*pow(10, exp)); + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; }

1 0

Dmitry Timoshkov : advapi32: Add named pipe access tests.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 3bb0462165a89b72e4cdc65e8ba03bbce1611f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb0462165a89b72e4cdc65e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:30:04 2012 +0900 advapi32: Add named pipe access tests. --- dlls/advapi32/tests/security.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 40691ad..3fc9930 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4053,7 +4053,7 @@ static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MA ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, sd, length, &needed); ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); validate_default_security_descriptor(sd); @@ -4164,6 +4164,36 @@ static void test_event_security(HANDLE token) CloseHandle(event); } +#define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" +static void test_named_pipe_security(HANDLE token) +{ + HANDLE pipe, file; + GENERIC_MAPPING mapping = { FILE_GENERIC_READ, + FILE_GENERIC_WRITE, + FILE_GENERIC_EXECUTE, + STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + + SetLastError(0xdeadbeef); + pipe = CreateNamedPipe(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, + PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_UNLIMITED_INSTANCES, + 0, 0, NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe error %d\n", GetLastError()); + + test_default_handle_security(token, pipe, &mapping); + + SetLastError(0xdeadbeef); + file = CreateFile(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); + + CloseHandle(pipe); + + SetLastError(0xdeadbeef); + file = CreateFile("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + CloseHandle(file); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4236,6 +4266,7 @@ static void test_kernel_objects_security(void) test_mutex_security(token); test_event_security(token); + test_named_pipe_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Aric Stewart : quartz: Correct a critical section lock reversal issue found by Marcus Meissner ( Coverity).
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 6aafd2f1dedfe286e75892bef866d89150c12377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aafd2f1dedfe286e75892bef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 19 08:11:12 2012 -0500 quartz: Correct a critical section lock reversal issue found by Marcus Meissner (Coverity). --- dlls/quartz/videorenderer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1e9628..27c656c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -368,11 +368,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); LeaveCriticalSection(iface->pInputPin->pin.pCritSec); - LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); + LeaveCriticalSection(&iface->filter.csFilter); WaitForSingleObject(This->hEvent, INFINITE); - EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); + EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) {

1 0

Nikolay Sivov : msxml3: Make failing Locator QI a warning.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 1554cbc4d75c3d6e1eb5c51ce8b50b4a8c0553ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1554cbc4d75c3d6e1eb5c51ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:55:17 2012 +0400 msxml3: Make failing Locator QI a warning. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 936f583..eb66899 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1941,7 +1941,7 @@ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Nikolay Sivov : msxml3: Respect 'namespaces' feature calling content handler callbacks.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: f27159a59f11c835ae219fb837c342612cc083c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27159a59f11c835ae219fb83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 10:46:03 2012 +0400 msxml3: Respect 'namespaces' feature calling content handler callbacks. --- dlls/msxml3/saxreader.c | 97 +++++++++++++++---------- dlls/msxml3/tests/saxreader.c | 160 ++++++++++++++++++++++++++++++++++------- 2 files changed, 193 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f27159a59f11c835ae219…

1 0

Henri Verbeet : d3d8: Merge volumetexture.c into texture.c.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 715fd2aea714cea1884e880d0a303c24f5b77fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715fd2aea714cea1884e880d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:25 2012 +0200 d3d8: Merge volumetexture.c into texture.c. --- dlls/d3d8/Makefile.in | 4 +- dlls/d3d8/texture.c | 384 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/volumetexture.c | 418 --------------------------------------------- 3 files changed, 385 insertions(+), 421 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=715fd2aea714cea1884e8…

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_LockBox().
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 79e6ff850c1c06a9513bcfbae02e52fc2e72cb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e6ff850c1c06a9513bcfbae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:23 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_LockBox(). --- dlls/d3d8/volumetexture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 05ff065..1ce2b90 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -300,6 +300,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", @@ -309,8 +310,10 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume8_LockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource), - locked_box, box, flags); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume8_LockBox(&volume_impl->IDirect3DVolume8_iface, locked_box, box, flags); + } wined3d_mutex_unlock(); return hr;

1 0