wineoss.drv: Add mmdevapi driver.

configure

@@ -11027,6 +11027,33 @@ fi
 
 fi
 
+if test "$ac_cv_header_sys_soundcard_h" = "yes" -o \
+        "$ac_cv_header_machine_soundcard_h" = "yes" -o \
+        "$ac_cv_header_soundcard_h" = "yes"
+then
+    ac_fn_c_check_type "$LINENO" "oss_sysinfo" "ac_cv_type_oss_sysinfo" "#if defined(HAVE_SYS_SOUNDCARD_H)
+#include <sys/soundcard.h>
+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
+#include <machine/soundcard.h>
+#elif defined(HAVE_SOUNDCARD_H)
+#include <soundcard.h>
+#endif
+"
+if test "x$ac_cv_type_oss_sysinfo" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_OSS_SYSINFO 1
+_ACEOF
+
+
+fi
+
+    if test "x$ac_cv_type_oss_sysinfo" != xyes
+    then
+        as_fn_append wine_notices "|OSS sound system found but too old (OSSv4 needed), OSS won't be supported."
+    fi
+fi
+
 
 if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
 then
@@ -12107,15 +12134,11 @@ test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no}
 test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no}
 test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
-test "$ac_cv_header_sys_soundcard_h" = "yes" -o \
+test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
-     "$ac_cv_header_machine_soundcard_h" = "yes" -o \
-     "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no}
 test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
 
 if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
-        "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+        "x$ac_cv_type_oss_sysinfo" != xyes -a \
-        "$ac_cv_header_machine_soundcard_h" != "yes" -a \
-        "$ac_cv_header_soundcard_h" != "yes" -a \
         "x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
 then
     as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."

configure.ac

@@ -1524,6 +1524,24 @@ then
                         [ALSALIBS="-lasound"])])
 fi
 
+dnl **** Check for OSSv4 ****
+if test "$ac_cv_header_sys_soundcard_h" = "yes" -o \
+        "$ac_cv_header_machine_soundcard_h" = "yes" -o \
+        "$ac_cv_header_soundcard_h" = "yes"
+then
+    AC_CHECK_TYPES([oss_sysinfo],,,[#if defined(HAVE_SYS_SOUNDCARD_H)
+#include <sys/soundcard.h>
+#elif defined(HAVE_MACHINE_SOUNDCARD_H)
+#include <machine/soundcard.h>
+#elif defined(HAVE_SOUNDCARD_H)
+#include <soundcard.h>
+#endif])
+    if test "x$ac_cv_type_oss_sysinfo" != xyes
+    then
+        WINE_NOTICE([OSS sound system found but too old (OSSv4 needed), OSS won't be supported.])
+    fi
+fi
+
 dnl **** Check for capi4linux ****
 
 if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
@@ -1673,16 +1691,12 @@ test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 test -n "$NASLIBS" || enable_winenas_drv=${enable_winenas_drv:-no}
 test -n "$ESDLIBS" || enable_wineesd_drv=${enable_wineesd_drv:-no}
 test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
-test "$ac_cv_header_sys_soundcard_h" = "yes" -o \
+test "x$ac_cv_type_oss_sysinfo" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
-     "$ac_cv_header_machine_soundcard_h" = "yes" -o \
-     "$ac_cv_header_soundcard_h" = "yes" || enable_wineoss_drv=${enable_wineoss_drv:-no}
 test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
 
 dnl **** Check for any sound system ****
 if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
-        "$ac_cv_header_sys_soundcard_h" != "yes" -a \
+        "x$ac_cv_type_oss_sysinfo" != xyes -a \
-        "$ac_cv_header_machine_soundcard_h" != "yes" -a \
-        "$ac_cv_header_soundcard_h" != "yes" -a \
         "x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
 then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])

dlls/wineoss.drv/Makefile.in

@@ -1,5 +1,5 @@
 MODULE    = wineoss.drv
-IMPORTS   = dxguid uuid winmm user32
+IMPORTS   = dxguid uuid winmm ole32 user32
 
 C_SRCS = \
 	audio.c \
@@ -8,6 +8,7 @@ C_SRCS = \
 	midi.c \
 	midipatch.c \
 	mixer.c \
-	mmaux.c
+	mmaux.c \
+	mmdevdrv.c
 
 @MAKE_DLL_RULES@

dlls/wineoss.drv/audio.c

@@ -76,7 +76,6 @@
 #include "mmreg.h"
 #include "dsound.h"
 #include "ks.h"
-#include "ksguid.h"
 #include "ksmedia.h"
 #include "initguid.h"
 #include "dsdriver.h"

dlls/wineoss.drv/wineoss.drv.spec

@@ -1,3 +1,4 @@
+# WinMM driver functions
 @ stdcall -private DriverProc(long long long long long) OSS_DriverProc
 @ stdcall -private auxMessage(long long long long long) OSS_auxMessage
 @ stdcall -private mxdMessage(long long long long long) OSS_mxdMessage
@@ -5,3 +6,7 @@
 @ stdcall -private modMessage(long long long long long) OSS_modMessage
 @ stdcall -private widMessage(long long long long long) OSS_widMessage
 @ stdcall -private wodMessage(long long long long long) OSS_wodMessage
+
+# MMDevAPI driver functions
+@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
+@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint

include/config.h.in

@@ -599,6 +599,9 @@
 /* Define to 1 if you have the <openssl/ssl.h> header file. */
 #undef HAVE_OPENSSL_SSL_H
 
+/* Define to 1 if the system has the type `oss_sysinfo'. */
+#undef HAVE_OSS_SYSINFO
+
 /* Define to 1 if you have the `pclose' function. */
 #undef HAVE_PCLOSE