remove objmgr code

winsiderss · Nov 23, 2024 · af3ec7c · af3ec7c
1 parent 165f3a5
commit af3ec7c
Show file tree

Hide file tree

Showing 5 changed files with 391 additions and 734 deletions.
diff --git a/SystemInformer/srvprp.c b/SystemInformer/srvprp.c
@@ -447,10 +447,7 @@ INT_PTR CALLBACK PhpServiceGeneralDlgProc(
 
             context->Ready = TRUE;
 
-            if (PhEnableThemeSupport) // TODO: Required for compat (dmex)
-                PhInitializeWindowTheme(GetParent(hwndDlg), PhEnableThemeSupport);  // HACK (GetParent)
-            else
-                PhInitializeWindowTheme(hwndDlg, FALSE);
+            PhInitializeWindowTheme(GetParent(hwndDlg), PhEnableThemeSupport);  // HACK (GetParent)
         }
         break;
     case WM_DESTROY:

diff --git a/SystemInformer/tokprp.c b/SystemInformer/tokprp.c
@@ -2586,10 +2586,7 @@ INT_PTR CALLBACK PhpTokenGeneralPageProc(
 
             EnableWindow(GetDlgItem(hwndDlg, IDC_LINKEDTOKEN), !!hasLinkedToken);
 
-            if (PhEnableThemeSupport) // TODO: Required for compat (dmex)
-                PhInitializeWindowTheme(GetParent(hwndDlg), PhEnableThemeSupport);  // HACK (GetParent)
-            else
-                PhInitializeWindowTheme(hwndDlg, FALSE);
+            PhInitializeWindowTheme(GetParent(hwndDlg), PhEnableThemeSupport);  // HACK (GetParent)
         }
         break;
     case WM_COMMAND:

diff --git a/phlib/treenew.c b/phlib/treenew.c
@@ -5364,7 +5364,10 @@ VOID PhTnpPaint(
             BLENDFUNCTION blendFunction;
 
             // Fix ForeColor for theme, previously it was always white. Plus 90-100 brightness adjustments seems fine for good contrast. (Dart Vanya)
-            SetTextColor(hdc, !node->UseAutoForeColor && node->s.DrawForeColor != 0 ? PhMakeColorBrighter(node->s.DrawForeColor, 95) : PhThemeWindowTextColor);
+            SetTextColor(hdc,
+                !node->UseAutoForeColor && node->s.DrawForeColor != 0 ?
+                PhMakeColorBrighter(node->s.DrawForeColor, node->s.DrawBackColor == 16777215 ? 95 : 105) :
+                PhThemeWindowTextColor);
             SetDCBrushColor(hdc, PhThemeWindowBackgroundColor);
             FillRect(hdc, &rowRect, PhGetStockBrush(DC_BRUSH));