NetworkTools: Fix crash winsiderss#379

Author: dmex

plugins/NetworkTools/nettools.h

@@ -93,14 +93,17 @@ typedef enum _PH_NETWORK_ACTION
     MENU_ACTION_COPY,
 } PH_NETWORK_ACTION;
 
+#define UPDATE_MENUITEM 1005
 #define NTM_RECEIVEDTRACE (WM_APP + 1)
 #define NTM_RECEIVEDWHOIS (WM_APP + 2)
 #define NTM_RECEIVEDFINISH (WM_APP + 3)
 #define WM_TRACERT_UPDATE (WM_APP + 4)
 #define WM_TRACERT_HOSTNAME (WM_APP + 5)
 #define WM_TRACERT_COUNTRY (WM_APP + 6)
 
-#define UPDATE_MENUITEM    1005
+#define PH_SHOWDIALOG (WM_APP + 10)
+#define PH_SHOWINSTALL (WM_APP + 11)
+#define PH_SHOWERROR (WM_APP + 12)
 
 typedef struct _NETWORK_PING_CONTEXT
 {
@@ -155,6 +158,12 @@ typedef struct _NETWORK_WHOIS_CONTEXT
     WCHAR IpAddressString[INET6_ADDRSTRLEN + 1];
 } NETWORK_WHOIS_CONTEXT, *PNETWORK_WHOIS_CONTEXT;
 
+// TDM_NAVIGATE_PAGE can not be called from other threads without comctl32.dll throwing access violations 
+// after navigating to the page and you press keys such as ctrl, alt, home and insert. (dmex)
+#define TaskDialogNavigatePage(WindowHandle, Config) \
+    assert(HandleToUlong(NtCurrentThreadId()) == GetWindowThreadProcessId(WindowHandle, NULL)); \
+    SendMessage(WindowHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)Config);
+
 VOID ShowWhoisWindow(
     _In_ PPH_NETWORK_ITEM NetworkItem
     );
@@ -294,14 +303,12 @@ VOID DrawCountryIcon(
 
 typedef struct _PH_UPDATER_CONTEXT
 {
-    BOOLEAN FixedWindowStyles;
     HWND DialogHandle;
     HICON IconSmallHandle;
     HICON IconLargeHandle;
+    WNDPROC DefaultWindowProc;
 
     PPH_STRING FileDownloadUrl;
-    PPH_STRING RevVersion;
-    PPH_STRING Size;
 } PH_UPDATER_CONTEXT, *PPH_UPDATER_CONTEXT;
 
 VOID TaskDialogLinkClicked(

plugins/NetworkTools/pages.c

@@ -182,7 +182,7 @@ VOID ShowDbCheckForUpdatesDialog(
     config.pszMainInstruction = L"Download the latest GeoIP database?";
     config.pszContent = L"This product includes GeoLite2 data created by MaxMind, available from <a href=\"http://www.maxmind.com\">http://www.maxmind.com</a>\r\n\r\nSelect download to continue.";
 
-    SendMessage(Context->DialogHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)&config);
+    TaskDialogNavigatePage(Context->DialogHandle, &config);
 }
 
 VOID ShowDbCheckingForUpdatesDialog(
@@ -204,7 +204,7 @@ VOID ShowDbCheckingForUpdatesDialog(
     config.pszMainInstruction = L"Downloading";
     config.pszContent = L"Downloaded: ~ of ~ (~%%)\r\nSpeed: ~/s";
 
-    SendMessage(Context->DialogHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)&config);
+    TaskDialogNavigatePage(Context->DialogHandle, &config);
 }
 
 VOID ShowDbInstallRestartDialog(
@@ -228,7 +228,7 @@ VOID ShowDbInstallRestartDialog(
     config.pszMainInstruction = L"The GeoIP database has been installed";
     config.pszContent = L"You need to restart Process Hacker for the changes to take effect...";
 
-    SendMessage(Context->DialogHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)&config);
+    TaskDialogNavigatePage(Context->DialogHandle, &config);
 }
 
 VOID ShowDbUpdateFailedDialog(
@@ -251,5 +251,5 @@ VOID ShowDbUpdateFailedDialog(
     config.pszMainInstruction = L"Error downloading GeoIP database.";
     config.pszContent = L"Click Retry to download the database again.";
 
-    SendMessage(Context->DialogHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)&config);
-}
+    TaskDialogNavigatePage(Context->DialogHandle, &config);
+}

plugins/NetworkTools/update.c

@@ -2,7 +2,7 @@
  * Process Hacker Network Tools -
  *   GeoIP database updater
  *
- * Copyright (C) 2016 dmex
+ * Copyright (C) 2016-2019 dmex
  *
  * This file is part of Process Hacker.
  *
@@ -29,21 +29,36 @@
 HWND UpdateDialogHandle = NULL;
 HANDLE UpdateDialogThreadHandle = NULL;
 PH_EVENT InitializedEvent = PH_EVENT_INIT;
+PPH_OBJECT_TYPE UpdateContextType = NULL;
+PH_INITONCE UpdateContextTypeInitOnce = PH_INITONCE_INIT;
 
-VOID FreeUpdateContext(
-    _In_ _Post_invalid_ PPH_UPDATER_CONTEXT Context
+VOID UpdateContextDeleteProcedure(
+    _In_ PVOID Object,
+    _In_ ULONG Flags
     )
 {
-    if (Context->FileDownloadUrl)
-        PhDereferenceObject(Context->FileDownloadUrl);
+    PPH_UPDATER_CONTEXT context = Object;
 
-    if (Context->RevVersion)
-        PhDereferenceObject(Context->RevVersion);
+    if (context->FileDownloadUrl)
+        PhDereferenceObject(context->FileDownloadUrl);
+}
+
+PPH_UPDATER_CONTEXT CreateUpdateContext(
+    VOID
+    )
+{
+    PPH_UPDATER_CONTEXT context;
+
+    if (PhBeginInitOnce(&UpdateContextTypeInitOnce))
+    {
+        UpdateContextType = PhCreateObjectType(L"GeoIpContextObjectType", 0, UpdateContextDeleteProcedure);
+        PhEndInitOnce(&UpdateContextTypeInitOnce);
+    }
 
-    if (Context->Size)
-        PhDereferenceObject(Context->Size);
+    context = PhCreateObject(sizeof(PH_UPDATER_CONTEXT), UpdateContextType);
+    memset(context, 0, sizeof(PH_UPDATER_CONTEXT));
 
-    PhDereferenceObject(Context);
+    return context;
 }
 
 VOID TaskDialogCreateIcons(
@@ -484,18 +499,68 @@ NTSTATUS GeoIPUpdateThread(
     {
         if (success)
         {
-            ShowDbInstallRestartDialog(context);
+            PostMessage(context->DialogHandle, PH_SHOWINSTALL, 0, 0);
         }
         else
         {
-            ShowDbUpdateFailedDialog(context);
+            PostMessage(context->DialogHandle, PH_SHOWERROR, 0, 0);
         }
     }
 
     PhDereferenceObject(context);
     return STATUS_SUCCESS;
 }
 
+LRESULT CALLBACK TaskDialogSubclassProc(
+    _In_ HWND hwndDlg,
+    _In_ UINT uMsg,
+    _In_ WPARAM wParam,
+    _In_ LPARAM lParam
+    )
+{
+    PPH_UPDATER_CONTEXT context;
+    WNDPROC oldWndProc;
+
+    if (!(context = PhGetWindowContext(hwndDlg, UCHAR_MAX)))
+        return 0;
+
+    oldWndProc = context->DefaultWindowProc;
+
+    switch (uMsg)
+    {
+    case WM_DESTROY:
+        {
+            SetWindowLongPtr(hwndDlg, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
+            PhRemoveWindowContext(hwndDlg, UCHAR_MAX);
+
+            PhUnregisterWindowCallback(hwndDlg);
+        }
+        break;
+    case PH_SHOWDIALOG:
+        {
+            if (IsMinimized(hwndDlg))
+                ShowWindow(hwndDlg, SW_RESTORE);
+            else
+                ShowWindow(hwndDlg, SW_SHOW);
+
+            SetForegroundWindow(hwndDlg);
+        }
+        break;
+    case PH_SHOWINSTALL:
+        {
+            ShowDbInstallRestartDialog(context);
+        }
+        break;
+    case PH_SHOWERROR:
+        {
+            ShowDbUpdateFailedDialog(context);
+        }
+        break;
+    }
+
+    return CallWindowProc(oldWndProc, hwndDlg, uMsg, wParam, lParam);
+}
+
 HRESULT CALLBACK TaskDialogBootstrapCallback(
     _In_ HWND hwndDlg,
     _In_ UINT uMsg,
@@ -518,6 +583,13 @@ HRESULT CALLBACK TaskDialogBootstrapCallback(
             // Create the Taskdialog icons
             TaskDialogCreateIcons(context);
 
+            PhRegisterWindowCallback(hwndDlg, PH_PLUGIN_WINDOW_EVENT_TYPE_TOPMOST, NULL);
+
+            // Subclass the Taskdialog.
+            context->DefaultWindowProc = (WNDPROC)GetWindowLongPtr(hwndDlg, GWLP_WNDPROC);
+            PhSetWindowContext(hwndDlg, UCHAR_MAX, context);
+            SetWindowLongPtr(hwndDlg, GWLP_WNDPROC, (LONG_PTR)TaskDialogSubclassProc);
+
             ShowDbCheckForUpdatesDialog(context);
         }
         break;
@@ -532,23 +604,21 @@ NTSTATUS GeoIPUpdateDialogThread(
 {
     PH_AUTO_POOL autoPool;
     PPH_UPDATER_CONTEXT context;
-    INT result = 0;
     TASKDIALOGCONFIG config = { sizeof(TASKDIALOGCONFIG) };
 
     PhInitializeAutoPool(&autoPool);
 
-    context = (PPH_UPDATER_CONTEXT)PhCreateAlloc(sizeof(PH_UPDATER_CONTEXT));
-    memset(context, 0, sizeof(PH_UPDATER_CONTEXT));
+    context = CreateUpdateContext();
 
     config.dwFlags = TDF_ALLOW_DIALOG_CANCELLATION | TDF_CAN_BE_MINIMIZED;
     config.pszContent = L"Initializing...";
     config.lpCallbackData = (LONG_PTR)context;
     config.pfCallback = TaskDialogBootstrapCallback;
     config.hwndParent = Parameter;
 
-    TaskDialogIndirect(&config, &result, NULL, NULL);
+    TaskDialogIndirect(&config, NULL, NULL, NULL);
 
-    FreeUpdateContext(context);
+    PhDereferenceObject(context);
     PhDeleteAutoPool(&autoPool);
 
     return STATUS_SUCCESS;
@@ -601,5 +671,16 @@ VOID ShowGeoIPUpdateDialog(
     _In_opt_ HWND Parent
     )
 {
-    PhCreateThread2(GeoIPUpdateDialogThread, Parent);
+    if (!UpdateDialogThreadHandle)
+    {
+        if (!(UpdateDialogThreadHandle = PhCreateThread(0, GeoIPUpdateDialogThread, NULL)))
+        {
+            PhShowStatus(PhMainWndHandle, L"Unable to create the updater window.", 0, GetLastError());
+            return;
+        }
+
+        PhWaitForEvent(&InitializedEvent, NULL);
+    }
+
+    PostMessage(UpdateDialogHandle, PH_SHOWDIALOG, 0, 0);
 }