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

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


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 13 14:04:07 2006 +0200

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

---

 dlls/winmm/tests/capture.c |    3 +--
 dlls/winmm/tests/wave.c    |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index e3d3044..c0e18d0 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -375,8 +375,7 @@ #endif
         ok(rc==MMSYSERR_NOERROR,"waveInMessage(%s): failed to get interface "
            "name: rc=%s\n",dev_name(device),wave_in_error(rc));
         ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),
-           "got an incorrect size: %ld instead of %d\n",
-           size,(lstrlenW(nameW)+1)*sizeof(WCHAR));
+           "got an incorrect size %ld\n", size);
         if (rc==MMSYSERR_NOERROR) {
             nameA = malloc(size/sizeof(WCHAR));
             WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR),
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 3019472..3c447d2 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -873,8 +873,7 @@ #endif
                           (DWORD_PTR)nameW, size);
         ok(rc==MMSYSERR_NOERROR,"waveOutMessage(%s): failed to get interface "
            "name, rc=%s\n",dev_name(device),wave_out_error(rc));
-        ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size: "
-           "%ld instead of %d\n",size,(lstrlenW(nameW)+1)*sizeof(WCHAR));
+        ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size %ld\n",size);
         if (rc==MMSYSERR_NOERROR) {
             nameA = malloc(size/sizeof(WCHAR));
             WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), nameA,




More information about the wine-cvs mailing list