And adding new patches

This commit is contained in:
rohee 1999-02-12 18:48:07 +00:00
parent 50277f14f7
commit d0896f7e9e
2 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,23 @@
Do *NOT* submit this patch to Wine developers <rohee@OpenBSD.ORG>
NetBSD did it the wrong way, don't make the same mistakes :-)
--- multimedia/init.c.orig Thu Feb 11 20:22:06 1999
+++ multimedia/init.c Thu Feb 11 20:27:27 1999
@@ -36,7 +36,7 @@
#ifdef HAVE_OSS
int unixToWindowsDeviceType(int type)
{
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
/* MOD_MIDIPORT output port
* MOD_SYNTH generic internal synth
* MOD_SQSYNTH square wave internal synth
@@ -70,7 +70,7 @@
*/
BOOL32 MULTIMEDIA_MidiInit(void)
{
-#if defined(HAVE_OSS) && !defined(__NetBSD__)
+#if defined(HAVE_OSS) && !defined(__NetBSD__) && !defined(__OpenBSD__)
int i, status, numsynthdevs = 255, nummididevs = 255;
struct synth_info sinfo;
struct midi_info minfo;

View File

@ -0,0 +1,29 @@
This patch seems to be needed on machine without MIDI support because
midMessage is used in all cases and was not compiled if SNDCTL_MIDI_INFO
was not defined.
Regards,
Bruno Rohée <rohee@OpenBSD.ORG>
--- multimedia/midi.c.orig Thu Feb 11 21:52:46 1999
+++ multimedia/midi.c Thu Feb 11 21:59:31 1999
@@ -1574,3 +1574,18 @@
}
/*-----------------------------------------------------------------------*/
+
+/* needed by OpenBSD 2.4, OpenBSD current has MIDI support */
+
+#ifndef SNDCTL_MIDI_INFO
+
+/**************************************************************************
+ * midMessage [sample driver]
+ */
+DWORD WINAPI midMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
+ DWORD dwParam1, DWORD dwParam2)
+{
+ return MMSYSERR_NOTSUPPORTED;
+}
+
+#endif