From 1b469c2482eec0a84574a6d02f977d075d40d14c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 13 Jun 2006 14:10:12 +0200
Subject: [PATCH] dmstyle: Don't use sizeof in traces to avoid printf format
 warnings.

---
 dlls/dmstyle/commandtrack.c | 2 +-
 dlls/dmstyle/style.c        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c
index 9e0ecc422f8..de7913fa6b1 100644
--- a/dlls/dmstyle/commandtrack.c
+++ b/dlls/dmstyle/commandtrack.c
@@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR
 			TRACE_(dmfile)(": command track chunk\n");
 			IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL);
 			if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) {
-				TRACE_(dmfile)(": declared size of struct (=%ld) != actual size (=%i); indicates older direct music version\n", dwSizeOfStruct, sizeof(DMUS_IO_COMMAND));
+				TRACE_(dmfile)(": declared size of struct (=%ld) != actual size; indicates older direct music version\n", dwSizeOfStruct);
 			}
 			chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */
 			nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index dd3fdc5ccaf..9987e0d3ce8 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -588,13 +588,13 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
     TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
     switch (Chunk.fccID) {
     case DMUS_FOURCC_PART_CHUNK: {
-      TRACE_(dmfile)(": Part chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLEPART));
+      TRACE_(dmfile)(": Part chunk (skipping for now)\n" );
       liMove.QuadPart = Chunk.dwSize;
       IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
       break;
     }
     case DMUS_FOURCC_NOTE_CHUNK: { 
-      TRACE_(dmfile)(": Note chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLENOTE));
+      TRACE_(dmfile)(": Note chunk (skipping for now)\n");
       IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
       cnt = (Chunk.dwSize - sizeof(DWORD));
       TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);
@@ -610,7 +610,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
       break;
     }
     case DMUS_FOURCC_CURVE_CHUNK: { 
-      TRACE_(dmfile)(": Curve chunk (skipping for now) (sizeof %u)\n", sizeof(DMUS_IO_STYLECURVE));
+      TRACE_(dmfile)(": Curve chunk (skipping for now)\n");
       IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
       cnt = (Chunk.dwSize - sizeof(DWORD));
       TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);