OnlineChecks: Add indeterminate progress

Author: dmex

plugins/OnlineChecks/onlnchk.h

@@ -34,7 +34,6 @@
 #include <shlobj.h>
 #include <windowsx.h>
 #include <winhttp.h>
-
 #include "resource.h"
 #include "db.h"
 
@@ -55,25 +54,12 @@
 #define UM_ERROR (WM_APP + 4)
 #define UM_SHOWDIALOG (WM_APP + 5)
 
-#define Control_Visible(hWnd, visible) \
-    ShowWindow(hWnd, visible ? SW_SHOW : SW_HIDE);
-
 extern PPH_PLUGIN PluginInstance;
 
 VOID ShowOptionsDialog(
     _In_opt_ HWND Parent
     );
 
-typedef enum _PH_UPLOAD_SERVICE_STATE
-{
-    PhUploadServiceDefault = 0,
-    PhUploadServiceChecking,
-    PhUploadServiceViewReport,
-    PhUploadServiceUploading,
-    PhUploadServiceLaunching,
-    PhUploadServiceMaximum
-} PH_UPLOAD_SERVICE_STATE;
-
 typedef struct _SERVICE_INFO
 {
     ULONG Id;
@@ -137,32 +123,25 @@ typedef struct _UPLOAD_CONTEXT
 {
     BOOLEAN FileExists;
     ULONG Service;
-
     ULONG ErrorCode;
-    PPH_STRING ErrorString;
-
     ULONG TotalFileLength;
+    
     HWND DialogHandle;
+    HANDLE UploadThreadHandle;
     HICON IconLargeHandle;
     HICON IconSmallHandle;
-    HANDLE UploadThreadHandle;
     HINTERNET HttpHandle;
     ITaskbarList3* TaskbarListClass;
-
-    PVIRUSTOTAL_FILE_HASH_ENTRY Extension;
-    PH_UPLOAD_SERVICE_STATE UploadServiceState;
+    PPH_STRING ErrorString;
 
     PPH_STRING FileName;
     PPH_STRING BaseFileName;
     PPH_STRING WindowFileName;
-    //PPH_STRING ObjectName;
     PPH_STRING LaunchCommand;
-    PPH_STRING RedirectCommand;
-
     PPH_STRING Detected;
     PPH_STRING MaxDetected;
     PPH_STRING UploadUrl;
-    PPH_STRING reAnalyseUrl;
+    PPH_STRING ReAnalyseUrl;
     PPH_STRING FirstAnalysisDate;
     PPH_STRING LastAnalysisDate;
     PPH_STRING LastAnalysisUrl;

plugins/OnlineChecks/page1.c

@@ -39,6 +39,9 @@ HRESULT CALLBACK CheckingForUpdatesCallbackProc(
             SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, TRUE, 0);
             SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, TRUE, 1);
 
+            if (context->TaskbarListClass)
+                ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_INDETERMINATE);
+
             // reference the context for the new thread
             PhReferenceObject(context);
 

plugins/OnlineChecks/page2.c

@@ -41,6 +41,12 @@ HRESULT CALLBACK ShowAvailableCallbackProc(
 
     switch (uMsg)
     {
+    case TDN_NAVIGATED:
+        {
+            if (context->TaskbarListClass)
+                ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_NOPROGRESS);
+        }
+        break;
     case TDN_BUTTON_CLICKED:
         {         
             INT buttonID = (INT)wParam;
@@ -52,8 +58,8 @@ HRESULT CALLBACK ShowAvailableCallbackProc(
             }
             else if (buttonID == IDRETRY)
             {
-                if (!PhIsNullOrEmptyString(context->reAnalyseUrl))
-                    PhShellExecute(hwndDlg, PhGetString(context->reAnalyseUrl), NULL);
+                if (!PhIsNullOrEmptyString(context->ReAnalyseUrl))
+                    PhShellExecute(hwndDlg, PhGetString(context->ReAnalyseUrl), NULL);
             }
             else if (buttonID == IDYES)
             {

plugins/OnlineChecks/page3.c

@@ -39,6 +39,9 @@ HRESULT CALLBACK ShowProgressCallbackProc(
             SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, TRUE, 0);
             SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, TRUE, 1);
 
+            if (context->TaskbarListClass)
+                ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_INDETERMINATE);
+
             // reference the context for the new thread
             PhReferenceObject(context);
 

plugins/OnlineChecks/page4.c

@@ -38,6 +38,18 @@ HRESULT CALLBACK TaskDialogErrorProc(
         {
             SendMessage(hwndDlg, TDM_SET_MARQUEE_PROGRESS_BAR, FALSE, 0);
             SendMessage(hwndDlg, TDM_SET_PROGRESS_BAR_MARQUEE, FALSE, 1);
+
+            if (context->TaskbarListClass)
+            {
+                ITaskbarList3_SetProgressValue(context->TaskbarListClass, PhMainWndHandle, 1, 1);
+                ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_ERROR);
+            }
+        }
+        break;
+    case TDN_DESTROYED:
+        {
+            if (context->TaskbarListClass)
+                ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_NOPROGRESS);
         }
         break;
     }