[PATCH v3 7/7] 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 4be2781f0d8..664c87a3375 100644
--- a/dlls/mp3dmod/mp3dmod.c
+++ b/dlls/mp3dmod/mp3dmod.c
@@ -295,6 +295,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);

@@ -314,6 +315,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 03f9a163bb7..d8ddd94d4e5 100644
--- a/dlls/mp3dmod/tests/mp3dmod.c
+++ b/dlls/mp3dmod/tests/mp3dmod.c
@@ -774,7 +774,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);