fix #2074

winsiderss · Nov 22, 2024 · 165f3a5 · 165f3a5
1 parent 53fe931
commit 165f3a5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/phlib/delayhook.c b/phlib/delayhook.c
@@ -714,8 +714,9 @@ LRESULT CALLBACK PhEditWindowHookProcedure(
             RECT windowRect;
             HRGN updateRegion;
 
-            // The searchbox control does its own theme drawing.
-            if (!PhEnableThemeSupport || PhGetWindowContext(WindowHandle, SHRT_MAX))
+            if (!PhEnableThemeSupport ||
+                PhGetWindowContext(WindowHandle, SHRT_MAX) ||   // The searchbox control does its own theme drawing.
+                !PhIsDarkModeAllowedForWindow(WindowHandle))    // Unsupported system dialogs does its own drawing
                 break;
 
             updateRegion = (HRGN)wParam;
@@ -969,7 +970,7 @@ LRESULT CALLBACK PhHeaderWindowHookProcedure(
 
         PhSetControlTheme(WindowHandle, PhEnableThemeSupport ? L"DarkMode_ItemsView" : L"Explorer");
     }
-    else if (PhEnableThemeSupport)
+    else if (PhEnableThemeSupport || WindowMessage == WM_NCDESTROY)
     {
         context = PhGetWindowContext(WindowHandle, LONG_MAX);
     }
@@ -1058,6 +1059,7 @@ LRESULT CALLBACK PhHeaderWindowHookProcedure(
                     PhRemoveWindowContext(WindowHandle, LONG_MAX);
                     if (context->ThemeHandle)
                         PhCloseThemeData(context->ThemeHandle);
+                    PhSetControlTheme(WindowHandle, L"Explorer");
                     PhFree(context);
                     break;
                 }

diff --git a/phlib/theme.c b/phlib/theme.c
@@ -927,6 +927,8 @@ BOOLEAN CALLBACK PhpThemeWindowEnumChildWindows(
         {
             SendMessage(WindowHandle, WM_THEMECHANGED, 0, 0); // searchbox.c
         }
+
+        PhAllowDarkModeForWindow(WindowHandle, enableThemeSupport); // fix for unsupported system dialogs (ex. Advanced Security)
     }
     else if (PhEqualStringZ(windowClassName, WC_LINK, FALSE))
     {
@@ -3182,6 +3184,7 @@ LRESULT CALLBACK PhpThemeWindowComboBoxControlSubclassProc(
         goto DefaultWndProc;
     }
 
+    // BUG BUG BUG fix 
     return CallWindowProc(oldWndProc, WindowHandle, uMsg, wParam, lParam);
 
 DefaultWndProc:

diff --git a/plugins/ExtendedTools/objmgr.c b/plugins/ExtendedTools/objmgr.c
@@ -696,7 +696,6 @@ NTSTATUS EtTreeViewEnumDirectoryObjects(
     if (NT_SUCCESS(status))
     {
         DIRECTORY_ENUM_CONTEXT enumContext;
-
         enumContext.TreeViewHandle = TreeViewHandle;
         enumContext.RootTreeItem = RootTreeItem;
         enumContext.DirectoryPath = DirectoryPath;
@@ -708,9 +707,21 @@ NTSTATUS EtTreeViewEnumDirectoryObjects(
             );
 
         NtClose(directoryHandle);
-    }
 
-    TreeView_SortChildren(TreeViewHandle, RootTreeItem, TRUE);
+        TreeView_SortChildren(TreeViewHandle, RootTreeItem, TRUE); // add ?? item last
+
+        if (PhEqualStringRef(&DirectoryPath, &EtObjectManagerRootDirectoryObject, FALSE))
+        {
+            enumContext.DirectoryPath = EtObjectManagerRootDirectoryObject;
+
+            // enumerate \??
+            EtEnumDirectoryObjectsCallback(    
+                &EtObjectManagerUserDirectoryObject,
+                &DirectoryObjectType,
+                &enumContext
+                );
+        }
+    }
 
     return status;
 }