PhReInitializeTheme: runtime theme switching on ImmersiveColorSet message

SystemInformer/SystemInformer.def

@@ -183,7 +183,7 @@ EXPORTS
     PhWordMatchStringRef
     PhWritePhTextHeader
     PhaChoiceDialog
-    PhaGetProcessKnownCommandLine
+    PhaGetProcessKnownCommandLine 
 
 ; plugin
     PhEnumeratePlugins
@@ -819,6 +819,7 @@ EXPORTS
 ; cpysave
     PhGetGenericTreeNewLines
     PhGetListViewItemText
+    PhGetIListViewItemText
     PhGetListViewSelectedItemText
     PhGetTreeNewText
 
@@ -900,13 +901,15 @@ EXPORTS
     PhFindIListViewItemByFlags
     PhFindListViewItemByFlags
     PhFindListViewItemByParam
+    PhFindIListViewItemByParam
     PhGetComboBoxString
     PhGetDialogItemValue
     PhGetIListViewItemParam
     PhGetListBoxString
     PhGetListViewItemImageIndex
     PhGetListViewItemParam
     PhGetSelectedListViewItemParam
+    PhGetSelectedIListViewItemParam
     PhGetSelectedListViewItemParams
     PhGetSelectedIListViewItemParams
     PhGetStockApplicationIcon
@@ -935,9 +938,10 @@ EXPORTS
     PhModalPropertySheet
     PhQueryDirectXExclusiveOwnership
     PhInitializeWindowTheme
-    PhReInitializeWindowTheme
+    PhReInitializeTheme
     PhRegisterWindowCallback
     PhRemoveListViewItem
+    PhRemoveIListViewItem
     PhRemoveWindowContext
     PhSelectComboBoxString
     PhSetClipboardString
@@ -949,21 +953,27 @@ EXPORTS
     PhSetHeaderSortIcon
     PhSetImageListBitmap
     PhSetListViewItemImageIndex
+    PhSetIListViewItemImageIndex
     PhSetListViewItemParam
     PhSetListViewSubItem
     PhSetIListViewSubItem
     PhSetStateAllListViewItems
     PhSetWindowContext
     PhSetWindowText
     PhTerminateWindow
+    PhUnregisterWindowCallback
+    PhThemeWindowDrawButton
     PhThemeWindowDrawRebar
     PhThemeWindowDrawToolbar
-    PhUnregisterWindowCallback
     PhWindowThemeControlColor
+    PhIsThemeSupportEnabled
+    PhWindowThemeSetDarkMode
+    PhReInitializeStreamerMode
 
 ; hndlinfo
     PhCallKphQueryFileInformationWithTimeout
     PhCreateHandleItem
+    PhShowHandlePropertiesEx
     PhCompareObjects
     PhEnumObjectTypes
     PhFormatNativeKeyName
@@ -1195,4 +1205,4 @@ EXPORTS
     KphQueryInformationDriver
     KphQueryInformationObject
     KsiEnumerateProcessHandles
-    KsiQueryHashInformationFile
+    KsiQueryHashInformationFile

SystemInformer/SystemInformer.rc

@@ -1425,9 +1425,9 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,62,82,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,116,82,50,14
     PUSHBUTTON      "&Browse...",IDC_BROWSE,170,82,50,14
-    CONTROL         "Create this task with TrustedInstaller privileges.",IDC_TRUSTEDINSTALLER,
+    CONTROL         "Create this task with &TrustedInstaller privileges.",IDC_TRUSTEDINSTALLER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,62,180,10
-    CONTROL         "Create this task with Administrative privileges.",IDC_TOGGLEELEVATION,
+    CONTROL         "Create this task with &Administrative privileges.",IDC_TOGGLEELEVATION,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,51,180,10
 END
 

SystemInformer/SystemInformer.vcxproj

@@ -231,8 +231,6 @@
     <ClCompile Include="colmgr.c" />
     <ClCompile Include="colsetmgr.c" />
     <ClCompile Include="dbgcon.c" />
-    <ClCompile Include="delayhook.c" />
-    <ClCompile Include="delayload.c" />
     <ClCompile Include="devprv.c" />
     <ClCompile Include="extmgr.c" />
     <ClCompile Include="findobj.c" />
@@ -339,6 +337,7 @@
     <ClInclude Include="include\heapstruct.h" />
     <ClInclude Include="include\hndllist.h" />
     <ClInclude Include="include\hndlmenu.h" />
+    <ClInclude Include="include\hndlprp.h" />
     <ClInclude Include="include\hndlprv.h" />
     <ClInclude Include="include\informer.h" />
     <ClInclude Include="include\ksisup.h" />

SystemInformer/SystemInformer.vcxproj.filters

@@ -306,18 +306,12 @@
     <ClCompile Include="prpgvdm.c">
       <Filter>System Informer</Filter>
     </ClCompile>
-    <ClCompile Include="delayload.c">
-      <Filter>System Informer</Filter>
-    </ClCompile>
     <ClCompile Include="admintask.c">
       <Filter>System Informer</Filter>
     </ClCompile>
     <ClCompile Include="ksisup.c">
       <Filter>System Informer</Filter>
     </ClCompile>
-    <ClCompile Include="delayhook.c">
-      <Filter>System Informer</Filter>
-    </ClCompile>
     <ClCompile Include="ksyscall.c">
       <Filter>System Informer</Filter>
     </ClCompile>
@@ -500,6 +494,9 @@
     <ClInclude Include="include\informer.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\hndlprp.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="SystemInformer.ico">

SystemInformer/about.c

@@ -71,7 +71,7 @@ static INT_PTR CALLBACK PhpAboutDlgProc(
             PhSetDialogFocus(hwndDlg, GetDlgItem(hwndDlg, IDOK));
             PhRegisterWindowCallback(hwndDlg, PH_PLUGIN_WINDOW_EVENT_TYPE_TOPMOST, NULL);
 
-            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
+            PhInitializeWindowTheme(hwndDlg);
         }
         break;
     case WM_DESTROY:

SystemInformer/actions.c

@@ -4142,8 +4142,6 @@ HRESULT CALLBACK PhpUiServiceInitializeDialogCallbackProc(
             {
                 PhShowServiceProgressDialogStatusPage(context);
             }
-
-            PhInitializeWindowTheme(WindowHandle, !!PhGetIntegerSetting(L"EnableThemeSupport"));
         }
         break;
     }
@@ -6436,6 +6434,8 @@ BOOLEAN PhUiCloseHandles(
         {
             if (FlagOn(Handles[i]->Attributes, OBJ_PROTECT_CLOSE))
             {
+                success = FALSE;
+
                 if (!PhpShowErrorHandle(
                     WindowHandle,
                     L"close",
@@ -6444,9 +6444,7 @@ BOOLEAN PhUiCloseHandles(
                     STATUS_HANDLE_NOT_CLOSABLE,
                     0
                     ))
-                {
                     break;
-                }
             }
 
             status = NtDuplicateObject(

SystemInformer/affinity.c

@@ -497,7 +497,7 @@ INT_PTR CALLBACK PhpProcessAffinityDlgProc(
                 }
             }
 
-            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
+            PhInitializeWindowTheme(hwndDlg);
         }
         break;
     case WM_DESTROY:

SystemInformer/chcol.c

@@ -24,6 +24,10 @@ typedef struct _COLUMNS_DIALOG_CONTEXT
     HBRUSH BrushPushed;
     HBRUSH BrushHot;
     COLORREF TextColor;
+    HBRUSH BrushNormalDark;
+    HBRUSH BrushPushedDark;
+    HBRUSH BrushHotDark;
+    COLORREF TextColorDark;
 
     HWND InactiveWindowHandle;
     HWND ActiveWindowHandle;
@@ -256,20 +260,15 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
             Button_Enable(context->MoveUpHandle, FALSE);
             Button_Enable(context->MoveDownHandle, FALSE);
 
-            if (PhEnableThemeSupport)
-            {
-                context->BrushNormal = CreateSolidBrush(PhThemeWindowBackgroundColor);
-                context->BrushHot = CreateSolidBrush(PhThemeWindowHighlightColor);
-                context->BrushPushed = CreateSolidBrush(PhThemeWindowHighlight2Color);
-                context->TextColor = PhThemeWindowTextColor;
-            }
-            else
-            {
-                context->BrushNormal = GetSysColorBrush(COLOR_WINDOW);
-                context->BrushHot = CreateSolidBrush(RGB(145, 201, 247));
-                context->BrushPushed = CreateSolidBrush(RGB(153, 209, 255));
-                context->TextColor = GetSysColor(COLOR_WINDOWTEXT);
-            }
+            context->BrushNormal = GetSysColorBrush(COLOR_WINDOW);
+            context->BrushHot = CreateSolidBrush(RGB(145, 201, 247));
+            context->BrushPushed = CreateSolidBrush(RGB(153, 209, 255));
+            context->TextColor = GetSysColor(COLOR_WINDOWTEXT);
+
+            context->BrushNormalDark = CreateSolidBrush(PhThemeWindowBackgroundColor);
+            context->BrushHotDark = CreateSolidBrush(PhThemeWindowHighlightColor);
+            context->BrushPushedDark = CreateSolidBrush(PhThemeWindowHighlight2Color);
+            context->TextColorDark = PhThemeWindowTextColor;
 
             if (context->Type == PH_CONTROL_TYPE_TREE_NEW)
             {
@@ -340,7 +339,7 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
             SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_INACTIVE, LBN_SELCHANGE), (LPARAM)context->InactiveWindowHandle);
             SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_ACTIVE, LBN_SELCHANGE), (LPARAM)context->ActiveWindowHandle);
 
-            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
+            PhInitializeWindowTheme(hwndDlg);
 
             PhSetDialogFocus(hwndDlg, GetDlgItem(hwndDlg, IDCANCEL));
         }
@@ -356,6 +355,12 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
                 DeleteBrush(context->BrushHot);
             if (context->BrushPushed)
                 DeleteBrush(context->BrushPushed);
+            if (context->BrushNormalDark)
+                DeleteBrush(context->BrushNormalDark);
+            if (context->BrushHotDark)
+                DeleteBrush(context->BrushHotDark);
+            if (context->BrushPushedDark)
+                DeleteBrush(context->BrushPushedDark);
             if (context->ControlFont)
                 DeleteFont(context->ControlFont);
             if (context->InactiveListArray)
@@ -696,16 +701,15 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
 
                  if (isSelected || isFocused)
                  {
-                     FillRect(bufferDc, &bufferRect, context->BrushHot);
+                     FillRect(bufferDc, &bufferRect, PhEnableThemeSupport ? context->BrushHotDark : context->BrushHot);
                      //FrameRect(bufferDc, &bufferRect, PhGetStockBrush(BLACK_BRUSH));
-                     SetTextColor(bufferDc, context->TextColor);
                  }
                  else
                  {
-                     FillRect(bufferDc, &bufferRect, context->BrushNormal);
+                     FillRect(bufferDc, &bufferRect, PhEnableThemeSupport ? context->BrushNormalDark : context->BrushNormal);
                      //FrameRect(bufferDc, &bufferRect, GetSysColorBrush(COLOR_HIGHLIGHTTEXT));
-                     SetTextColor(bufferDc, context->TextColor);
                  }
+                 SetTextColor(bufferDc, PhEnableThemeSupport ? context->TextColorDark : context->TextColor);
 
                  bufferRect.left += 5;
                  DrawText(

SystemInformer/chdlg.c

@@ -220,7 +220,7 @@ INT_PTR CALLBACK PhChoiceDlgProc(
                     SWP_NOACTIVATE | SWP_NOZORDER);
             }
 
-            PhInitializeWindowTheme(WindowHandle, PhEnableThemeSupport);
+            PhInitializeWindowTheme(WindowHandle);
 
             PhSetDialogFocus(WindowHandle, comboBoxHandle);
         }
@@ -430,9 +430,12 @@ INT_PTR CALLBACK PhChooseNewPageDlgProc(
 
             PhSetDialogFocus(WindowHandle, context->ComboBoxHandle);
 
-            if (PhEnableThemeSupport)
-                ShowWindow(GetDlgItem(WindowHandle, IDC_SIZE_), SW_HIDE);
-            PhInitializeWindowTheme(WindowHandle, PhEnableThemeSupport);
+            PhInitializeWindowTheme(WindowHandle);
+        }
+        break;
+    case WM_THEMECHANGED:
+        {
+            ShowWindow(GetDlgItem(WindowHandle, IDC_SIZE_), PhEnableThemeSupport ? SW_HIDE : SW_SHOW);
         }
         break;
     case WM_DESTROY:
@@ -541,7 +544,7 @@ INT_PTR CALLBACK PhChooseNewPageDlgProc(
 
             if (PhEnableThemeSupport)
             {
-                SetDCBrushColor(hdc, RGB(50, 50, 50));
+                SetDCBrushColor(hdc, PhMakeColorBrighter(PhThemeWindowBackgroundColor, 7)); // RGB(50, 50, 50)
                 FillRect(hdc, &clientRect, PhGetStockBrush(DC_BRUSH));
                 clientRect.bottom = clientRect.top + 1;
                 SetDCBrushColor(hdc, PhThemeWindowForegroundColor);

SystemInformer/chproc.c

@@ -262,7 +262,7 @@ INT_PTR CALLBACK PhpChooseProcessDlgProc(
 
             EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);
 
-            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
+            PhInitializeWindowTheme(hwndDlg);
         }
         break;
     case WM_DESTROY:

SystemInformer/colsetmgr.c

@@ -400,7 +400,7 @@ INT_PTR CALLBACK PhpColumnSetEditorDlgProc(
             Button_Enable(context->MoveDownButtonHandle, FALSE);
             Button_Enable(context->RemoveButtonHandle, FALSE);
 
-            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
+            PhInitializeWindowTheme(hwndDlg);
         }
         break;
     case WM_DESTROY: