Fix warning C4703

Author: dmex

ProcessHacker/appsup.c

@@ -1388,8 +1388,8 @@ VOID PhInitializeTreeNewColumnMenuEx(
     PPH_EMENU_ITEM resetSortMenuItem = NULL;
     PPH_EMENU_ITEM sizeColumnToFitMenuItem;
     PPH_EMENU_ITEM sizeAllColumnsToFitMenuItem;
-    PPH_EMENU_ITEM hideColumnMenuItem;
-    PPH_EMENU_ITEM chooseColumnsMenuItem;
+    PPH_EMENU_ITEM hideColumnMenuItem = NULL;
+    PPH_EMENU_ITEM chooseColumnsMenuItem = NULL;
     ULONG minimumNumberOfColumns;
 
     Data->Menu = PhCreateEMenu();
@@ -1421,13 +1421,10 @@ VOID PhInitializeTreeNewColumnMenuEx(
 
     if (!(Flags & PH_TN_COLUMN_MENU_NO_VISIBILITY))
     {
-        PhInsertEMenuItem(Data->Menu, hideColumnMenuItem, ULONG_MAX);
-
-        if (resetSortMenuItem)
-            PhInsertEMenuItem(Data->Menu, resetSortMenuItem, ULONG_MAX);
-
+        if (hideColumnMenuItem) PhInsertEMenuItem(Data->Menu, hideColumnMenuItem, ULONG_MAX);
+        if (resetSortMenuItem) PhInsertEMenuItem(Data->Menu, resetSortMenuItem, ULONG_MAX);
         PhInsertEMenuItem(Data->Menu, PhCreateEMenuSeparator(), ULONG_MAX);
-        PhInsertEMenuItem(Data->Menu, chooseColumnsMenuItem, ULONG_MAX);
+        if (chooseColumnsMenuItem) PhInsertEMenuItem(Data->Menu, chooseColumnsMenuItem, ULONG_MAX);
 
         if (TreeNew_GetFixedColumn(Data->TreeNewHandle))
             minimumNumberOfColumns = 2; // don't allow user to remove all normal columns (the fixed column can never be removed)
@@ -1439,7 +1436,8 @@ VOID PhInitializeTreeNewColumnMenuEx(
             TreeNew_GetVisibleColumnCount(Data->TreeNewHandle) < minimumNumberOfColumns + 1
             )
         {
-            hideColumnMenuItem->Flags |= PH_EMENU_DISABLED;
+            if (hideColumnMenuItem)
+                PhSetDisabledEMenuItem(hideColumnMenuItem);
         }
     }
     else
@@ -1450,7 +1448,7 @@ VOID PhInitializeTreeNewColumnMenuEx(
 
     if (!Data->MouseEvent || !Data->MouseEvent->Column)
     {
-        sizeColumnToFitMenuItem->Flags |= PH_EMENU_DISABLED;
+        PhSetDisabledEMenuItem(sizeColumnToFitMenuItem);
     }
 }
 

ProcessHacker/hndlprp.c

@@ -658,7 +658,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE alpcPortHandle;
+        HANDLE alpcPortHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -678,7 +678,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && alpcPortHandle)
         {
             ALPC_BASIC_INFORMATION basicInfo;
 
@@ -708,7 +708,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE fileHandle;
+        HANDLE fileHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -728,7 +728,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && fileHandle)
         {
             BOOLEAN disableFlushButton = FALSE;
             BOOLEAN isFileOrDirectory = FALSE;
@@ -889,7 +889,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE sectionHandle;
+        HANDLE sectionHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -923,7 +923,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && sectionHandle)
         {
             SECTION_BASIC_INFORMATION basicInfo;
             PWSTR sectionType = L"Unknown";
@@ -965,7 +965,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE mutantHandle;
+        HANDLE mutantHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -985,7 +985,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && mutantHandle)
         {
             MUTANT_BASIC_INFORMATION basicInfo;
             MUTANT_OWNER_INFORMATION ownerInfo;
@@ -1015,7 +1015,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE dupHandle;
+        HANDLE dupHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -1036,7 +1036,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && dupHandle)
         {
             NTSTATUS exitStatus = STATUS_PENDING;
             PPH_STRING fileName;
@@ -1099,7 +1099,7 @@ VOID PhpUpdateHandleGeneral(
     {
         NTSTATUS status;
         HANDLE processHandle;
-        HANDLE dupHandle;
+        HANDLE dupHandle = NULL;
 
         if (NT_SUCCESS(status = PhOpenProcess(
             &processHandle,
@@ -1120,7 +1120,7 @@ VOID PhpUpdateHandleGeneral(
             NtClose(processHandle);
         }
 
-        if (NT_SUCCESS(status))
+        if (NT_SUCCESS(status) && dupHandle)
         {
             BOOLEAN isTerminated = FALSE;
             THREAD_BASIC_INFORMATION basicInfo;