Revert "Improve 'driver unload on exit' options window, Remove kernel-driver SCM and RPC dependencies"

This reverts commit 0a8a178.

Author: dmex

ProcessHacker/ProcessHacker.rc

@@ -1329,6 +1329,7 @@ BEGIN
     CONTROL         "Enable warnings",IDC_ENABLEWARNINGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,68,10
     CONTROL         "Enable kernel-mode driver",IDC_ENABLEKERNELMODEDRIVER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,19,99,10
+    CONTROL         "Hide unnamed handles",IDC_HIDEUNNAMEDHANDLES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,31,88,10
     CONTROL         "Check images for digital signatures and packing",IDC_ENABLESTAGE2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,43,167,10
     CONTROL         "Resolve addresses for network connections",IDC_ENABLENETWORKRESOLVE,
@@ -1340,13 +1341,13 @@ BEGIN
     CONTROL         "Enable cycle-based CPU usage",IDC_ENABLECYCLECPUUSAGE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,91,114,10
     CONTROL         "Replace Task Manager with Process Hacker",IDC_REPLACETASKMANAGER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,103,154,10
-    PUSHBUTTON      "Change...",IDC_CHANGE,161,101,62,14
-    LTEXT           "History sample count:",IDC_SAMPLECOUNTLABEL,7,117,70,8
-    EDITTEXT        IDC_SAMPLECOUNT,82,116,39,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Automatic",IDC_SAMPLECOUNTAUTOMATIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,117,48,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,154,10
+    PUSHBUTTON      "Change...",IDC_CHANGE,161,103,62,14
+    LTEXT           "History sample count:",IDC_SAMPLECOUNTLABEL,7,121,70,8
+    EDITTEXT        IDC_SAMPLECOUNT,82,120,39,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Automatic",IDC_SAMPLECOUNTAUTOMATIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,121,48,10
     CONTROL         "Unload kernel-mode driver on exit",IDC_UNLOADKERNELMODEDRIVERONEXIT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,31,124,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,119,7,124,10
 END
 
 IDD_GDIHANDLES DIALOGEX 0, 0, 351, 307

ProcessHacker/main.c

@@ -289,7 +289,7 @@ INT WINAPI wWinMain(
     result = PhMainMessageLoop();
 
     if (PhGetIntegerSetting(L"KphUnloadOnShutdown"))
-        KphUninstall(NULL);
+        PhUnloadDriver(NULL, KPH_DEVICE_SHORT_NAME);
 
     RtlExitUserProcess(result);
 }
@@ -571,9 +571,8 @@ VOID PhInitializeKph(
     kprocesshackerFileName = PhConcatStringRef2(&PhApplicationDirectory->sr, &kprocesshacker);
     processhackerSigFileName = PhConcatStringRef2(&PhApplicationDirectory->sr, &processhackerSig);
 
-    parameters.SecurityLevel = KphSecuritySignatureCheck;
+    parameters.SecurityLevel = KphSecurityPrivilegeCheck;
     parameters.CreateDynamicConfiguration = TRUE;
-
     KphConnect2Ex(KPH_DEVICE_SHORT_NAME, kprocesshackerFileName->Buffer, &parameters);
 
     if (signature = PhpReadSignature(processhackerSigFileName->Buffer, &signatureSize))

ProcessHacker/options.c

@@ -674,6 +674,7 @@ VOID PhpAdvancedPageLoad(
 
     SetDlgItemCheckForSetting(hwndDlg, IDC_ENABLEWARNINGS, L"EnableWarnings");
     SetDlgItemCheckForSetting(hwndDlg, IDC_ENABLEKERNELMODEDRIVER, L"EnableKph");
+    SetDlgItemCheckForSetting(hwndDlg, IDC_HIDEUNNAMEDHANDLES, L"HideUnnamedHandles");
     SetDlgItemCheckForSetting(hwndDlg, IDC_ENABLESTAGE2, L"EnableStage2");
     SetDlgItemCheckForSetting(hwndDlg, IDC_ENABLENETWORKRESOLVE, L"EnableNetworkResolve");
     SetDlgItemCheckForSetting(hwndDlg, IDC_PROPAGATECPUUSAGE, L"PropagateCpuUsage");
@@ -689,9 +690,6 @@ VOID PhpAdvancedPageLoad(
     if (PhGetIntegerSetting(L"SampleCountAutomatic"))
         EnableWindow(GetDlgItem(hwndDlg, IDC_SAMPLECOUNT), FALSE);
 
-    if (!PhGetIntegerSetting(L"EnableKph"))
-        EnableWindow(GetDlgItem(hwndDlg, IDC_UNLOADKERNELMODEDRIVERONEXIT), FALSE);
-
     // Replace Task Manager
 
     changeButton = GetDlgItem(hwndDlg, IDC_CHANGE);
@@ -759,6 +757,7 @@ VOID PhpAdvancedPageSave(
 
     SetSettingForDlgItemCheck(hwndDlg, IDC_ENABLEWARNINGS, L"EnableWarnings");
     SetSettingForDlgItemCheckRestartRequired(hwndDlg, IDC_ENABLEKERNELMODEDRIVER, L"EnableKph");
+    SetSettingForDlgItemCheck(hwndDlg, IDC_HIDEUNNAMEDHANDLES, L"HideUnnamedHandles");
     SetSettingForDlgItemCheckRestartRequired(hwndDlg, IDC_ENABLESTAGE2, L"EnableStage2");
     SetSettingForDlgItemCheckRestartRequired(hwndDlg, IDC_ENABLENETWORKRESOLVE, L"EnableNetworkResolve");
     SetSettingForDlgItemCheck(hwndDlg, IDC_PROPAGATECPUUSAGE, L"PropagateCpuUsage");
@@ -866,6 +865,7 @@ INT_PTR CALLBACK PhpOptionsAdvancedDlgProc(
                 // Disable all controls except for Replace Task Manager.
                 EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLEWARNINGS), FALSE);
                 EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLEKERNELMODEDRIVER), FALSE);
+                EnableWindow(GetDlgItem(hwndDlg, IDC_HIDEUNNAMEDHANDLES), FALSE);
                 EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLESTAGE2), FALSE);
                 EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLENETWORKRESOLVE), FALSE);
                 EnableWindow(GetDlgItem(hwndDlg, IDC_PROPAGATECPUUSAGE), FALSE);
@@ -914,11 +914,6 @@ INT_PTR CALLBACK PhpOptionsAdvancedDlgProc(
                         NtClose(threadHandle);
                 }
                 break;
-            case IDC_ENABLEKERNELMODEDRIVER:
-                {
-                    EnableWindow(GetDlgItem(hwndDlg, IDC_UNLOADKERNELMODEDRIVERONEXIT), Button_GetCheck(GetDlgItem(hwndDlg, IDC_ENABLEKERNELMODEDRIVER)) == BST_CHECKED);
-                }
-                break;
             case IDC_SAMPLECOUNTAUTOMATIC:
                 {
                     EnableWindow(GetDlgItem(hwndDlg, IDC_SAMPLECOUNT), Button_GetCheck(GetDlgItem(hwndDlg, IDC_SAMPLECOUNTAUTOMATIC)) != BST_CHECKED);