Index: usetup/interface/consup.c
===================================================================
--- usetup/interface/consup.c	(revision 65379)
+++ usetup/interface/consup.c	(working copy)
@@ -69,7 +69,7 @@
         ReadConsoleInput(StdInput, Buffer, 1, &Read);
 
         if ((Buffer->EventType == KEY_EVENT)
-         && (Buffer->Event.KeyEvent.bKeyDown == TRUE))
+         && (Buffer->Event.KeyEvent.bKeyDown))
             break;
     }
 }
Index: usetup/interface/usetup.c
===================================================================
--- usetup/interface/usetup.c	(revision 65379)
+++ usetup/interface/usetup.c	(working copy)
@@ -246,7 +246,7 @@
         if (Length > MaxLength)
             MaxLength = Length;
 
-        if (LastLine == TRUE)
+        if (LastLine)
             break;
 
         pnext = p + 1;
@@ -312,7 +312,7 @@
                                          &Written);
         }
 
-        if (LastLine == TRUE)
+        if (LastLine)
             break;
 
         coPos.Y++;
@@ -676,7 +676,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
             else
                 RedrawGenericList(LanguageList);
@@ -922,7 +922,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1025,7 +1025,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1062,7 +1062,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1179,7 +1179,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1233,7 +1233,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1284,7 +1284,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
             {
                 return QUIT_PAGE;
             }
@@ -1337,7 +1337,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1398,7 +1398,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -1484,8 +1484,8 @@
     DrawPartitionList(PartitionList);
 
     /* Warn about partitions created by Linux Fdisk */
-    if (WarnLinuxPartitions == TRUE &&
-        CheckForLinuxFdiskPartitions(PartitionList) == TRUE)
+    if (WarnLinuxPartitions &&
+        CheckForLinuxFdiskPartitions(PartitionList))
     {
         MUIDisplayError(ERROR_WARN_PARTITION, NULL, POPUP_WAIT_NONE);
 
@@ -1585,7 +1585,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
             {
                 DestroyPartitionList(PartitionList);
                 PartitionList = NULL;
@@ -1660,7 +1660,7 @@
         }
         else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L')  /* L */
         {
-            if (PartitionList->CurrentPartition->LogicalPartition == TRUE)
+            if (PartitionList->CurrentPartition->LogicalPartition)
             {
                 Error = LogicalPartitionCreationChecks(PartitionList);
                 if (Error != NOT_AN_ERROR)
@@ -1921,14 +1921,14 @@
         ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */
                                   MaxSize, InputBuffer, &Quit, &Cancel);
 
-        if (Quit == TRUE)
+        if (Quit)
         {
-            if (ConfirmQuit (Ir) == TRUE)
+            if (ConfirmQuit (Ir))
             {
                 return QUIT_PAGE;
             }
         }
-        else if (Cancel == TRUE)
+        else if (Cancel)
         {
             return SELECT_PARTITION_PAGE;
         }
@@ -2068,14 +2068,14 @@
         ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */
                                   MaxSize, InputBuffer, &Quit, &Cancel);
 
-        if (Quit == TRUE)
+        if (Quit)
         {
-            if (ConfirmQuit (Ir) == TRUE)
+            if (ConfirmQuit (Ir))
             {
                 return QUIT_PAGE;
             }
         }
-        else if (Cancel == TRUE)
+        else if (Cancel)
         {
             return SELECT_PARTITION_PAGE;
         }
@@ -2214,14 +2214,14 @@
         ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */
                                   MaxSize, InputBuffer, &Quit, &Cancel);
 
-        if (Quit == TRUE)
+        if (Quit)
         {
-            if (ConfirmQuit (Ir) == TRUE)
+            if (ConfirmQuit (Ir))
             {
                 return QUIT_PAGE;
             }
         }
-        else if (Cancel == TRUE)
+        else if (Cancel)
         {
             return SELECT_PARTITION_PAGE;
         }
@@ -2295,11 +2295,11 @@
 
     /* Determine partition type */
     PartType = NULL;
-    if (PartEntry->New == TRUE)
+    if (PartEntry->New)
     {
         PartType = MUIGetString(STRING_UNFORMATTED);
     }
-    else if (PartEntry->IsPartitioned == TRUE)
+    else if (PartEntry->IsPartitioned)
     {
         if ((PartEntry->PartitionType == PARTITION_FAT_12) ||
             (PartEntry->PartitionType == PARTITION_FAT_16) ||
@@ -2416,7 +2416,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
             {
                 return QUIT_PAGE;
             }
@@ -2517,7 +2517,7 @@
         PartType = MUIGetString(STRING_FORMATUNKNOWN);
     }
 
-    if (PartEntry->AutoCreate == TRUE)
+    if (PartEntry->AutoCreate)
     {
         CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION));
 
@@ -2543,7 +2543,7 @@
 
         PartEntry->AutoCreate = FALSE;
     }
-    else if (PartEntry->New == TRUE)
+    else if (PartEntry->New)
     {
         CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART));
         CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT));
@@ -2622,7 +2622,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
             {
                 return QUIT_PAGE;
             }
@@ -2698,7 +2698,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
             {
                 return QUIT_PAGE;
             }
@@ -2779,7 +2779,7 @@
             {
                 PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
 
-                if (PartEntry->IsPartitioned == TRUE)
+                if (PartEntry->IsPartitioned)
                 {
                     CONSOLE_PrintTextXY(6, Line,
                                         "%2u:  %2u  %c  %12I64u  %12I64u  %2u  %c",
@@ -3007,7 +3007,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -3793,7 +3793,7 @@
         InstallOnFloppy = TRUE;
     }
 
-    if (InstallOnFloppy == TRUE)
+    if (InstallOnFloppy)
     {
         return BOOT_LOADER_FLOPPY_PAGE;
     }
@@ -3842,7 +3842,7 @@
         else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
                  (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
@@ -3890,7 +3890,7 @@
         if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) &&
             (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3))  /* F3 */
         {
-            if (ConfirmQuit(Ir) == TRUE)
+            if (ConfirmQuit(Ir))
                 return QUIT_PAGE;
 
             break;
Index: usetup/partlist.c
===================================================================
--- usetup/partlist.c	(revision 65379)
+++ usetup/partlist.c	(working copy)
@@ -531,7 +531,7 @@
 
     PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex];
     if (PartitionInfo->PartitionType == 0 ||
-        (LogicalPartition == TRUE && IsContainerPartition(PartitionInfo->PartitionType)))
+        (LogicalPartition && IsContainerPartition(PartitionInfo->PartitionType)))
         return;
 
     PartEntry = RtlAllocateHeap(ProcessHeap,
@@ -1497,11 +1497,11 @@
     {
         /* Determine partition type */
         PartType = NULL;
-        if (PartEntry->New == TRUE)
+        if (PartEntry->New)
         {
             PartType = MUIGetString(STRING_UNFORMATTED);
         }
-        else if (PartEntry->IsPartitioned == TRUE)
+        else if (PartEntry->IsPartitioned)
         {
             if ((PartEntry->PartitionType == PARTITION_FAT_12) ||
                 (PartEntry->PartitionType == PARTITION_FAT_16) ||
@@ -2054,7 +2054,7 @@
         {
             /* Primary or extended partition */
 
-            if (List->CurrentPartition->IsPartitioned == TRUE &&
+            if (List->CurrentPartition->IsPartitioned &&
                 IsContainerPartition(List->CurrentPartition->PartitionType))
             {
                 /* First logical partition */
@@ -2148,7 +2148,7 @@
             {
                 PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry);
 
-                if (PartEntry->IsPartitioned == TRUE &&
+                if (PartEntry->IsPartitioned &&
                     IsContainerPartition(PartEntry->PartitionType))
                 {
                     PartListEntry = List->CurrentDisk->LogicalPartListHead.Blink;
@@ -2173,7 +2173,7 @@
         {
             PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry);
 
-            if (PartEntry->IsPartitioned == TRUE &&
+            if (PartEntry->IsPartitioned &&
                 IsContainerPartition(PartEntry->PartitionType))
             {
                 PartListEntry = DiskEntry->LogicalPartListHead.Blink;
@@ -2250,7 +2250,7 @@
     {
         PartEntry = CONTAINING_RECORD(ListEntry, PARTENTRY, ListEntry);
 
-        if (PartEntry->IsPartitioned == TRUE)
+        if (PartEntry->IsPartitioned)
         {
             PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index];
 
@@ -2363,7 +2363,7 @@
     if (List == NULL ||
         List->CurrentDisk == NULL ||
         List->CurrentPartition == NULL ||
-        List->CurrentPartition->IsPartitioned == TRUE)
+        List->CurrentPartition->IsPartitioned)
     {
         return;
     }
@@ -2373,7 +2373,7 @@
 
 DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart);
 
-    if (AutoCreate == TRUE ||
+    if (AutoCreate ||
         Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart)
     {
 DPRINT1("Convert existing partition entry\n");
@@ -2482,7 +2482,7 @@
     if (List == NULL ||
         List->CurrentDisk == NULL ||
         List->CurrentPartition == NULL ||
-        List->CurrentPartition->IsPartitioned == TRUE)
+        List->CurrentPartition->IsPartitioned)
     {
         return;
     }
@@ -2592,7 +2592,7 @@
     if (List == NULL ||
         List->CurrentDisk == NULL ||
         List->CurrentPartition == NULL ||
-        List->CurrentPartition->IsPartitioned == TRUE)
+        List->CurrentPartition->IsPartitioned)
     {
         return;
     }
@@ -2756,7 +2756,7 @@
                                   ListEntry);
 
     /* Set active boot partition */
-    if ((DiskEntry->NewDisk == TRUE) ||
+    if ((DiskEntry->NewDisk) ||
         (PartEntry->BootIndicator == FALSE))
     {
         PartEntry->BootIndicator = TRUE;
@@ -2942,7 +2942,7 @@
     {
         DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry);
 
-        if (DiskEntry->Dirty == TRUE)
+        if (DiskEntry->Dirty)
         {
             WritePartitons(List, DiskEntry);
         }
@@ -3016,7 +3016,7 @@
     while (Entry != &DiskEntry->PrimaryPartListHead)
     {
         PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
-        if (PartEntry->IsPartitioned == TRUE)
+        if (PartEntry->IsPartitioned)
             nCount++;
 
         Entry = Entry->Flink;
@@ -3037,7 +3037,7 @@
     PartEntry = List->CurrentPartition;
 
     /* Fail if partition is already in use */
-    if (PartEntry->IsPartitioned == TRUE)
+    if (PartEntry->IsPartitioned)
         return ERROR_NEW_PARTITION;
 
     /* Fail if there are more than 4 partitions in the list */
@@ -3059,7 +3059,7 @@
     PartEntry = List->CurrentPartition;
 
     /* Fail if partition is already in use */
-    if (PartEntry->IsPartitioned == TRUE)
+    if (PartEntry->IsPartitioned)
         return ERROR_NEW_PARTITION;
 
     /* Fail if there are more than 4 partitions in the list */
@@ -3085,7 +3085,7 @@
     PartEntry = List->CurrentPartition;
 
     /* Fail if partition is already in use */
-    if (PartEntry->IsPartitioned == TRUE)
+    if (PartEntry->IsPartitioned)
         return ERROR_NEW_PARTITION;
 
     return ERROR_SUCCESS;
Index: vmwinst/vmwinst.c
===================================================================
--- vmwinst/vmwinst.c	(revision 65379)
+++ vmwinst/vmwinst.c	(working copy)
@@ -234,7 +234,7 @@
         /* If this key is absent, just get current settings */
         memset(&CurrentDevMode, 0, sizeof(CurrentDevMode));
         CurrentDevMode.dmSize = sizeof(CurrentDevMode);
-        if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &CurrentDevMode) == TRUE)
+        if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &CurrentDevMode))
         {
             *ColDepth = CurrentDevMode.dmBitsPerPel;
             *ResX = CurrentDevMode.dmPelsWidth;