>From 42bd06330ddff0add3a0d530235a3c13c05903e1 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Wed, 4 Mar 2009 21:55:11 +0100 Subject: [PATCH] Skip some tests on Win95 because of W-functions --- dlls/shell32/tests/shlfolder.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9de37bd..404c413 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -853,7 +853,7 @@ static void test_SHGetPathFromIDList(void) if(!pSHGetPathFromIDListW || !pSHGetSpecialFolderPathW) { - skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); + win_skip("SHGetPathFromIDListW() or SHGetSpecialFolderPathW() is missing\n"); return; } @@ -868,7 +868,16 @@ static void test_SHGetPathFromIDList(void) result = pSHGetSpecialFolderPathW(NULL, wszDesktop, CSIDL_DESKTOP, FALSE); ok(result, "SHGetSpecialFolderPathW(CSIDL_DESKTOP) failed! Last error: %u\n", GetLastError()); if (!result) return; - + + /* Check if we are on Win9x */ + SetLastError(0xdeadbeef); + lstrcmpiW(wszDesktop, wszDesktop); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("Most W-calls are not implemented\n"); + return; + } + result = pSHGetPathFromIDListW(pidlEmpty, wszPath); ok(result, "SHGetPathFromIDListW failed! Last error: %u\n", GetLastError()); if (!result) return; -- 1.6.0.6