Misha Koshelev : shell32/tests:
Allow CoCreateInstance to return E_NOINTERFACE to pass on Win98;
add skips and display return values.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 29 08:14:58 CDT 2007
Module: wine
Branch: master
Commit: de774710d6f61d07e9a46dc5aaae84c3f920bf72
URL: http://source.winehq.org/git/wine.git/?a=commit;h=de774710d6f61d07e9a46dc5aaae84c3f920bf72
Author: Misha Koshelev <mk144210 at bcm.edu>
Date: Thu Jun 28 19:56:24 2007 -0500
shell32/tests: Allow CoCreateInstance to return E_NOINTERFACE to pass on Win98; add skips and display return values.
---
dlls/shell32/tests/shelllink.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index dc139e4..57e1d7c 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -624,15 +624,21 @@ static void test_datalink(void)
r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
&IID_IShellLinkW, (LPVOID*)&sl );
- ok( r == S_OK, "no shelllink\n");
+ ok( r == S_OK || r == E_NOINTERFACE, "CoCreateInstance failed (0x%08x)\n", r);
if (!sl)
+ {
+ skip("no shelllink\n");
return;
+ }
r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl );
- ok(r == S_OK, "no datalink interface\n");
+ ok(r == S_OK, "IShellLinkW_QueryInterface failed (0x%08x)\n", r);
if (!dl)
+ {
+ skip("no datalink interface\n");
return;
+ }
flags = 0;
r = dl->lpVtbl->GetFlags( dl, &flags );
More information about the wine-cvs
mailing list