Moved delayhook to phlib

- phlib PhIsThemeSupportEnabled, exported for plugins.
- New option EnableThemeUseWindowsTheme - Use Windows app color mode. On default settings PH will use current Windows theme.
- New option EnableThemeTabBorders (default 0).

SystemInformer/SystemInformer.def

@@ -916,6 +916,8 @@ EXPORTS
     PhStdGetClientIdName                                                          @1857     NONAME
     PhCallKphQueryFileInformationWithTimeout                                      @1858     NONAME
     PhGetSectionFileName                                                          @1859     NONAME
+    PhCreateHandleItem                                                            @2056     NONAME
+    PhShowHandlePropertiesEx                                                      @2057     NONAME
 
 ; lsasup
     PhEnumeratePrivileges                                                         @1860     NONAME
@@ -976,6 +978,7 @@ EXPORTS
     PhSetStringRefSetting                                                         @1909     NONAME
     PhSaveSettings                                                                @1910     NONAME
     PhUpdateCachedSettings                                                        @1911     NONAME
+    PhIsThemeSupportEnabled                                                       @2058     NONAME
 
 ; secedit
     PhCreateSecurityPage                                                          @1912     NONAME

SystemInformer/SystemInformer.vcxproj

@@ -451,7 +451,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" />

SystemInformer/SystemInformer.vcxproj.filters

@@ -315,9 +315,6 @@
     <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>

SystemInformer/chcol.c

@@ -261,7 +261,7 @@ INT_PTR CALLBACK PhpColumnsDlgProc(
             Button_Enable(context->MoveUpHandle, FALSE);
             Button_Enable(context->MoveDownHandle, FALSE);
 
-            if (PhGetIntegerSetting(L"EnableThemeSupport"))
+            if (PhEnableThemeSupport)
             {
                 context->BrushNormal = CreateSolidBrush(PhThemeWindowBackgroundColor);
                 context->BrushHot = CreateSolidBrush(PhThemeWindowHighlightColor);

SystemInformer/main.c

@@ -1198,7 +1198,7 @@ VOID PhpInitializeSettings(
     for (ULONG i = 0; i < PhMaxPrecisionUnit; i++)
         PhMaxPrecisionLimit /= 10;
     PhEnableWindowText = !!PhGetIntegerSetting(L"EnableWindowText");
-    PhEnableThemeSupport = !!PhGetIntegerSetting(L"EnableThemeSupport");
+    PhEnableThemeSupport = PhIsThemeSupportEnabled();
     PhThemeWindowForegroundColor = PhGetIntegerSetting(L"ThemeWindowForegroundColor");
     PhThemeWindowBackgroundColor = PhGetIntegerSetting(L"ThemeWindowBackgroundColor");
     PhThemeWindowBackground2Color = PhGetIntegerSetting(L"ThemeWindowBackground2Color");

SystemInformer/memedit.c

@@ -312,7 +312,7 @@ INT_PTR CALLBACK PhpMemoryEditorDlgProc(
                 }
             }
 
-            PhInitializeWindowTheme(hwndDlg, !!PhGetIntegerSetting(L"EnableThemeSupport"));
+            PhInitializeWindowTheme(hwndDlg, PhEnableThemeSupport);
 
             context->LoadCompleted = TRUE;
         }

SystemInformer/options.c

@@ -1401,6 +1401,7 @@ typedef enum _PHP_OPTIONS_INDEX
     PHP_OPTIONS_INDEX_ENABLE_MEMSTRINGS_TREE,
     PHP_OPTIONS_INDEX_ENABLE_LASTTAB_SUPPORT,
     PHP_OPTIONS_INDEX_ENABLE_THEME_SUPPORT,
+    PHP_OPTIONS_INDEX_ENABLE_THEME_WINDOWS_THEME,
     PHP_OPTIONS_INDEX_ENABLE_START_ASADMIN,
     PHP_OPTIONS_INDEX_ENABLE_STREAM_MODE,
     PHP_OPTIONS_INDEX_ENABLE_SILENT_CRASH_NOTIFY,
@@ -1452,7 +1453,8 @@ static VOID PhpAdvancedPageLoad(
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_MINIINFO_WINDOW, L"Enable tray information window", NULL);
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_MEMSTRINGS_TREE, L"Enable new memory strings dialog", NULL);
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_LASTTAB_SUPPORT, L"Remember last selected window", NULL);
-    PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_SUPPORT, L"Enable theme support (experimental)", NULL);
+    PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_SUPPORT, L"Enable theme support", NULL);
+    PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_WINDOWS_THEME, L"Use Windows app color mode", NULL);
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_START_ASADMIN, L"Enable start as admin (experimental)", NULL);
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_STREAM_MODE, L"Enable streamer mode (disable window capture) (experimental)", NULL);
     PhAddListViewItem(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_SILENT_CRASH_NOTIFY, L"Enable silent crash notification (experimental)", NULL);
@@ -1484,6 +1486,7 @@ static VOID PhpAdvancedPageLoad(
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_GRAPH_SCALING, L"EnableGraphMaxScale");
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_CYCLE_CPU_USAGE, L"EnableCycleCpuUsage");
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_SUPPORT, L"EnableThemeSupport");
+    SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_WINDOWS_THEME, L"EnableThemeUseWindowsTheme");
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_START_ASADMIN, L"EnableStartAsAdmin");
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_STREAM_MODE, L"EnableStreamerMode");
     SetLvItemCheckForSetting(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_SILENT_CRASH_NOTIFY, L"EnableSilentCrashNotify");
@@ -1675,6 +1678,7 @@ static VOID PhpAdvancedPageSave(
     SetSettingForLvItemCheckRestartRequired(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_GRAPH_SCALING, L"EnableGraphMaxScale");
     SetSettingForLvItemCheckRestartRequired(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_CYCLE_CPU_USAGE, L"EnableCycleCpuUsage");
     SetSettingForLvItemCheckRestartRequired(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_SUPPORT, L"EnableThemeSupport");
+    SetSettingForLvItemCheckRestartRequired(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_THEME_WINDOWS_THEME, L"EnableThemeUseWindowsTheme");
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_START_ASADMIN, L"EnableStartAsAdmin");
     SetSettingForLvItemCheckRestartRequired(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_STREAM_MODE, L"EnableStreamerMode");
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_ENABLE_SILENT_CRASH_NOTIFY, L"EnableSilentCrashNotify");
@@ -1691,7 +1695,7 @@ static VOID PhpAdvancedPageSave(
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_PROPAGATE_CPU_USAGE, L"PropagateCpuUsage");
     SetSettingForLvItemCheck(listViewHandle, PHP_OPTIONS_INDEX_SHOW_ADVANCED_OPTIONS, L"EnableAdvancedOptions");
 
-    if (PhGetIntegerSetting(L"EnableThemeSupport"))
+    if (PhEnableThemeSupport)
     {
         PhSetIntegerSetting(L"GraphColorMode", 1); // HACK switch to dark theme. (dmex)
     }

SystemInformer/settings.c

@@ -78,11 +78,13 @@ VOID PhAddDefaultSettings(
     PhpAddIntegerSetting(L"EnableShutdownCriticalMenu", L"0");
     PhpAddIntegerSetting(L"EnableShutdownBootMenu", L"1");
     PhpAddIntegerSetting(L"EnableSilentCrashNotify", L"0");
-    PhpAddIntegerSetting(L"EnableThemeSupport", L"0");
+    PhpAddIntegerSetting(L"EnableThemeSupport", L"1");
+    PhpAddIntegerSetting(L"EnableThemeUseWindowsTheme", L"1");
     PhpAddIntegerSetting(L"EnableThemeAcrylicSupport", L"0");
     PhpAddIntegerSetting(L"EnableThemeAcrylicWindowSupport", L"0");
     PhpAddIntegerSetting(L"EnableThemeAnimation", L"1");
     PhpAddIntegerSetting(L"EnableThemeNativeButtons", L"0");
+    PhpAddIntegerSetting(L"EnableThemeTabBorders", L"0");
     PhpAddIntegerSetting(L"ThemeWindowForegroundColor", L"1c1c1c"); // RGB(28, 28, 28)
     PhpAddIntegerSetting(L"ThemeWindowBackgroundColor", L"2b2b2b"); // RGB(43, 43, 43)
     PhpAddIntegerSetting(L"ThemeWindowBackground2Color", L"414141"); // RGB(65, 65, 65)

SystemInformer/delayhook.c → phlib/delayhook.c

@@ -5,11 +5,14 @@
  *
  * Authors:
  *
- *     dmex    2022-2023
+ *     dmex         2022-2023
+ *     Dart Vanya   2024
  *
  */
 
-#include <phapp.h>
+#include <ph.h>
+#include <guisup.h>
+#include <treenew.h>
 #include <apiimport.h>
 #include <mapldr.h>
 #include <thirdparty.h>
@@ -28,9 +31,6 @@ static WNDPROC PhDefaultStaticWindowProcedure = NULL;
 static WNDPROC PhDefaultStatusbarWindowProcedure = NULL;
 static WNDPROC PhDefaultEditWindowProcedure = NULL;
 static WNDPROC PhDefaultHeaderWindowProcedure = NULL;
-static BOOLEAN PhDefaultEnableStreamerMode = FALSE;
-static BOOLEAN PhDefaultEnableThemeAcrylicWindowSupport = FALSE;
-static BOOLEAN PhDefaultEnableThemeAnimation = FALSE;
 
 LRESULT CALLBACK PhMenuWindowHookProcedure(
     _In_ HWND WindowHandle,
@@ -62,7 +62,7 @@ LRESULT CALLBACK PhMenuWindowHookProcedure(
         {
             //CREATESTRUCT* createStruct = (CREATESTRUCT*)lParam;
 
-            if (PhDefaultEnableStreamerMode)
+            if (PhEnableStreamerMode)
             {
                 if (SetWindowDisplayAffinity_Import())
                     SetWindowDisplayAffinity_Import()(WindowHandle, WDA_EXCLUDEFROMCAPTURE);
@@ -115,13 +115,13 @@ LRESULT CALLBACK PhDialogWindowHookProcedure(
 
             if (WindowHandle == GetAncestor(WindowHandle, GA_ROOT))
             {
-                if (PhDefaultEnableStreamerMode)
+                if (PhEnableStreamerMode)
                 {
                     if (SetWindowDisplayAffinity_Import())
                         SetWindowDisplayAffinity_Import()(WindowHandle, WDA_EXCLUDEFROMCAPTURE);
                 }
 
-                if (PhEnableThemeSupport && PhDefaultEnableThemeAcrylicWindowSupport)
+                if (PhEnableThemeSupport && PhEnableThemeAcrylicWindowSupport)
                 {
                     // Note: DWM crashes if called from WM_NCCREATE (dmex)
                     PhSetWindowAcrylicCompositionColor(WindowHandle, MakeABGRFromCOLORREF(0, RGB(10, 10, 10)));
@@ -176,7 +176,7 @@ LRESULT CALLBACK PhComboBoxWindowHookProcedure(
 
             if (SendMessage(WindowHandle, CB_GETCOMBOBOXINFO, 0, (LPARAM)&info))
             {
-                if (PhDefaultEnableStreamerMode)
+                if (PhEnableStreamerMode)
                 {
                     if (SetWindowDisplayAffinity_Import())
                         SetWindowDisplayAffinity_Import()(info.hwndList, WDA_EXCLUDEFROMCAPTURE);
@@ -1578,13 +1578,13 @@ HWND PhCreateWindowExHook(
 
     if (Parent == NULL)
     {
-        if (PhDefaultEnableStreamerMode)
+        if (PhEnableStreamerMode)
         {
             if (SetWindowDisplayAffinity_Import())
                 SetWindowDisplayAffinity_Import()(windowHandle, WDA_EXCLUDEFROMCAPTURE);
         }
 
-        if (PhEnableThemeSupport && PhDefaultEnableThemeAcrylicWindowSupport)
+        if (PhEnableThemeSupport && PhEnableThemeAcrylicWindowSupport)
         {
             PhSetWindowAcrylicCompositionColor(windowHandle, MakeABGRFromCOLORREF(0, RGB(10, 10, 10)));
         }
@@ -1867,7 +1867,7 @@ BOOLEAN CALLBACK PhInitializeTaskDialogTheme(
 
     if (CallbackData && !windowHasContext)
     {
-        if (PhDefaultEnableStreamerMode)
+        if (PhEnableStreamerMode)
         {
             if (SetWindowDisplayAffinity_Import())
                 SetWindowDisplayAffinity_Import()(WindowHandle, WDA_EXCLUDEFROMCAPTURE);
@@ -2093,7 +2093,7 @@ VOID PhRegisterDetoursHooks(
             goto CleanupExit;
         if (!NT_SUCCESS(status = DetourAttach((PVOID)&DefaultDrawThemeBackgroundEx, (PVOID)PhDrawThemeBackgroundExHook)))
             goto CleanupExit;
-        if (!PhDefaultEnableThemeAnimation)
+        if (!PhEnableThemeAnimation)
         {
             if (!NT_SUCCESS(status = DetourAttach((PVOID)&DefaultSystemParametersInfo, (PVOID)PhSystemParametersInfoHook)))
                 goto CleanupExit;
@@ -2151,21 +2151,23 @@ VOID PhInitializeSuperclassControls(
     VOID
     )
 {
-    PhDefaultEnableStreamerMode = !!PhGetIntegerSetting(L"EnableStreamerMode");
+    PhEnableStreamerMode = !!PhGetIntegerSetting(L"EnableStreamerMode");
 
     if (PhEnableThemeAcrylicSupport && !PhEnableThemeSupport)
         PhEnableThemeAcrylicSupport = FALSE;
     if (PhEnableThemeAcrylicSupport)
         PhEnableThemeAcrylicSupport = PhIsThemeTransparencyEnabled();
 
-    if (PhEnableThemeSupport || PhDefaultEnableStreamerMode)
+    if (PhEnableThemeSupport || PhEnableStreamerMode)
     {
         if (WindowsVersion >= WINDOWS_11)
         {
-            PhDefaultEnableThemeAcrylicWindowSupport = !!PhGetIntegerSetting(L"EnableThemeAcrylicWindowSupport");
+            PhEnableThemeAcrylicWindowSupport = !!PhGetIntegerSetting(L"EnableThemeAcrylicWindowSupport");
         }
 
-        PhDefaultEnableThemeAnimation = !!PhGetIntegerSetting(L"EnableThemeAnimation");
+        PhEnableThemeAnimation = !!PhGetIntegerSetting(L"EnableThemeAnimation");
+        PhEnableThemeNativeButtons = !!PhGetIntegerSetting(L"EnableThemeNativeButtons");
+        PhEnableThemeTabBorders = !!PhGetIntegerSetting(L"EnableThemeTabBorders");
 
         PhRegisterDialogSuperClass();
         PhRegisterMenuSuperClass();

phlib/guisup.c

@@ -76,6 +76,11 @@ static _DrawThemeBackground DrawThemeBackground_I = NULL;
 static _DrawThemeTextEx DrawThemeTextEx_I = NULL;
 static _AllowDarkModeForWindow AllowDarkModeForWindow_I = NULL; // Win10-RS5 (uxtheme.dll ordinal 133)
 static _IsDarkModeAllowedForWindow IsDarkModeAllowedForWindow_I = NULL; // Win10-RS5 (uxtheme.dll ordinal 137)
+static _ShouldAppsUseDarkMode ShouldAppsUseDarkMode_I = NULL; // Win10-RS5 (uxtheme.dll ordinal 132)
+// Win10-RS5 (uxtheme.dll ordinal 135)
+// Win10 build 17763: AllowDarkModeForApp(BOOL)
+// Win10 build 18334: SetPreferredAppMode(enum PreferredAppMode)
+static _SetPreferredAppMode SetPreferredAppMode_I = NULL;
 static _GetDpiForMonitor GetDpiForMonitor_I = NULL; // win81+
 static _GetDpiForWindow GetDpiForWindow_I = NULL; // win10rs1+
 static _GetDpiForSystem GetDpiForSystem_I = NULL; // win10rs1+
@@ -127,6 +132,8 @@ VOID PhGuiSupportInitialization(
         {
             AllowDarkModeForWindow_I = PhGetDllBaseProcedureAddress(baseAddress, NULL, 133);
             IsDarkModeAllowedForWindow_I = PhGetDllBaseProcedureAddress(baseAddress, NULL, 137);
+            ShouldAppsUseDarkMode_I = PhGetDllBaseProcedureAddress(baseAddress, NULL, 132);
+            SetPreferredAppMode_I = PhGetDllBaseProcedureAddress(baseAddress, NULL, 135);
         }
     }
 
@@ -428,6 +435,43 @@ BOOLEAN PhIsDarkModeAllowedForWindow(
     return !!IsDarkModeAllowedForWindow_I(WindowHandle);
 }
 
+BOOLEAN PhShouldAppsUseDarkMode(
+    VOID
+    )
+{
+    if (!ShouldAppsUseDarkMode_I)
+        return FALSE;
+
+    return !!ShouldAppsUseDarkMode_I();
+}
+
+BOOLEAN PhIsThemeSupportEnabled(
+    VOID
+    )
+{
+    if (PhGetIntegerSetting(L"EnableThemeSupport"))
+    {
+        if (PhGetIntegerSetting(L"EnableThemeUseWindowsTheme"))
+            return PhShouldAppsUseDarkMode();
+        else
+            return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+BOOLEAN PhSetPreferredAppMode(
+    _In_ PreferredAppMode AppMode
+    )
+{
+    if (!SetPreferredAppMode_I)
+        return FALSE;
+
+    return !!SetPreferredAppMode_I(AppMode);
+}
+
 // rev from EtwRundown.dll!EtwpLogDPISettingsInfo (dmex)
 //LONG PhGetUserOrMachineDpi(
 //    VOID

phlib/include/guisup.h

@@ -223,6 +223,34 @@ PhIsDarkModeAllowedForWindow(
     _In_ HWND WindowHandle
     );
 
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhShouldAppsUseDarkMode(
+    VOID
+    );
+
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhIsThemeSupportEnabled(
+    VOID
+    );
+
+typedef enum _PreferredAppMode
+{
+    PreferredAppModeDisabled,
+    PreferredAppModeDarkOnDark,
+    PreferredAppModeDarkAlways
+} PreferredAppMode;
+
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhSetPreferredAppMode(
+    _In_ PreferredAppMode AppMode
+    );
+
 PHLIBAPI
 BOOLEAN
 NTAPI
@@ -2092,6 +2120,9 @@ extern BOOLEAN PhEnableThemeSupport;
 extern BOOLEAN PhEnableThemeAcrylicSupport;
 extern BOOLEAN PhEnableThemeAcrylicWindowSupport;
 extern BOOLEAN PhEnableThemeNativeButtons;
+extern BOOLEAN PhEnableThemeTabBorders;
+extern BOOLEAN PhEnableThemeAnimation;
+extern BOOLEAN PhEnableStreamerMode;
 extern BOOLEAN PhEnableThemeListviewBorder;
 extern COLORREF PhThemeWindowForegroundColor;
 extern COLORREF PhThemeWindowBackgroundColor;
@@ -2183,6 +2214,13 @@ PhThemeWindowDrawToolbar(
     _In_ LPNMTBCUSTOMDRAW DrawInfo
     );
 
+PHLIBAPI
+VOID
+CALLBACK
+PhInitializeSuperclassControls(
+    VOID
+    );
+
 // Font support
 
 FORCEINLINE

phlib/include/guisupp.h

@@ -118,6 +118,14 @@ typedef BOOL(WINAPI* _IsDarkModeAllowedForWindow)(
     _In_ HWND WindowHandle
     );
 
+typedef BOOL(WINAPI* _ShouldAppsUseDarkMode)(
+    VOID
+    );
+
+typedef BOOL(WINAPI* _SetPreferredAppMode)(
+    _In_ PreferredAppMode AppMode
+    );
+
 typedef HRESULT (WINAPI* _GetDpiForMonitor)(
     _In_ HMONITOR hmonitor,
     _In_ enum MONITOR_DPI_TYPE dpiType,

phlib/phlib.vcxproj

@@ -316,6 +316,7 @@
     <ClCompile Include="colorbox.c" />
     <ClCompile Include="cpysave.c" />
     <ClCompile Include="data.c" />
+    <ClCompile Include="delayhook.c" />
     <ClCompile Include="directdraw.cpp" />
     <ClCompile Include="dspick.c" />
     <ClCompile Include="emenu.c" />
@@ -444,4 +445,4 @@
     <ClInclude Include="include\workqueuep.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>