ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmstyle: Don't use sizeof in traces to avoid printf format warnings.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-06-13 14:10:12 +02:00
parent 7ad5f9eca0
commit 1b469c2482
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dmstyle/commandtrack.c
View File

@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR
TRACE_(dmfile)(": command track chunk\n"); TRACE_(dmfile)(": command track chunk\n");
IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL);
if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) { 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 */ chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */
nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */ nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */

6
dlls/dmstyle/style.c
View File

@ -588,13 +588,13 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case DMUS_FOURCC_PART_CHUNK: { 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; liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break; break;
} }
case DMUS_FOURCC_NOTE_CHUNK: { 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); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
cnt = (Chunk.dwSize - sizeof(DWORD)); cnt = (Chunk.dwSize - sizeof(DWORD));
TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);
@ -610,7 +610,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
break; break;
} }
case DMUS_FOURCC_CURVE_CHUNK: { 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); IStream_Read (pStm, &dwSize, sizeof(DWORD), NULL);
cnt = (Chunk.dwSize - sizeof(DWORD)); cnt = (Chunk.dwSize - sizeof(DWORD));
TRACE_(dmfile)(" - dwSize: %lu\n", dwSize); TRACE_(dmfile)(" - dwSize: %lu\n", dwSize);