Paul Vriens : shell32/tests: Fix a test failure on some platforms.

Alexandre Julliard julliard at winehq.org
Wed Jan 21 06:40:05 CST 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Jan 21 12:03:44 2009 +0100

shell32/tests: Fix a test failure on some platforms.

---

 dlls/shell32/tests/shlfolder.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 6a06fb7..a396cf0 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -1090,7 +1090,10 @@ static void test_FolderShortcut(void) {
     static const GUID CLSID_UnixDosFolder = 
         {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}};
 
-    if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) return;
+    if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) {
+        win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n");
+        return;
+    }
    
     /* These tests basically show, that CLSID_FolderShortcuts are initialized
      * via their IPersistPropertyBag interface. And that the target folder
@@ -1098,6 +1101,10 @@ static void test_FolderShortcut(void) {
      */
     hr = CoCreateInstance(&CLSID_FolderShortcut, NULL, CLSCTX_INPROC_SERVER, 
                           &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag);
+    if (hr == REGDB_E_CLASSNOTREG) {
+        win_skip("CLSID_FolderShortcut is not implemented\n");
+        return;
+    }
     ok (SUCCEEDED(hr), "CoCreateInstance failed! hr = 0x%08x\n", hr);
     if (FAILED(hr)) return;
 




More information about the wine-cvs mailing list