From 97512d70cfa0a3f4bc4b0c068c1c67ac1f78c580 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 31 Jul 2012 11:34:54 +0200 Subject: [PATCH] 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 a8deb5ed4f4..5ab5c062bfd 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 18ed188ae62..717ae9b0739 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 90603f2ff17..3867d8d8e51 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 6fbf4bf4be0..94c1a783b1c 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, -- 2.11.4.GIT