devicetree force republishing

Author: jxy-s

SystemInformer/devprv.c

@@ -3402,19 +3402,6 @@ HICON PhGetDeviceIcon(
     return iconHandle;
 }
 
-PPH_DEVICE_TREE PhReferenceDeviceTree(
-    VOID
-    )
-{
-    PPH_DEVICE_TREE deviceTree;
-
-    PhAcquireFastLockShared(&PhpDeviceTreeLock);
-    PhSetReference(&deviceTree, PhpDeviceTree);
-    PhReleaseFastLockShared(&PhpDeviceTreeLock);
-
-    return deviceTree;
-}
-
 ULONG PhpGenerateInstanceIdHash(
     _In_ PPH_STRINGREF InstanceId
     )
@@ -4051,22 +4038,31 @@ PPH_DEVICE_TREE PhpCreateDeviceTree(
     return tree;
 }
 
-VOID PhpDeviceNotify(
-    _In_ PLIST_ENTRY List
+VOID PhpPublishDeviceTree(
+    VOID
     )
 {
     PPH_DEVICE_TREE newTree;
     PPH_DEVICE_TREE oldTree;
 
-    // We process device notifications in blocks so that bursts of device changes
-    // don't each trigger a new tree each time.
-
     newTree = PhpCreateDeviceTree();
     PhAcquireFastLockExclusive(&PhpDeviceTreeLock);
     oldTree = PhpDeviceTree;
     PhpDeviceTree = newTree;
     PhReleaseFastLockExclusive(&PhpDeviceTreeLock);
 
+    PhDereferenceObject(oldTree);
+}
+
+VOID PhpDeviceNotify(
+    _In_ PLIST_ENTRY List
+    )
+{
+    // We process device notifications in blocks so that bursts of device changes
+    // don't each trigger a new tree each time.
+
+    PhpPublishDeviceTree();
+
     while (!IsListEmpty(List))
     {
         PPH_DEVICE_NOTIFY entry;
@@ -4077,8 +4073,6 @@ VOID PhpDeviceNotify(
 
         PhDereferenceObject(entry);
     }
-
-    PhDereferenceObject(oldTree);
 }
 
 _Function_class_(PUSER_THREAD_START_ROUTINE)
@@ -4243,3 +4237,26 @@ BOOLEAN PhDeviceProviderInitialization(
 
     return initialized;
 }
+
+PPH_DEVICE_TREE PhReferenceDeviceTree(
+    VOID
+    )
+{
+    return PhReferenceDeviceTreeEx(FALSE);
+}
+
+PPH_DEVICE_TREE PhReferenceDeviceTreeEx(
+    _In_ BOOLEAN ForceRefresh
+    )
+{
+    PPH_DEVICE_TREE deviceTree;
+
+    if (ForceRefresh)
+        PhpPublishDeviceTree();
+
+    PhAcquireFastLockShared(&PhpDeviceTreeLock);
+    PhSetReference(&deviceTree, PhpDeviceTree);
+    PhReleaseFastLockShared(&PhpDeviceTreeLock);
+
+    return deviceTree;
+}

SystemInformer/include/devprv.h

@@ -384,6 +384,13 @@ PhReferenceDeviceTree(
     VOID
     );
 
+PHAPPAPI
+PPH_DEVICE_TREE
+NTAPI
+PhReferenceDeviceTreeEx(
+    _In_ BOOLEAN ForceRefresh
+    );
+
 PHAPPAPI
 _Success_(return != NULL)
 _Must_inspect_result_

plugins/HardwareDevices/devicetree.c

@@ -204,7 +204,7 @@ PDEVICE_TREE DeviceTreeCreateIfNecessary(
     PDEVICE_TREE deviceTree;
     PPH_DEVICE_TREE tree;
 
-    tree = PhReferenceDeviceTree();
+    tree = PhReferenceDeviceTreeEx(Force);
     if (Force || !DeviceTree || DeviceTree->Tree != tree)
     {
         deviceTree = DeviceTreeCreate(tree);
@@ -258,7 +258,7 @@ NTSTATUS NTAPI DeviceTreePublishThread(
     return STATUS_SUCCESS;
 }
 
-VOID DeviceTreePublicAsync(
+VOID DeviceTreePublishAsync(
     _In_ BOOLEAN Force
     )
 {
@@ -765,7 +765,7 @@ BOOLEAN NTAPI DeviceTreeCallback(
 
             if (republish)
             {
-                DeviceTreePublicAsync(TRUE);
+                DeviceTreePublishAsync(TRUE);
             }
             else if (invalidate)
             {
@@ -1246,7 +1246,7 @@ BOOLEAN DevicesTabPageCallback(
         {
             DeviceTabSelected = (BOOLEAN)Parameter1;
             if (DeviceTabSelected)
-                DeviceTreePublicAsync(FALSE);
+                DeviceTreePublishAsync(FALSE);
         }
         break;
     case MainTabPageFontChanged: