Skip ACL tests on Win9x

Felix Nawothnig felix.nawothnig at t-online.de
Tue Jun 21 22:21:37 CDT 2005


ChangeLog:
Skip ACL tests on Win9x
-------------- next part --------------
Index: security.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/tests/security.c,v
retrieving revision 1.18
diff -u -r1.18 security.c
--- security.c	9 Jun 2005 10:03:11 -0000	1.18
+++ security.c	22 Jun 2005 03:18:49 -0000
@@ -448,6 +448,15 @@
     PRIVILEGE_SET *PrivSet;
     BOOL res;
 
+    Acl = HeapAlloc(GetProcessHeap(), 0, 256);
+    res = InitializeAcl(Acl, 256, ACL_REVISION);
+    if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+    {
+        trace("ACLs not implemented - skipping tests\n");
+        return;
+    }
+    ok(res, "InitializeAcl failed with error %ld\n", GetLastError());
+
     res = AllocateAndInitializeSid( &SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &EveryoneSid);
     ok(res, "AllocateAndInitializeSid failed with error %ld\n", GetLastError());
 
@@ -459,10 +468,6 @@
         DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &UsersSid);
     ok(res, "AllocateAndInitializeSid failed with error %ld\n", GetLastError());
 
-    Acl = HeapAlloc(GetProcessHeap(), 0, 256);
-    res = InitializeAcl(Acl, 256, ACL_REVISION);
-    ok(res, "InitializeAcl failed with error %ld\n", GetLastError());
-
     res = AddAccessAllowedAce(Acl, ACL_REVISION, KEY_READ, EveryoneSid);
     ok(res, "AddAccessAllowedAceEx failed with error %ld\n", GetLastError());
 


More information about the wine-patches mailing list