Module: wine Branch: master Commit: ec2258169cfca4aac63fe15d0f0564b40096dce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2258169cfca4aac63fe15d0f... Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 5 08:20:34 2008 +0100 shell32/tests: Fix a test failure on NT4. --- dlls/shell32/tests/shelllink.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7657fe0..7206df3 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -650,7 +650,9 @@ static void test_datalink(void) r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl ); - ok( r == S_OK || r == E_NOINTERFACE, "CoCreateInstance failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* Win9x */ + "CoCreateInstance failed (0x%08x)\n", r); if (!sl) { skip("no shelllink\n"); @@ -658,11 +660,14 @@ static void test_datalink(void) } r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); - ok(r == S_OK, "IShellLinkW_QueryInterface failed (0x%08x)\n", r); + ok( r == S_OK || + broken(r == E_NOINTERFACE), /* NT4 */ + "IShellLinkW_QueryInterface failed (0x%08x)\n", r); if (!dl) { skip("no datalink interface\n"); + IShellLinkW_Release( sl ); return; }