Fix all drivers DriverProc to conform to the DRIVERPROC definition.

dlls/iccvid/iccvid.c

@@ -931,7 +931,7 @@ static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize )
     return sizeof(ICINFO);
 }
 
-LRESULT WINAPI ICCVID_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
+LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
                                   LPARAM lParam1, LPARAM lParam2)
 {
     ICCVID_Info *info = (ICCVID_Info *) dwDriverId;

dlls/iccvid/iccvid.spec

-@ stdcall -private DriverProc(long ptr long long long) ICCVID_DriverProc
+@ stdcall -private DriverProc(long long long long long) ICCVID_DriverProc

dlls/mciavi32/mciavi.c

@@ -1197,10 +1197,10 @@ static	DWORD	MCIAVI_mciRestore(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RESTORE_PAR
 /**************************************************************************
  * 				DriverProc (MCIAVI.@)
  */
-LONG CALLBACK	MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				  DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                   LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
+    TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n",
 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg) {
@@ -1262,14 +1262,14 @@ LONG CALLBACK	MCIAVI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 
     case MCI_SPIN:
     case MCI_ESCAPE:
-	WARN("Unsupported command [%lu]\n", wMsg);
+	WARN("Unsupported command [%u]\n", wMsg);
 	break;
     case MCI_OPEN:
     case MCI_CLOSE:
 	FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n");
 	break;
     default:
-	TRACE("Sending msg [%lu] to default driver proc\n", wMsg);
+	TRACE("Sending msg [%u] to default driver proc\n", wMsg);
 	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;

dlls/mcicda/mcicda.c

@@ -988,8 +988,8 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 /**************************************************************************
  * 			DriverProc (MCICDA.@)
  */
-LONG CALLBACK	MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				      DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MCICDA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                   LPARAM dwParam1, LPARAM dwParam2)
 {
     switch(wMsg) {
     case DRV_LOAD:		return 1;
@@ -1038,14 +1038,14 @@ LONG CALLBACK	MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
     case MCI_DELETE:
     case MCI_PASTE:
     case MCI_WINDOW:
-	TRACE("Unsupported command [0x%lx]\n", wMsg);
+	TRACE("Unsupported command [0x%x]\n", wMsg);
 	break;
     case MCI_OPEN:
     case MCI_CLOSE:
 	ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n");
 	break;
     default:
-	TRACE("Sending msg [0x%lx] to default driver proc\n", wMsg);
+	TRACE("Sending msg [0x%x] to default driver proc\n", wMsg);
 	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;

dlls/mciseq/mcimidi.c

@@ -1647,8 +1647,8 @@ static DWORD MIDI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
 /**************************************************************************
  * 				DriverProc (MCISEQ.@)
  */
-LONG CALLBACK	MCIMIDI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				   DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                    LPARAM dwParam1, LPARAM dwParam2)
 {
     switch (wMsg) {
     case DRV_LOAD:		return 1;
@@ -1694,18 +1694,18 @@ LONG CALLBACK	MCIMIDI_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
     case MCI_CUT:
     case MCI_DELETE:
     case MCI_PASTE:
-	WARN("Unsupported command [%lu]\n", wMsg);
+	WARN("Unsupported command [%u]\n", wMsg);
 	break;
     /* commands that should report an error */
     case MCI_WINDOW:
-	TRACE("Unsupported command [%lu]\n", wMsg);
+	TRACE("Unsupported command [%u]\n", wMsg);
 	break;
     case MCI_OPEN:
     case MCI_CLOSE:
 	FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n");
 	break;
     default:
-	TRACE("Sending msg [%lu] to default driver proc\n", wMsg);
+	TRACE("Sending msg [%u] to default driver proc\n", wMsg);
 	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;

dlls/midimap/midimap.c

@@ -490,7 +490,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
 /**************************************************************************
  * 				MIDIMAP_drvOpen			[internal]
  */
-static	DWORD	MIDIMAP_drvOpen(LPSTR str)
+static LRESULT MIDIMAP_drvOpen(LPSTR str)
 {
     MIDIOUTCAPSW	moc;
     unsigned		dev, i;
@@ -525,7 +525,7 @@ static	DWORD	MIDIMAP_drvOpen(LPSTR str)
 /**************************************************************************
  * 				MIDIMAP_drvClose		[internal]
  */
-static	DWORD	MIDIMAP_drvClose(DWORD dwDevID)
+static LRESULT MIDIMAP_drvClose(DWORD_PTR dwDevID)
 {
     if (midiOutPorts)
     {
@@ -539,8 +539,8 @@ static	DWORD	MIDIMAP_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (MIDIMAP.@)
  */
-LONG CALLBACK	MIDIMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				   DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MIDIMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                    LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/msacm/imaadp32/imaadp32.c

@@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(adpcm);
 /***********************************************************************
  *           ADPCM_drvOpen
  */
-static	DWORD	ADPCM_drvOpen(LPCSTR str)
+static LRESULT ADPCM_drvOpen(LPCSTR str)
 {
     return 1;
 }
@@ -48,7 +48,7 @@ static	DWORD	ADPCM_drvOpen(LPCSTR str)
 /***********************************************************************
  *           ADPCM_drvClose
  */
-static	DWORD	ADPCM_drvClose(DWORD dwDevID)
+static LRESULT ADPCM_drvClose(DWORD_PTR dwDevID)
 {
     return 1;
 }
@@ -870,11 +870,11 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
 /**************************************************************************
  * 			ADPCM_DriverProc			[exported]
  */
-LRESULT CALLBACK	ADPCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %08lx %04x %08lx %08lx);\n",
-	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg)
     {

dlls/msacm/msadp32/msadp32.c

@@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(adpcm);
 /***********************************************************************
  *           ADPCM_drvOpen
  */
-static	DWORD	ADPCM_drvOpen(LPCSTR str)
+static LRESULT ADPCM_drvOpen(LPCSTR str)
 {
     return 1;
 }
@@ -48,7 +48,7 @@ static	DWORD	ADPCM_drvOpen(LPCSTR str)
 /***********************************************************************
  *           ADPCM_drvClose
  */
-static	DWORD	ADPCM_drvClose(DWORD dwDevID)
+static LRESULT ADPCM_drvClose(DWORD_PTR dwDevID)
 {
     return 1;
 }
@@ -713,7 +713,7 @@ static LRESULT ADPCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
 /**************************************************************************
  * 			ADPCM_DriverProc			[exported]
  */
-LRESULT CALLBACK	ADPCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+LRESULT CALLBACK ADPCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
     TRACE("(%08lx %p %04x %08lx %08lx);\n",

dlls/msacm/msg711/msg711.c

@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(g711);
 /***********************************************************************
  *           G711_drvOpen
  */
-static	DWORD	G711_drvOpen(LPCSTR str)
+static LRESULT G711_drvOpen(LPCSTR str)
 {
     return 1;
 }
@@ -46,7 +46,7 @@ static	DWORD	G711_drvOpen(LPCSTR str)
 /***********************************************************************
  *           G711_drvClose
  */
-static	DWORD	G711_drvClose(DWORD dwDevID)
+static LRESULT G711_drvClose(DWORD_PTR dwDevID)
 {
     return 1;
 }
@@ -1097,7 +1097,7 @@ static LRESULT G711_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADE
 /**************************************************************************
  * 			G711_DriverProc			[exported]
  */
-LRESULT CALLBACK	G711_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+LRESULT CALLBACK G711_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
     TRACE("(%08lx %p %04x %08lx %08lx);\n",

dlls/msacm/pcmconverter.c

@@ -1022,7 +1022,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
 /**************************************************************************
  * 			DriverProc (MSACM32.@)
  */
-LRESULT CALLBACK	PCM_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 				       LPARAM dwParam1, LPARAM dwParam2)
 {
     TRACE("(%08lx %p %u %08lx %08lx);\n",

dlls/msacm/winemp3/mpegl3.c

@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mpeg3);
 /***********************************************************************
  *           MPEG3_drvOpen
  */
-static	DWORD	MPEG3_drvOpen(LPCSTR str)
+static LRESULT MPEG3_drvOpen(LPCSTR str)
 {
     return 1;
 }
@@ -49,7 +49,7 @@ static	DWORD	MPEG3_drvOpen(LPCSTR str)
 /***********************************************************************
  *           MPEG3_drvClose
  */
-static	DWORD	MPEG3_drvClose(DWORD dwDevID)
+static LRESULT MPEG3_drvClose(DWORD_PTR dwDevID)
 {
     return 1;
 }
@@ -542,11 +542,11 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD
 /**************************************************************************
  * 			MPEG3_DriverProc			[exported]
  */
-LRESULT CALLBACK	MPEG3_DriverProc(DWORD dwDevID, HDRVR hDriv, UINT wMsg,
+LRESULT CALLBACK MPEG3_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 					 LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lx %08lx %04x %08lx %08lx);\n",
-	  dwDevID, (DWORD)hDriv, wMsg, dwParam1, dwParam2);
+    TRACE("(%08lx %p %04x %08lx %08lx);\n",
+	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg)
     {

dlls/msrle32/msrle32.c

@@ -1772,7 +1772,7 @@ static LRESULT DecompressGetPalette(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn,
 }
 
 /* DriverProc - entry point for an installable driver */
-LRESULT CALLBACK MSRLE32_DriverProc(DWORD dwDrvID, HDRVR hDrv, UINT uMsg,
+LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg,
 				    LPARAM lParam1, LPARAM lParam2)
 {
   CodecInfo *pi = (CodecInfo*)dwDrvID;

dlls/msvidc32/msvidc32.spec

-@ stdcall -private DriverProc(long ptr long long long) CRAM_DriverProc
+@ stdcall -private DriverProc(long long long long long) CRAM_DriverProc

dlls/msvidc32/msvideo1.c

@@ -478,7 +478,7 @@ static LRESULT CRAM_GetInfo( Msvideo1Context *info, ICINFO *icinfo, DWORD dwSize
 /***********************************************************************
  *		DriverProc (MSVIDC32.@)
  */
-LRESULT WINAPI CRAM_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
+LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
                                 LPARAM lParam1, LPARAM lParam2 )
 {
     Msvideo1Context *info = (Msvideo1Context *) dwDriverId;

dlls/winmm/joystick/joystick.c

@@ -104,13 +104,13 @@ static	WINE_JSTCK	JSTCK_Data[MAXJOYSTICK];
 /**************************************************************************
  * 				JSTCK_drvGet			[internal]
  */
-static	WINE_JSTCK*	JSTCK_drvGet(DWORD dwDevID)
+static WINE_JSTCK *JSTCK_drvGet(DWORD_PTR dwDevID)
 {
     int	p;
 
-    if ((dwDevID - (DWORD)JSTCK_Data) % sizeof(JSTCK_Data[0]) != 0)
+    if ((dwDevID - (DWORD_PTR)JSTCK_Data) % sizeof(JSTCK_Data[0]) != 0)
 	return NULL;
-    p = (dwDevID - (DWORD)JSTCK_Data) / sizeof(JSTCK_Data[0]);
+    p = (dwDevID - (DWORD_PTR)JSTCK_Data) / sizeof(JSTCK_Data[0]);
     if (p < 0 || p >= MAXJOYSTICK || !((WINE_JSTCK*)dwDevID)->in_use)
 	return NULL;
 
@@ -120,20 +120,20 @@ static	WINE_JSTCK*	JSTCK_drvGet(DWORD dwDevID)
 /**************************************************************************
  * 				JSTCK_drvOpen			[internal]
  */
-static	DWORD	JSTCK_drvOpen(LPSTR str, DWORD dwIntf)
+static LRESULT JSTCK_drvOpen(LPSTR str, DWORD dwIntf)
 {
     if (dwIntf >= MAXJOYSTICK || JSTCK_Data[dwIntf].in_use)
 	return 0;
 
     JSTCK_Data[dwIntf].joyIntf = dwIntf;
     JSTCK_Data[dwIntf].in_use = 1;
-    return (DWORD)&JSTCK_Data[dwIntf];
+    return (LRESULT)&JSTCK_Data[dwIntf];
 }
 
 /**************************************************************************
  * 				JSTCK_drvClose			[internal]
  */
-static	DWORD	JSTCK_drvClose(DWORD dwDevID)
+static LRESULT JSTCK_drvClose(DWORD_PTR dwDevID)
 {
     WINE_JSTCK*	jstck = JSTCK_drvGet(dwDevID);
 
@@ -179,7 +179,7 @@ static	int	JSTCK_OpenDevice(WINE_JSTCK* jstick)
 /**************************************************************************
  * 				JoyGetDevCaps		[MMSYSTEM.102]
  */
-static	LONG	JSTCK_GetDevCaps(DWORD dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize)
+static LRESULT JSTCK_GetDevCaps(DWORD_PTR dwDevID, LPJOYCAPSW lpCaps, DWORD dwSize)
 {
     WINE_JSTCK*	jstck;
 #ifdef HAVE_LINUX_22_JOYSTICK_API
@@ -285,7 +285,7 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k',
 /**************************************************************************
  * 				JSTCK_GetPos			[internal]
  */
-static LONG	JSTCK_GetPosEx(DWORD dwDevID, LPJOYINFOEX lpInfo)
+static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo)
 {
     WINE_JSTCK*		jstck;
     int			dev;
@@ -407,7 +407,7 @@ static LONG	JSTCK_GetPosEx(DWORD dwDevID, LPJOYINFOEX lpInfo)
 /**************************************************************************
  * 				JSTCK_GetPos			[internal]
  */
-static LONG	JSTCK_GetPos(DWORD dwDevID, LPJOYINFO lpInfo)
+static LRESULT JSTCK_GetPos(DWORD_PTR dwDevID, LPJOYINFO lpInfo)
 {
     JOYINFOEX	ji;
     LONG	ret;
@@ -430,8 +430,8 @@ static LONG	JSTCK_GetPos(DWORD dwDevID, LPJOYINFO lpInfo)
 /**************************************************************************
  * 				DriverProc (JOYSTICK.@)
  */
-LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				 DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                  LPARAM dwParam1, LPARAM dwParam2)
 {
     /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
     /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
@@ -464,8 +464,8 @@ LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 /**************************************************************************
  * 				DriverProc (JOYSTICK.@)
  */
-LONG CALLBACK	JSTCK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				 DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                  LPARAM dwParam1, LPARAM dwParam2)
 {
     /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
     /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/mciwave/mciwave.c

@@ -136,7 +136,7 @@ static DWORD WAVE_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa
 /**************************************************************************
  * 				MCIWAVE_drvOpen			[internal]
  */
-static	DWORD	WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
+static LRESULT WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
 {
     WINE_MCIWAVE*	wmw;
 
@@ -166,7 +166,7 @@ static	DWORD	WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp)
 /**************************************************************************
  * 				MCIWAVE_drvClose		[internal]
  */
-static	DWORD	WAVE_drvClose(DWORD dwDevID)
+static LRESULT WAVE_drvClose(MCIDEVICEID dwDevID)
 {
     WINE_MCIWAVE*  wmw = (WINE_MCIWAVE*)mciGetDriverData(dwDevID);
 
@@ -181,7 +181,7 @@ static	DWORD	WAVE_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				WAVE_mciGetOpenDev		[internal]
  */
-static WINE_MCIWAVE*  WAVE_mciGetOpenDev(UINT wDevID)
+static WINE_MCIWAVE *WAVE_mciGetOpenDev(MCIDEVICEID wDevID)
 {
     WINE_MCIWAVE*	wmw = (WINE_MCIWAVE*)mciGetDriverData(wDevID);
 
@@ -346,7 +346,7 @@ err:
 /**************************************************************************
  * 			WAVE_mciOpen	                        [internal]
  */
-static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSW lpOpenParms)
+static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSW lpOpenParms)
 {
     DWORD		dwRet = 0;
     WINE_MCIWAVE*	wmw = (WINE_MCIWAVE*)mciGetDriverData(wDevID);
@@ -510,7 +510,7 @@ static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSW lpO
 /**************************************************************************
  *                               WAVE_mciCue             [internal]
  */
-static DWORD WAVE_mciCue(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms)
+static DWORD WAVE_mciCue(MCIDEVICEID wDevID, LPARAM dwParam, LPMCI_GENERIC_PARMS lpParms)
 {
     /*
       FIXME
@@ -554,7 +554,7 @@ static DWORD WAVE_mciCue(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms
 /**************************************************************************
  * 				WAVE_mciStop			[internal]
  */
-static DWORD WAVE_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
     DWORD 		dwRet = 0;
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
@@ -595,7 +595,7 @@ static DWORD WAVE_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm
 /**************************************************************************
  *				WAVE_mciClose		[internal]
  */
-static DWORD WAVE_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD WAVE_mciClose(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
     DWORD		dwRet = 0;
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
@@ -643,8 +643,8 @@ static DWORD WAVE_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar
  * 				WAVE_mciPlayCallback		[internal]
  */
 static	void	CALLBACK WAVE_mciPlayCallback(HWAVEOUT hwo, UINT uMsg,
-					      DWORD dwInstance,
-					      DWORD dwParam1, DWORD dwParam2)
+					      DWORD_PTR dwInstance,
+					      LPARAM dwParam1, LPARAM dwParam2)
 {
     WINE_MCIWAVE*	wmw = (WINE_MCIWAVE*)dwInstance;
 
@@ -683,7 +683,7 @@ static void WAVE_mciPlayWaitDone(WINE_MCIWAVE* wmw)
 /**************************************************************************
  * 				WAVE_mciPlay		[internal]
  */
-static DWORD WAVE_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
+static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
 {
     DWORD		end;
     LONG		bufsize, count, left;
@@ -877,8 +877,8 @@ cleanUp:
  * 				WAVE_mciPlayCallback		[internal]
  */
 static	void	CALLBACK WAVE_mciRecordCallback(HWAVEOUT hwo, UINT uMsg,
-                                                DWORD dwInstance,
-                                                DWORD dwParam1, DWORD dwParam2)
+                                                DWORD_PTR dwInstance,
+                                                LPARAM dwParam1, LPARAM dwParam2)
 {
     WINE_MCIWAVE*	wmw = (WINE_MCIWAVE*)dwInstance;
     LPWAVEHDR           lpWaveHdr;
@@ -936,7 +936,7 @@ static void WAVE_mciRecordWaitDone(WINE_MCIWAVE* wmw)
 /**************************************************************************
  * 				WAVE_mciRecord			[internal]
  */
-static DWORD WAVE_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpParms)
+static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpParms)
 {
     DWORD		end;
     DWORD		dwRet = MMSYSERR_NOERROR;
@@ -1104,7 +1104,7 @@ cleanUp:
 /**************************************************************************
  * 				WAVE_mciPause			[internal]
  */
-static DWORD WAVE_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
     DWORD 		dwRet;
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
@@ -1127,7 +1127,7 @@ static DWORD WAVE_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar
 /**************************************************************************
  * 				WAVE_mciResume			[internal]
  */
-static DWORD WAVE_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
+static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms)
 {
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
     DWORD		dwRet = 0;
@@ -1148,7 +1148,7 @@ static DWORD WAVE_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa
 /**************************************************************************
  * 				WAVE_mciSeek			[internal]
  */
-static DWORD WAVE_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
+static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
 {
     DWORD		ret = 0;
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
@@ -1186,7 +1186,7 @@ static DWORD WAVE_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms)
 /**************************************************************************
  * 				WAVE_mciSet			[internal]
  */
-static DWORD WAVE_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
+static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 {
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
 
@@ -1282,7 +1282,7 @@ static DWORD WAVE_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms)
 /**************************************************************************
  *				WAVE_mciSave		[internal]
  */
-static DWORD WAVE_mciSave(UINT wDevID, DWORD dwFlags, LPMCI_SAVE_PARMSW lpParms)
+static DWORD WAVE_mciSave(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SAVE_PARMSW lpParms)
 {
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
     DWORD		ret = MCIERR_FILE_NOT_SAVED, tmpRet;
@@ -1333,7 +1333,7 @@ static DWORD WAVE_mciSave(UINT wDevID, DWORD dwFlags, LPMCI_SAVE_PARMSW lpParms)
 /**************************************************************************
  * 				WAVE_mciStatus		[internal]
  */
-static DWORD WAVE_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
+static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms)
 {
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
     DWORD		ret = 0;
@@ -1479,7 +1479,7 @@ static DWORD WAVE_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpPar
 /**************************************************************************
  * 				WAVE_mciGetDevCaps		[internal]
  */
-static DWORD WAVE_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
+static DWORD WAVE_mciGetDevCaps(MCIDEVICEID wDevID, DWORD dwFlags,
 				LPMCI_GETDEVCAPS_PARMS lpParms)
 {
     WINE_MCIWAVE*	wmw = WAVE_mciGetOpenDev(wDevID);
@@ -1548,7 +1548,7 @@ static DWORD WAVE_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
 /**************************************************************************
  * 				WAVE_mciInfo			[internal]
  */
-static DWORD WAVE_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
+static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
 {
     DWORD		ret = 0;
     LPCWSTR		str = 0;
@@ -1593,10 +1593,10 @@ static DWORD WAVE_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms)
 /**************************************************************************
  * 				DriverProc (MCIWAVE.@)
  */
-LONG CALLBACK	MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				   DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                    LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
+    TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n",
 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch (wMsg) {
@@ -1644,10 +1644,10 @@ LONG CALLBACK	MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
     case MCI_CUT:
     case MCI_DELETE:
     case MCI_PASTE:
-	FIXME("Unsupported yet command [%lu]\n", wMsg);
+	FIXME("Unsupported yet command [%u]\n", wMsg);
 	break;
     case MCI_WINDOW:
-	TRACE("Unsupported command [%lu]\n", wMsg);
+	TRACE("Unsupported command [%u]\n", wMsg);
 	break;
 	/* option which can be silenced */
     case MCI_CONFIGURE:
@@ -1657,7 +1657,7 @@ LONG CALLBACK	MCIWAVE_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 	ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n");
 	break;
     default:
-	FIXME("is probably wrong msg [%lu]\n", wMsg);
+	FIXME("is probably wrong msg [%u]\n", wMsg);
 	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;

dlls/winmm/wavemap/wavemap.c

@@ -76,8 +76,8 @@ static	BOOL	WAVEMAP_IsData(WAVEMAPDATA* wm)
  *                  WAVE OUT part                                       *
  *======================================================================*/
 
-static void	CALLBACK wodCallback(HWAVEOUT hWave, UINT uMsg, DWORD dwInstance,
-				     DWORD dwParam1, DWORD dwParam2)
+static void CALLBACK wodCallback(HWAVEOUT hWave, UINT uMsg, DWORD_PTR dwInstance,
+				     LPARAM dwParam1, LPARAM dwParam2)
 {
     WAVEMAPDATA*	wom = (WAVEMAPDATA*)dwInstance;
 
@@ -1186,7 +1186,7 @@ static	struct WINE_WAVEMAP* oss = NULL;
 /**************************************************************************
  * 				WAVEMAP_drvOpen			[internal]
  */
-static	DWORD	WAVEMAP_drvOpen(LPSTR str)
+static LRESULT WAVEMAP_drvOpen(LPSTR str)
 {
     TRACE("(%p)\n", str);
 
@@ -1201,7 +1201,7 @@ static	DWORD	WAVEMAP_drvOpen(LPSTR str)
 /**************************************************************************
  * 				WAVEMAP_drvClose		[internal]
  */
-static	DWORD	WAVEMAP_drvClose(DWORD dwDevID)
+static LRESULT WAVEMAP_drvClose(DWORD_PTR dwDevID)
 {
     TRACE("(%08lx)\n", dwDevID);
 
@@ -1215,10 +1215,10 @@ static	DWORD	WAVEMAP_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (MSACM.@)
  */
-LONG CALLBACK	WAVEMAP_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-				   DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK WAVEMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                    LPARAM dwParam1, LPARAM dwParam2)
 {
-    TRACE("(%08lX, %p, %08lX, %08lX, %08lX)\n",
+    TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n",
 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2);
 
     switch(wMsg) {

dlls/winmm/winealsa/alsa.c

@@ -37,7 +37,7 @@ static	struct WINE_ALSA* alsa = NULL;
 /**************************************************************************
  * 				ALSA_drvOpen			[internal]
  */
-static	DWORD	ALSA_drvOpen(LPSTR str)
+static LRESULT ALSA_drvOpen(LPSTR str)
 {
     if (alsa)
 	return 0;
@@ -50,7 +50,7 @@ static	DWORD	ALSA_drvOpen(LPSTR str)
 /**************************************************************************
  * 				ALSA_drvClose			[internal]
  */
-static	DWORD	ALSA_drvClose(DWORD dwDevID)
+static LRESULT ALSA_drvClose(DWORD_PTR dwDevID)
 {
     if (alsa) {
 	alsa = NULL;
@@ -65,8 +65,8 @@ static	DWORD	ALSA_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINEALSA.@)
  */
-LONG CALLBACK	ALSA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                 LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/winearts/arts.c

@@ -38,7 +38,7 @@ static		int arts = 0;
 /**************************************************************************
  * 				ARTS_drvOpen			[internal]
  */
-static	DWORD	ARTS_drvOpen(LPSTR str)
+static LRESULT ARTS_drvOpen(LPSTR str)
 {
     if (arts)
 	return 0;
@@ -51,7 +51,7 @@ static	DWORD	ARTS_drvOpen(LPSTR str)
 /**************************************************************************
  * 				ARTS_drvClose			[internal]
  */
-static	DWORD	ARTS_drvClose(DWORD dwDevID)
+static LRESULT ARTS_drvClose(DWORD_PTR dwDevID)
 {
     if (arts) {
 	arts = 0;
@@ -65,8 +65,8 @@ static	DWORD	ARTS_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINEARTS.@)
  */
-LONG CALLBACK	ARTS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK ARTS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                 LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/wineaudioio/audioio.c

@@ -39,7 +39,7 @@ extern LONG LIBAUDIOIO_WaveInit(void);
 /**************************************************************************
  * 				LIBAUDIOIO_drvOpen			[internal]
  */
-static	DWORD	LIBAUDIOIO_drvOpen(LPSTR str)
+static LRESULT LIBAUDIOIO_drvOpen(LPSTR str)
 {
     if (audioio)
 	return 0;
@@ -52,7 +52,7 @@ static	DWORD	LIBAUDIOIO_drvOpen(LPSTR str)
 /**************************************************************************
  * 				LIBAUDIOIO_drvClose			[internal]
  */
-static	DWORD	LIBAUDIOIO_drvClose(DWORD dwDevID)
+static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID)
 {
     if (audioio) {
 	audioio = NULL;
@@ -67,8 +67,8 @@ static	DWORD	LIBAUDIOIO_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc
  */
-LONG CALLBACK	LIBAUDIOIO_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK LIBAUDIOIO_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                       LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/wineesd/esound.c

@@ -39,7 +39,7 @@ static		int esd = 0;
 /**************************************************************************
  * 				ESD_drvOpen			[internal]
  */
-static	DWORD	ESD_drvOpen(LPSTR str)
+static LRESULT ESD_drvOpen(LPSTR str)
 {
     if (esd)
 	return 0;
@@ -52,7 +52,7 @@ static	DWORD	ESD_drvOpen(LPSTR str)
 /**************************************************************************
  * 				ESD_drvClose			[internal]
  */
-static	DWORD	ESD_drvClose(DWORD dwDevID)
+static LRESULT ESD_drvClose(DWORD_PTR dwDevID)
 {
     if (esd) {
 	esd = 0;
@@ -66,8 +66,8 @@ static	DWORD	ESD_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINEESD.@)
  */
-LONG CALLBACK	ESD_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/winejack/jack.c

@@ -51,7 +51,7 @@ void *jackhandle = NULL;
 /**************************************************************************
  * 				JACK_drvLoad			[internal]	
  */
-static DWORD JACK_drvLoad(void)
+static LRESULT JACK_drvLoad(void)
 {
   TRACE("JACK_drvLoad()\n");
 
@@ -76,7 +76,7 @@ static DWORD JACK_drvLoad(void)
  * 				JACK_drvFree			[internal]	
  */
 /* unload the jack library on driver free */
-static DWORD JACK_drvFree(void)
+static LRESULT JACK_drvFree(void)
 {
   TRACE("JACK_drvFree()\n");
 
@@ -93,7 +93,7 @@ static DWORD JACK_drvFree(void)
 /**************************************************************************
  * 				JACK_drvOpen			[internal]	
  */
-static	DWORD	JACK_drvOpen(LPSTR str)
+static LRESULT JACK_drvOpen(LPSTR str)
 {
   /* if we were unable to load the jack library then fail the */
   /* driver open */
@@ -118,7 +118,7 @@ static	DWORD	JACK_drvOpen(LPSTR str)
 /**************************************************************************
  * 				JACK_drvClose			[internal]	
  */
-static	DWORD	JACK_drvClose(DWORD dwDevID)
+static LRESULT JACK_drvClose(DWORD_PTR dwDevID)
 {
   if (jack)
   {
@@ -136,8 +136,8 @@ static	DWORD	JACK_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINEJACK.1)
  */
-LONG CALLBACK	JACK_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, 
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, 
+                                 LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/winemm.h

@@ -32,9 +32,6 @@
 #define WINE_DEFAULT_WINMM_MAPPER     "msacm.drv"
 #define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"
 
-typedef DWORD (WINAPI *MessageProc16)(UINT16 wDevID, UINT16 wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
-typedef DWORD (WINAPI *MessageProc32)(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
-
 typedef enum {
     WINMM_MAP_NOMEM, 	/* ko, memory problem */
     WINMM_MAP_MSGERROR, /* ko, unknown message */
@@ -54,7 +51,7 @@ typedef struct tagWINE_DRIVER
 	struct {
 	    HMODULE			hModule;
 	    DRIVERPROC			lpDrvProc;
-	    DWORD		  	dwDriverID;
+	    DWORD_PTR		  	dwDriverID;
 	} d32;
 	struct {
 	    UINT16			hDriver16;

dlls/winmm/winenas/nas.c

@@ -41,7 +41,7 @@ static		int nas = 0;
 /**************************************************************************
  * 				NAS_drvOpen			[internal]
  */
-static	DWORD	NAS_drvOpen(LPSTR str)
+static LRESULT NAS_drvOpen(LPSTR str)
 {
     if (nas)
 	return 0;
@@ -54,7 +54,7 @@ static	DWORD	NAS_drvOpen(LPSTR str)
 /**************************************************************************
  * 				NAS_drvClose			[internal]
  */
-static	DWORD	NAS_drvClose(DWORD dwDevID)
+static LRESULT NAS_drvClose(DWORD_PTR dwDevID)
 {
     if (nas) {
 	nas = 0;
@@ -68,8 +68,8 @@ static	DWORD	NAS_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINENAS.@)
  */
-LONG CALLBACK	NAS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */

dlls/winmm/wineoss/oss.c

@@ -37,7 +37,7 @@ static	struct WINE_OSS* oss = NULL;
 /**************************************************************************
  * 				OSS_drvOpen			[internal]
  */
-static	DWORD	OSS_drvOpen(LPSTR str)
+static LRESULT OSS_drvOpen(LPSTR str)
 {
     if (oss)
 	return 0;
@@ -50,7 +50,7 @@ static	DWORD	OSS_drvOpen(LPSTR str)
 /**************************************************************************
  * 				OSS_drvClose			[internal]
  */
-static	DWORD	OSS_drvClose(DWORD dwDevID)
+static LRESULT OSS_drvClose(DWORD_PTR dwDevID)
 {
     if (oss) {
 	oss = NULL;
@@ -65,8 +65,8 @@ static	DWORD	OSS_drvClose(DWORD dwDevID)
 /**************************************************************************
  * 				DriverProc (WINEOSS.1)
  */
-LONG CALLBACK	OSS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
-			       DWORD dwParam1, DWORD dwParam2)
+LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
+                                LPARAM dwParam1, LPARAM dwParam2)
 {
 /* EPP     TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n",  */
 /* EPP 	  dwDevID, hDriv, wMsg, dwParam1, dwParam2); */