head	1.4;
access;
symbols
	pkgsrc-2013Q4:1.3.0.22
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.20
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.18
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.16
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.14
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.12
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.10
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.8
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.6
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.4
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.2.0.20
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.18
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.16
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.14
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.12
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.10
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.8
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.6
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.4
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2014.01.19.10.58.23;	author adam;	state dead;
branches;
next	1.3;
commitid	4D1ECVbACnM1uIlx;

1.3
date	2011.05.02.21.23.01;	author adam;	state Exp;
branches;
next	1.2;

1.2
date	2008.12.07.00.43.03;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2008.11.21.17.40.31;	author adam;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.11.21.17.40.31;	author adam;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Changes 1.7.11:
- Uniscribe support in the RichEdit control.
- Support for condition variables and Slim Reader/Writer locks.
- More D3D command stream preparation work.
- Optional Start Menu in desktop mode.
- Improved support for vertical fonts metrics.
- Various bug fixes.
@
text
@$NetBSD: patch-bc,v 1.3 2011/05/02 21:23:01 adam Exp $

--- dlls/wineoss.drv/audio.c.orig	2008-12-05 17:57:45.000000000 +0100
+++ dlls/wineoss.drv/audio.c
@@@@ -83,6 +83,12 @@@@
 
 #include "audio.h"
 
+#ifdef __NetBSD__
+#define SOUND_DEV	"/dev/sound"
+#else
+#define SOUND_DEV	"/dev/dsp"
+#endif
+
 WINE_DEFAULT_DEBUG_CHANNEL(wave);
 
 /* Allow 1% deviation for sample rates (some ES137x cards) */
@@@@ -1168,12 +1174,12 @@@@ LRESULT OSS_WaveInit(void)
     }
     else
     {
-        WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup("/dev/dsp",NULL);
+        WOutDev[0].ossdev.dev_name = WInDev[0].ossdev.dev_name = StrDup(SOUND_DEV,NULL);
         WOutDev[0].ossdev.mixer_name = WInDev[0].ossdev.mixer_name = StrDup("/dev/mixer",NULL);
         for (i = 1; i < MAX_WAVEDRV; ++i)
         {
             WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11);
-            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i);
+            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%u", i);
             WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13);
             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i);
         }
@


1.3
log
@Changes 1.3.19:
* New sound driver architecture for MMDevAPI.
* Better support for relative mouse events in DInput.
* Debugger support for the ARM platform.
* Various improvements in D3DX9.
* More MSVC runtime functions.
* Various bug fixes.
@
text
@d1 1
a1 1
$NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $
@


1.2
log
@Changes 1.1.10:
- Support for virtual memory write watches.
- Workarounds for the WINAPI compiler bug on Mac OS.
- Several fixes for the 64-bit build.
- Some more GdiPlus functions.
- Various bug fixes.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
@@@@ -75,6 +75,12 @@@@
d18 1
a18 1
@@@@ -1170,12 +1176,12 @@@@ LRESULT OSS_WaveInit(void)
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-bc,v 1.1 2008/06/27 02:51:11 jmcneill Exp $
d3 2
a4 2
--- dlls/wineoss.drv/audio.c.orig	2008-06-26 22:44:15.000000000 -0400
+++ dlls/wineoss.drv/audio.c	2008-06-26 22:45:02.000000000 -0400
d18 1
a18 1
@@@@ -1167,12 +1173,12 @@@@
d28 2
a29 2
-            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i);
+            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%d", i);
d31 1
a31 1
             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i);
@


1.1.1.1
log
@Wine is a program which allows running Microsoft Windows programs
(including DOS, Windows 3.x and Win32 executables) on Unix.  It consists
of a program loader which loads and executes an Microsoft Windows binary,
and a library that implements Windows API calls using their Unix or X11
equivalents.  The library may also be used for porting Win32 code into
native Unix executables.
@
text
@@