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

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jun 14 06:50:18 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 28e17a75afee56c4abccce35e81f4827909b364a
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=28e17a75afee56c4abccce35e81f4827909b364a

Author: Alexandre Julliard <julliard at 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;




More information about the wine-cvs mailing list