dmsynth: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Oct 8 11:59:31 CDT 2006
---
dlls/dmsynth/Makefile.in | 1 -
dlls/dmsynth/dmsynth_main.c | 2 +-
dlls/dmsynth/synth.c | 22 +++++++++++-----------
dlls/dmsynth/synthsink.c | 4 ++--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in
index f6fc5f5..88224f4 100644
--- a/dlls/dmsynth/Makefile.in
+++ b/dlls/dmsynth/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = dmsynth.dll
IMPORTS = winmm ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
dmsynth_main.c \
diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index b982e48..6de7c48 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -516,7 +516,7 @@ const char *debugstr_dmreturn (DWORD cod
return codes[i].name;
}
/* if we didn't find it, return value */
- return wine_dbg_sprintf("0x%08lx", code);
+ return wine_dbg_sprintf("0x%08x", code);
}
/* generic flag-dumping function */
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index ad052c2..8c774e9 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -41,7 +41,7 @@ static ULONG WINAPI IDirectMusicSynth8Im
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
DMSYNTH_LockModule();
@@ -52,7 +52,7 @@ static ULONG WINAPI IDirectMusicSynth8Im
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(), 0, This);
@@ -78,7 +78,7 @@ static HRESULT WINAPI IDirectMusicSynth8
static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups (LPDIRECTMUSICSYNTH8 iface, DWORD dwGroups) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %ld): stub\n", This, dwGroups);
+ FIXME("(%p, %d): stub\n", This, dwGroups);
return S_OK;
}
@@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicSynth8
static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rt), pbBuffer, cbBuffer);
+ FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rt), pbBuffer, cbBuffer);
return S_OK;
}
@@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicSynth8
static HRESULT WINAPI IDirectMusicSynth8Impl_Render (LPDIRECTMUSICSYNTH8 iface, short* pBuffer, DWORD dwLength, LONGLONG llPosition) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %p, %ld, 0x%s): stub\n", This, pBuffer, dwLength, wine_dbgstr_longlong(llPosition));
+ FIXME("(%p, %p, %d, 0x%s): stub\n", This, pBuffer, dwLength, wine_dbgstr_longlong(llPosition));
return S_OK;
}
@@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSynth8
static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %ld, %ld, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority);
+ FIXME("(%p, %d, %d, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority);
return S_OK;
}
@@ -174,7 +174,7 @@ static HRESULT WINAPI IDirectMusicSynth8
/* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */
static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, 0x%s, %ld, %ld, %ld, %ld, %li, %li,0x%s, 0x%s, 0x%s): stub\n",
+ FIXME("(%p, 0x%s, %d, %d, %d, %d, %li, %li,0x%s, 0x%s, 0x%s): stub\n",
This, wine_dbgstr_longlong(rt), dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume,
wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd));
return S_OK;
@@ -182,25 +182,25 @@ static HRESULT WINAPI IDirectMusicSynth8
static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, 0x%s, %ld): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId);
+ FIXME("(%p, 0x%s, %d): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState (LPDIRECTMUSICSYNTH8 iface, DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState);
+ FIXME("(%p, %p, %d, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh (LPDIRECTMUSICSYNTH8 iface, DWORD dwDownloadID, DWORD dwFlags) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %ld, %ld): stub\n", This, dwDownloadID, dwFlags);
+ FIXME("(%p, %d, %d): stub\n", This, dwDownloadID, dwFlags);
return S_OK;
}
static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) {
IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface;
- FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses);
+ FIXME("(%p, %d, %d, %p, %d): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses);
return S_OK;
}
diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index a9f7099..e139afc 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -40,7 +40,7 @@ static ULONG WINAPI IDirectMusicSynthSin
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount - 1);
DMSYNTH_LockModule();
@@ -51,7 +51,7 @@ static ULONG WINAPI IDirectMusicSynthSin
IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1);
+ TRACE("(%p)->(ref before=%u)\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(), 0, This);
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/26b4c0e6/attachment.pgp
More information about the wine-patches
mailing list