OnlineChecks: Fixed Jotti upload; Fixed upload dialog exit; Added taskbar upload progress; Added upload error dialog;

Author: dmex

plugins/OnlineChecks/OnlineChecks.vcxproj

@@ -82,6 +82,7 @@
     <ClCompile Include="page1.c" />
     <ClCompile Include="page2.c" />
     <ClCompile Include="page3.c" />
+    <ClCompile Include="page4.c" />
     <ClCompile Include="upload.c" />
     <ClCompile Include="virustotal.c" />
   </ItemGroup>

plugins/OnlineChecks/OnlineChecks.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClCompile Include="page3.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="page4.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="onlnchk.h">

plugins/OnlineChecks/onlnchk.h

@@ -88,12 +88,15 @@ typedef struct _PROCESS_EXTENSION
 {
     LIST_ENTRY ListEntry;
 
-    BOOLEAN Flags;
-    struct
+    union
     {
-        BOOLEAN Stage1 : 1;
-        BOOLEAN ResultValid : 1;
-        BOOLEAN Spare : 6;
+        BOOLEAN Flags;
+        struct
+        {
+            BOOLEAN Stage1 : 1;
+            BOOLEAN ResultValid : 1;
+            BOOLEAN Spare : 6;
+        };
     };
 
     INT64 Retries;
@@ -134,21 +137,27 @@ typedef struct _UPLOAD_CONTEXT
 {
     BOOLEAN FileExists;
     ULONG Service;
+
     ULONG ErrorCode;
+    PPH_STRING ErrorString;
+
     ULONG TotalFileLength;
     HWND DialogHandle;
     HICON IconLargeHandle;
     HICON IconSmallHandle;
+    HANDLE UploadThreadHandle;
     HINTERNET HttpHandle;
+    ITaskbarList3* TaskbarListClass;
 
     PVIRUSTOTAL_FILE_HASH_ENTRY Extension;
     PH_UPLOAD_SERVICE_STATE UploadServiceState;
 
     PPH_STRING FileName;
     PPH_STRING BaseFileName;
     PPH_STRING WindowFileName;
-    PPH_STRING ObjectName;
+    //PPH_STRING ObjectName;
     PPH_STRING LaunchCommand;
+    PPH_STRING RedirectCommand;
 
     PPH_STRING Detected;
     PPH_STRING MaxDetected;
@@ -172,10 +181,6 @@ VOID ShowVirusTotalUploadDialog(
     _In_ PUPLOAD_CONTEXT Context
     );
 
-VOID ShowCheckForUpdatesDialog(
-    _In_ PUPLOAD_CONTEXT Context
-    );
-
 VOID ShowFileFoundDialog(
     _In_ PUPLOAD_CONTEXT Context
     );
@@ -184,18 +189,9 @@ VOID ShowVirusTotalProgressDialog(
     _In_ PUPLOAD_CONTEXT Context
     );
 
-typedef struct _VIRUSTOTAL_FILE_RESULT
-{
-    BOOLEAN FileExists;
-    BOOLEAN EmptyFile;
-    PPH_STRING DetectionRatio;
-    PPH_STRING UploadUrl;
-    PPH_STRING reAnalyseUrl;
-    PPH_STRING FirstAnalysisDate;
-    PPH_STRING LastAnalysisDate;
-    PPH_STRING LastAnalysisUrl;
-    PPH_STRING LastAnalysisAgo;
-} VIRUSTOTAL_FILE_RESULT, *PVIRUSTOTAL_FILE_RESULT;
+VOID VirusTotalShowErrorDialog(
+    _In_ PUPLOAD_CONTEXT Context
+    );
 
 typedef struct _VIRUSTOTAL_FILE_REPORT_RESULT
 {
@@ -219,7 +215,7 @@ PPH_STRING VirusTotalStringToTime(
     _In_ PPH_STRING Time
     );
 
-PVIRUSTOTAL_FILE_REPORT_RESULT VirusTotalQueryFileReport(
+PVIRUSTOTAL_FILE_REPORT_RESULT VirusTotalSendHttpFileReportRequest(
     _In_ PPH_STRING FileHash
     );
 

plugins/OnlineChecks/page1.c

@@ -39,7 +39,10 @@ HRESULT CALLBACK CheckingForUpdatesCallbackProc(
             SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, TRUE, 0);
             SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, TRUE, 1);
 
+            // reference the context for the new thread
             PhReferenceObject(context);
+
+            // create the new thread
             PhQueueItemWorkQueue(PhGetGlobalWorkQueue(), UploadCheckThreadStart, context);
         }
         break;

plugins/OnlineChecks/page2.c

@@ -43,7 +43,7 @@ HRESULT CALLBACK ShowAvailableCallbackProc(
     {
     case TDN_BUTTON_CLICKED:
         {         
-            int buttonID = (INT)wParam;
+            INT buttonID = (INT)wParam;
 
             if (buttonID == IDOK)
             {
@@ -53,19 +53,12 @@ HRESULT CALLBACK ShowAvailableCallbackProc(
             else if (buttonID == IDRETRY)
             {
                 if (!PhIsNullOrEmptyString(context->reAnalyseUrl))
-                {
-                    PPH_STRING urlPath = PhFormatString(L"https://www.virustotal.com%s", PhGetString(context->reAnalyseUrl));
-
-                    PhShellExecute(hwndDlg, PhGetString(urlPath), NULL);
-                    PhDereferenceObject(urlPath);
-                }
+                    PhShellExecute(hwndDlg, PhGetString(context->reAnalyseUrl), NULL);
             }
             else if (buttonID == IDYES)
             {
                 if (!PhIsNullOrEmptyString(context->LaunchCommand))
-                {
                     PhShellExecute(hwndDlg, PhGetString(context->LaunchCommand), NULL);
-                }
             }
         }
         break;

plugins/OnlineChecks/page3.c

@@ -39,8 +39,32 @@ HRESULT CALLBACK ShowProgressCallbackProc(
             SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, TRUE, 0);
             SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, TRUE, 1);
 
+            // reference the context for the new thread
             PhReferenceObject(context);
-            PhQueueItemWorkQueue(PhGetGlobalWorkQueue(), UploadFileThreadStart, context);
+
+            // create the new thread
+            context->UploadThreadHandle = PhCreateThread(0, UploadFileThreadStart, context);
+        }
+        break;
+    case TDN_BUTTON_CLICKED:
+        {
+            if ((INT)wParam == IDCANCEL)
+            {
+                if (context->UploadThreadHandle)
+                {
+                    NtClose(context->UploadThreadHandle);
+                    context->UploadThreadHandle = NULL;
+                }
+            }
+        }
+        break;
+    case TDN_DESTROYED:
+        {
+            if (context->UploadThreadHandle)
+            {
+                NtClose(context->UploadThreadHandle);
+                context->UploadThreadHandle = NULL;
+            }
         }
         break;
     }

plugins/OnlineChecks/page4.c

@@ -0,0 +1,69 @@
+/*
+ * Process Hacker Plugins -
+ *   Update Checker Plugin
+ *
+ * Copyright (C) 2016 dmex
+ *
+ * This file is part of Process Hacker.
+ *
+ * Process Hacker is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Process Hacker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Process Hacker.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "onlnchk.h"
+
+HRESULT CALLBACK TaskDialogErrorProc(
+    _In_ HWND hwndDlg,
+    _In_ UINT uMsg,
+    _In_ WPARAM wParam,
+    _In_ LPARAM lParam,
+    _In_ LONG_PTR dwRefData
+    )
+{
+    PUPLOAD_CONTEXT context = (PUPLOAD_CONTEXT)dwRefData;
+
+    switch (uMsg)
+    {
+    case TDN_NAVIGATED:
+        {
+            SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, FALSE, 0);
+            SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, FALSE, 1);
+        }
+        break;
+    }
+
+    return S_OK;
+}
+
+VOID VirusTotalShowErrorDialog(
+    _In_ PUPLOAD_CONTEXT Context
+    )
+{
+    TASKDIALOGCONFIG config;
+
+    memset(&config, 0, sizeof(TASKDIALOGCONFIG));
+    config.cbSize = sizeof(TASKDIALOGCONFIG);
+    config.dwFlags = TDF_USE_HICON_MAIN | TDF_ALLOW_DIALOG_CANCELLATION | TDF_CAN_BE_MINIMIZED | TDF_EXPAND_FOOTER_AREA | TDF_ENABLE_HYPERLINKS | TDF_SHOW_PROGRESS_BAR;
+    config.dwCommonButtons = TDCBF_CLOSE_BUTTON;
+    config.hMainIcon = Context->IconLargeHandle;
+
+    config.pszWindowTitle = PhaFormatString(L"Uploading %s...", PhGetStringOrEmpty(Context->BaseFileName))->Buffer;
+    config.pszMainInstruction = PhaFormatString(L"Error uploading %s", PhGetStringOrEmpty(Context->BaseFileName))->Buffer;
+    config.pszContent = PhGetStringOrEmpty(Context->ErrorString);
+
+    config.cxWidth = 200;
+    config.lpCallbackData = (LONG_PTR)Context;
+    config.pfCallback = TaskDialogErrorProc;
+
+    SendMessage(Context->DialogHandle, TDM_NAVIGATE_PAGE, 0, (LPARAM)&config);
+}