Paul Vriens : shlwapi/tests: Don't crash on IE5.

Alexandre Julliard julliard at winehq.org
Mon Mar 9 09:40:28 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Sun Mar  8 18:07:30 2009 +0100

shlwapi/tests: Don't crash on IE5.

---

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

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index d0e8dd8..3e37121 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -380,7 +380,9 @@ static void test_GetShellSecurityDescriptor(void)
     }
 
     psd = pGetShellSecurityDescriptor(NULL, 2);
-    ok(psd==NULL, "GetShellSecurityDescriptor should fail\n");
+    ok(psd==NULL ||
+       broken(psd==INVALID_HANDLE_VALUE), /* IE5 */
+       "GetShellSecurityDescriptor should fail\n");
     psd = pGetShellSecurityDescriptor(rgsup, 0);
     ok(psd==NULL, "GetShellSecurityDescriptor should fail\n");
 
@@ -392,6 +394,11 @@ static void test_GetShellSecurityDescriptor(void)
         win_skip("GetShellSecurityDescriptor is not implemented\n");
         return;
     }
+    if (psd==INVALID_HANDLE_VALUE)
+    {
+        win_skip("GetShellSecurityDescriptor is broken on IE5\n");
+        return;
+    }
     ok(psd!=NULL, "GetShellSecurityDescriptor failed\n");
     if (psd!=NULL)
     {




More information about the wine-cvs mailing list