system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

dmscript/tests: Just use proper IUnknown implementations for aggregation.

Browse Source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2017-04-25 20:47:40 +02:00 committed by Alexandre Julliard
parent 47df3778aa
commit 89ef7b59f5
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/dmscript/tests/dmscript.c
View File

@ -88,11 +88,7 @@ static void test_COM(void)
ULONG refcount;
HRESULT hr;
/* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicScript, (IUnknown*)&dms, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dms);
todo_wine ok(hr == E_POINTER, "DirectMusicScript create failed: %08x, expected E_POINTER\n", hr);
/* An invalid non-NULL pUnkOuter crashes newer Windows versions */
/* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */
hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&unk_obj.inner_unk);
ok(hr == CLASS_E_NOAGGREGATION,
@ -137,15 +133,16 @@ static void test_COM_scripttrack(void)
IDirectMusicTrack *dmt;
IPersistStream *ps;
IUnknown *unk;
struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL};
ULONG refcount;
HRESULT hr;
/* COM aggregation */
hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER,
&IID_IUnknown, (void**)&dmt);
/* COM aggregation. An invalid non-NULL outer IUnknown crashes newer Windows versions */
hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface,
CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk);
ok(hr == CLASS_E_NOAGGREGATION,
"DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
ok(!dmt, "dmt = %p\n", dmt);
ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk);
/* Invalid RIID */
hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER,