Andrew Eikum : winecoreaudio.drv: Improve IsFormatSupported handling.

[Alexandre Julliard]

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

Author: Andrew Eikum <aeikum(a)codeweavers.com>
Date:   Mon Dec  3 10:28:07 2012 -0600

winecoreaudio.drv: Improve IsFormatSupported handling.

---

 dlls/winecoreaudio.drv/mmdevdrv.c |   47 ++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 06f46f7..8ee0dec 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -1131,6 +1131,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
         if( duration < 3 * period)
             duration = 3 * period;
     }else{
+        if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
+            if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 ||
+                    ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED)
+                return AUDCLNT_E_UNSUPPORTED_FORMAT;
+        }
+
         if(!period)
             period = DefaultPeriod; /* not minimum */
         if(period < MinimumPeriod || period > 5000000)
@@ -1445,12 +1451,31 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
 
     dump_fmt(pwfx);
 
-    if(outpwfx)
+    if(outpwfx){
         *outpwfx = NULL;
+        if(mode != AUDCLNT_SHAREMODE_SHARED)
+            outpwfx = NULL;
+    }
+
+    if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
+        if(pwfx->nAvgBytesPerSec == 0 ||
+                pwfx->nBlockAlign == 0 ||
+                fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample)
+            return E_INVALIDARG;
+        if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample)
+            goto unsupported;
+        if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){
+            if(fmtex->dwChannelMask == 0 ||
+                    fmtex->dwChannelMask & SPEAKER_RESERVED)
+                goto unsupported;
+        }
+    }
 
-    if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
-            fmtex->dwChannelMask != 0 &&
-            fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels))
+    if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 ||
+            pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec)
+        goto unsupported;
+
+    if(pwfx->nChannels == 0)
         return AUDCLNT_E_UNSUPPORTED_FORMAT;
 
     OSSpinLockLock(&This->lock);
@@ -1462,10 +1487,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface,
         TRACE("returning %08x\n", S_OK);
         return S_OK;
     }
-
     OSSpinLockUnlock(&This->lock);
+    if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT){
+        TRACE("returning %08x\n", hr);
+        return hr;
+    }
+
+unsupported:
+    if(outpwfx){
+        hr = IAudioClient_GetMixFormat(&This->IAudioClient_iface, outpwfx);
+        if(FAILED(hr))
+            return hr;
+        return S_FALSE;
+    }
 
-    TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT);
     return AUDCLNT_E_UNSUPPORTED_FORMAT;
 }