Michael Stefaniuc : kernel32: Avoid TRUE:FALSE conditional expressions.

Alexandre Julliard julliard at winehq.org
Tue Jul 31 12:04:15 CDT 2012


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jul 31 11:34:54 2012 +0200

kernel32: Avoid TRUE:FALSE conditional expressions.

---

 dlls/kernel32/atom.c     |    2 +-
 dlls/kernel32/file.c     |    2 +-
 dlls/kernel32/locale.c   |    2 +-
 dlls/kernel32/toolhelp.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c
index a8deb5e..5ab5c06 100644
--- a/dlls/kernel32/atom.c
+++ b/dlls/kernel32/atom.c
@@ -78,7 +78,7 @@ static RTL_ATOM_TABLE get_local_table(DWORD entries)
  */
 BOOL WINAPI InitAtomTable( DWORD entries )
 {
-    return get_local_table( entries ) ? TRUE : FALSE;
+    return get_local_table( entries ) != 0;
 }
 
 /******************************************************************
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 18ed188..717ae9b 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -1383,7 +1383,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
         qos.Length = sizeof(qos);
         qos.ImpersonationLevel = (attributes >> 16) & 0x3;
         qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING;
-        qos.EffectiveOnly = attributes & SECURITY_EFFECTIVE_ONLY ? TRUE : FALSE;
+        qos.EffectiveOnly = (attributes & SECURITY_EFFECTIVE_ONLY) != 0;
         attr.SecurityQualityOfService = &qos;
     }
     else
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 90603f2..3867d8d 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -3397,7 +3397,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs)
         if (NLS_RegEnumValue( hKey, ulIndex, szNumber, sizeof(szNumber),
                               szValue, sizeof(szValue) ))
         {
-            BOOL bInstalled = szValue[0] == '1' ? TRUE : FALSE;
+            BOOL bInstalled = szValue[0] == '1';
             LGRPID lgrpid = strtoulW( szNumber, NULL, 16 );
 
             TRACE("grpid %s (%sinstalled)\n", debugstr_w(szNumber),
diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c
index 6fbf4bf..94c1a78 100644
--- a/dlls/kernel32/toolhelp.c
+++ b/dlls/kernel32/toolhelp.c
@@ -319,7 +319,7 @@ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process )
         if (flags & TH32CS_SNAPTHREAD)  sect_size += num_thd * sizeof(THREADENTRY32);
         if (flags & TH32CS_SNAPHEAPLIST)FIXME("Unimplemented: heap list snapshot\n");
 
-        sa.bInheritHandle = (flags & TH32CS_INHERIT) ? TRUE : FALSE;
+        sa.bInheritHandle = (flags & TH32CS_INHERIT) != 0;
         sa.lpSecurityDescriptor = NULL;
 
         hSnapShot = CreateFileMappingW( INVALID_HANDLE_VALUE, &sa,




More information about the wine-cvs mailing list