Index: advapi32/misc/shutdown.c
===================================================================
--- advapi32/misc/shutdown.c	(revision 65379)
+++ advapi32/misc/shutdown.c	(working copy)
@@ -132,7 +132,7 @@
     {
         /* FIXME: Right now, only basic shutting down and rebooting
         is supported */
-        if(bRebootAfterShutdown == TRUE)
+        if(bRebootAfterShutdown)
         {
             action = ShutdownReboot;
         }
Index: advapi32/reg/reg.c
===================================================================
--- advapi32/reg/reg.c	(revision 65379)
+++ advapi32/reg/reg.c	(working copy)
@@ -3195,7 +3195,7 @@
         return ERROR_INVALID_HANDLE;
     }
 
-    if (fAsynchronous == TRUE && hEvent == NULL)
+    if (fAsynchronous && hEvent == NULL)
     {
         return ERROR_INVALID_PARAMETER;
     }
Index: advapi32/sec/misc.c
===================================================================
--- advapi32/sec/misc.c	(revision 65379)
+++ advapi32/sec/misc.c	(working copy)
@@ -214,7 +214,7 @@
                                     &NewToken,
                                     sizeof(HANDLE));
 
-    if (Duplicated == TRUE)
+    if (Duplicated)
     {
         NtClose(NewToken);
     }
Index: advapi32/service/scm.c
===================================================================
--- advapi32/service/scm.c	(revision 65379)
+++ advapi32/service/scm.c	(working copy)
@@ -2120,7 +2120,7 @@
         return FALSE;
     }
 
-    if (bUseTempBuffer == TRUE)
+    if (bUseTempBuffer)
     {
         TRACE("RQueryServiceConfig2A() returns ERROR_INSUFFICIENT_BUFFER\n");
         *pcbBytesNeeded = dwBufferSize;
@@ -2238,7 +2238,7 @@
         return FALSE;
     }
 
-    if (bUseTempBuffer == TRUE)
+    if (bUseTempBuffer)
     {
         TRACE("RQueryServiceConfig2W() returns ERROR_INSUFFICIENT_BUFFER\n");
         *pcbBytesNeeded = dwBufferSize;
Index: advapi32/service/sctrl.c
===================================================================
--- advapi32/service/sctrl.c	(revision 65379)
+++ advapi32/service/sctrl.c	(working copy)
@@ -463,7 +463,7 @@
     lpService->hServiceStatus = ControlPacket->hServiceStatus;
 
     /* Build the arguments vector */
-    if (lpService->bUnicode == TRUE)
+    if (lpService->bUnicode)
     {
         dwError = ScBuildUnicodeArgsVector(ControlPacket,
                                            &lpService->ThreadParams.W.dwArgCount,
Index: jscript/regexp.c
===================================================================
--- jscript/regexp.c	(revision 65379)
+++ jscript/regexp.c	(working copy)
@@ -2119,7 +2119,7 @@
         assert(charSet->sense == FALSE);
         ++src;
     } else {
-        assert(charSet->sense == TRUE);
+        assert(charSet->sense != FALSE);
     }
 
     while (src != end) {
Index: kernel32/client/appcache.c
===================================================================
--- kernel32/client/appcache.c	(revision 65379)
+++ kernel32/client/appcache.c	(working copy)
@@ -58,7 +58,7 @@
             if ((NT_SUCCESS(Status)) &&
                  (KeyInfo.Type == REG_DWORD) &&
                  (KeyInfo.DataLength == sizeof(ULONG)) &&
-                 (KeyInfo.Data[0] == TRUE))
+                 (KeyInfo.Data[0]))
             {
                 /* It is, so disable shims! */
                 g_ShimsEnabled = TRUE;
@@ -80,7 +80,7 @@
                     if ((NT_SUCCESS(Status)) &&
                         (KeyInfo.Type == REG_DWORD) &&
                         (KeyInfo.DataLength == sizeof(ULONG)) &&
-                        (KeyInfo.Data[0] == TRUE))
+                        (KeyInfo.Data[0]))
                     {
                         /* It is, so disable shims! */
                         g_ShimsEnabled = TRUE;
@@ -102,7 +102,7 @@
                             if ((NT_SUCCESS(Status)) &&
                                 (KeyInfo.Type == REG_DWORD) &&
                                 (KeyInfo.DataLength == sizeof(ULONG)) &&
-                                (KeyInfo.Data[0] == TRUE))
+                                (KeyInfo.Data[0]))
                             {
                                 /* It does, so disable shims! */
                                 g_ShimsEnabled = TRUE;
Index: kernel32/client/console/init.c
===================================================================
--- kernel32/client/console/init.c	(revision 65379)
+++ kernel32/client/console/init.c	(working copy)
@@ -353,7 +353,7 @@
         else if (Reason == DLL_PROCESS_DETACH)
         {
             /* Free our resources */
-            if (ConsoleInitialized == TRUE)
+            if (ConsoleInitialized)
             {
                 if (ConsoleApplet) FreeLibrary(ConsoleApplet);
 
Index: kernel32/client/dllmain.c
===================================================================
--- kernel32/client/dllmain.c	(revision 65379)
+++ kernel32/client/dllmain.c	(working copy)
@@ -217,7 +217,7 @@
 
         case DLL_PROCESS_DETACH:
         {
-            if (DllInitialized == TRUE)
+            if (DllInitialized)
             {
                 /* Uninitialize console support */
                 ConDllInitialize(dwReason, NULL);
Index: kernel32/client/power.c
===================================================================
--- kernel32/client/power.c	(revision 65379)
+++ kernel32/client/power.c	(working copy)
@@ -89,7 +89,7 @@
 
     Status = NtInitiatePowerAction((fSuspend != FALSE) ? PowerActionSleep     : PowerActionHibernate,
                                    (fSuspend != FALSE) ? PowerSystemSleeping1 : PowerSystemHibernate,
-                                   fForce != TRUE,
+                                   ! fForce,
                                    FALSE);
     if (!NT_SUCCESS(Status))
     {
Index: kernel32/client/proc.c
===================================================================
--- kernel32/client/proc.c	(revision 65379)
+++ kernel32/client/proc.c	(working copy)
@@ -1228,7 +1228,7 @@
     if (!NT_SUCCESS(Status))
     {
         /* We failed, was this because this is a VDM process? */
-        if (BaseCheckForVDM(hProcess, lpExitCode) == TRUE) return TRUE;
+        if (BaseCheckForVDM(hProcess, lpExitCode)) return TRUE;
 
         /* Not a VDM process, fail the call */
         BaseSetLastNTError(Status);
Index: lsasrv/authport.c
===================================================================
--- lsasrv/authport.c	(revision 65379)
+++ lsasrv/authport.c	(working copy)
@@ -97,7 +97,7 @@
 
     TRACE("Logon Process Name: %s\n", RequestMsg->ConnectInfo.LogonProcessNameBuffer);
 
-    if (RequestMsg->ConnectInfo.CreateContext == TRUE)
+    if (RequestMsg->ConnectInfo.CreateContext)
     {
         Status = LsapCheckLogonProcess(RequestMsg,
                                        &LogonContext);
@@ -129,7 +129,7 @@
         return Status;
     }
 
-    if (Accept == TRUE)
+    if (Accept)
     {
         if (LogonContext != NULL)
         {
Index: lsasrv/lsarpc.c
===================================================================
--- lsasrv/lsarpc.c	(revision 65379)
+++ lsasrv/lsarpc.c	(working copy)
@@ -1384,8 +1384,8 @@
     TRACE("(%p %u %p)\n", AccountHandle, AllPrivileges, Privileges);
 
     /* */
-    if ((AllPrivileges == FALSE && Privileges == NULL) ||
-        (AllPrivileges == TRUE && Privileges != NULL))
+    if (( !AllPrivileges && Privileges == NULL) ||
+        (AllPrivileges && Privileges != NULL))
             return STATUS_INVALID_PARAMETER;
 
     /* Validate the AccountHandle */
@@ -1399,7 +1399,7 @@
         return Status;
     }
 
-    if (AllPrivileges == TRUE)
+    if (AllPrivileges)
     {
         /* Delete the Privilgs attribute */
         Status = LsapDeleteObjectAttribute(AccountObject,
Index: lsasrv/privileges.c
===================================================================
--- lsasrv/privileges.c	(revision 65379)
+++ lsasrv/privileges.c	(working copy)
@@ -231,7 +231,7 @@
         }
     }
 
-    if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE))
+    if ((Status == STATUS_SUCCESS) && (MoreEntries))
         Status = STATUS_MORE_ENTRIES;
 
     return Status;
Index: msgina/gui.c
===================================================================
--- msgina/gui.c	(revision 65379)
+++ msgina/gui.c	(working copy)
@@ -534,7 +534,7 @@
 
     SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4);
 
-    if (pgContext->bAutoAdminLogon == TRUE)
+    if (pgContext->bAutoAdminLogon)
         EnableWindow(GetDlgItem(hwnd, IDC_LOGOFF), FALSE);
 }
 
@@ -1118,7 +1118,7 @@
             if (pgContext->bDontDisplayLastUserName == FALSE)
                 SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName);
 
-            if (pgContext->bDisableCAD == TRUE)
+            if (pgContext->bDisableCAD)
                 EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
 
             if (pgContext->bShutdownWithoutLogon == FALSE)
@@ -1377,7 +1377,7 @@
             SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName);
             SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD));
 
-            if (pgContext->bDisableCAD == TRUE)
+            if (pgContext->bDisableCAD)
                 EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
 
             pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
Index: msgina/msgina.c
===================================================================
--- msgina/msgina.c	(revision 65379)
+++ msgina/msgina.c	(working copy)
@@ -911,7 +911,7 @@
         }
 
         result = CreateProfile(pgContext, UserName, Domain, Password);
-        if (result == TRUE)
+        if (result)
         {
             ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR));
             wcscpy(pgContext->Password, Password);
@@ -952,7 +952,7 @@
         return;
     }
 
-    if (pgContext->bAutoAdminLogon == TRUE)
+    if (pgContext->bAutoAdminLogon)
     {
         /* Don't display the window, we want to do an automatic logon */
         pgContext->AutoLogonState = AUTOLOGON_ONCE;
@@ -962,7 +962,7 @@
     else
         pgContext->AutoLogonState = AUTOLOGON_DISABLED;
 
-    if (pgContext->bDisableCAD == TRUE)
+    if (pgContext->bDisableCAD)
     {
         pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL);
         return;
@@ -1043,7 +1043,7 @@
 
     TRACE("WlxDisplayLockedNotice()\n");
 
-    if (pgContext->bDisableCAD == TRUE)
+    if (pgContext->bDisableCAD)
     {
         pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL);
         return;
Index: msports/classinst.c
===================================================================
--- msports/classinst.c	(revision 65379)
+++ msports/classinst.c	(working copy)
@@ -91,7 +91,7 @@
     if (hDeviceKey)
         RegCloseKey(hDeviceKey);
 
-    if (ret == TRUE)
+    if (ret)
         *ppResourceList = (PCM_RESOURCE_LIST)lpBuffer;
 
     return ret;
Index: msv1_0/msv1_0.c
===================================================================
--- msv1_0/msv1_0.c	(revision 65379)
+++ msv1_0/msv1_0.c	(working copy)
@@ -1223,7 +1223,7 @@
 
     if (!NT_SUCCESS(Status))
     {
-        if (SessionCreated == TRUE)
+        if (SessionCreated)
             DispatchTable.DeleteLogonSession(LogonId);
 
         if (*ProfileBuffer != NULL)
Index: netapi32/user.c
===================================================================
--- netapi32/user.c	(revision 65379)
+++ netapi32/user.c	(working copy)
@@ -2479,7 +2479,7 @@
 
         if (EnumContext->Index >= EnumContext->Count)
         {
-//            if (EnumContext->BuiltinDone == TRUE)
+//            if (EnumContext->BuiltinDone)
 //            {
 //                ApiStatus = NERR_Success;
 //                goto done;
Index: samsrv/samrpc.c
===================================================================
--- samsrv/samrpc.c	(revision 65379)
+++ samsrv/samrpc.c	(working copy)
@@ -2232,7 +2232,7 @@
     SampRegCloseKey(&NamesKeyHandle);
     SampRegCloseKey(&GroupsKeyHandle);
 
-    if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE))
+    if ((Status == STATUS_SUCCESS) && (MoreEntries))
         Status = STATUS_MORE_ENTRIES;
 
     RtlReleaseResource(&SampResource);
@@ -2843,7 +2843,7 @@
     SampRegCloseKey(&NamesKeyHandle);
     SampRegCloseKey(&UsersKeyHandle);
 
-    if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE))
+    if ((Status == STATUS_SUCCESS) && (MoreEntries))
         Status = STATUS_MORE_ENTRIES;
 
     RtlReleaseResource(&SampResource);
@@ -3224,7 +3224,7 @@
     SampRegCloseKey(&NamesKeyHandle);
     SampRegCloseKey(&AliasesKeyHandle);
 
-    if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE))
+    if ((Status == STATUS_SUCCESS) && (MoreEntries))
         Status = STATUS_MORE_ENTRIES;
 
     RtlReleaseResource(&SampResource);
@@ -7815,7 +7815,7 @@
                                         Buffer->All.SecurityDescriptor.Length);
     }
 
-    if (WriteFixedData == TRUE)
+    if (WriteFixedData)
     {
         Status = SampSetObjectAttribute(UserObject,
                                         L"F",
Index: samsrv/setup.c
===================================================================
--- samsrv/setup.c	(revision 65379)
+++ samsrv/setup.c	(working copy)
@@ -762,7 +762,7 @@
         goto done;
 
     /* Create the server SD */
-    if (bBuiltinDomain == TRUE)
+    if (bBuiltinDomain)
         Status = SampCreateBuiltinDomainSD(&Sd,
                                            &SdSize);
     else
Index: serialui/serialui.c
===================================================================
--- serialui/serialui.c	(revision 65379)
+++ serialui/serialui.c	(working copy)
@@ -309,7 +309,7 @@
 			{
 				SendMessageW(hBox, CB_INSERTSTRING, 1, (LPARAM)wstr);
 				if(lpDlgInfo->lpCC->dcb.fRtsControl == RTS_CONTROL_HANDSHAKE
-					|| lpDlgInfo->lpCC->dcb.fOutxCtsFlow == TRUE)
+					|| lpDlgInfo->lpCC->dcb.fOutxCtsFlow)
 				{
 					SendMessageW(hBox, CB_SETCURSEL, 1, 0);
 					lpDlgInfo->InitialFlowIndex = 1;
Index: shimgvw/shimgvw.c
===================================================================
--- shimgvw/shimgvw.c	(revision 65379)
+++ shimgvw/shimgvw.c	(working copy)
@@ -123,7 +123,7 @@
         c++;
         sizeRemain -= sizeof(*c);
 
-        if (IsEqualGUID(&rawFormat, &codecInfo[j].FormatID) == TRUE)
+        if (IsEqualGUID(&rawFormat, &codecInfo[j].FormatID))
         {
             sfn.nFilterIndex = j + 1;
         }
Index: shlwapi/path.c
===================================================================
--- shlwapi/path.c	(revision 65379)
+++ shlwapi/path.c	(working copy)
@@ -1636,7 +1636,7 @@
  *  Although this function is prototyped as returning a BOOL, it returns
  *  FILE_ATTRIBUTE_DIRECTORY for success. This means that code such as:
  *
- *|  if (PathIsDirectoryA("c:\\windows\\") == TRUE)
+ *|  if (PathIsDirectoryA("c:\\windows\\"))
  *|    ...
  *
  *  will always fail.
Index: userenv/setup.c
===================================================================
--- userenv/setup.c	(revision 65379)
+++ userenv/setup.c	(working copy)
@@ -269,7 +269,7 @@
             }
         }
 
-        if (lpFolderData->bHidden == TRUE)
+        if (lpFolderData->bHidden)
         {
             SetFileAttributesW(szBuffer,
                                FILE_ATTRIBUTE_HIDDEN);
Index: uxtheme/system.c
===================================================================
--- uxtheme/system.c	(revision 65379)
+++ uxtheme/system.c	(working copy)
@@ -189,7 +189,7 @@
     WCHAR szCurrentSize[64];
     BOOL bThemeActive = FALSE;
 
-    if(bLoad == TRUE) 
+    if(bLoad) 
     {
         /* Get current theme configuration */
         if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) {
Index: uxtheme/themehooks.c
===================================================================
--- uxtheme/themehooks.c	(revision 65379)
+++ uxtheme/themehooks.c	(working copy)
@@ -151,11 +151,11 @@
         return 0;
 
     /* We don't touch the shape of the window if the application sets it on its own */
-    if (pcontext->HasAppDefinedRgn == TRUE)
+    if (pcontext->HasAppDefinedRgn)
         return 0;
 
     /* Calling SetWindowRgn will call SetWindowPos again so we need to avoid this recursion */
-    if (pcontext->UpdatingRgn == TRUE)
+    if (pcontext->UpdatingRgn)
         return 0;
 
     if(!IsAppThemed())
Index: vbscript/regexp.c
===================================================================
--- vbscript/regexp.c	(revision 65379)
+++ vbscript/regexp.c	(working copy)
@@ -2119,7 +2119,7 @@
         assert(charSet->sense == FALSE);
         ++src;
     } else {
-        assert(charSet->sense == TRUE);
+        assert(charSet->sense != FALSE);
     }
 
     while (src != end) {
Index: wshtcpip/wshtcpip.c
===================================================================
--- wshtcpip/wshtcpip.c	(revision 65379)
+++ wshtcpip/wshtcpip.c	(working copy)
@@ -405,7 +405,7 @@
 
     closeTcpFile(TcpCC);
 
-    DPRINT("DeviceIoControl: %d\n", ((Status == TRUE) ? 0 : GetLastError()));
+    DPRINT("DeviceIoControl: %d\n", ((Status) ? 0 : GetLastError()));
 
     if (!Status)
         return WSAEINVAL;