August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 6ea59b91577e230bb529e23567328cdf083e7f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea59b91577e230bb529e2356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 22 09:48:43 2013 +0200 d3dx9: Get rid of the ID3DXMatrixStack_Vtbl forward declaration. --- dlls/d3dx9_36/math.c | 68 +++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e0cab9e..f6a43a0 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; - struct ID3DXMatrixStackImpl { ID3DXMatrixStack ID3DXMatrixStack_iface; @@ -47,6 +45,7 @@ struct ID3DXMatrixStackImpl D3DXMATRIX *stack; }; +static const unsigned int INITIAL_STACK_SIZE = 32; /*_________________D3DXColor____________________*/ @@ -930,40 +929,6 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, const D3DXMATRIX *pm) /*_________________D3DXMatrixStack____________________*/ -static const unsigned int INITIAL_STACK_SIZE = 32; - -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) -{ - struct ID3DXMatrixStackImpl *object; - - TRACE("flags %#x, ppstack %p\n", flags, ppstack); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (object == NULL) - { - *ppstack = NULL; - return E_OUTOFMEMORY; - } - object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; - object->ref = 1; - - object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)); - if (!object->stack) - { - HeapFree(GetProcessHeap(), 0, object); - *ppstack = NULL; - return E_OUTOFMEMORY; - } - - object->current = 0; - object->stack_size = INITIAL_STACK_SIZE; - D3DXMatrixIdentity(&object->stack[0]); - - TRACE("Created matrix stack %p\n", object); - - *ppstack = &object->ID3DXMatrixStack_iface; - return D3D_OK; -} static inline struct ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) { @@ -1243,6 +1208,37 @@ static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl = ID3DXMatrixStackImpl_GetTop }; +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack) +{ + struct ID3DXMatrixStackImpl *object; + + TRACE("flags %#x, stack %p.\n", flags, stack); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + *stack = NULL; + return E_OUTOFMEMORY; + } + object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; + object->ref = 1; + + if (!(object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)))) + { + HeapFree(GetProcessHeap(), 0, object); + *stack = NULL; + return E_OUTOFMEMORY; + } + + object->current = 0; + object->stack_size = INITIAL_STACK_SIZE; + D3DXMatrixIdentity(&object->stack[0]); + + TRACE("Created matrix stack %p.\n", object); + + *stack = &object->ID3DXMatrixStack_iface; + return D3D_OK; +} + /*_________________D3DXPLANE________________*/ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, const D3DXVECTOR3 *pvpoint, const D3DXVECTOR3 *pvnormal)

1 0

Vincent Povirk : msvcrt: _[w]access_s returns an error code.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 5f2e48f737ecfa2e397d1148474824fcb70f4d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2e48f737ecfa2e397d11484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 21 15:13:36 2013 -0500 msvcrt: _[w]access_s returns an error code. --- dlls/msvcr90/tests/msvcr90.c | 82 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/file.c | 16 +++++--- 2 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index e4eee04..fa2b445 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -111,6 +111,7 @@ static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va static FILE* (__cdecl *p_fopen)(const char*, const char*); static int (__cdecl *p_fclose)(FILE*); static int (__cdecl *p_unlink)(const char*); +static int (__cdecl *p_access_s)(const char*, int); static void (__cdecl *p_lock_file)(FILE*); static void (__cdecl *p_unlock_file)(FILE*); static int (__cdecl *p_fileno)(FILE*); @@ -298,6 +299,7 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_unlink, "_unlink"); + SET(p_access_s, "_access_s"); SET(p_lock_file, "_lock_file"); SET(p_unlock_file, "_unlock_file"); SET(p_fileno, "_fileno"); @@ -1217,6 +1219,85 @@ static void test_byteswap(void) ok(ret == 0, "ret = %lx\n", ret); } +static void test_access_s(void) +{ + FILE *f; + int res; + + f = p_fopen("test_file", "w"); + ok(f != NULL, "unable to create test file\n"); + if(!f) + return; + + p_fclose(f); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_READONLY); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == 0, "got %x\n", res); + ok(errno == 0xdeadbeef, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == EACCES, "got %x\n", res); + ok(errno == EACCES, "got %x\n", res); + + SetFileAttributesA("test_file", FILE_ATTRIBUTE_NORMAL); + + p_unlink("test_file"); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 0); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 2); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 4); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); + + errno = 0xdeadbeef; + res = p_access_s("test_file", 6); + ok(res == ENOENT, "got %x\n", res); + ok(errno == ENOENT, "got %x\n", res); +} + START_TEST(msvcr90) { if(!init()) @@ -1242,4 +1323,5 @@ START_TEST(msvcr90) test__vswprintf_l(); test_nonblocking_file_access(); test_byteswap(); + test_access_s(); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 871027d..0054222 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -715,10 +715,12 @@ int CDECL MSVCRT__access(const char *filename, int mode) */ int CDECL _access_s(const char *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__access(filename, mode); + if (MSVCRT__access(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /********************************************************************* @@ -748,10 +750,12 @@ int CDECL MSVCRT__waccess(const MSVCRT_wchar_t *filename, int mode) */ int CDECL _waccess_s(const MSVCRT_wchar_t *filename, int mode) { - if (!MSVCRT_CHECK_PMT(filename != NULL)) return -1; - if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return -1; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno(); + if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno(); - return MSVCRT__waccess(filename, mode); + if (MSVCRT__waccess(filename, mode) == -1) + return *MSVCRT__errno(); + return 0; } /*********************************************************************

1 0

Nikolay Sivov : ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 43d5d86716e46d438b65446ea5fb799ec9122976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d5d86716e46d438b65446ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 22 00:00:39 2013 +0400 ole32: Fix IClassFactory initialization and QueryInterface behavior for GIT. --- dlls/ole32/git.c | 8 ++++---- dlls/ole32/tests/marshal.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f5dd00b..f0be9ee 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -311,8 +311,8 @@ static HRESULT WINAPI GITCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) { *ppv = NULL; - if (IsEqualIID(riid,&IID_IUnknown) || - IsEqualIID(riid,&IID_IGlobalInterfaceTable)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; return S_OK; @@ -357,11 +357,11 @@ static const IClassFactoryVtbl GITClassFactoryVtbl = { GITCF_LockServer }; -static const IClassFactoryVtbl *PGITClassFactoryVtbl = &GITClassFactoryVtbl; +static IClassFactory git_classfactory = { &GITClassFactoryVtbl }; HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) { - *ppv = &PGITClassFactoryVtbl; + *ppv = &git_classfactory; TRACE("Returning GIT classfactory\n"); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2baec4b..9566de3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -40,6 +40,7 @@ DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x0 /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); /* helper macros to make tests a bit leaner */ #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -2804,10 +2805,19 @@ static void test_globalinterfacetable(void) struct git_params params; DWORD ret; IUnknown *object; + IClassFactory *cf; trace("test_globalinterfacetable\n"); cLocks = 0; + hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IClassFactory_QueryInterface(cf, &IID_IGlobalInterfaceTable, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IClassFactory_Release(cf); + hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); @@ -3149,6 +3159,7 @@ START_TEST(marshal) } pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); + pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding")))

1 0

Huw Davies : ntdll: Call the correct server request.
by Alexandre Julliard 22 Aug '13

22 Aug '13

Module: wine Branch: master Commit: 97fd3f3b521252ca0d7f13ca9f09ec2c1cada1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fd3f3b521252ca0d7f13ca9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 22 09:27:46 2013 +0100 ntdll: Call the correct server request. --- dlls/ntdll/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9d14bbb..2f34ee0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1291,7 +1291,7 @@ NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJE if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; - SERVER_START_REQ( open_event ) + SERVER_START_REQ( open_keyed_event ) { req->access = access; req->attributes = attr ? attr->Attributes : 0;

1 0

Henri Verbeet : d3dx9: ID3DXBaseEffectImpl doesn' t need to be a COM implementation.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 1cb70eb07a7e6d7c60771d85a21c5f34592b60aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb70eb07a7e6d7c60771d85a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:31 2013 +0200 d3dx9: ID3DXBaseEffectImpl doesn't need to be a COM implementation. --- dlls/d3dx9_36/effect.c | 1647 +++++++++++++++++++----------------------------- 1 files changed, 664 insertions(+), 983 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cb70eb07a7e6d7c60771…

1 0

Dmitry Timoshkov : ntdll/tests: Fix the typos.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: b45ec4607babf8d545be66916c8d0f47c388171e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45ec4607babf8d545be66916… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:32:10 2013 +0900 ntdll/tests: Fix the typos. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 37d11d1..46541d5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2243,7 +2243,7 @@ todo_wine ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); iob.Status = -1; iob.Information = -1; @@ -2254,7 +2254,7 @@ todo_wine ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");

1 0

Dmitry Timoshkov : ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation .
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8ec8d70adae0ab4af5a5183ae8173f7c8a95d6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec8d70adae0ab4af5a5183ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:33:05 2013 +0900 ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation. --- dlls/ntdll/tests/file.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 46541d5..879c3f2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2107,38 +2107,29 @@ todo_wine todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); - S(U(ovl)).Offset = 0; - S(U(ovl)).OffsetHigh = 0; - ovl.Internal = -1; - ovl.InternalHigh = -1; - ovl.hEvent = 0; - bytes = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, contents, sizeof(contents), &bytes, &ovl); -todo_wine - ok(!ret || broken(ret) /* see below */, "WriteFile should fail\n"); + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine - ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == 0xdeadbeef), "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* see below */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); /* even fully updated XP passes this test, but it looks like some VMs * in a testbot get never updated, so overlapped IO is broken. Instead * of fighting with broken tests and adding a bunch of broken() statements * it's better to skip further tests completely. */ - if (GetLastError() != ERROR_IO_PENDING) + if (status != STATUS_PENDING) { todo_wine win_skip("broken overlapped IO implementation, update your OS\n"); CloseHandle(hfile); return; } - ok(bytes == 0, "bytes %u\n", bytes); - ok(ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); - bytes = 0xdeadbeef; - ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); bytes = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Dmitry Timoshkov : ntdll/tests: Add the tests for some error cases.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: aa14c2daa5e390b74d0a4f60c1f1d80afe84d21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa14c2daa5e390b74d0a4f60c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:33:46 2013 +0900 ntdll/tests: Add the tests for some error cases. --- dlls/ntdll/tests/file.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 879c3f2..e30ada0 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1941,11 +1941,41 @@ static void test_read_write(void) DWORD ret, bytes, status; LARGE_INTEGER offset; + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + hfile = create_temp_file(0); if (!hfile) return; iob.Status = -1; iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status);

1 0

Dmitry Timoshkov : kernel32/tests: Revert inadvertent change.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 2192745042b510b5acd8e4dc369b4be19e6d14b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2192745042b510b5acd8e4dc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:36:34 2013 +0900 kernel32/tests: Revert inadvertent change. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 12a808d..75944e9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1628,7 +1628,7 @@ static void test_WaitRing(void) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RING); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RING_ON) ok((evtmask & MS_RING_ON) == 0,"DTR didn't change state!\n");

1 0

George Stephanos : advapi32/tests: delete_key() permissions fix.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 4bdba5c4021f665f9a9a7cfe7397da8210d016be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdba5c4021f665f9a9a7cfe7… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Tue Aug 20 21:58:41 2013 +0200 advapi32/tests: delete_key() permissions fix. --- dlls/advapi32/tests/registry.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1a98f91..197ff07 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -144,6 +144,7 @@ static DWORD delete_key( HKEY hkey ) char name[MAX_PATH]; DWORD ret; + if ((ret = RegOpenKeyExA( hkey, "", 0, KEY_ENUMERATE_SUB_KEYS, &hkey ))) return ret; while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) { HKEY tmp; @@ -156,6 +157,7 @@ static DWORD delete_key( HKEY hkey ) } if (ret != ERROR_NO_MORE_ITEMS) return ret; RegDeleteKeyA( hkey, "" ); + RegCloseKey(hkey); return 0; } @@ -2214,10 +2216,10 @@ static void test_classesroot(void) res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); - /* check that the value is not modified in hklm classes */ + /* check that the value is modified in hklm classes */ res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return;

1 0