Hans Leidekker : advapi32/tests: Avoid test failures when running as an unprivileged user.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Sep 7 09:20:13 CDT 2015


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Sep  7 11:36:04 2015 +0200

advapi32/tests: Avoid test failures when running as an unprivileged user.

---

 dlls/advapi32/tests/security.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 46db49c..c48ffc9 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -5886,6 +5886,12 @@ static void test_system_security_access(void)
     /* ACCESS_SYSTEM_SECURITY requires special privilege */
     res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL );
     todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res );
+    if (res == ERROR_ACCESS_DENIED)
+    {
+        skip( "unprivileged user\n" );
+        CloseHandle( token );
+        return;
+    }
 
     priv.PrivilegeCount = 1;
     priv.Privileges[0].Luid = luid;
@@ -5897,6 +5903,13 @@ static void test_system_security_access(void)
 
     res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL );
     ok( !res, "got %d\n", res );
+    if (res == ERROR_PRIVILEGE_NOT_HELD)
+    {
+        win_skip( "privilege not held\n" );
+        HeapFree( GetProcessHeap(), 0, priv_prev );
+        CloseHandle( token );
+        return;
+    }
 
     /* restore privileges */
     ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL );




More information about the wine-cvs mailing list