advapi32/tests: Fixed -Wsign-compare warnings in security tests.

[Marko Nikolic]

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

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 029568c..598a55b 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -656,7 +656,7 @@ static void test_lookupPrivilegeValue(void)
      { "SeCreateGlobalPrivilege", SE_CREATE_GLOBAL_PRIVILEGE },
     };
     BOOL (WINAPI *pLookupPrivilegeValueA)(LPCSTR, LPCSTR, PLUID);
-    int i;
+    size_t i;
     LUID luid;
     BOOL ret;
 
@@ -919,7 +919,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_INVALID_SECURITY_DESCR, "AccessCheck should have "
        "failed with ERROR_INVALID_SECURITY_DESCR, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     /* Set owner and group */
@@ -936,7 +936,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_GENERIC_NOT_MAPPED, "AccessCheck should have failed "
        "with ERROR_GENERIC_NOT_MAPPED, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     /* Generic access mask - no privilegeset buffer */
@@ -947,7 +947,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed "
        "with ERROR_NOACCESS, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     /* Generic access mask - no returnlength */
@@ -958,7 +958,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed "
        "with ERROR_NOACCESS, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     /* Generic access mask - no privilegeset buffer, no returnlength */
@@ -969,7 +969,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed "
        "with ERROR_NOACCESS, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     /* sd with no dacl present */
@@ -991,7 +991,7 @@ static void test_AccessCheck(void)
     err = GetLastError();
     ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have failed "
        "with ERROR_NOACCESS, instead of %d\n", err);
-    ok(Access == 0xdeadbeef && AccessStatus == 0xdeadbeef,
+    ok(Access == 0xdeadbeef && (size_t)AccessStatus == 0xdeadbeef,
        "Access and/or AccessStatus were changed!\n");
 
     if(pNtAccessCheck)
@@ -1006,7 +1006,7 @@ static void test_AccessCheck(void)
           "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret);
        ok(err == 0xdeadbeef,
           "NtAccessCheck shouldn't set last error, got %d\n", err);
-       ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef,
+       ok(Access == 0xdeadbeef && (size_t)ntAccessStatus == 0xdeadbeef,
           "Access and/or AccessStatus were changed!\n");
 
       /* Generic access mask - no returnlength */
@@ -1019,7 +1019,7 @@ static void test_AccessCheck(void)
          "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret);
       ok(err == 0xdeadbeef,
          "NtAccessCheck shouldn't set last error, got %d\n", err);
-      ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef,
+      ok(Access == 0xdeadbeef && (size_t)ntAccessStatus == 0xdeadbeef,
          "Access and/or AccessStatus were changed!\n");
 
       /* Generic access mask - no privilegeset buffer, no returnlength */
@@ -1032,7 +1032,7 @@ static void test_AccessCheck(void)
          "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret);
       ok(err == 0xdeadbeef,
          "NtAccessCheck shouldn't set last error, got %d\n", err);
-      ok(Access == 0xdeadbeef && ntAccessStatus == 0xdeadbeef,
+      ok(Access == 0xdeadbeef && (size_t)ntAccessStatus == 0xdeadbeef,
          "Access and/or AccessStatus were changed!\n");
     }
     else
@@ -1420,7 +1420,7 @@ static void test_CreateWellKnownSid(void)
     PSID domainsid, sid;
     DWORD size, error;
     BOOL ret;
-    int i;
+    size_t i;
 
     if (!pCreateWellKnownSid)
     {
@@ -1931,7 +1931,7 @@ static void test_LookupAccountName(void)
         ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain);
     }
     ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size);
-    ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
+    ok((DWORD)lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
     ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use);
     domain_size = domain_save;
     sid_size = sid_save;
@@ -1949,7 +1949,7 @@ static void test_LookupAccountName(void)
         ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account);
         ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain);
         ok(domain_size == 0, "Expected 0, got %d\n", domain_size);
-        ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
+        ok((DWORD)lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size);
         ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use);
         domain_size = domain_save;
     }
@@ -2674,7 +2674,7 @@ static void test_ConvertStringSecurityDescriptor(void)
     BOOL ret;
     PSECURITY_DESCRIPTOR pSD;
     static const WCHAR Blank[] = { 0 };
-    int i;
+    size_t i;
     static const struct
     {
         const char *sidstring;
@@ -2807,12 +2807,12 @@ static void test_ConvertSecurityDescriptorToString(void)
  * don't replicate this feature so we only test len >= strlen+1. */
 #define CHECK_RESULT_AND_FREE(exp_str) \
     ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \
-    ok(len >= (lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \
+    ok(len >= ((ULONG)lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \
     LocalFree(string);
 
 #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \
     ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \
-    ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \
+    ok(len >= ((ULONG)strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \
     LocalFree(string);
 
     InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION);
-- 
1.7.0.4