Make it (almost) 32 bit only.

multimedia/mixer.c

@@ -505,9 +505,9 @@ static	DWORD	MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWO
 #endif /* HAVE_OSS */
 
 /**************************************************************************
- * 				mixMessage			[sample driver]
+ * 				OSS_mixMessage		[sample driver]
  */
-DWORD WINAPI mixMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
+DWORD WINAPI OSS_mixMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
 {
     TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", 
@@ -515,6 +515,12 @@ DWORD WINAPI mixMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
     
 #ifdef HAVE_OSS
     switch(wMsg) {
+    case DRVM_INIT:
+    case DRVM_EXIT:
+    case DRVM_ENABLE:
+    case DRVM_DISABLE:
+	/* FIXME: Pretend this is supported */
+	return 0;
     case MXDM_GETDEVCAPS:	
 	return MIX_GetDevCaps(wDevID, (LPMIXERCAPSA)dwParam1, dwParam2);
     case MXDM_GETLINEINFO:

multimedia/mmaux.c

+/* -*- tab-width: 8; c-basic-offset: 4 -*- */
 /*
  * Sample AUXILARY Wine Driver
  *
@@ -15,7 +16,6 @@
 #include "driver.h"
 #include "mmddk.h"
 #include "oss.h"
-
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(mmaux)
@@ -30,7 +30,7 @@ static int	NumDev = 6;
 /**************************************************************************
  * 				AUX_GetDevCaps			[internal]
  */
-static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPS16 lpCaps, DWORD dwSize)
+static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSA lpCaps, DWORD dwSize)
 {
 #ifdef HAVE_OSS
     int 	mixer,volume;
@@ -219,23 +219,29 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
 
 
 /**************************************************************************
- * 				auxMessage			[sample driver]
+ *		OSS_auxMessage				[sample driver]
  */
-DWORD WINAPI auxMessage(WORD wDevID, WORD wMsg, DWORD dwUser, 
+DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser, 
 			    DWORD dwParam1, DWORD dwParam2)
 {
     TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", 
 	  wDevID, wMsg, dwUser, dwParam1, dwParam2);
     switch(wMsg) {
+    case DRVM_INIT:
+    case DRVM_EXIT:
+    case DRVM_ENABLE:
+    case DRVM_DISABLE:
+	/* FIXME: Pretend this is supported */
+	return 0;
     case AUXDM_GETDEVCAPS:
-		return AUX_GetDevCaps(wDevID,(LPAUXCAPS16)dwParam1,dwParam2);
+	return AUX_GetDevCaps(wDevID, (LPAUXCAPSA)dwParam1,dwParam2);
     case AUXDM_GETNUMDEVS:
 	TRACE("return %d;\n", NumDev);
 	return NumDev;
     case AUXDM_GETVOLUME:
-		return AUX_GetVolume(wDevID,(LPDWORD)dwParam1);
+	return AUX_GetVolume(wDevID, (LPDWORD)dwParam1);
     case AUXDM_SETVOLUME:
-		return AUX_SetVolume(wDevID,dwParam1);
+	return AUX_SetVolume(wDevID, dwParam1);
     default:
 	WARN("unknown message !\n");
     }