[PATCH v4 8/8] mp3dmod: Ensure nChannels is greater than zero on input.

[Brendan McGrath]

From: Brendan McGrath

---
 dlls/mp3dmod/mp3dmod.c       | 6 ++++++
 dlls/mp3dmod/tests/mp3dmod.c | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c
index 9055f63cf67..211d4ac63a9 100644
--- a/dlls/mp3dmod/mp3dmod.c
+++ b/dlls/mp3dmod/mp3dmod.c
@@ -228,6 +228,7 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index
 static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, const DMO_MEDIA_TYPE *type, DWORD flags)
 {
     struct mp3_decoder *dmo = impl_from_IMediaObject(iface);
+    const WAVEFORMATEX *format;

TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags);

@@ -247,6 +248,11 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index,
             || !IsEqualGUID(&type->formattype, &WMFORMAT_WaveFormatEx))
         return DMO_E_TYPE_NOT_ACCEPTED;

+    format = (WAVEFORMATEX *) type->pbFormat;
+
+    if (!format->nChannels)
+        return DMO_E_TYPE_NOT_ACCEPTED;
+
     if (!(flags & DMO_SET_TYPEF_TEST_ONLY))
     {
         if (dmo->intype_set)
diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c
index fc9e99d3833..655224da7ca 100644
--- a/dlls/mp3dmod/tests/mp3dmod.c
+++ b/dlls/mp3dmod/tests/mp3dmod.c
@@ -783,7 +783,6 @@ static void test_media_types(void)

mp3fmt.wfx.nChannels = 0;
     hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY);
-    todo_wine
     ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr);

IMediaObject_Release(dmo);