Erich Hoover : winealsa.drv: Re-allow fallback to waveout ( regression in dsound).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0addd3ba5a7c1de970d1829f77969e5331ad2be0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0addd3ba5a7c1de970d1829f77...

Author: Erich Hoover <ehoover(a)mines.edu>
Date:   Sat Jul 18 23:51:33 2009 -0600

winealsa.drv: Re-allow fallback to waveout (regression in dsound).

---

 dlls/winealsa.drv/dsoutput.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index 9c6d7fd..dd95ad0 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -927,6 +927,13 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
 
     TRACE("driver created\n");
 
+    /* the HAL isn't much better than the HEL if we can't do mmap() */
+    if (!(WOutDev[wDevID].outcaps.dwSupport & WAVECAPS_DIRECTSOUND))
+    {
+        WARN("MMAP not supported for this device, falling back to waveout, should be harmless\n");
+        return MMSYSERR_NOTSUPPORTED;
+    }
+
     *idrv = HeapAlloc(GetProcessHeap(),0,sizeof(IDsDriverImpl));
     if (!*idrv)
         return MMSYSERR_NOMEM;