wineoss.drv: Eliminate all 64-bits warnings

Austin English austinenglish at gmail.com
Tue Dec 2 03:28:04 CST 2008


On Tue, Dec 2, 2008 at 3:19 AM, Maarten Lankhorst
<m.b.lankhorst at gmail.com> wrote:
> sizeof is defined as int on 32-bits, and long on 64-bits. To keep this
> working I'm casting all sizeofs to longs
> ---
>

Minor, but you've got a few extraneous whitespace changes:

diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index 460c1f5..1828320 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -1923,7 +1923,6 @@ static	DWORD	CALLBACK	wodPlayer(LPVOID pmt)
 	    dwNextFeedTime = dwNextNotifyTime = INFINITE;
 	}
     }
-
     return 0;
 }

diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c
index b48ea6b..44e22b7 100644
--- a/dlls/wineoss.drv/mmaux.c
+++ b/dlls/wineoss.drv/mmaux.c
@@ -219,10 +219,10 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
 /**************************************************************************
  *		auxMessage (WINEOSS.2)
  */
-DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
-			    DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+			    DWORD_PTR dwParam1, DWORD_PTR dwParam2)
 {
-    TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
+    TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
 	  wDevID, wMsg, dwUser, dwParam1, dwParam2);

 #ifdef HAVE_OSS
@@ -250,3 +250,4 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT
wMsg, DWORD dwUser,
     return MMSYSERR_NOTENABLED;
 #endif
 }
+

-- 
-Austin



More information about the wine-devel mailing list