shell32/tests: Allow CoCreateInstance to return E_NOINTERFACE to pass on Win98; add skips and display return values.

This commit is contained in:
Misha Koshelev 2007-06-28 19:56:24 -05:00 committed by Alexandre Julliard
parent 75fbca227b
commit de774710d6
1 changed files with 8 additions and 2 deletions

View File

@ -624,15 +624,21 @@ static void test_datalink(void)
r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
&IID_IShellLinkW, (LPVOID*)&sl ); &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) if (!sl)
{
skip("no shelllink\n");
return; return;
}
r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); 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) if (!dl)
{
skip("no datalink interface\n");
return; return;
}
flags = 0; flags = 0;
r = dl->lpVtbl->GetFlags( dl, &flags ); r = dl->lpVtbl->GetFlags( dl, &flags );