advapi32/tests: Use BOOL type where appropriate

[Frédéric Delanoy]

---
 dlls/advapi32/tests/security.c | 44 +++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 9f1e611..232a729 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -4526,13 +4526,14 @@ static void test_mutex_security(HANDLE token)
                                 STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS };
     static const struct
     {
-        int todo, generic, mapped;
+        BOOL todo;
+        int generic, mapped;
     } map[] =
     {
-        { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE },
-        { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE },
-        { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
-        { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE }
+        { TRUE,  GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE },
+        { FALSE, GENERIC_WRITE, STANDARD_RIGHTS_WRITE },
+        { FALSE, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
+        { FALSE, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE }
     };
 
     SetLastError(0xdeadbeef);
@@ -4579,13 +4580,14 @@ static void test_event_security(HANDLE token)
                                 STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS };
     static const struct
     {
-        int todo, generic, mapped;
+        BOOL todo;
+        int generic, mapped;
     } map[] =
     {
-        { 1, GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE },
-        { 1, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE },
-        { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
-        { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE }
+        { TRUE,  GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE },
+        { TRUE,  GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE },
+        { TRUE,  GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
+        { FALSE, GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE }
     };
 
     SetLastError(0xdeadbeef);
@@ -4632,13 +4634,14 @@ static void test_semaphore_security(HANDLE token)
                                 STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS };
     static const struct
     {
-        int todo, generic, mapped;
+        BOOL todo;
+        int generic, mapped;
     } map[] =
     {
-        { 1, GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE },
-        { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE },
-        { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
-        { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | SEMAPHORE_QUERY_STATE | SEMAPHORE_MODIFY_STATE }
+        { TRUE,  GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE },
+        { FALSE, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE },
+        { TRUE,  GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE },
+        { FALSE, GENERIC_ALL, STANDARD_RIGHTS_ALL | SEMAPHORE_QUERY_STATE | SEMAPHORE_MODIFY_STATE }
     };
 
     SetLastError(0xdeadbeef);
@@ -4686,13 +4689,14 @@ static void test_named_pipe_security(HANDLE token)
                                 STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS };
     static const struct
     {
-        int todo, generic, mapped;
+        BOOL todo;
+        int generic, mapped;
     } map[] =
     {
-        { 1, GENERIC_READ, FILE_GENERIC_READ },
-        { 1, GENERIC_WRITE, FILE_GENERIC_WRITE },
-        { 1, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE },
-        { 1, GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }
+        { TRUE, GENERIC_READ, FILE_GENERIC_READ },
+        { TRUE, GENERIC_WRITE, FILE_GENERIC_WRITE },
+        { TRUE, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE },
+        { TRUE, GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }
     };
 
     SetLastError(0xdeadbeef);
-- 
1.8.5.2