Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/dmime/tests/dmime.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index d259e41ed4..d7afb6c303 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -723,6 +723,7 @@ static void test_parsedescriptor(void) }; FOURCC empty[] = {FOURCC_RIFF, ~0, 0}; FOURCC inam[] = {FOURCC_RIFF, ~0, FOURCC_LIST, ~0, mmioFOURCC('I','N','A','M'), 0, 0}; + FOURCC noriff[] = {mmioFOURCC('J','U','N','K'), 0}; #define X(class) &CLSID_ ## class, #class #define Y(form) form, #form const struct { @@ -807,6 +808,18 @@ static void test_parsedescriptor(void) ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData);
+ /* Not a RIFF stream */ + stream = gen_riff_stream(noriff); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + if (forms[i].needs_size) + ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + else + ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + /* All desc chunks */ alldesc[1] = forms[i].form; stream = gen_riff_stream(alldesc);
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=36670
Your paranoid android.
=== wvistau64 (32 bit dmime) === dmime.c:792: Test failed: ParseDescriptor failed: 80004003, expected E_INVALIDARG
=== w7u (32 bit dmime) === dmime.c:792: Test failed: ParseDescriptor failed: 80004003, expected E_INVALIDARG