Robert Reif : winmm: Allow sound card drivers to be opened more than
once.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Dec 6 04:37:27 CST 2005
Module: wine
Branch: refs/heads/master
Commit: ce4fdfdbcd8c502b17687085605a0d6641ef988c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce4fdfdbcd8c502b17687085605a0d6641ef988c
Author: Robert Reif <reif at earthlink.net>
Date: Tue Dec 6 10:58:25 2005 +0100
winmm: Allow sound card drivers to be opened more than once.
---
dlls/winmm/winealsa/alsa.c | 13 +------------
dlls/winmm/winearts/arts.c | 12 +-----------
dlls/winmm/wineaudioio/audioio.c | 13 +------------
dlls/winmm/wineesd/esound.c | 12 +-----------
dlls/winmm/winenas/nas.c | 12 +-----------
dlls/winmm/wineoss/oss.c | 13 +------------
6 files changed, 6 insertions(+), 69 deletions(-)
diff --git a/dlls/winmm/winealsa/alsa.c b/dlls/winmm/winealsa/alsa.c
index 06dc4bc..781d43c 100644
--- a/dlls/winmm/winealsa/alsa.c
+++ b/dlls/winmm/winealsa/alsa.c
@@ -32,18 +32,11 @@
#ifdef HAVE_ALSA
-static struct WINE_ALSA* alsa = NULL;
-
/**************************************************************************
* ALSA_drvOpen [internal]
*/
static LRESULT ALSA_drvOpen(LPSTR str)
{
- if (alsa)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- alsa = (struct WINE_ALSA*)1;
return 1;
}
@@ -52,11 +45,7 @@ static LRESULT ALSA_drvOpen(LPSTR str)
*/
static LRESULT ALSA_drvClose(DWORD_PTR dwDevID)
{
- if (alsa) {
- alsa = NULL;
- return 1;
- }
- return 0;
+ return 1;
}
#endif
diff --git a/dlls/winmm/winearts/arts.c b/dlls/winmm/winearts/arts.c
index 36506db..7f9d1ac 100644
--- a/dlls/winmm/winearts/arts.c
+++ b/dlls/winmm/winearts/arts.c
@@ -33,18 +33,12 @@
#include "arts.h"
#ifdef HAVE_ARTS
-static int arts = 0;
/**************************************************************************
* ARTS_drvOpen [internal]
*/
static LRESULT ARTS_drvOpen(LPSTR str)
{
- if (arts)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- arts = 1;
return 1;
}
@@ -53,11 +47,7 @@ static LRESULT ARTS_drvOpen(LPSTR str)
*/
static LRESULT ARTS_drvClose(DWORD_PTR dwDevID)
{
- if (arts) {
- arts = 0;
- return 1;
- }
- return 0;
+ return 1;
}
#endif /* #ifdef HAVE_ARTS */
diff --git a/dlls/winmm/wineaudioio/audioio.c b/dlls/winmm/wineaudioio/audioio.c
index f946710..aa43c69 100644
--- a/dlls/winmm/wineaudioio/audioio.c
+++ b/dlls/winmm/wineaudioio/audioio.c
@@ -32,8 +32,6 @@
#ifdef HAVE_LIBAUDIOIO
-static struct WINE_LIBAUDIOIO* audioio = NULL;
-
extern LONG LIBAUDIOIO_WaveInit(void);
/**************************************************************************
@@ -41,11 +39,6 @@ extern LONG LIBAUDIOIO_WaveInit(void);
*/
static LRESULT LIBAUDIOIO_drvOpen(LPSTR str)
{
- if (audioio)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- audioio = (struct WINE_LIBAUDIOIO*)1;
return 1;
}
@@ -54,11 +47,7 @@ static LRESULT LIBAUDIOIO_drvOpen(LPSTR
*/
static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID)
{
- if (audioio) {
- audioio = NULL;
- return 1;
- }
- return 0;
+ return 1;
}
#endif
diff --git a/dlls/winmm/wineesd/esound.c b/dlls/winmm/wineesd/esound.c
index 702dbe5..091a8e4 100644
--- a/dlls/winmm/wineesd/esound.c
+++ b/dlls/winmm/wineesd/esound.c
@@ -34,18 +34,12 @@
#include "esound.h"
#ifdef HAVE_ESD
-static int esd = 0;
/**************************************************************************
* ESD_drvOpen [internal]
*/
static LRESULT ESD_drvOpen(LPSTR str)
{
- if (esd)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- esd = 1;
return 1;
}
@@ -54,11 +48,7 @@ static LRESULT ESD_drvOpen(LPSTR str)
*/
static LRESULT ESD_drvClose(DWORD_PTR dwDevID)
{
- if (esd) {
- esd = 0;
- return 1;
- }
- return 0;
+ return 1;
}
#endif /* #ifdef HAVE_ESD */
diff --git a/dlls/winmm/winenas/nas.c b/dlls/winmm/winenas/nas.c
index 9b7b026..02f3474 100644
--- a/dlls/winmm/winenas/nas.c
+++ b/dlls/winmm/winenas/nas.c
@@ -36,18 +36,12 @@
#include "nas.h"
#ifdef HAVE_NAS
-static int nas = 0;
/**************************************************************************
* NAS_drvOpen [internal]
*/
static LRESULT NAS_drvOpen(LPSTR str)
{
- if (nas)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- nas = 1;
return 1;
}
@@ -56,11 +50,7 @@ static LRESULT NAS_drvOpen(LPSTR str)
*/
static LRESULT NAS_drvClose(DWORD_PTR dwDevID)
{
- if (nas) {
- nas = 0;
- return 1;
- }
- return 0;
+ return 1;
}
#endif /* #ifdef HAVE_NAS */
diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c
index d1437b5..8526f42 100644
--- a/dlls/winmm/wineoss/oss.c
+++ b/dlls/winmm/wineoss/oss.c
@@ -32,18 +32,11 @@
#ifdef HAVE_OSS
-static struct WINE_OSS* oss = NULL;
-
/**************************************************************************
* OSS_drvOpen [internal]
*/
static LRESULT OSS_drvOpen(LPSTR str)
{
- if (oss)
- return 0;
-
- /* I know, this is ugly, but who cares... */
- oss = (struct WINE_OSS*)1;
return 1;
}
@@ -52,11 +45,7 @@ static LRESULT OSS_drvOpen(LPSTR str)
*/
static LRESULT OSS_drvClose(DWORD_PTR dwDevID)
{
- if (oss) {
- oss = NULL;
- return 1;
- }
- return 0;
+ return 1;
}
#endif
More information about the wine-cvs
mailing list