From 2d50e7d9b92fb03c6f83f73e52f2ffb3d39e686b Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Mon, 12 Oct 2009 23:31:32 +0000
Subject: [PATCH] * sync with trunk * disabled ILMerge for PH.Common and
 PH.Native

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@2159 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 branches/ph-plugins/CHANGELOG.txt             |   1 +
 .../KProcessHacker/i386/kprocesshacker.sys    | Bin 57856 -> 58880 bytes
 branches/ph-plugins/KProcessHacker/version.c  |  93 ++++++++++++++++--
 .../ProcessHacker.Native/KProcessHacker.cs    |  40 ++++++--
 .../ProcessHacker/Build/release.cmd           |   3 +-
 .../RestartRecoveryInterop.cs                 |   9 +-
 .../ProcessHacker/Forms/HackerWindow.cs       |   7 +-
 .../ProcessHacker/Program/Program.cs          |   6 +-
 8 files changed, 126 insertions(+), 33 deletions(-)

diff --git a/branches/ph-plugins/CHANGELOG.txt b/branches/ph-plugins/CHANGELOG.txt
index 9b169170b..af6d4cd37 100644
--- a/branches/ph-plugins/CHANGELOG.txt
+++ b/branches/ph-plugins/CHANGELOG.txt
@@ -5,6 +5,7 @@ Process Hacker
    * #2817429 - "Add Port and IP Address columns to Network tab"
    * #2845829 - "System uptime"
    * #2853452 - "Find handles window: Minor usability improvements"
+   * KProcessHacker support for Windows Server 2003
    * Update system
    * Network tools: ping, traceroute and whois
    * Object security editor
diff --git a/branches/ph-plugins/KProcessHacker/i386/kprocesshacker.sys b/branches/ph-plugins/KProcessHacker/i386/kprocesshacker.sys
index ae87f7343cd5868ec07a6c6abd2f89e7b784a5e7..3dcccc5bfdb4fecd3c2d593aff29793757f196ee 100644
GIT binary patch
delta 14167
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

delta 13732
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
T`Cz$HZjj@L3%}E=!4dxlU-S;D

diff --git a/branches/ph-plugins/KProcessHacker/version.c b/branches/ph-plugins/KProcessHacker/version.c
index e8a7a8410..ef2e9bb2b 100644
--- a/branches/ph-plugins/KProcessHacker/version.c
+++ b/branches/ph-plugins/KProcessHacker/version.c
@@ -51,6 +51,11 @@ static char KiFastCallEntry51[] =
     0x8b, 0xf2, 0x8b, 0x5f, 0x0c, 0x33, 0xc9, 0x8a,
     0x0c, 0x18, 0x8b, 0x3f, 0x8b, 0x1c, 0x87, 0x2b
 };
+static char KiFastCallEntry52[] =
+{
+    0x8b, 0xf2, 0x8b, 0x5f, 0x0c, 0x33, 0xc9, 0x8a,
+    0x0c, 0x18, 0x8b, 0x3f, 0x8b, 0x1c, 0x87, 0x2b
+}; /* same as 5.1 */
 static char KiFastCallEntry60[] =
 {
     0x8b, 0xf2, 0x33, 0xc9, 0x8b, 0x57, 0x0c, 0x8b,
@@ -60,7 +65,7 @@ static char KiFastCallEntry61[] =
 {
     0x8b, 0xf2, 0x33, 0xc9, 0x8b, 0x57, 0x0c, 0x8b,
     0x3f, 0x8a, 0x0c, 0x10, 0x8b, 0x14, 0x87, 0x2b
-};
+}; /* same as 6.0 */
 /* Below is the scan to find the start of KiFastCallEntry. */
 /* static char KiFastCallEntry[] =
 {
@@ -91,6 +96,11 @@ static char PspTerminateProcess51[] =
     0x8b, 0xff, 0x55, 0x8b, 0xec, 0x56, 0x64, 0xa1,
     0x24, 0x01, 0x00, 0x00, 0x8b, 0x75, 0x08, 0x3b
 };
+static char PspTerminateProcess52[] =
+{
+    0x8b, 0xff, 0x55, 0x8b, 0xec, 0x56, 0x8b, 0x75,
+    0x08, 0x57, 0x8d, 0xbe, 0x40, 0x02, 0x00, 0x00
+};
 static char PsTerminateProcess60[] =
 {
     0x8b, 0xff, 0x55, 0x8b, 0xec, 0x53, 0x56, 0x57,
@@ -113,6 +123,11 @@ static char PspTerminateThreadByPointer51[] =
     0x8b, 0xff, 0x55, 0x8b, 0xec, 0x83, 0xec, 0x0c,
     0x83, 0x4d, 0xf8, 0xff, 0x56, 0x57, 0x8b, 0x7d
 };
+static char PspTerminateThreadByPointer52[] =
+{
+    0x8b, 0xff, 0x55, 0x8b, 0xec, 0x53, 0x56, 0x57,
+    0x8b, 0x7d, 0x08, 0x8d, 0xb7, 0x40, 0x02, 0x00
+};
 static char PspTerminateThreadByPointer60[] =
 {
     0x8b, 0xff, 0x55, 0x8b, 0xec, 0x83, 0xe4, 0xf8,
@@ -193,6 +208,7 @@ NTSTATUS KvInit()
         
         SsNtContinue = 0x20;
         
+        /* KiFastCallEntry isn't hooked properly yet. Disabled for now. */
         /* INIT_SCAN(
             KiFastCallEntryScan,
             KiFastCallEntry51,
@@ -241,10 +257,67 @@ NTSTATUS KvInit()
     /* Windows Server 2003 */
     else if (majorVersion == 5 && minorVersion == 2)
     {
-        WindowsVersion = WINDOWS_SERVER_2003;
+        ULONG_PTR psSearchOffset = (ULONG_PTR)GetSystemRoutineAddress(L"RtlCreateHeap");
         
-        /* Not supported yet */
-        return STATUS_NOT_SUPPORTED;
+        WindowsVersion = WINDOWS_SERVER_2003;
+        ProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xfff;
+        ThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff;
+        
+        OffEtClientId = 0x1e4;
+        OffEtSpareByteForSs = 0x24f; /* Padding, last */
+        OffEtStartAddress = 0x21c;
+        OffEtWin32StartAddress = 0x220;
+        OffEpJob = 0x120;
+        OffEpObjectTable = 0xd4;
+        OffEpProtectedProcessOff = 0;
+        OffEpProtectedProcessBit = 0;
+        OffEpRundownProtect = 0x90;
+        OffOhBody = 0x18;
+        OffOtName = 0x40;
+        OffOtiGenericMapping = 0x60 + 0x8;
+        OffOtiOpenProcedure = 0x60 + 0x30;
+        
+        SsNtContinue = 0x22;
+        
+        /* Can't find on ntoskrnl *and* ntkrnlpa. Disabled for now. */
+        /* INIT_SCAN(
+            KiFastCallEntryScan,
+            KiFastCallEntry52,
+            sizeof(KiFastCallEntry52),
+            (ULONG_PTR)__ZwClose, SCAN_LENGTH, -7
+            ); */
+        /* We are scanning for PspTerminateProcess which has 
+           the same signature as PsTerminateProcess because 
+           PsTerminateProcess is simply a wrapper on Server 2003.
+         */
+        INIT_SCAN(
+            PsTerminateProcessScan,
+            PspTerminateProcess52,
+            sizeof(PspTerminateProcess52),
+            psSearchOffset - 0x50000, SCAN_LENGTH, 0
+            );
+        INIT_SCAN(
+            PspTerminateThreadByPointerScan,
+            PspTerminateThreadByPointer52,
+            sizeof(PspTerminateThreadByPointer52),
+            psSearchOffset - 0x20000, SCAN_LENGTH, 0
+            );
+        
+        if (servicePack == 0)
+        {
+        }
+        else if (servicePack == 1)
+        {
+        }
+        else if (servicePack == 2)
+        {
+        }
+        else
+        {
+            return STATUS_NOT_SUPPORTED;
+        }
+        
+        dprintf("Initialized version-specific data for Windows Server 2003 SP%d\n", servicePack);
     }
     /* Windows Vista, Windows Server 2008 */
     else if (majorVersion == 6 && minorVersion == 0)
@@ -252,8 +325,9 @@ NTSTATUS KvInit()
         ULONG_PTR searchOffset = (ULONG_PTR)__NtClose;
         
         WindowsVersion = WINDOWS_VISTA;
-        ProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff;
-        ThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff;
+        ProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1fff;
+        ThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xfff;
+        
         OffEtClientId = 0x20c;
         OffEtSpareByteForSs = 0x26f; /* Padding, second-last */
         OffEtStartAddress = 0x1f8;
@@ -441,7 +515,7 @@ NTSTATUS KvInit()
         
         dprintf("Initialized version-specific data for Windows Vista SP%d/Windows Server 2008\n", servicePack);
     }
-    /* Windows 7 */
+    /* Windows 7, Windows Server 2008 R2 */
     else if (majorVersion == 6 && minorVersion == 1)
     {
         ULONG_PTR psSearchOffset = (ULONG_PTR)GetSystemRoutineAddress(L"PsSetCreateProcessNotifyRoutine");
@@ -451,8 +525,9 @@ NTSTATUS KvInit()
             return STATUS_NOT_SUPPORTED;
         
         WindowsVersion = WINDOWS_7;
-        ProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff;
-        ThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff;
+        ProcessAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1fff;
+        ThreadAllAccess = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xfff;
+        
         OffEtClientId = 0x22c;
         OffEtSpareByteForSs = 0x2b4; /* Padding, last */
         OffEtStartAddress = 0x218;
diff --git a/branches/ph-plugins/ProcessHacker.Native/KProcessHacker.cs b/branches/ph-plugins/ProcessHacker.Native/KProcessHacker.cs
index ed4a0977b..be35b86b7 100644
--- a/branches/ph-plugins/ProcessHacker.Native/KProcessHacker.cs
+++ b/branches/ph-plugins/ProcessHacker.Native/KProcessHacker.cs
@@ -163,16 +163,28 @@ namespace ProcessHacker.Native
                 {
                     // Attempt to load the driver, then try again.
                     ServiceHandle shandle;
+                    bool created = false;
 
-                    using (var scm = new ServiceManagerHandle(ScManagerAccess.CreateService))
+                    try
                     {
-                        shandle = scm.CreateService(
-                            deviceName,
-                            deviceName,
-                            ServiceType.KernelDriver,
-                            fileName
-                            );
-                        shandle.Start();
+                        using (shandle = new ServiceHandle("KProcessHacker", ServiceAccess.Start))
+                        {
+                            shandle.Start();
+                        }
+                    }
+                    catch
+                    {
+                        using (var scm = new ServiceManagerHandle(ScManagerAccess.CreateService))
+                        {
+                            shandle = scm.CreateService(
+                                deviceName,
+                                deviceName,
+                                ServiceType.KernelDriver,
+                                fileName
+                                );
+                            shandle.Start();
+                            created = true;
+                        }
                     }
 
                     try
@@ -185,8 +197,16 @@ namespace ProcessHacker.Native
                     }
                     finally
                     {
-                        // The SCM will delete the service when it is stopped.
-                        shandle.Delete();
+                        if (shandle != null)
+                        {
+                            if (created)
+                            {
+                                // The SCM will delete the service when it is stopped.
+                                shandle.Delete();
+                            }
+
+                            shandle.Dispose();
+                        }
                     }
                 }
                 else
diff --git a/branches/ph-plugins/ProcessHacker/Build/release.cmd b/branches/ph-plugins/ProcessHacker/Build/release.cmd
index 6874fd393..ac242ecb6 100644
--- a/branches/ph-plugins/ProcessHacker/Build/release.cmd
+++ b/branches/ph-plugins/ProcessHacker/Build/release.cmd
@@ -26,8 +26,7 @@ IF NOT EXIST %ILMergePath% (FOR %%a IN (ILMerge.exe) DO IF %%~$PATH:a' NEQ ' (
 	SET ILMergePath="%%~$PATH:a") ELSE (SET "N_=T"
 		ECHO:ILMerge IS NOT INSTALLED!!!&&(GOTO CLEANUP)))
 
-SET RequiredDLLs="Aga.Controls.dll" "ProcessHacker.Common.dll"^
- "ProcessHacker.Native.dll"
+SET RequiredDLLs="Aga.Controls.dll"
 
 REM Create a temporary directory for the merged files
 MD tmp >NUL 2>&1
diff --git a/branches/ph-plugins/ProcessHacker/Components/RestartRecoveryLib/RestartRecoveryInterop.cs b/branches/ph-plugins/ProcessHacker/Components/RestartRecoveryLib/RestartRecoveryInterop.cs
index 4878a6528..34976f142 100644
--- a/branches/ph-plugins/ProcessHacker/Components/RestartRecoveryLib/RestartRecoveryInterop.cs
+++ b/branches/ph-plugins/ProcessHacker/Components/RestartRecoveryLib/RestartRecoveryInterop.cs
@@ -62,14 +62,12 @@ namespace ProcessHackerRestartRecovery
             );
 
         [DllImport("kernel32.dll")]
-        [PreserveSig]
         internal static extern HResult ApplicationRecoveryInProgress(
             [Out, MarshalAs(UnmanagedType.Bool)] 
             out bool canceled
             );
 
         [DllImport("kernel32.dll")]
-        [PreserveSig]
         internal static extern HResult GetApplicationRecoveryCallback(
             IntPtr processHandle,
             [Out] RecoveryCallback recoveryCallback,
@@ -79,7 +77,6 @@ namespace ProcessHackerRestartRecovery
             );
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-        [PreserveSig]
         internal static extern HResult RegisterApplicationRecoveryCallback(
             InternalRecoveryCallback callback, IntPtr param,
             uint pingInterval,
@@ -88,15 +85,13 @@ namespace ProcessHackerRestartRecovery
 
 
         [DllImport("kernel32.dll")]
-        [PreserveSig]
         internal static extern HResult RegisterApplicationRestart(
-            [MarshalAs(UnmanagedType.BStr)] 
+            [MarshalAs(UnmanagedType.LPWStr)] 
             string commandLineArgs,
             RestartRestrictions flags
             );
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        [PreserveSig]
         internal static extern HResult GetApplicationRestartSettings(
             IntPtr process,
             IntPtr commandLine,
@@ -105,11 +100,9 @@ namespace ProcessHackerRestartRecovery
             );
 
         [DllImport("kernel32.dll")]
-        [PreserveSig]
         internal static extern HResult UnregisterApplicationRecoveryCallback();
 
         [DllImport("kernel32.dll")]
-        [PreserveSig]
         internal static extern HResult UnregisterApplicationRestart();
 
         #endregion
diff --git a/branches/ph-plugins/ProcessHacker/Forms/HackerWindow.cs b/branches/ph-plugins/ProcessHacker/Forms/HackerWindow.cs
index e449972b1..35837cfc3 100644
--- a/branches/ph-plugins/ProcessHacker/Forms/HackerWindow.cs
+++ b/branches/ph-plugins/ProcessHacker/Forms/HackerWindow.cs
@@ -3457,8 +3457,11 @@ namespace ProcessHacker
             {
                 isFirstPaint = false;
 
-                ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RegisterForRestart();
-                ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RegisterForRecovery();
+                if (!Program.Recovered)
+                {
+                    ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RegisterForRestart();
+                    //ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RegisterForRecovery();
+                }
 
                 this.CreateShutdownMenuItems();
                 this.LoadFixMenuItems();
diff --git a/branches/ph-plugins/ProcessHacker/Program/Program.cs b/branches/ph-plugins/ProcessHacker/Program/Program.cs
index 24c3803e8..785429dd3 100644
--- a/branches/ph-plugins/ProcessHacker/Program/Program.cs
+++ b/branches/ph-plugins/ProcessHacker/Program/Program.cs
@@ -101,6 +101,7 @@ namespace ProcessHacker
             new System.Collections.Specialized.StringCollection();
         public static int InspectPid = -1;
         public static bool NoKph = false;
+        public static bool Recovered = false;
         public static string SelectTab = "Processes";
         public static bool StartHidden = false;
         public static bool StartVisible = false;
@@ -150,9 +151,10 @@ namespace ProcessHacker
                 return;
             }
 
-            if (pArgs.ContainsKey("-recovered")) //used for Windows Error Reporting recovery
+            if (pArgs.ContainsKey("-recovered")) // used for Windows Error Reporting recovery
             {
-                ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RecoverLastSession();
+                Recovered = true;
+                //ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RecoverLastSession();
             }
 
             if (pArgs.ContainsKey("-elevate"))