devprv lazy initialize

Author: jxy-s

SystemInformer/devprv.c

@@ -4013,15 +4013,15 @@ ULONG CALLBACK PhpCmNotifyCallback(
     return ERROR_SUCCESS;
 }
 
-BOOLEAN PhDeviceProviderInitialization(
+BOOLEAN PhpDeviceProviderInitialization(
     VOID
     )
 {
     NTSTATUS status;
     CM_NOTIFY_FILTER cmFilter;
 
     if (WindowsVersion < WINDOWS_10 || !PhGetIntegerSetting(L"EnableDeviceSupport"))
-        return TRUE;
+        return FALSE;
 
     PhDeviceItemType = PhCreateObjectType(L"DeviceItem", 0, PhpDeviceItemDeleteProcedure);
     PhDeviceTreeType = PhCreateObjectType(L"DeviceTree", 0, PhpDeviceTreeDeleteProcedure);
@@ -4065,3 +4065,20 @@ BOOLEAN PhDeviceProviderInitialization(
 
     return TRUE;
 }
+
+BOOLEAN PhDeviceProviderInitialization(
+    VOID
+    )
+{
+    static PH_INITONCE initOnce = PH_INITONCE_INIT;
+    static BOOLEAN initialized = FALSE;
+
+    if (PhBeginInitOnce(&initOnce))
+    {
+        initialized = PhpDeviceProviderInitialization();
+
+        PhEndInitOnce(&initOnce);
+    }
+
+    return initialized;
+}

SystemInformer/include/devprv.h

@@ -443,11 +443,14 @@ typedef struct _PH_DEVICE_NOTIFY
     LIST_ENTRY ListEntry;
 // begin_phapppub
 } PH_DEVICE_NOTIFY, *PPH_DEVICE_NOTIFY;
-// end_phapppub
 
+PHAPPAPI
 BOOLEAN
+NTAPI
 PhDeviceProviderInitialization(
     VOID
     );
 
+// end_phapppub
+
 #endif

SystemInformer/main.c

@@ -1066,8 +1066,6 @@ BOOLEAN PhInitializeAppSystem(
         return FALSE;
     if (!PhNetworkProviderInitialization())
         return FALSE;
-    if (!PhDeviceProviderInitialization())
-        return FALSE;
 
     PhSetHandleClientIdFunction(PhGetClientIdName);
 

SystemInformer/mainwnd.c

@@ -532,11 +532,6 @@ VOID PhMwpInitializeControls(
     PhNetworkTreeListInitialization();
     PhInitializeNetworkTreeList(PhMwpNetworkTreeNewHandle);
 
-    // N.B. Devices tab is handled by the HardwareDevices plug-in. The provider is managed internally
-    // such that we can handle notifications and dispatch them to other plug-ins. Here we initialize
-    // only the device notifications. (jxy-s).
-    PhMwpInitializesDeviceNotifications();
-
     CurrentPage = PageList->Items[0];
 }
 
@@ -581,6 +576,11 @@ NTSTATUS PhMwpLoadStage1Worker(
         ChangeWindowMessageFilterEx(PhMainWndHandle, WM_PH_ACTIVATE, MSGFLT_ADD, NULL);
     }
 
+    // N.B. Devices tab is handled by the HardwareDevices plug-in. The provider is managed internally
+    // such that we can handle notifications and dispatch them to other plug-ins. Here we initialize
+    // only the device notifications. (jxy-s).
+    PhMwpInitializesDeviceNotifications();
+
     DelayedLoadCompleted = TRUE;
     //PostMessage((HWND)Parameter, WM_PH_DELAYED_LOAD_COMPLETED, 0, 0);
 

SystemInformer/mwpgdev.c

@@ -115,6 +115,9 @@ VOID PhMwpInitializesDeviceNotifications(
     VOID
     )
 {
+    if (!PhDeviceProviderInitialization())
+        return;
+
     PhRegisterCallback(
         PhGetGeneralCallback(GeneralCallbackDeviceNotificationEvent),
         PhpDeviceProviderCallbackHandler,

plugins/HardwareDevices/main.c

@@ -122,7 +122,7 @@ VOID NTAPI MainWindowShowingCallback(
     )
 {
     AddRemoveDeviceChangeCallback();
-    if (NetWindowsVersion >= WINDOWS_10)
+    if (PhDeviceProviderInitialization())
         InitializeDevicesTab();
 }