Michael Stefaniuc : include: Use LONG instead of long in dmusici. h for Win64 compatibility.

Alexandre Julliard julliard at winehq.org
Sat Jan 10 11:16:35 CST 2009


Module: wine
Branch: master
Commit: 9e296ead7ea718f63849e12381f02b22948ea908
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9e296ead7ea718f63849e12381f02b22948ea908

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sat Jan 10 02:44:57 2009 +0100

include: Use LONG instead of long in dmusici.h for Win64 compatibility.

---

 dlls/dmime/audiopath.c |    4 ++--
 include/dmusici.h      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index 23d837a..301ace9 100644
--- a/dlls/dmime/audiopath.c
+++ b/dlls/dmime/audiopath.c
@@ -206,9 +206,9 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_Activate (
   return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume (LPDIRECTMUSICAUDIOPATH iface, long lVolume, DWORD dwDuration) {
+static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_SetVolume (LPDIRECTMUSICAUDIOPATH iface, LONG lVolume, DWORD dwDuration) {
   ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface);
-  FIXME("(%p, %li, %d): stub\n", This, lVolume, dwDuration);
+  FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration);
   return S_OK;
 }
 
diff --git a/include/dmusici.h b/include/dmusici.h
index 46cbdf3..82a137b 100644
--- a/include/dmusici.h
+++ b/include/dmusici.h
@@ -707,9 +707,9 @@ struct _DMUS_WAVE_PMSG {
 	DMUS_PMSG_PART    
 	REFERENCE_TIME rtStartOffset;
 	REFERENCE_TIME rtDuration;
-	long           lOffset;
-	long           lVolume;
-	long           lPitch;
+	LONG           lOffset;
+	LONG           lVolume;
+	LONG           lPitch;
 	BYTE           bFlags;
 };
 
@@ -1199,7 +1199,7 @@ DECLARE_INTERFACE_(IDirectMusicAudioPath,IUnknown)
     /*** IDirectMusicAudioPath methods ***/
     STDMETHOD(GetObjectInPath)(THIS_ DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, WORD dwIndex, REFGUID iidInterface, void **ppObject) PURE;
     STDMETHOD(Activate)(THIS_ BOOL fActivate) PURE;
-    STDMETHOD(SetVolume)(THIS_ long lVolume, DWORD dwDuration) PURE;
+    STDMETHOD(SetVolume)(THIS_ LONG lVolume, DWORD dwDuration) PURE;
     STDMETHOD(ConvertPChannel)(THIS_ DWORD dwPChannelIn, DWORD *pdwPChannelOut) PURE;
 };
 #undef INTERFACE




More information about the wine-cvs mailing list