Paul Vriens : shell32/tests: Fix a test failure on a default Windows 7 system.

Alexandre Julliard julliard at winehq.org
Fri Dec 11 11:04:48 CST 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Fri Dec 11 12:56:01 2009 +0100

shell32/tests: Fix a test failure on a default Windows 7 system.

---

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

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index caae425..f676a2a 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -647,8 +647,12 @@ static void test_CallForAttributes(void)
      * key. So the test will return at this point, if run on wine. 
      */
     lResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMyDocumentsKey, 0, KEY_WRITE|KEY_READ, &hKey);
-    ok (lResult == ERROR_SUCCESS, "RegOpenKeyEx failed! result: %08x\n", lResult);
+    ok (lResult == ERROR_SUCCESS ||
+        lResult == ERROR_ACCESS_DENIED,
+        "RegOpenKeyEx failed! result: %08x\n", lResult);
     if (lResult != ERROR_SUCCESS) {
+        if (lResult == ERROR_ACCESS_DENIED)
+            skip("Not enough rights to open the registry key\n");
         IMalloc_Free(ppM, pidlMyDocuments);
         IShellFolder_Release(psfDesktop);
         return;




More information about the wine-cvs mailing list