Paul Vriens : shell32/tests: Skip some tests on Win95 because of W-functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ebb6dd9c197e38c996acb0e8e6e582d90fe9b3b0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ebb6dd9c197e38c996acb0e8e6...

Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com>
Date:   Wed Mar  4 21:55:11 2009 +0100

shell32/tests: 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;