Skip to content

W
wine-cw
Commit 10ee330a authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

winmm/wineoss: Win64 printf format warning fixes.

parent a0f54139
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 75 deletions
dlls/winmm/wineoss/Makefile.in
View file @ 10ee330a
...@@ -5,7 +5,6 @@ VPATH = @srcdir@ ...@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = wineoss.drv MODULE = wineoss.drv
IMPORTS = winmm user32 kernel32 IMPORTS = winmm user32 kernel32
EXTRALIBS = -ldxguid -luuid EXTRALIBS = -ldxguid -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
audio.c \ audio.c \
......
dlls/winmm/wineoss/dsrender.c
View file @ 10ee330a
...@@ -170,7 +170,7 @@ static ULONG WINAPI IDsDriverPropertySetImpl_AddRef(PIDSDRIVERPROPERTYSET iface) ...@@ -170,7 +170,7 @@ static ULONG WINAPI IDsDriverPropertySetImpl_AddRef(PIDSDRIVERPROPERTYSET iface)
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount - 1); TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -180,7 +180,7 @@ static ULONG WINAPI IDsDriverPropertySetImpl_Release(PIDSDRIVERPROPERTYSET iface ...@@ -180,7 +180,7 @@ static ULONG WINAPI IDsDriverPropertySetImpl_Release(PIDSDRIVERPROPERTYSET iface
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount + 1); TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer); IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer);
...@@ -200,7 +200,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Get( ...@@ -200,7 +200,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Get(
PULONG pcbReturnedData ) PULONG pcbReturnedData )
{ {
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
FIXME("(%p,%p,%p,%lx,%p,%lx,%p)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData); FIXME("(%p,%p,%p,%x,%p,%x,%p)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData);
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
...@@ -213,7 +213,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Set( ...@@ -213,7 +213,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Set(
ULONG cbPropertyData ) ULONG cbPropertyData )
{ {
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
FIXME("(%p,%p,%p,%lx,%p,%lx)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData); FIXME("(%p,%p,%p,%x,%p,%x)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData);
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
...@@ -224,7 +224,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QuerySupport( ...@@ -224,7 +224,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QuerySupport(
PULONG pSupport ) PULONG pSupport )
{ {
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
FIXME("(%p,%s,%lx,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,pSupport); FIXME("(%p,%s,%x,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,pSupport);
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
...@@ -268,7 +268,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_AddRef(PIDSDRIVERNOTIFY iface) ...@@ -268,7 +268,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_AddRef(PIDSDRIVERNOTIFY iface)
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount - 1); TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -278,7 +278,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) ...@@ -278,7 +278,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface)
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount + 1); TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer); IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer);
...@@ -295,7 +295,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( ...@@ -295,7 +295,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions(
LPCDSBPOSITIONNOTIFY notify) LPCDSBPOSITIONNOTIFY notify)
{ {
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify);
if (!notify) { if (!notify) {
WARN("invalid parameter\n"); WARN("invalid parameter\n");
...@@ -305,7 +305,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( ...@@ -305,7 +305,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions(
if (TRACE_ON(wave)) { if (TRACE_ON(wave)) {
int i; int i;
for (i=0;i<howmuch;i++) for (i=0;i<howmuch;i++)
TRACE("notify at %ld to 0x%08lx\n", TRACE("notify at %d to 0x%08x\n",
notify[i].dwOffset,(DWORD)notify[i].hEventNotify); notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
} }
...@@ -338,7 +338,7 @@ static const IDsDriverNotifyVtbl dsdnvt = ...@@ -338,7 +338,7 @@ static const IDsDriverNotifyVtbl dsdnvt =
static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb) static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb)
{ {
TRACE("(%p), format=%ldx%dx%d\n", dsdb, dsdb->wfex.Format.nSamplesPerSec, TRACE("(%p), format=%dx%dx%d\n", dsdb, dsdb->wfex.Format.nSamplesPerSec,
dsdb->wfex.Format.wBitsPerSample, dsdb->wfex.Format.nChannels); dsdb->wfex.Format.wBitsPerSample, dsdb->wfex.Format.nChannels);
if (!dsdb->mapping) { if (!dsdb->mapping) {
dsdb->mapping = mmap(NULL, dsdb->maplen, PROT_WRITE, MAP_SHARED, dsdb->mapping = mmap(NULL, dsdb->maplen, PROT_WRITE, MAP_SHARED,
...@@ -349,7 +349,7 @@ static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb) ...@@ -349,7 +349,7 @@ static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb)
"\"Hardware Acceleration\" to \"Emulation\".\n"); "\"Hardware Acceleration\" to \"Emulation\".\n");
return DSERR_GENERIC; return DSERR_GENERIC;
} }
TRACE("The sound device has been mapped for direct access at %p, size=%ld\n", dsdb->mapping, dsdb->maplen); TRACE("The sound device has been mapped for direct access at %p, size=%d\n", dsdb->mapping, dsdb->maplen);
/* for some reason, es1371 and sblive! sometimes have junk in here. /* for some reason, es1371 and sblive! sometimes have junk in here.
* clear it, or we get junk noise */ * clear it, or we get junk noise */
...@@ -445,7 +445,7 @@ static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) ...@@ -445,7 +445,7 @@ static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface)
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount - 1); TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -455,7 +455,7 @@ static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) ...@@ -455,7 +455,7 @@ static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface)
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount + 1); TRACE("(%p) ref was %d\n", This, refCount + 1);
if (refCount) if (refCount)
return refCount; return refCount;
...@@ -527,7 +527,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, ...@@ -527,7 +527,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface,
static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq) static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq)
{ {
/* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */
TRACE("(%p,%ld): stub\n",iface,dwFreq); TRACE("(%p,%d): stub\n",iface,dwFreq);
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
...@@ -550,7 +550,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, P ...@@ -550,7 +550,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, P
static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos) static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos)
{ {
/* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */
TRACE("(%p,%ld): stub\n",iface,dwNewPos); TRACE("(%p,%d): stub\n",iface,dwNewPos);
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
} }
...@@ -582,7 +582,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, ...@@ -582,7 +582,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface,
while (*lpdwWrite > This->buflen) while (*lpdwWrite > This->buflen)
*lpdwWrite -= This->buflen; *lpdwWrite -= This->buflen;
} }
TRACE("playpos=%ld, writepos=%ld\n", lpdwPlay?*lpdwPlay:0, lpdwWrite?*lpdwWrite:0); TRACE("playpos=%d, writepos=%d\n", lpdwPlay?*lpdwPlay:0, lpdwWrite?*lpdwWrite:0);
return DS_OK; return DS_OK;
} }
...@@ -590,7 +590,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR ...@@ -590,7 +590,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR
{ {
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
int enable; int enable;
TRACE("(%p,%lx,%lx,%lx)\n",iface,dwRes1,dwRes2,dwFlags); TRACE("(%p,%x,%x,%x)\n",iface,dwRes1,dwRes2,dwFlags);
WOutDev[This->drv->wDevID].ossdev->bOutputEnabled = TRUE; WOutDev[This->drv->wDevID].ossdev->bOutputEnabled = TRUE;
enable = getEnables(WOutDev[This->drv->wDevID].ossdev); enable = getEnables(WOutDev[This->drv->wDevID].ossdev);
if (ioctl(This->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0) { if (ioctl(This->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0) {
...@@ -686,7 +686,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) ...@@ -686,7 +686,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface)
IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverImpl *This = (IDsDriverImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount - 1); TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -696,7 +696,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) ...@@ -696,7 +696,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface)
IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverImpl *This = (IDsDriverImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p) ref was %ld\n", This, refCount + 1); TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
HeapFree(GetProcessHeap(),0,This); HeapFree(GetProcessHeap(),0,This);
...@@ -780,7 +780,7 @@ static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface, ...@@ -780,7 +780,7 @@ static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface,
HRESULT err; HRESULT err;
audio_buf_info info; audio_buf_info info;
int enable = 0; int enable = 0;
TRACE("(%p,%p,%lx,%lx,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj); TRACE("(%p,%p,%x,%x,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
if (This->primary) if (This->primary)
return DSERR_ALLOCATED; return DSERR_ALLOCATED;
...@@ -844,7 +844,7 @@ static HRESULT WINAPI DSD_CreateSecondaryBuffer(PIDSDRIVER iface, ...@@ -844,7 +844,7 @@ static HRESULT WINAPI DSD_CreateSecondaryBuffer(PIDSDRIVER iface,
{ {
IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverImpl *This = (IDsDriverImpl *)iface;
IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj;
FIXME("(%p,%p,%lx,%lx,%p,%p,%p): stub\n",This,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj); FIXME("(%p,%p,%x,%x,%p,%p,%p): stub\n",This,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
*ippdsdb = 0; *ippdsdb = 0;
return DSERR_UNSUPPORTED; return DSERR_UNSUPPORTED;
...@@ -858,7 +858,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, ...@@ -858,7 +858,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface,
LPBYTE *ppbBuffer, LPBYTE *ppbBuffer,
LPVOID *ppvObj) LPVOID *ppvObj)
{ {
TRACE("(%p,%p,%lx,%lx,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj); TRACE("(%p,%p,%x,%x,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
if (dwFlags & DSBCAPS_PRIMARYBUFFER) if (dwFlags & DSBCAPS_PRIMARYBUFFER)
return DSD_CreatePrimaryBuffer(iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj); return DSD_CreatePrimaryBuffer(iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
......
dlls/winmm/wineoss/midi.c
View file @ 10ee330a
...@@ -263,8 +263,8 @@ LRESULT OSS_MidiInit(void) ...@@ -263,8 +263,8 @@ LRESULT OSS_MidiInit(void)
FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); FIXME("Synthesizer supports MIDI in. Not yet supported.\n");
} }
TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%ld\n" TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
"\tOSS info: synth subtype=%d capa=%lx\n", "\tOSS info: synth subtype=%d capa=%lx\n",
i, wine_dbgstr_w(MidiOutDev[i].caps.szPname), i, wine_dbgstr_w(MidiOutDev[i].caps.szPname),
MidiOutDev[i].caps.wTechnology, MidiOutDev[i].caps.wTechnology,
MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes, MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes,
...@@ -353,9 +353,9 @@ LRESULT OSS_MidiInit(void) ...@@ -353,9 +353,9 @@ LRESULT OSS_MidiInit(void)
/* FIXME : could we get better information than that ? */ /* FIXME : could we get better information than that ? */
MidiInDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; MidiInDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME;
TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%ld\n" TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
"MidiIn [%d]\tname='%s' support=%ld\n" "MidiIn [%d]\tname='%s' support=%d\n"
"\tOSS info: midi dev-type=%d, capa=%lx\n", "\tOSS info: midi dev-type=%d, capa=%lx\n",
i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname),
MidiOutDev[numsynthdevs + i].caps.wTechnology, MidiOutDev[numsynthdevs + i].caps.wTechnology,
MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes, MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes,
...@@ -407,7 +407,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, ...@@ -407,7 +407,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg,
HANDLE hDev; HANDLE hDev;
DWORD dwInstance; DWORD dwInstance;
TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", TRACE("wDevID = %04X wMsg = %d dwParm1 = %04X dwParam2 = %04X\n",
wDevID, wMsg, dwParam1, dwParam2); wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {
...@@ -632,7 +632,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) ...@@ -632,7 +632,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]);
} }
if (toSend != 0) { if (toSend != 0) {
TRACE("Sending event %08lx\n", toSend); TRACE("Sending event %08x\n", toSend);
MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].incLen = 0;
dwTime -= MidiInDev[wDevID].startTime; dwTime -= MidiInDev[wDevID].startTime;
if (MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime) != MMSYSERR_NOERROR) { if (MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime) != MMSYSERR_NOERROR) {
...@@ -704,7 +704,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) ...@@ -704,7 +704,7 @@ static DWORD WINAPI midRecThread(LPVOID arg)
*/ */
static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpCaps, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
...@@ -719,7 +719,7 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) ...@@ -719,7 +719,7 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize)
*/ */
static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpDesc, dwFlags); TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) { if (lpDesc == NULL) {
WARN("Invalid Parameter !\n"); WARN("Invalid Parameter !\n");
...@@ -834,7 +834,7 @@ static DWORD midClose(WORD wDevID) ...@@ -834,7 +834,7 @@ static DWORD midClose(WORD wDevID)
*/ */
static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
...@@ -866,7 +866,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -866,7 +866,7 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
*/ */
static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 ||
lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 ||
...@@ -885,7 +885,7 @@ static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -885,7 +885,7 @@ static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
*/ */
static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
...@@ -1079,7 +1079,7 @@ static void modFMReset(WORD wDevID) ...@@ -1079,7 +1079,7 @@ static void modFMReset(WORD wDevID)
*/ */
static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpCaps, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (lpCaps == NULL) return MMSYSERR_INVALPARAM; if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
...@@ -1094,7 +1094,7 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) ...@@ -1094,7 +1094,7 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
*/ */
static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpDesc, dwFlags); TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) { if (lpDesc == NULL) {
WARN("Invalid Parameter !\n"); WARN("Invalid Parameter !\n");
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
...@@ -1231,7 +1231,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) ...@@ -1231,7 +1231,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
WORD d1 = HIBYTE(LOWORD(dwParam)); WORD d1 = HIBYTE(LOWORD(dwParam));
WORD d2 = LOBYTE(HIWORD(dwParam)); WORD d2 = LOBYTE(HIWORD(dwParam));
TRACE("(%04X, %08lX);\n", wDevID, dwParam); TRACE("(%04X, %08X);\n", wDevID, dwParam);
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
...@@ -1521,7 +1521,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1521,7 +1521,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
int count; int count;
LPBYTE lpData; LPBYTE lpData;
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
/* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
* but it seems to be used only for midi input. * but it seems to be used only for midi input.
...@@ -1556,7 +1556,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1556,7 +1556,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
} }
TRACE("dwBufferLength=%lu !\n", lpMidiHdr->dwBufferLength); TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
TRACE(" %02X %02X %02X ... %02X %02X %02X\n", TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
...@@ -1603,7 +1603,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1603,7 +1603,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
*/ */
static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (midiSeqFD == -1) { if (midiSeqFD == -1) {
WARN("can't prepare !\n"); WARN("can't prepare !\n");
...@@ -1617,7 +1617,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1617,7 +1617,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 ||
lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 || lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 ||
lpMidiHdr->dwBufferLength >= 0x10000ul) { lpMidiHdr->dwBufferLength >= 0x10000ul) {
WARN("%p %p %08lx %d/%ld\n", lpMidiHdr, lpMidiHdr->lpData, WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData,
lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize); lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize);
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
} }
...@@ -1633,7 +1633,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ...@@ -1633,7 +1633,7 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
*/ */
static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{ {
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (midiSeqFD == -1) { if (midiSeqFD == -1) {
WARN("can't unprepare !\n"); WARN("can't unprepare !\n");
...@@ -1693,7 +1693,7 @@ LRESULT OSS_MidiInit(void) ...@@ -1693,7 +1693,7 @@ LRESULT OSS_MidiInit(void)
DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2); wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {
#ifdef HAVE_OSS_MIDI #ifdef HAVE_OSS_MIDI
...@@ -1736,7 +1736,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, ...@@ -1736,7 +1736,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2); wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {
......
dlls/winmm/wineoss/mmaux.c
View file @ 10ee330a
...@@ -80,7 +80,7 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) ...@@ -80,7 +80,7 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize)
int mixer, volume; int mixer, volume;
static const WCHAR ini[] = {'O','S','S',' ','A','u','x',0}; static const WCHAR ini[] = {'O','S','S',' ','A','u','x',0};
TRACE("(%04X, %p, %lu);\n", wDevID, lpCaps, dwSize); TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) return MMSYSERR_NOTENABLED; if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
WARN("mixer device not available !\n"); WARN("mixer device not available !\n");
...@@ -166,7 +166,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) ...@@ -166,7 +166,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
int volume, left, right; int volume, left, right;
int cmd; int cmd;
TRACE("(%04X, %08lX);\n", wDevID, dwParam); TRACE("(%04X, %08X);\n", wDevID, dwParam);
left = (LOWORD(dwParam) * 100) >> 16; left = (LOWORD(dwParam) * 100) >> 16;
right = (HIWORD(dwParam) * 100) >> 16; right = (HIWORD(dwParam) * 100) >> 16;
...@@ -222,7 +222,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) ...@@ -222,7 +222,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2); wDevID, wMsg, dwUser, dwParam1, dwParam2);
#ifdef HAVE_OSS #ifdef HAVE_OSS
......
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