OnlineChecks: Add VirusTotal detection actions to the options window (Not working yet); Fix build errors;

Author: dmex

plugins/OnlineChecks/OnlineChecks.rc

@@ -87,7 +87,7 @@ END
 // Dialog
 //
 
-IDD_OPTIONS DIALOGEX 0, 0, 201, 57
+IDD_OPTIONS DIALOGEX 0, 0, 185, 103
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -96,7 +96,12 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,101,10
     CONTROL         "Enable VirusTotal detection highlighting",IDC_ENABLE_IDC_ENABLE_VIRUSTOTAL_HIGHLIGHT,
                     "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,7,19,141,10
-    PUSHBUTTON      "Close",IDCANCEL,145,36,50,14
+    PUSHBUTTON      "Close",IDCANCEL,129,82,50,14
+    CONTROL         "Enable detection actions",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,94,10
+    EDITTEXT        IDC_EDIT1,91,47,37,14,ES_AUTOHSCROLL
+    LTEXT           "Minimum detection ratio:",IDC_STATIC,8,50,79,8
+    COMBOBOX        IDC_COMBO1,91,65,88,14,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Minimum detection action:",IDC_STATIC,7,67,84,8
 END
 
 
@@ -111,9 +116,9 @@ BEGIN
     IDD_OPTIONS, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 195
+        RIGHTMARGIN, 179
         TOPMARGIN, 7
-        BOTTOMMARGIN, 50
+        BOTTOMMARGIN, 96
     END
 END
 #endif    // APSTUDIO_INVOKED

plugins/OnlineChecks/page1.c

@@ -42,10 +42,7 @@ HRESULT CALLBACK CheckingForUpdatesCallbackProc(
             if (context->TaskbarListClass)
                 ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_INDETERMINATE);
 
-            // reference the context for the new thread
             PhReferenceObject(context);
-
-            // create the new thread
             PhQueueItemWorkQueue(PhGetGlobalWorkQueue(), UploadCheckThreadStart, context);
         }
         break;

plugins/OnlineChecks/page2.c

@@ -24,8 +24,8 @@
 
 static TASKDIALOG_BUTTON TaskDialogButtonArray[] =
 {
-    { IDRETRY, L"Reanalyse file\nRescan the existing sample on VirusTotal" },
     { IDOK, L"Upload file\nUpload fresh sample to VirusTotal for analysis" },
+    { IDRETRY, L"Reanalyse file\nRescan the existing sample on VirusTotal" },
     { IDYES, L"View last analysis\nOpen the last VirusTotal analysis page" },
 };
 

plugins/OnlineChecks/page3.c

@@ -42,10 +42,7 @@ HRESULT CALLBACK ShowProgressCallbackProc(
             if (context->TaskbarListClass)
                 ITaskbarList3_SetProgressState(context->TaskbarListClass, PhMainWndHandle, TBPF_INDETERMINATE);
 
-            // reference the context for the new thread
             PhReferenceObject(context);
-
-            // create the new thread
             context->UploadThreadHandle = PhCreateThread(0, UploadFileThreadStart, context);
         }
         break;

plugins/OnlineChecks/resource.h

@@ -5,14 +5,17 @@
 #define IDD_OPTIONS                     102
 #define IDC_ENABLE_VIRUSTOTAL           1001
 #define IDC_ENABLE_IDC_ENABLE_VIRUSTOTAL_HIGHLIGHT 1002
+#define IDC_CHECK1                      1010
+#define IDC_EDIT1                       1011
+#define IDC_COMBO1                      1012
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        103
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1010
+#define _APS_NEXT_CONTROL_VALUE         1013
 #define _APS_NEXT_SYMED_VALUE           103
 #endif
 #endif

plugins/OnlineChecks/upload.c

@@ -266,7 +266,7 @@ NTSTATUS HashFileAndResetPosition(
     NTSTATUS status;
     IO_STATUS_BLOCK iosb;
     PH_HASH_CONTEXT hashContext;
-    PPH_STRING hashString;
+    PPH_STRING hashString = NULL;
     ULONG64 bytesRemaining;
     FILE_POSITION_INFORMATION positionInfo;
     LONG priority;
@@ -277,15 +277,15 @@ NTSTATUS HashFileAndResetPosition(
 
     bytesRemaining = FileSize->QuadPart;
 
-    PhInitializeHash(&hashContext, Algorithm);
-
     newpriority = THREAD_PRIORITY_LOWEST;
     newioPriority = IoPriorityVeryLow;
     NtQueryInformationThread(NtCurrentThread(), ThreadBasePriority, &priority, sizeof(LONG), NULL);
     NtQueryInformationThread(NtCurrentThread(), ThreadIoPriority, &ioPriority, sizeof(IO_PRIORITY_HINT), NULL);
     NtSetInformationThread(NtCurrentThread(), ThreadBasePriority, &newpriority, sizeof(LONG));
     NtSetInformationThread(NtCurrentThread(), ThreadIoPriority, &newioPriority, sizeof(IO_PRIORITY_HINT));
 
+    PhInitializeHash(&hashContext, Algorithm);
+
     while (bytesRemaining)
     {
         status = NtReadFile(
@@ -318,20 +318,18 @@ NTSTATUS HashFileAndResetPosition(
         {
         case Md5HashAlgorithm:
             PhFinalHash(&hashContext, hash, 16, NULL);
-            hashString = PhBufferToHexString(hash, 16);
+            *HashString = PhBufferToHexString(hash, 16);
             break;
         case Sha1HashAlgorithm:
             PhFinalHash(&hashContext, hash, 20, NULL);
-            hashString = PhBufferToHexString(hash, 20);
+            *HashString = PhBufferToHexString(hash, 20);
             break;
         case Sha256HashAlgorithm:
             PhFinalHash(&hashContext, hash, 32, NULL);
-            hashString = PhBufferToHexString(hash, 32);
+            *HashString = PhBufferToHexString(hash, 32);
             break;
         }
 
-        *HashString = hashString;
-
         positionInfo.CurrentByteOffset.QuadPart = 0;
         status = NtSetInformationFile(
             FileHandle,