Module: wine Branch: master Commit: 1470955cc50c8359f961910cefd312db8361d993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470955cc50c8359f961910cef...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Tue Dec 2 15:01:48 2008 +0100
wineoss.drv: Get rid of sizeof in traces.
---
dlls/wineoss.drv/midi.c | 4 ++-- dlls/wineoss.drv/mixer.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index ade1928..15e0396 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1620,8 +1620,8 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->dwBufferLength >= 0x10000ul) { - WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, - lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize); + WARN("%p %p %08x %d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL, + lpMidiHdr ? lpMidiHdr->dwFlags : 0, dwSize); return MMSYSERR_INVALPARAM; }
diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 34588f9..8eeb22b 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -787,8 +787,8 @@ static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD fdwInfo) }
if (lpMl->cbStruct != sizeof(*lpMl)) { - WARN("invalid parameter: lpMl->cbStruct = %d != %d\n", - lpMl->cbStruct, sizeof(*lpMl)); + WARN("invalid parameter: lpMl->cbStruct = %d\n", + lpMl->cbStruct); return MMSYSERR_INVALPARAM; }
@@ -963,14 +963,14 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc, }
if (lpMlc->cbStruct < sizeof(*lpMlc)) { - WARN("invalid parameter: lpMlc->cbStruct = %d < %d\n", - lpMlc->cbStruct, sizeof(*lpMlc)); + WARN("invalid parameter: lpMlc->cbStruct = %d\n", + lpMlc->cbStruct); return MMSYSERR_INVALPARAM; }
if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) { - WARN("invalid parameter: lpMlc->cbmxctrl = %d < %d\n", - lpMlc->cbmxctrl, sizeof(MIXERCONTROLW)); + WARN("invalid parameter: lpMlc->cbmxctrl = %d\n", + lpMlc->cbmxctrl); return MMSYSERR_INVALPARAM; }
@@ -1098,8 +1098,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
@@ -1145,8 +1145,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
@@ -1167,8 +1167,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
@@ -1299,8 +1299,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_UNSIGNED)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_UNSIGNED)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
@@ -1351,8 +1351,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
@@ -1395,8 +1395,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) { - WARN("invalid parameter: cbDetails != %d\n", - sizeof(MIXERCONTROLDETAILS_BOOLEAN)); + WARN("invalid parameter: cbDetails = %d\n", + lpmcd->cbDetails); return MMSYSERR_INVALPARAM; }
-
Alexandre Julliard