Maarten Lankhorst : quartz: Refuse WAVE_FORMAT_PCM/EXTENSIBLE in acmwrapper .

Alexandre Julliard julliard at winehq.org
Thu Dec 2 12:23:57 CST 2010


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

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Wed Dec  1 23:17:31 2010 +0100

quartz: Refuse WAVE_FORMAT_PCM/EXTENSIBLE in acmwrapper.

---

 dlls/quartz/acmwrapper.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index dfd0529..3659326 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -259,7 +259,11 @@ static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION
         (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx)))
     {
         HACMSTREAM drv;
+        WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat;
         AM_MEDIA_TYPE* outpmt = &This->tf.pmt;
+
+        if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE)
+            return VFW_E_TYPE_NOT_ACCEPTED;
         FreeMediaType(outpmt);
 
         This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat;




More information about the wine-cvs mailing list