OnlineChecks: Fix options layout

Author: dmex

plugins/OnlineChecks/OnlineChecks.rc

@@ -95,7 +95,7 @@ BEGIN
     CONTROL         "Enable VirusTotal scanning",IDC_ENABLE_VIRUSTOTAL,
                     "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
+                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,20,141,10
     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

plugins/Updater/page5.c

@@ -72,20 +72,19 @@ HRESULT CALLBACK FinalTaskDialogCallbackProc(
 
                 ProcessHacker_PrepareForEarlyShutdown(PhMainWndHandle);
 
-                if (!ShellExecuteEx(&info))
+                if (ShellExecuteEx(&info))
+                {
+                    ProcessHacker_Destroy(PhMainWndHandle);
+                }
+                else
                 {
                     // Install failed, cancel the shutdown.
                     ProcessHacker_CancelEarlyShutdown(PhMainWndHandle);
 
                     // Set button text for next action
                     //Button_SetText(GetDlgItem(hwndDlg, IDOK), L"Retry");
-
                     return S_FALSE;
                 }
-                else
-                {
-                    ProcessHacker_Destroy(PhMainWndHandle);
-                }
             }
         }
         break;
@@ -149,8 +148,8 @@ VOID ShowLatestVersionDialog(
         PIMAGE_NT_HEADERS imageNtHeader;
 
         // HACK
-        imageDosHeader = (PIMAGE_DOS_HEADER)PluginInstance->DllBase;
-        imageNtHeader = (PIMAGE_NT_HEADERS)PTR_ADD_OFFSET(PluginInstance->DllBase, (ULONG)imageDosHeader->e_lfanew);
+        imageDosHeader = (PIMAGE_DOS_HEADER)NtCurrentPeb()->ImageBaseAddress;
+        imageNtHeader = (PIMAGE_NT_HEADERS)PTR_ADD_OFFSET(imageDosHeader, (ULONG)imageDosHeader->e_lfanew);
 
         RtlSecondsSince1970ToTime(imageNtHeader->FileHeader.TimeDateStamp, &time);
         PhLargeIntegerToLocalSystemTime(&systemTime, &time);