[PATCH 1/2] dlls/wineoss.drv-longtypes: use correct integral type
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/ossmidi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9c1261ce05cc..0a7c2011c63f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT*)flags; params.devpos = devpos; params.qpcpos = qpcpos; OSS_CALL(get_capture_buffer, ¶ms); diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 09eed8085c42..b6fde8175ae8 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -396,8 +396,8 @@ static UINT midi_init(void) if (sinfo.capabilities & SYNTH_CAP_INPUT) FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", - i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%x\n", + i, sinfo.synth_type, sinfo.synth_subtype, sinfo.capabilities); } TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", @@ -489,10 +489,10 @@ static UINT midi_init(void) } src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + TRACE("OSS info: midi[%d] dev-type=%d capa=%x\n" "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" "\tMidiIn [%d] name='%s' support=%d\n", - i, minfo.dev_type, (long)minfo.capabilities, + i, minfo.dev_type, minfo.capabilities, synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport, i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wineoss.drv/Makefile.in | 1 - dlls/wineoss.drv/midi.c | 8 ++++---- dlls/wineoss.drv/mmaux.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 38 +++++++++++++++++++------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 9 +++++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index d41aa0113c82..ae9187cd9fb1 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineoss.drv UNIXLIB = wineoss.so IMPORTS = uuid ole32 user32 advapi32 diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index dda5dabf522e..ca842bbdc04d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static void notify_client(struct notify_context *notify) { - TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", + TRACE("dev_id = %d msg = %d param1 = %04IX param2 = %04IX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, @@ -78,7 +78,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, struct notify_context notify; UINT err; - TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%04X, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); params.dev_id = wDevID; @@ -108,7 +108,7 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, struct notify_context notify; UINT err; - TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%04X, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); params.dev_id = wDevID; @@ -150,7 +150,7 @@ static DWORD WINAPI notify_thread(void *p) LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch(wMsg) { diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index ae52293f944d..f86ec6f4bae9 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -42,7 +42,7 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, struct aux_message_params params; UINT err; - TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%04X, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0a7c2011c63f..26ff60aeb2af 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -272,7 +272,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, lr = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, KEY_WRITE, NULL, &drv_key, NULL); if(lr != ERROR_SUCCESS){ - ERR("RegCreateKeyEx(drv_key) failed: %u\n", lr); + ERR("RegCreateKeyEx(drv_key) failed: %lu\n", lr); return; } opened = TRUE; @@ -281,14 +281,14 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, lr = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); if(lr != ERROR_SUCCESS){ - ERR("RegCreateKeyEx(%s) failed: %u\n", wine_dbgstr_w(key_name), lr); + ERR("RegCreateKeyEx(%s) failed: %lu\n", wine_dbgstr_w(key_name), lr); goto exit; } lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); if(lr != ERROR_SUCCESS) - ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); + ERR("RegSetValueEx(%s\\guid) failed: %lu\n", wine_dbgstr_w(key_name), lr); RegCloseKey(key); exit: @@ -318,7 +318,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); return; } - ERR("Invalid type for device %s GUID: %u; ignoring and overwriting\n", + ERR("Invalid type for device %s GUID: %lu; ignoring and overwriting\n", wine_dbgstr_w(key_name), type); } RegCloseKey(dev_key); @@ -505,7 +505,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) ACImpl *This = impl_from_IAudioClient3(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -515,7 +515,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); @@ -553,15 +553,15 @@ static void dump_fmt(const WAVEFORMATEX *fmt) TRACE(")\n"); TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); + TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); + TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); TRACE("cbSize: %u\n", fmt->cbSize); if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); + TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); TRACE("Samples: %04x\n", fmtex->Samples.wReserved); TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); } @@ -656,7 +656,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream_handle stream; unsigned int i; - TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, + TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); if(!fmt) @@ -677,7 +677,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ - FIXME("Unknown flags: %08x\n", flags); + FIXME("Unknown flags: %08lx\n", flags); return E_INVALIDARG; } @@ -1147,7 +1147,7 @@ static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *ifa { ACImpl *This = impl_from_IAudioClient3(iface); - FIXME("(%p)->(0x%x, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); + FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); return E_NOTIMPL; } @@ -1240,7 +1240,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( ACImpl *This = impl_from_IAudioRenderClient(iface); struct release_render_buffer_params params; - TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); + TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); params.stream = This->stream; params.written_frames = written_frames; @@ -1548,7 +1548,7 @@ static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -1557,7 +1557,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ if(This->client){ EnterCriticalSection(&g_sessions_lock); @@ -2239,7 +2239,7 @@ static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; } @@ -2248,7 +2248,7 @@ static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -2263,7 +2263,7 @@ static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( AudioSessionWrapper *wrapper; HRESULT hr; - TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), + TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid), flags, out); hr = get_audio_session(session_guid, This->device, 0, &session); @@ -2290,7 +2290,7 @@ static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( AudioSessionWrapper *wrapper; HRESULT hr; - TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), + TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid), flags, out); hr = get_audio_session(session_guid, This->device, 0, &session); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index e9616a84b36a..07a2a1ed7c1a 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -531,7 +531,7 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, } free(closest); - TRACE("returning: %08x\n", ret); + TRACE("returning: %08x\n", (unsigned)ret); return ret; } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index b6fde8175ae8..93d4399d5aa7 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -402,7 +402,8 @@ static UINT midi_init(void) TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, - dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport); + dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, + (unsigned)dest->caps.dwSupport); } /* find how many MIDI devices are there in the system */ @@ -494,8 +495,8 @@ static UINT midi_init(void) "\tMidiIn [%d] name='%s' support=%d\n", i, minfo.dev_type, minfo.capabilities, synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, - dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport, - i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport); + dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, (unsigned)dest->caps.dwSupport, + i, wine_dbgstr_w(src->caps.szPname), (unsigned)src->caps.dwSupport); } wrapup: @@ -1115,7 +1116,7 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7) WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength); + TRACE("dwBufferLength=%u !\n", (unsigned)hdr->dwBufferLength); TRACE(" %02X %02X %02X ... %02X %02X %02X\n", data[0], data[1], data[2], data[hdr->dwBufferLength - 3], data[hdr->dwBufferLength - 2], data[hdr->dwBufferLength - 1]);
participants (1)
-
Eric Pouech