Add parent window to MainTabPageCreateWindow callback

Author: dmex

SystemInformer/include/mainwnd.h

@@ -168,7 +168,7 @@ typedef enum _PH_MAIN_TAB_PAGE_MESSAGE
 {
     MainTabPageCreate,
     MainTabPageDestroy,
-    MainTabPageCreateWindow, // HWND *Parameter1 (WindowHandle)
+    MainTabPageCreateWindow, // HWND *Parameter1 (WindowHandle), HWND Parameter2 (ParentWindow)
     MainTabPageSelected, // BOOLEAN Parameter1 (Selected)
     MainTabPageInitializeSectionMenuItems, // PPH_MAIN_TAB_PAGE_MENU_INFORMATION Parameter1
 

SystemInformer/mainwnd.c

@@ -543,7 +543,7 @@ NTSTATUS PhMwpLoadStage1Worker(
     //PPH_STRING windowTitle;
     //if (windowTitle = PhMwpInitializeWindowTitle())
     //{
-    //    PhSetWindowText(PhMainWndHandle, PhGetString(windowTitle));
+    //    PhSetWindowText((HWND)Parameter, PhGetString(windowTitle));
     //    PhDereferenceObject(windowTitle);
     //}
 
@@ -573,7 +573,7 @@ NTSTATUS PhMwpLoadStage1Worker(
     // Allow WM_PH_ACTIVATE to pass through UIPI. (wj32)
     if (PhGetOwnTokenAttributes().Elevated)
     {
-        ChangeWindowMessageFilterEx(PhMainWndHandle, WM_PH_ACTIVATE, MSGFLT_ADD, NULL);
+        ChangeWindowMessageFilterEx((HWND)Parameter, WM_PH_ACTIVATE, MSGFLT_ADD, NULL);
     }
 
     // N.B. Devices tab is handled by the HardwareDevices plug-in. The provider is managed internally
@@ -3477,7 +3477,7 @@ VOID PhMwpSelectionChangedTabControl(
             // Create the tab page window if it doesn't exist. (wj32)
             if (!page->WindowHandle && !page->CreateWindowCalled)
             {
-                if (page->Callback(page, MainTabPageCreateWindow, &page->WindowHandle, NULL))
+                if (page->Callback(page, MainTabPageCreateWindow, &page->WindowHandle, PhMainWndHandle))
                     page->CreateWindowCalled = TRUE;
 
                 if (page->WindowHandle)

plugins/ExtendedTools/disktab.c

@@ -102,7 +102,7 @@ BOOLEAN EtpDiskPageCallback(
                 0,
                 3,
                 3,
-                PhMainWndHandle,
+                Parameter2,
                 NULL,
                 NULL,
                 &treelistCreateParams

plugins/ExtendedTools/fwtab.c

@@ -72,7 +72,7 @@ BOOLEAN FwTabPageCallback(
                 0,
                 3,
                 3,
-                PhMainWndHandle,
+                Parameter2,
                 NULL,
                 PluginInstance->DllBase,
                 &treelistCreateParams

plugins/HardwareDevices/devicetree.c

@@ -176,7 +176,7 @@ PDEVICE_TREE DeviceTreeCreate(
 }
 
 VOID DeviceTreeFree(
-    _In_opt_ PDEVICE_TREE Tree 
+    _In_opt_ PDEVICE_TREE Tree
     )
 {
     if (!Tree)
@@ -221,7 +221,7 @@ PDEVICE_TREE DeviceTreeCreateIfNecessary(
 }
 
 VOID NTAPI DeviceTreePublish(
-    _In_opt_ PDEVICE_TREE Tree 
+    _In_opt_ PDEVICE_TREE Tree
     )
 {
     PDEVICE_TREE oldTree;
@@ -392,7 +392,7 @@ static int __cdecl DeviceTreeSortFunction(
                 sortResult = PhCompareStringRef(&srl, &srr, TRUE);
             }
             break;
-        case PhDevicePropertyTypeBinary: 
+        case PhDevicePropertyTypeBinary:
             {
                 sortResult = memcmp(lhs->Binary.Buffer, rhs->Binary.Buffer, min(lhs->Binary.Size, rhs->Binary.Size));
                 if (sortResult == 0)
@@ -1213,7 +1213,7 @@ BOOLEAN DevicesTabPageCallback(
                 0,
                 3,
                 3,
-                PhMainWndHandle,
+                Parameter2,
                 NULL,
                 PluginInstance->DllBase,
                 &treelistCreateParams