Michael Stefaniuc : dplayx/tests: Deal with broken COM aggregation handling on NT4.
Alexandre Julliard
julliard at winehq.org
Tue Apr 9 13:41:27 CDT 2013
Module: wine
Branch: master
Commit: df39c470ed613e7315c0749275c163be997c9b3e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=df39c470ed613e7315c0749275c163be997c9b3e
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Apr 8 23:16:26 2013 +0200
dplayx/tests: Deal with broken COM aggregation handling on NT4.
---
dlls/dplayx/tests/dplayx.c | 4 ++--
1 files 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,
More information about the wine-cvs
mailing list