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

Hans Leidekker : winhttp: Add networking infrastructure.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 266c4b2c046b334ca44cdc1826c4434625dcb29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=266c4b2c046b334ca44cdc182… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:03:19 2008 +0200 winhttp: Add networking infrastructure. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/net.c | 327 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 23 +++ 3 files changed, 351 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=266c4b2c046b334ca44cd…

1 0

Hans Leidekker : winhttp: Implement WinHttpSendRequest.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: f07f2304b0b30e2efac70f0a4defc0999a7b583e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07f2304b0b30e2efac70f0a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:03:40 2008 +0200 winhttp: Implement WinHttpSendRequest. --- dlls/winhttp/handle.c | 2 + dlls/winhttp/main.c | 13 ---- dlls/winhttp/request.c | 142 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/session.c | 7 ++- dlls/winhttp/tests/winhttp.c | 4 +- dlls/winhttp/winhttp_private.h | 13 ++++ 6 files changed, 165 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f07f2304b0b30e2efac70…

1 0

Paul Vriens : shell32/tests: Run tests again on win95.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 8be7d000419715dcbc41edefdab38c7385b50ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be7d000419715dcbc41edefd… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 26 08:49:59 2008 +0200 shell32/tests: Run tests again on win95. --- dlls/shell32/tests/shlfileop.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1cedcfb..eca4f94 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -41,6 +41,7 @@ static HMODULE hshell32; static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); static int (WINAPI *pSHCreateDirectoryExW)(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); static int (WINAPI *pSHFileOperationW)(LPSHFILEOPSTRUCTW); +static DWORD_PTR (WINAPI *pSHGetFileInfoW)(LPCWSTR, DWORD , SHFILEINFOW*, UINT, UINT); static int (WINAPI *pSHPathPrepareForWriteA)(HWND, IUnknown*, LPCSTR, DWORD); static int (WINAPI *pSHPathPrepareForWriteW)(HWND, IUnknown*, LPCWSTR, DWORD); @@ -50,6 +51,7 @@ static void InitFunctionPointers(void) pSHCreateDirectoryExA = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExA"); pSHCreateDirectoryExW = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExW"); pSHFileOperationW = (void*)GetProcAddress(hshell32, "SHFileOperationW"); + pSHGetFileInfoW = (void*)GetProcAddress(hshell32, "SHGetFileInfoW"); pSHPathPrepareForWriteA = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteA"); pSHPathPrepareForWriteW = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteW"); } @@ -168,15 +170,20 @@ static void test_get_file_info(void) ok(shfi.iIcon == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear iIcon\n"); ok(shfi.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear dwAttributes\n"); - /* Test whether fields of SHFILEINFOW are always cleared */ - memset(&shfiw, 0xcf, sizeof(shfiw)); - rc=SHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); - todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); - ok(shfiw.hIcon == (HANDLE) 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); - todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); - todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); - todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); - ok(shfiw.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear dwAttributes\n"); + if (pSHGetFileInfoW) + { + /* Test whether fields of SHFILEINFOW are always cleared */ + memset(&shfiw, 0xcf, sizeof(shfiw)); + rc=pSHGetFileInfoW(NULL, 0, &shfiw, sizeof(shfiw), 0); + todo_wine ok(!rc, "SHGetFileInfoW(NULL | 0) should fail\n"); + ok(shfiw.hIcon == (HANDLE) 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear hIcon\n"); + todo_wine ok(shfiw.szDisplayName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szDisplayName[0]\n"); + todo_wine ok(shfiw.szTypeName[0] == 0xcfcf, "SHGetFileInfoW(NULL | 0) should not clear szTypeName[0]\n"); + todo_wine ok(shfiw.iIcon == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear iIcon\n"); + ok(shfiw.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(NULL | 0) should not clear dwAttributes\n"); + } + else + win_skip("SHGetFileInfoW is not available\n"); /* Test some flag combinations that MSDN claims are not allowed, @@ -284,8 +291,14 @@ static void test_get_file_info_iconlist(void) ok(shInfoa.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); CloseHandle(hSysImageList); + if (!pSHGetFileInfoW) + { + win_skip("SHGetFileInfoW is not available\n"); + ILFree(pidList); + } + memset(&shInfow, 0xcf, sizeof(shInfow)); - hSysImageList = (HIMAGELIST) SHGetFileInfoW((const WCHAR *)pidList, 0, + hSysImageList = (HIMAGELIST) pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); ok(hSysImageList != INVALID_HANDLE_VALUE, "Can't get handle for CSIDL_DESKTOP imagelist\n");

1 0

Hans Leidekker : winhttp: Add support for querying most of the standard header attributes.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: ac95d77e1f0980cbe0025012c5a06156ea910447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac95d77e1f0980cbe0025012c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:02:54 2008 +0200 winhttp: Add support for querying most of the standard header attributes. --- dlls/winhttp/request.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 146 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac95d77e1f0980cbe0025…

1 0

Paul Vriens : d3dxof/tests: Run tests again on win9x.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: d9f37dd022b5d525996d07f54731eb98ede2a8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f37dd022b5d525996d07f54… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 26 08:19:03 2008 +0200 d3dxof/tests: Run tests again on win9x. --- dlls/d3dxof/tests/d3dxof.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 8ee58b3..b38fa5d 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -23,6 +23,9 @@ #include "wine/test.h" #include "dxfile.h" +static HMODULE hd3dxof; +static HRESULT (WINAPI *pDirectXFileCreate)(LPDIRECTXFILE*); + char template[] = "xof 0302txt 0064\n" "template Header\n" @@ -33,6 +36,14 @@ char template[] = "DWORD flags ;\n" "}\n"; +static void init_function_pointers(void) +{ + /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ + hd3dxof = LoadLibraryA("d3dxof.dll"); + + pDirectXFileCreate = (void *)GetProcAddress(hd3dxof, "DirectXFileCreate"); +} + static unsigned long getRefcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -44,11 +55,18 @@ static void test_d3dxof(void) HRESULT hr; unsigned long ref; LPDIRECTXFILE lpDirectXFile = NULL; - hr = DirectXFileCreate(&lpDirectXFile); + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr); if(!lpDirectXFile) { - trace("Couldn't create DirectXFile interface, skipping tests\n"); + skip("Couldn't create DirectXFile interface\n"); return; } @@ -71,5 +89,9 @@ static void test_d3dxof(void) START_TEST(d3dxof) { + init_function_pointers(); + test_d3dxof(); + + FreeLibrary(hd3dxof); }

1 0

Alexandre Julliard : msvcrt/tests: Add support for some broken demangle results on older Windows versions.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 42563b407b5165731514dc6cf8bfbdf5399cd3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=42563b407b5165731514dc6cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:28:57 2008 +0200 msvcrt/tests: Add support for some broken demangle results on older Windows versions. --- dlls/msvcrt/tests/cpp.c | 278 +++++++++++++++++++++++++++-------------------- 1 files changed, 159 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42563b407b5165731514d…

1 0

Alexandre Julliard : ntdll/tests: Allow alternate results in the string tests to make them pass on Vista.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: fcdce5c6f37dce1ee3f39d2abf0b86dbfc853a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdce5c6f37dce1ee3f39d2ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:28:31 2008 +0200 ntdll/tests: Allow alternate results in the string tests to make them pass on Vista. --- dlls/ntdll/tests/rtlstr.c | 63 +++++++++++++++++++++++++++------------------ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++------------- 2 files changed, 73 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcdce5c6f37dce1ee3f39…

1 0

Alexandre Julliard : ntdll/tests: Allow alternate results in the env test to make it pass on Vista.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: d1f8dd15493ebc360f3a47a3be68f37fc7f9217e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f8dd15493ebc360f3a47a3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:28:11 2008 +0200 ntdll/tests: Allow alternate results in the env test to make it pass on Vista. --- dlls/ntdll/tests/env.c | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 3363e73..0480e7a 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -57,6 +57,7 @@ static void testQuery(void) int len; NTSTATUS status; const char *val; + NTSTATUS alt; }; static const struct test tests[] = @@ -67,12 +68,13 @@ static void testQuery(void) {"foo ", 256, STATUS_VARIABLE_NOT_FOUND, NULL}, {"foo", 1, STATUS_BUFFER_TOO_SMALL, "toto"}, {"foo", 3, STATUS_BUFFER_TOO_SMALL, "toto"}, - {"foo", 4, STATUS_SUCCESS, "toto"}, + {"foo", 4, STATUS_SUCCESS, "toto", STATUS_BUFFER_TOO_SMALL}, + {"foo", 5, STATUS_SUCCESS, "toto"}, {"fooo", 256, STATUS_SUCCESS, "tutu"}, {"f", 256, STATUS_VARIABLE_NOT_FOUND, NULL}, {"g", 256, STATUS_SUCCESS, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}, - {"sr=an", 256, STATUS_VARIABLE_NOT_FOUND, NULL}, + {"sr=an", 256, STATUS_SUCCESS, "ouo", STATUS_VARIABLE_NOT_FOUND}, {"sr", 256, STATUS_SUCCESS, "an=ouo"}, {"=oOH", 256, STATUS_SUCCESS, "III"}, {"", 256, STATUS_VARIABLE_NOT_FOUND, NULL}, @@ -99,7 +101,8 @@ static void testQuery(void) pRtlMultiByteToUnicodeN( bn, sizeof(bn), NULL, test->var, strlen(test->var)+1 ); nts = pRtlQueryEnvironmentVariable_U(small_env, &name, &value); - ok( nts == test->status, "[%d]: Wrong status for '%s', expecting %x got %x\n", + ok( nts == test->status || (test->alt && nts == test->alt), + "[%d]: Wrong status for '%s', expecting %x got %x\n", test - tests, test->var, test->status, nts ); if (nts == test->status) switch (nts) { @@ -120,7 +123,7 @@ static void testQuery(void) } } -static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret) +static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATUS ret, NTSTATUS alt) { WCHAR bvar[256], bval1[256], bval2[256]; UNICODE_STRING uvar; @@ -139,7 +142,7 @@ static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATU pRtlMultiByteToUnicodeN( bval1, sizeof(bval1), NULL, val, strlen(val)+1 ); } nts = pRtlSetEnvironmentVariable(env, &uvar, val ? &uval : NULL); - ok(nts == ret, "Setting var %s=%s (%x/%x)\n", var, val, nts, ret); + ok(nts == ret || (alt && nts == alt), "Setting var %s=%s (%x/%x)\n", var, val, nts, ret); if (nts == STATUS_SUCCESS) { uval.Length = 0; @@ -168,31 +171,30 @@ static void testSet(void) int i; ok(pRtlCreateEnvironment(FALSE, &env) == STATUS_SUCCESS, "Creating environment\n"); - memmove(env, small_env, sizeof(small_env)); - testSetHelper(&env, "cat", "dog", STATUS_SUCCESS); - testSetHelper(&env, "cat", "horse", STATUS_SUCCESS); - testSetHelper(&env, "cat", "zz", STATUS_SUCCESS); - testSetHelper(&env, "cat", NULL, STATUS_SUCCESS); - testSetHelper(&env, "cat", NULL, STATUS_VARIABLE_NOT_FOUND); - testSetHelper(&env, "foo", "meouw", STATUS_SUCCESS); - testSetHelper(&env, "me=too", "also", STATUS_INVALID_PARAMETER); - testSetHelper(&env, "me", "too=also", STATUS_SUCCESS); - testSetHelper(&env, "=too", "also", STATUS_SUCCESS); - testSetHelper(&env, "=", "also", STATUS_SUCCESS); + testSetHelper(&env, "cat", "dog", STATUS_SUCCESS, 0); + testSetHelper(&env, "cat", "horse", STATUS_SUCCESS, 0); + testSetHelper(&env, "cat", "zz", STATUS_SUCCESS, 0); + testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, 0); + testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, STATUS_VARIABLE_NOT_FOUND); + testSetHelper(&env, "foo", "meouw", STATUS_SUCCESS, 0); + testSetHelper(&env, "me=too", "also", STATUS_INVALID_PARAMETER, 0); + testSetHelper(&env, "me", "too=also", STATUS_SUCCESS, 0); + testSetHelper(&env, "=too", "also", STATUS_SUCCESS, 0); + testSetHelper(&env, "=", "also", STATUS_SUCCESS, 0); for (i = 0; i < 128; i++) { sprintf(tmp, "zork%03d", i); - testSetHelper(&env, tmp, "is alive", STATUS_SUCCESS); + testSetHelper(&env, tmp, "is alive", STATUS_SUCCESS, 0); } for (i = 0; i < 128; i++) { sprintf(tmp, "zork%03d", i); - testSetHelper(&env, tmp, NULL, STATUS_SUCCESS); + testSetHelper(&env, tmp, NULL, STATUS_SUCCESS, 0); } - testSetHelper(&env, "fOo", NULL, STATUS_SUCCESS); + testSetHelper(&env, "fOo", NULL, STATUS_SUCCESS, 0); ok(pRtlDestroyEnvironment(env) == STATUS_SUCCESS, "Destroying environment\n"); } @@ -263,9 +265,6 @@ static void testExpand(void) ok(nts == STATUS_BUFFER_TOO_SMALL, "Call failed (%u)\n", nts); ok(ul == strlen(test->dst) * sizeof(WCHAR) + sizeof(WCHAR), "Wrong returned length for %s (with buffer too small): %u\n", test->src, ul); - ok(memcmp(dst, rst, 8*sizeof(WCHAR)) == 0, - "Wrong result for %s (with buffer too small): expecting %s\n", - test->src, test->dst); ok(dst[8] == '-', "Writing too far in buffer (got %c/%d)\n", dst[8], dst[8]); }

1 0

Alexandre Julliard : ntdll/tests: Allow alternate results in the info test to make it pass on Vista.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: f7a8436e92dd5c9fa210a5b71d84726981e33093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a8436e92dd5c9fa210a5b71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:28:18 2008 +0200 ntdll/tests: Allow alternate results in the info test to make it pass on Vista. --- dlls/ntdll/tests/info.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6b726d4..4a0b017 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -68,7 +68,8 @@ static void test_query_basic(void) /* Use a nonexistent info class */ trace("Check nonexistent info class\n"); status = pNtQuerySystemInformation(-1, NULL, 0, NULL); - ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status); + ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, + "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); /* Use an existing class but with a zero-length buffer */ trace("Check zero-length buffer\n"); @@ -78,7 +79,8 @@ static void test_query_basic(void) /* Use an existing class, correct length but no SystemInformation buffer */ trace("Check no SystemInformation buffer\n"); status = pNtQuerySystemInformation(SystemBasicInformation, NULL, sizeof(sbi), NULL); - ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* vista */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER, got %08x\n", status); /* Use a existing class, correct length, a pointer to a buffer but no ReturnLength pointer */ trace("Check no ReturnLength pointer\n"); @@ -202,7 +204,8 @@ static void test_query_timeofday(void) status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, 49, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( 0 == ReturnLength, "ReturnLength should be 0, it is (%d)\n", ReturnLength); + ok( ReturnLength == 0 || ReturnLength == sizeof(sti) /* vista */, + "ReturnLength should be 0, it is (%d)\n", ReturnLength); status = pNtQuerySystemInformation(SystemTimeOfDayInformation, &sti, sizeof(sti), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -404,28 +407,27 @@ static void test_query_handle(void) SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ - status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, 0, &ReturnLength); - /* The following check assumes more than one handle on any given system */ - todo_wine - { - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - } + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); ok( ReturnLength > 0, "Expected ReturnLength to be > 0, it was %d\n", ReturnLength); - SystemInformationLength = ReturnLength; + SystemInformationLength = ReturnLength + sizeof(HANDLE); shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - - /* Check if we have some return values */ - trace("Number of Handles : %d\n", shi->Count); - todo_wine + if (status != STATUS_INFO_LENGTH_MISMATCH) /* vista */ { - /* our implementation is a stub for now */ - ok( shi->Count > 1, "Expected more than 1 handles, got (%d)\n", shi->Count); - } + ok( status == STATUS_SUCCESS, + "Expected STATUS_SUCCESS, got %08x\n", status); + /* Check if we have some return values */ + trace("Number of Handles : %d\n", shi->Count); + todo_wine + { + /* our implementation is a stub for now */ + ok( shi->Count > 1, "Expected more than 1 handles, got (%d)\n", shi->Count); + } + } HeapFree( GetProcessHeap(), 0, shi); } @@ -534,7 +536,8 @@ static void test_query_process_basic(void) /* Use a nonexistent info class */ trace("Check nonexistent info class\n"); status = pNtQueryInformationProcess(NULL, -1, NULL, 0, NULL); - ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status); + ok( status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* vista */, + "Expected STATUS_INVALID_INFO_CLASS or STATUS_NOT_IMPLEMENTED, got %08x\n", status); /* Do not give a handle and buffer */ trace("Check NULL handle and buffer and zero-length buffersize\n"); @@ -708,7 +711,8 @@ static void test_query_process_times(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessTimes, &spti, sizeof(spti) * 2, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( sizeof(spti) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + ok( sizeof(spti) == ReturnLength || ReturnLength == 0 /* vista */, + "Inconsistent length %d\n", ReturnLength); } static void test_query_process_handlecount(void)

1 0

Alexandre Julliard : shell32/tests: Fix an unsigned comparison warning.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 517644971ceabf52b6f0e12d277dc221696b45f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517644971ceabf52b6f0e12d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:27:48 2008 +0200 shell32/tests: Fix an unsigned comparison warning. --- dlls/shell32/tests/systray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index c672d67..42d2d4a 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -123,7 +123,7 @@ static void test_SHAppBarMessage(void) ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); todo_wine { - ok(abd.uEdge >= ABE_LEFT && abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); + ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); } }

1 0