Paul Vriens : advapi32/tests: Move check for ERROR_CALL_NOT_IMPLEMENTED to the first call.

[Alexandre Julliard]

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

Author: Paul Vriens 
Date:   Thu Mar 29 20:47:14 2007 +0200

advapi32/tests: Move check for ERROR_CALL_NOT_IMPLEMENTED to the first call.

---

dlls/advapi32/tests/security.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 9da55cb..43235a0 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -857,7 +857,13 @@ static void test_token_attr(void)
     SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;

/* cygwin-like use case */
+    SetLastError(0xdeadbeef);
     ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &Token);
+    if(!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
+    {
+        skip("OpenProcessToken is not implemented\n");
+        return;
+    }
     ok(ret, "OpenProcessToken failed with error %d\n", GetLastError());
     if (ret)
     {
@@ -878,15 +884,9 @@ static void test_token_attr(void)
         return;
     }

+    SetLastError(0xdeadbeef);
     ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token);
-    GLE = GetLastError();
-    ok(ret || (GLE == ERROR_CALL_NOT_IMPLEMENTED), 
-        "OpenProcessToken failed with error %d\n", GLE);
-    if(!ret && (GLE == ERROR_CALL_NOT_IMPLEMENTED))
-    {
-        trace("OpenProcessToken() not implemented, skipping test_token_attr()\n");
-        return;
-    }
+    ok(ret, "OpenProcessToken failed with error %d\n", GetLastError());

/* groups */
     ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size);