[PATCH 1/5] dplayx/tests: Deal with broken COM aggregation handling on NT4.

Michael Stefaniuc mstefani at redhat.de
Mon Apr 8 16:16:26 CDT 2013


---
 dlls/dplayx/tests/dplayx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index 31cddee..619425d 100644
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -6380,9 +6380,9 @@ static void test_COM(void)
     /* COM aggregation */
     hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown,
             (void**)&dp4);
-    ok(hr == CLASS_E_NOAGGREGATION,
+    ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG),
             "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);
-    ok(!dp4, "dp4 = %p\n", dp4);
+    ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4);
 
     /* Invalid RIID */
     hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby,
-- 
1.7.11.7



More information about the wine-patches mailing list