Skip to content

W
wine-winehq
Commit d6610b8b authored by Tim Cadogan-Cowper's avatar Tim Cadogan-Cowper Committed by Alexandre Julliard
Browse files
Options

winmm: Wrap TRACE strings with debugstr_a/debugstr_an.

parent 6c144d06
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
dlls/winmm/mmio.c
View file @ d6610b8b
...@@ -584,7 +584,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, ...@@ -584,7 +584,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags,
MMIOINFO mmioinfo; MMIOINFO mmioinfo;
DWORD pos; DWORD pos;
TRACE("('%s', %p, %08X, %s);\n", szFileName, refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); TRACE("(%s, %p, %08X, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi");
if (!refmminfo) { if (!refmminfo) {
refmminfo = &mmioinfo; refmminfo = &mmioinfo;
...@@ -1058,7 +1058,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags) ...@@ -1058,7 +1058,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags)
/* Pad with spaces */ /* Pad with spaces */
while (i < 4) cc[i++] = ' '; while (i < 4) cc[i++] = ' ';
TRACE("Got '%.4s'\n",cc); TRACE("Got %s\n",debugstr_an(cc,4));
return mmioFOURCC(cc[0],cc[1],cc[2],cc[3]); return mmioFOURCC(cc[0],cc[1],cc[2],cc[3]);
} }
...@@ -1173,8 +1173,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, ...@@ -1173,8 +1173,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
srchType = lpck->fccType; srchType = lpck->fccType;
} }
TRACE("searching for %4.4s.%4.4s\n", TRACE("searching for %s.%s\n",
(LPCSTR)&srchCkId, srchType ? (LPCSTR)&srchType : "any"); debugstr_an((LPCSTR)&srchCkId, 4), srchType ? debugstr_an((LPCSTR)&srchType, 4) : "<any>");
while (TRUE) while (TRUE)
{ {
...@@ -1189,9 +1189,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, ...@@ -1189,9 +1189,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
} }
lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD); lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD);
TRACE("ckid=%4.4s fcc=%4.4s cksize=%08X !\n", TRACE("ckid=%s fcc=%s cksize=%08X !\n",
(LPCSTR)&lpck->ckid, debugstr_an((LPCSTR)&lpck->ckid, 4),
srchType ? (LPCSTR)&lpck->fccType:"<na>", srchType ? debugstr_an((LPCSTR)&lpck->fccType, 4) : "<na>",
lpck->cksize); lpck->cksize);
if ( (!srchCkId || (srchCkId == lpck->ckid)) && if ( (!srchCkId || (srchCkId == lpck->ckid)) &&
(!srchType || (srchType == lpck->fccType)) ) (!srchType || (srchType == lpck->fccType)) )
...@@ -1213,9 +1213,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, ...@@ -1213,9 +1213,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET);
lpck->fccType = 0; lpck->fccType = 0;
} }
TRACE("lpck: ckid=%.4s, cksize=%d, dwDataOffset=%d fccType=%08X (%.4s)!\n", TRACE("lpck: ckid=%s, cksize=%d, dwDataOffset=%d fccType=%08X (%s)!\n",
(LPSTR)&lpck->ckid, lpck->cksize, lpck->dwDataOffset, debugstr_an((LPSTR)&lpck->ckid, 4), lpck->cksize, lpck->dwDataOffset,
lpck->fccType, srchType?(LPSTR)&lpck->fccType:""); lpck->fccType, srchType ? debugstr_an((LPSTR)&lpck->fccType, 4):"");
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
...@@ -1272,7 +1272,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) ...@@ -1272,7 +1272,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags)
else if (uFlags == MMIO_CREATERIFF) else if (uFlags == MMIO_CREATERIFF)
lpck->ckid = FOURCC_RIFF; lpck->ckid = FOURCC_RIFF;
TRACE("ckid=%.4s\n", (LPSTR)&lpck->ckid); TRACE("ckid=%s\n", debugstr_an((LPSTR)&lpck->ckid, 4));
size = 2 * sizeof(DWORD); size = 2 * sizeof(DWORD);
lpck->dwDataOffset = dwOldPos + size; lpck->dwDataOffset = dwOldPos + size;
...@@ -1302,7 +1302,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, ...@@ -1302,7 +1302,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName,
struct IOProcList tmp; struct IOProcList tmp;
FOURCC fcc; FOURCC fcc;
TRACE("('%s', '%s', %p, %08X);\n", TRACE("(%s, %s, %p, %08X);\n",
debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags); debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags);
/* If both params are NULL, then parse the file name */ /* If both params are NULL, then parse the file name */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment