June 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : urlmon/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 744528578df383160a636485438f2022c06b3cb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=744528578df383160a63648… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:51 2006 +0200 urlmon/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/urlmon/tests/misc.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cbd5a4a..853a8dc 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -870,8 +870,7 @@ static void test_ReleaseBindInfo(void) bi.pUnk = &unk; SET_EXPECT(unk_Release); ReleaseBindInfo(&bi); - ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%ld, expected %d\n", - bi.cbSize, sizeof(bi)); + ok(bi.cbSize == sizeof(BINDINFO), "bi.cbSize=%ld\n", bi.cbSize); ok(bi.pUnk == NULL, "bi.pUnk=%p, expected NULL\n", bi.pUnk); CHECK_CALLED(unk_Release); @@ -879,8 +878,7 @@ static void test_ReleaseBindInfo(void) bi.cbSize = offsetof(BINDINFO, pUnk); bi.pUnk = &unk; ReleaseBindInfo(&bi); - ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%ld, expected %d\n", - bi.cbSize, sizeof(bi)); + ok(bi.cbSize == offsetof(BINDINFO, pUnk), "bi.cbSize=%ld\n", bi.cbSize); ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); memset(&bi, 0, sizeof(bi));

1 0

Alexandre Julliard : rpcrt4/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: d90f68166c33e85464afa193dde160ad82a0adaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d90f68166c33e85464afa19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:44 2006 +0200 rpcrt4/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/rpcrt4/tests/rpc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index e19844b..36bf4ef 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -232,8 +232,7 @@ static void test_towers(void) /* first check we have the right amount of data */ ok(tower->tower_length == sizeof(tower_data_tcp_ip1) || tower->tower_length == sizeof(tower_data_tcp_ip2), - "Size of tower differs (expected %d or %d, actual %d)\n", - sizeof(tower_data_tcp_ip1), sizeof(tower_data_tcp_ip2), tower->tower_length); + "Wrong size of tower %d\n", tower->tower_length); /* then do a byte-by-byte comparison */ same = ((tower->tower_length == sizeof(tower_data_tcp_ip1)) &&

1 0

Alexandre Julliard : ntdll/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: cba2c84741c50a403efcb3a817cfd482804eca9b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cba2c84741c50a403efcb3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:19 2006 +0200 ntdll/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/ntdll/tests/env.c | 19 +++++++------------ dlls/ntdll/tests/info.c | 44 ++++++++++++++++++++++---------------------- dlls/ntdll/tests/rtl.c | 4 ++-- dlls/ntdll/tests/rtlstr.c | 20 ++++++++++---------- 4 files changed, 41 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cba2c84741c50a403ef…

1 0

Alexandre Julliard : ole32/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 28e17a75afee56c4abccce35e81f4827909b364a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28e17a75afee56c4abccce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:36 2006 +0200 ole32/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/ole32/tests/marshal.c | 4 ++-- dlls/ole32/tests/moniker.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 7aba67e..061a843 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1981,7 +1981,7 @@ static void test_marshal_CLIPFORMAT(void CLIPFORMAT cf2; size = CLIPFORMAT_UserSize(&flags, 0, &cf); - ok(size == sizeof(*wirecf) + sizeof(cf_marshaled), "Size should be %d, instead of %ld\n", sizeof(*wirecf) + sizeof(cf_marshaled), size); + ok(size == sizeof(*wirecf) + sizeof(cf_marshaled), "Wrong size %ld\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); CLIPFORMAT_UserMarshal(&flags, buffer, &cf); @@ -2007,7 +2007,7 @@ static void test_marshal_HWND(void) wireHWND wirehwnd; size = HWND_UserSize(&flags, 0, &hwnd); - ok(size == sizeof(*wirehwnd), "Size should be %d, instead of %ld\n", sizeof(*wirehwnd), size); + ok(size == sizeof(*wirehwnd), "Wrong size %ld\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); HWND_UserMarshal(&flags, buffer, &hwnd); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 58f70a1..3b22ae3 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -304,9 +304,9 @@ static const BYTE expected_gc_moniker_co static void test_moniker( const char *testname, IMoniker *moniker, - const BYTE *expected_moniker_marshal_data, size_t sizeof_expected_moniker_marshal_data, - const BYTE *expected_moniker_saved_data, size_t sizeof_expected_moniker_saved_data, - const BYTE *expected_moniker_comparison_data, size_t sizeof_expected_moniker_comparison_data, + const BYTE *expected_moniker_marshal_data, unsigned int sizeof_expected_moniker_marshal_data, + const BYTE *expected_moniker_saved_data, unsigned int sizeof_expected_moniker_saved_data, + const BYTE *expected_moniker_comparison_data, unsigned int sizeof_expected_moniker_comparison_data, LPCWSTR expected_display_name) { IStream * stream;

1 0

Alexandre Julliard : mshtml/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 65459cb344905cb955eb1c9c9b0d26ef82485815 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65459cb344905cb955eb1c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:03:01 2006 +0200 mshtml/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/mshtml/tests/htmldoc.c | 3 +-- dlls/mshtml/tests/protocol.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c39242f..1835d73 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -781,8 +781,7 @@ static HRESULT WINAPI DocHostUIHandler_G CHECK_EXPECT(GetHostInfo); ok(pInfo != NULL, "pInfo=NULL\n"); if(pInfo) { - ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%lu, expected %u\n", - pInfo->cbSize, sizeof(DOCHOSTUIINFO)); + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%lu\n", pInfo->cbSize); ok(!pInfo->dwFlags, "pInfo->dwFlags=%08lx, expected 0\n", pInfo->dwFlags); pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE | DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY | DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index ba1be65..dfed396 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -296,16 +296,14 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(blank_url)/sizeof(WCHAR), - "size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR)); + ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(wrong_url1)/sizeof(WCHAR), - "size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR)); + ok(size == sizeof(wrong_url1)/sizeof(WCHAR), "size=%ld\n", size); #if 0 /* Crashes on win9x */ size = 0xdeadbeef; @@ -473,8 +471,7 @@ static void test_about_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(blank_url)/sizeof(WCHAR), - "size=%ld, expected %d\n", size, sizeof(blank_url)/sizeof(WCHAR)); + ok(size == sizeof(blank_url)/sizeof(WCHAR), "size=%ld\n", size); #if 0 /* Crashes on win9x */ size = 0xdeadbeef; @@ -521,7 +518,7 @@ #endif ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08lx\n", hres); - ok(cb == sizeof(blank_html), "cb=%ld, expected %d\n", cb, sizeof(blank_html)); + ok(cb == sizeof(blank_html), "cb=%ld\n", cb); ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); @@ -531,7 +528,7 @@ #endif ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08lx\n", hres); - ok(cb == sizeof(test_html), "cb=%ld, expected %d\n", cb, sizeof(test_html)); + ok(cb == sizeof(test_html), "cb=%ld\n", cb); ok(!memcmp(buf, test_html, cb), "Readed wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); @@ -541,7 +538,7 @@ #endif ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08lx\n", hres); - ok(cb == sizeof(blank_html), "cb=%ld, expected %d\n", cb, sizeof(blank_html)); + ok(cb == sizeof(blank_html), "cb=%ld\n", cb); ok(!memcmp(buf, blank_html, cb), "Readed wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres);

1 0

Alexandre Julliard : mlang/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: be4dccb33fe850f2e34ee3d81ac2211549d78a39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be4dccb33fe850f2e34ee3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:02:52 2006 +0200 mlang/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/mlang/tests/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index e439370..a8abb81 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -105,7 +105,7 @@ static void test_multibyte_to_unicode_tr ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, CP_UNICODE, stringA, &lenA, bufW, &lenW); ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); - ok(lenW == lstrlenW(stringW)/(int)sizeof(WCHAR), "expected lenW %u, got %u\n", lstrlenW(stringW)/sizeof(WCHAR), lenW); + ok(lenW == lstrlenW(stringW)/(int)sizeof(WCHAR), "wrong lenW %u\n", lenW); ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ ok(!lstrcmpA((LPCSTR)bufW, stringA), "bufW/stringA mismatch\n"); @@ -176,7 +176,7 @@ static void test_multibyte_to_unicode_tr TRACE_2("Call IMultiLanguage2_ConvertStringFromUnicode\n"); ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, CP_UNICODE, stringW, &lenW, bufA, &lenA); ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08lx\n", ret); - ok(lenA == lstrlenA(stringA) * (int)sizeof(WCHAR), "expected lenA %u, got %u\n", lstrlenA(stringA) * sizeof(WCHAR), lenA); + ok(lenA == lstrlenA(stringA) * (int)sizeof(WCHAR), "wrong lenA %u\n", lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); ok(bufA[lenA] != 0 && bufA[lenA+1] != 0, "buf should not be 0 terminated\n"); bufA[lenA] = 0; /* -1 doesn't include 0 terminator */

1 0

Alexandre Julliard : kernel32/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: c6b342d8ff2c397b26a0bcdbfc1ed4db0da21e13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6b342d8ff2c397b26a0bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:02:31 2006 +0200 kernel32/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/kernel/tests/codepage.c | 2 +- dlls/kernel/tests/comm.c | 24 ++++++++++-------------- dlls/kernel/tests/file.c | 17 +++++++---------- dlls/kernel/tests/locale.c | 4 ++-- dlls/kernel/tests/pipe.c | 8 ++++---- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/kernel/tests/codepage.c b/dlls/kernel/tests/codepage.c index 45658ba..db9ee16 100644 --- a/dlls/kernel/tests/codepage.c +++ b/dlls/kernel/tests/codepage.c @@ -142,7 +142,7 @@ static void test_overlapped_buffers(void lstrcpyW((WCHAR *)(buf + 1), strW); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); - ok(ret == sizeof(strA), "unexpected ret %d != %d\n", ret, sizeof(strA)); + ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); } diff --git a/dlls/kernel/tests/comm.c b/dlls/kernel/tests/comm.c index 3f33e61..3fac9c2 100644 --- a/dlls/kernel/tests/comm.c +++ b/dlls/kernel/tests/comm.c @@ -765,10 +765,10 @@ static void test_waittxempty(HANDLE hcom after = GetTickCount(); ok(res_write == TRUE, "WriteFile failed\n"); ok(written == sizeof(tbuf), - "WriteFile: Unexpected write_size %ld , expected %d\n", written, sizeof(tbuf)); + "WriteFile: Unexpected write_size %ld\n", written); - trace("WriteFile succeeded, took %ld ms to write %d Bytes at %ld Baud\n", - after - before, sizeof(tbuf), baud); + trace("WriteFile succeeded, took %ld ms to write %ld Bytes at %ld Baud\n", + after - before, written, baud); before = GetTickCount(); res = WaitCommEvent(hcom, &evtmask, NULL); @@ -845,8 +845,7 @@ static void test_LoopbackRead(HANDLE hco before = GetTickCount(); ok(WriteFile(hcom,tbuf,sizeof(tbuf),&written, NULL), "WriteFile failed\n"); after = GetTickCount(); - ok(written == sizeof(tbuf),"WriteFile %ld bytes written, expected %d\n", - written, sizeof(tbuf)); + ok(written == sizeof(tbuf),"WriteFile %ld bytes written\n", written); diff = after -before; /* make sure all bytes are written, so Readfile will succeed in one call*/ @@ -859,7 +858,7 @@ static void test_LoopbackRead(HANDLE hco read=0; ok(ReadFile(hcom, rbuf, sizeof(rbuf), &read, NULL), "Readfile failed\n"); - ok(read == sizeof(tbuf),"ReadFile read %ld bytes, expected %d \"%s\"\n", read, sizeof(tbuf),rbuf); + ok(read == sizeof(tbuf),"ReadFile read %ld bytes, expected \"%s\"\n", read,rbuf); /* Now do the same withe a slower Baud rate. As we request more characters then written, we will hit the timeout @@ -876,8 +875,7 @@ static void test_LoopbackRead(HANDLE hco ok(SetCommMask(hcom, EV_RXCHAR), "SetCommMask failed\n"); ok(WriteFile(hcom,tbuf,sizeof(tbuf),&written, NULL), "WriteFile failed\n"); - ok(written == sizeof(tbuf),"WriteFile %ld bytes written, expected %d\n", - written, sizeof(tbuf)); + ok(written == sizeof(tbuf),"WriteFile %ld bytes written\n", written); trace("WaitCommEventEV_RXCHAR\n"); ok(WaitCommEvent(hcom, &evtmask, NULL), "WaitCommEvent failed\n"); @@ -888,10 +886,9 @@ static void test_LoopbackRead(HANDLE hco res = ReadFile(hcom, rbuf, sizeof(rbuf), &read, NULL); after = GetTickCount(); ok(res, "Readfile failed\n"); - ok(read == sizeof(tbuf),"ReadFile read %ld bytes, expected %d\n", read, sizeof(tbuf)); + ok(read == sizeof(tbuf),"ReadFile read %ld bytes\n", read); diff = after - before; - trace("Readfile for %d chars with %d avail took %ld ms\n", - sizeof(rbuf), sizeof(tbuf), diff); + trace("Readfile for %ld chars took %ld ms\n", read, diff); ok( (diff > TIMEOUT - TIMEDELTA) && (diff < TIMEOUT + TIMEDELTA), "Timedout Wait took %ld ms, expected around %d\n", diff, TIMEOUT); @@ -914,9 +911,8 @@ static void test_LoopbackRead(HANDLE hco } while ((read < sizeof(tbuf)) && (i <10)); after = GetTickCount(); - ok( read == sizeof(tbuf),"ReadFile read %ld bytes, expected %d\n", read, sizeof(tbuf)); - trace("Plain Read for %d char at %d baud took %ld ms\n", sizeof(tbuf), SLOWBAUD, after-before); - + ok( read == sizeof(tbuf),"ReadFile read %ld bytes\n", read); + trace("Plain Read for %ld char at %d baud took %ld ms\n", read, SLOWBAUD, after-before); } static void test_LoopbackCtsRts(HANDLE hcom) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index ec736db..81528d3 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -895,7 +895,7 @@ static void test_offset_in_overlapped_st { HANDLE hFile; OVERLAPPED ov; - DWORD done; + DWORD done, offset; BOOL rc; BYTE buf[256], pattern[] = "TeSt"; UINT i; @@ -925,18 +925,16 @@ static void test_offset_in_overlapped_st if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) { ok(rc, "WriteFile error %ld\n", GetLastError()); ok(done == sizeof(pattern), "expected number of bytes written %lu\n", done); - /*trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT));*/ - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), - "expected file offset %d\n", PATTERN_OFFSET + sizeof(pattern)); + offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %ld\n", offset); S(U(ov)).Offset = sizeof(buf) * 2; S(U(ov)).OffsetHigh = 0; ret = WriteFile(hFile, pattern, sizeof(pattern), &done, &ov); ok( ret, "WriteFile error %ld\n", GetLastError()); ok(done == sizeof(pattern), "expected number of bytes written %lu\n", done); - /*trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT));*/ - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (sizeof(buf) * 2 + sizeof(pattern)), - "expected file offset %d\n", sizeof(buf) * 2 + sizeof(pattern)); + offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + ok(offset == sizeof(buf) * 2 + sizeof(pattern), "wrong file offset %ld\n", offset); } CloseHandle(hFile); @@ -955,9 +953,8 @@ static void test_offset_in_overlapped_st if (rc || GetLastError()!=ERROR_INVALID_PARAMETER) { ok(rc, "ReadFile error %ld\n", GetLastError()); ok(done == sizeof(pattern), "expected number of bytes read %lu\n", done); - /*trace("Current offset = %04lx\n", SetFilePointer(hFile, 0, NULL, FILE_CURRENT));*/ - ok(SetFilePointer(hFile, 0, NULL, FILE_CURRENT) == (PATTERN_OFFSET + sizeof(pattern)), - "expected file offset %d\n", PATTERN_OFFSET + sizeof(pattern)); + offset = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); + ok(offset == PATTERN_OFFSET + sizeof(pattern), "wrong file offset %ld\n", offset); ok(!memcmp(buf, pattern, sizeof(pattern)), "pattern match failed\n"); } diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c index b1214e7..c099930 100644 --- a/dlls/kernel/tests/locale.c +++ b/dlls/kernel/tests/locale.c @@ -106,7 +106,7 @@ #define eq(received, expected, label, ty #define BUFFER_SIZE 128 #define COUNTOF(x) (sizeof(x)/sizeof(x)[0]) -#define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (len), ret) +#define EXPECT_LEN(len) ok(ret == (len), "Expected Len %d, got %d\n", (int)(len), ret) #define EXPECT_INVALID ok(GetLastError() == ERROR_INVALID_PARAMETER, \ "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()) #define EXPECT_BUFFER ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, \ @@ -1545,7 +1545,7 @@ static void test_FoldStringA(void) static void test_FoldStringW(void) { int ret; - size_t i, j; + unsigned int i, j; WCHAR src[256], dst[256], ch, prev_ch = 1; static const DWORD badFlags[] = { diff --git a/dlls/kernel/tests/pipe.c b/dlls/kernel/tests/pipe.c index 92de9a7..c92563b 100644 --- a/dlls/kernel/tests/pipe.c +++ b/dlls/kernel/tests/pipe.c @@ -746,18 +746,18 @@ static void test_CreatePipe(void) pipe_attr.lpSecurityDescriptor = NULL; ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); - ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes instead of %d\n", written,sizeof(PIPENAME)); + ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes\n", written); ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from non empty pipe failed\n"); - ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes instead of %d\n", read, sizeof(PIPENAME)); + ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes\n", read); /* Now write another chunk*/ ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); - ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes instead of %d\n", written,sizeof(PIPENAME)); + ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %ld bytes\n", written); /* and close the write end, read should still succeed*/ ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe withe with pending data failed\n"); - ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes instead of %d\n", read, sizeof(PIPENAME)); + ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %ld bytes\n", read); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); }

1 0

Alexandre Julliard : mapi32/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 4ec2fcc9fd5ab5dd54d0f31fbf078fe0375c353b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ec2fcc9fd5ab5dd54d0f31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:02:45 2006 +0200 mapi32/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/mapi32/tests/prop.c | 48 +++++++++++++++++++++------------------------- dlls/mapi32/tests/util.c | 2 +- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 1088d88..0e4edf0 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -824,17 +824,14 @@ static void test_ScCopyRelocProps(void) ulCount = 0; sc = pScCopyProps(1, &pvProp, buffer, &ulCount); - ok(sc == S_OK && lpResProp->ulPropTag == pvProp.ulPropTag && - lpResProp->Value.MVszA.cValues == 1 && - lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*) && - ulCount == sizeof(SPropValue) + sizeof(char*) + 5 && - !strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), - "CopyProps(str): Expected 0 {1,%lx,%p,%s} %d got 0x%08lx {%ld,%lx,%p,%s} %ld\n", - pvProp.ulPropTag, buffer + sizeof(SPropValue) + sizeof(char*), - szTestA, sizeof(SPropValue) + sizeof(char*) + 5, sc, - lpResProp->Value.MVszA.cValues, lpResProp->ulPropTag, - sc==S_OK?lpResProp->Value.MVszA.lppszA[0]:NULL, - sc==S_OK?lpResProp->Value.MVszA.lppszA[0]:NULL, ulCount); + ok(sc == S_OK, "wrong ret %ld\n", sc); + ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %lx\n",lpResProp->ulPropTag); + ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %ld\n", lpResProp->Value.MVszA.cValues); + ok(lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*), + "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); + ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %ld\n", ulCount); + ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), + "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); memcpy(buffer2, buffer, sizeof(buffer)); @@ -847,21 +844,20 @@ static void test_ScCopyRelocProps(void) sc = pScRelocProps(1, (LPSPropValue)buffer2, buffer, buffer2, &ulCount); lpResProp = (LPSPropValue)buffer2; - ok(sc == S_OK && lpResProp->ulPropTag == pvProp.ulPropTag && - lpResProp->Value.MVszA.cValues == 1 && - lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*) && - /* Native has a bug whereby it calculates the size correctly when copying - * but when relocating does not (presumably it uses UlPropSize() which - * ignores multivalue pointers). Wine returns the correct value. - */ - (ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5) && - !strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), - "RelocProps(str): Expected 0 {1,%lx,%p,%s} %d got 0x%08lx {%ld,%lx,%p,%s} %ld\n", - pvProp.ulPropTag, buffer2 + sizeof(SPropValue) + sizeof(char*), - szTestA, sizeof(SPropValue) + sizeof(char*) + 5, sc, - lpResProp->Value.MVszA.cValues, lpResProp->ulPropTag, - sc==S_OK?lpResProp->Value.MVszA.lppszA[0]:NULL, - sc==S_OK?lpResProp->Value.MVszA.lppszA[0]:NULL, ulCount); + + ok(sc == S_OK, "wrong ret %ld\n", sc); + ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %lx\n",lpResProp->ulPropTag); + ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %ld\n", lpResProp->Value.MVszA.cValues); + ok(lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*), + "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); + /* Native has a bug whereby it calculates the size correctly when copying + * but when relocating does not (presumably it uses UlPropSize() which + * ignores multivalue pointers). Wine returns the correct value. + */ + ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5, + "wrong count %ld\n", ulCount); + ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), + "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); /* Native crashes with lpNew or lpOld set to NULL so skip testing this */ } diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 8484d98..1804a2e 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -140,7 +140,7 @@ static void test_UlFromSzHex(void) static void test_CbOfEncoded(void) { char buff[129]; - size_t i; + unsigned int i; pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded(a)4"); if (!pCbOfEncoded)

1 0

Alexandre Julliard : crypt32/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 52d6077f8bf15511f83d80e25ff6f0321ed51a7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52d6077f8bf15511f83d80e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:02:03 2006 +0200 crypt32/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/crypt32/tests/cert.c | 8 +- dlls/crypt32/tests/encode.c | 193 ++++++++++++++----------------------------- dlls/crypt32/tests/store.c | 48 ++++------- 3 files changed, 83 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=52d6077f8bf15511f83…

1 0

Alexandre Julliard : gdi/tests: Don't use sizeof in ok() to avoid printf format warnings.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: e19f31b682cc8d742df602ec88794be2f99c9ddb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e19f31b682cc8d742df602e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:02:13 2006 +0200 gdi/tests: Don't use sizeof in ok() to avoid printf format warnings. --- dlls/gdi/tests/bitmap.c | 22 +++++++++++----------- dlls/gdi/tests/font.c | 3 +-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index 7409074..62a57eb 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -69,7 +69,7 @@ static void test_bitmap_info(HBITMAP hbm char buf[512], buf_cmp[512]; ret = GetObject(hbm, sizeof(bm), &bm); - ok(ret == sizeof(bm), "GetObject returned %d instead of %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); @@ -96,10 +96,10 @@ static void test_bitmap_info(HBITMAP hbm /* test various buffer sizes for GetObject */ ret = GetObject(hbm, 0, NULL); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ret = GetObject(hbm, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ret = GetObject(hbm, sizeof(bm) / 2, &bm); ok(ret == 0, "%d != 0\n", ret); @@ -249,7 +249,7 @@ static void test_dib_info(HBITMAP hbm, c BYTE *buf; ret = GetObject(hbm, sizeof(bm), &bm); - ok(ret == sizeof(bm), "GetObject returned %d instead of %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); @@ -277,7 +277,7 @@ static void test_dib_info(HBITMAP hbm, c /* test various buffer sizes for GetObject */ memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); ok(bm.bmBits == bits, "wrong bm.bmBits %p != %p\n", bm.bmBits, bits); @@ -293,11 +293,11 @@ static void test_dib_info(HBITMAP hbm, c /* test various buffer sizes for GetObject */ ret = GetObject(hbm, 0, NULL); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(ds) * 2, &ds); - ok(ret == sizeof(ds), "%d != %d\n", ret, sizeof(ds)); + ok(ret == sizeof(ds), "wrong size %d\n", ret); ok(ds.dsBm.bmBits == bits, "wrong bm.bmBits %p != %p\n", ds.dsBm.bmBits, bits); ok(ds.dsBmih.biSizeImage == ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight, "%lu != %u\n", @@ -317,7 +317,7 @@ static void test_dib_info(HBITMAP hbm, c memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(ds) - 4, &ds); - ok(ret == sizeof(ds.dsBm), "%d != %d\n", ret, sizeof(ds.dsBm)); + ok(ret == sizeof(ds.dsBm), "wrong size %d\n", ret); ok(ds.dsBm.bmWidth == bmih->biWidth, "%lu != %lu\n", ds.dsBmih.biWidth, bmih->biWidth); ok(ds.dsBm.bmHeight == bmih->biHeight, "%lu != %lu\n", ds.dsBmih.biHeight, bmih->biHeight); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); @@ -940,7 +940,7 @@ static void test_bitmap(void) assert(hbmp != NULL); ret = GetObject(hbmp, sizeof(bm), &bm); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == 15, "wrong bm.bmWidth %d\n", bm.bmWidth); @@ -967,7 +967,7 @@ static void test_bitmap(void) hbmp_old = SelectObject(hdc, hbmp); ret = GetObject(hbmp, sizeof(bm), &bm); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == 15, "wrong bm.bmWidth %d\n", bm.bmWidth); @@ -987,7 +987,7 @@ static void test_bitmap(void) /* test various buffer sizes for GetObject */ ret = GetObject(hbmp, sizeof(bm) * 2, &bm); - ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm)); + ok(ret == sizeof(bm), "wrong size %d\n", ret); ret = GetObject(hbmp, sizeof(bm) / 2, &bm); ok(ret == 0, "%d != 0\n", ret); diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 1fefe56..393bc27 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -42,8 +42,7 @@ static void check_font(const char* test, while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; - ok(ret == sizeof(LOGFONTA) || ret == minlen, - "%s: GetObject returned %d expected %d or %d\n", test, ret, sizeof(LOGFONTA), minlen); + ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); ok(!memcmp(&lf, &lf, FIELD_OFFSET(LOGFONTA, lfFaceName)), "%s: fonts don't match\n", test); ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName), "%s: font names don't match: %s != %s\n", test, lf->lfFaceName, getobj_lf.lfFaceName);

1 0