8.20

Debug/PCMgr32.ini

@@ -5,11 +5,11 @@ TopMost=FALSE
 CloseHideToNotfication=FALSE
 ListSortIndex=0
 ListSortDk=TRUE
-OldSize=917-610
-OldPos=389-95
+OldSize=916-651
+OldPos=258-114
 OldIsMax=FALSE
 MainHeaders=#TitleProcName-130#TitleStatus-70#TitlePID-55#TitleCPU-75#TitleRam-75#TitleDisk-75#TitleNet-75#TitleProcPath-240
-MainHeaders1=284
+MainHeaders1=340
 X32Warning=FALSE
 HotKey=TRUE
 SelfProtect=FALSE
@@ -26,4 +26,4 @@ TerProcFun=PspTerProc
 LogDbgPrint=TRUE
 UseKrnlPDB=TRUE
 HighLightNoSystetm=TRUE
-ShowDebugWindow=TRUE
+ShowDebugWindow=FALSE

Debug_64/PCMgr64.ini

@@ -3,23 +3,13 @@ Lanuage=zh
 LastWindowTitle=ÈÎÎñ¹ÜÀíÆ÷
 TopMost=FALSE
 CloseHideToNotfication=FALSE
-AbortShutdown=FALSE
-HotKey=TRUE
-SelfProtect=FALSE
-Title=
-HotKey1=(None)
-HotKey2=T
-MainHeaders=#TitleProcName-130#TitleStatus-70#TitlePID-55#TitleCPU-75#TitleRam-75#TitleDisk-75#TitleNet-75#TitleProcPath-240
 ListSortIndex=0
 ListSortDk=TRUE
-OldSize=923-632
+OldSize=891-631
 OldPos=258-114
 OldIsMax=FALSE
+MainHeaders=#TitleProcName-130#TitleStatus-70#TitlePID-55#TitleCPU-75#TitleRam-75#TitleDisk-75#TitleNet-75#TitleProcPath-240
 MainHeaders1=200
-[Configure]
-TerProcFun=PspTerProc
-LogDbgPrint=TRUE
-UseKrnlPDB=TRUE
-LoadKernelDriver=TRUE
-HighLightNoSystetm=FALSE
-ShowDebugWindow=FALSE
+OldSizeSimple=380-334
+SimpleView=TRUE
+RefeshTime=Fast

PCMgr.sln

@@ -29,6 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCMgrCmd", "PCMgrCom\PCMgrC
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PCMgrLoader", "PCMgrLoader\PCMgrLoader.vcxproj", "{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{111387F6-40DD-4035-838B-8120BFF50B76} = {111387F6-40DD-4035-838B-8120BFF50B76}
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7} = {59FEF6F8-2687-4046-8934-90A7E68B35B7}
 	EndProjectSection
 EndProject
@@ -63,7 +64,7 @@ Global
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|ARM.Build.0 = Release|Any CPU
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|ARM64.Build.0 = Release|Any CPU
-		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|x64.ActiveCfg = Release|x64
+		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|x64.ActiveCfg = Debug|x64
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|x86.ActiveCfg = Debug|x86
 		{59FEF6F8-2687-4046-8934-90A7E68B35B7}.Release|x86.Build.0 = Debug|x86
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -77,8 +78,8 @@ Global
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|Any CPU.ActiveCfg = Release|Win32
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|ARM.ActiveCfg = Release|Win32
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|ARM64.ActiveCfg = Release|Win32
-		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x64.ActiveCfg = Release|x64
-		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x64.Build.0 = Release|x64
+		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x64.ActiveCfg = Debug|x64
+		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x64.Build.0 = Debug|x64
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x86.ActiveCfg = Debug|Win32
 		{F6BC96EA-82F7-422D-A371-A468F5E1CF22}.Release|x86.Build.0 = Debug|Win32
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Debug|Any CPU.ActiveCfg = Debug|x64
@@ -96,7 +97,7 @@ Global
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|ARM.Build.0 = Release|Any CPU
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|ARM64.Build.0 = Release|Any CPU
-		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|x64.ActiveCfg = Release|x64
+		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|x64.ActiveCfg = Debug|x64
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|x86.ActiveCfg = Debug|x86
 		{70682F19-24FD-4717-95D3-CFBFB4E02F00}.Release|x86.Build.0 = Debug|x86
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -109,8 +110,8 @@ Global
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|Any CPU.ActiveCfg = Release|Win32
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|ARM.ActiveCfg = Release|Win32
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|ARM64.ActiveCfg = Release|Win32
-		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x64.ActiveCfg = Release|x64
-		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x64.Build.0 = Release|x64
+		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x64.ActiveCfg = Debug|x64
+		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x64.Build.0 = Debug|x64
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x86.ActiveCfg = Debug|Win32
 		{E2499B72-39C2-4DFA-900D-67000CCC2634}.Release|x86.Build.0 = Debug|Win32
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -123,8 +124,8 @@ Global
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|Any CPU.ActiveCfg = Release|Win32
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|ARM.ActiveCfg = Release|Win32
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|ARM64.ActiveCfg = Release|Win32
-		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x64.ActiveCfg = Release|x64
-		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x64.Build.0 = Release|x64
+		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x64.ActiveCfg = Debug|x64
+		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x64.Build.0 = Debug|x64
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x86.ActiveCfg = Debug|Win32
 		{612A1DDA-1566-4125-86DE-2667D8FE2E95}.Release|x86.Build.0 = Debug|Win32
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -135,16 +136,16 @@ Global
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|x64.ActiveCfg = Debug|x64
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|x64.Build.0 = Debug|x64
-		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|x86.ActiveCfg = Debug|x86
+		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Debug|x86.ActiveCfg = Debug|x64
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|ARM.ActiveCfg = Release|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|ARM.Build.0 = Release|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|ARM64.Build.0 = Release|Any CPU
-		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x64.ActiveCfg = Release|x64
-		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x64.Build.0 = Release|x64
-		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x86.ActiveCfg = Debug|x86
+		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x64.ActiveCfg = Debug|x64
+		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x64.Build.0 = Debug|x64
+		{DED02CBD-498E-4301-A7D5-1F9102CEAFAF}.Release|x86.ActiveCfg = Debug|x64
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Debug|ARM.ActiveCfg = Debug|Win32
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Debug|ARM64.ActiveCfg = Debug|Win32
@@ -155,8 +156,8 @@ Global
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|Any CPU.ActiveCfg = Release|Win32
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|ARM.ActiveCfg = Release|Win32
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|ARM64.ActiveCfg = Release|Win32
-		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x64.ActiveCfg = Release|x64
-		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x64.Build.0 = Release|x64
+		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x64.ActiveCfg = Debug|x64
+		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x64.Build.0 = Debug|x64
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x86.ActiveCfg = Debug|Win32
 		{5BB9A727-FA09-4919-8532-9391A9402F43}.Release|x86.Build.0 = Debug|Win32
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -169,8 +170,8 @@ Global
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|Any CPU.ActiveCfg = Release|Win32
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|ARM.ActiveCfg = Release|Win32
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|ARM64.ActiveCfg = Release|Win32
-		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x64.ActiveCfg = Release|x64
-		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x64.Build.0 = Release|x64
+		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x64.ActiveCfg = Debug|x64
+		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x64.Build.0 = Debug|x64
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x86.ActiveCfg = Debug|Win32
 		{281DE3BB-26BD-486F-AEC4-008A6C9B98E8}.Release|x86.Build.0 = Debug|Win32
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -181,18 +182,16 @@ Global
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|ARM64.Build.0 = Debug|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|x64.ActiveCfg = Debug|x64
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|x64.Build.0 = Debug|x64
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|x86.ActiveCfg = Debug|x86
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|x86.Build.0 = Debug|x86
+		{111387F6-40DD-4035-838B-8120BFF50B76}.Debug|x86.ActiveCfg = Debug|x64
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|Any CPU.Build.0 = Release|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|ARM.ActiveCfg = Release|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|ARM.Build.0 = Release|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|ARM64.Build.0 = Release|Any CPU
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x64.ActiveCfg = Release|x64
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x64.Build.0 = Release|x64
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x86.ActiveCfg = Debug|x86
-		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x86.Build.0 = Debug|x86
+		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x64.ActiveCfg = Debug|x64
+		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x64.Build.0 = Debug|x64
+		{111387F6-40DD-4035-838B-8120BFF50B76}.Release|x86.ActiveCfg = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PCMgrKernel32/Driver.c

@@ -213,14 +213,16 @@ NTSTATUS IOControlDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
 		break;
 	}
 	case CTL_KERNEL_INIT_WITH_PDB_DATA: {
+
+		PNTOS_PDB_DATA data = (PNTOS_PDB_DATA)InputData;
+		KxGetFunctionsFormPDBData(data);
+		KxGetStructOffestsFormPDBData(&data->StructOffestData);
+		KxGetWin32kFunctionsFormPDBData(&data->Win32KData);
 		if (!kernelInited) {
-			PNTOS_PDB_DATA data = (PNTOS_PDB_DATA)InputData;
-			KxGetFunctionsFormPDBData(data);
-			KxGetStructOffestsFormPDBData(&data->StructOffestData);
-			KxGetWin32kFunctionsFormPDBData(&data->Win32KData);
 			KdPrint(("Pdb Data received."));
 			kernelInited = TRUE;
 		}
+		else KdPrint(("Reload Pdb Data."));
 		Status = STATUS_SUCCESS;
 		break;
 	}
@@ -619,10 +621,10 @@ NTSTATUS IOControlDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
 				data.fsModifiers = item->fsModifiers;
 				data.hWnd = item->hWnd;
 				data.id = item->id;
-				data.ThreadId = (ULONG)PsGetThreadId((PETHREAD)item->Thread);
+				data.ThreadId = (ULONG)(ULONG_PTR)PsGetThreadId((PETHREAD)item->Thread);
 				PEPROCESS process = IoThreadToProcess((PETHREAD)item->Thread);
 				if (process) {
-					data.ProcessId = (ULONG)PsGetProcessId(process);
+					data.ProcessId = (ULONG)(ULONG_PTR)PsGetProcessId(process);
 					PUCHAR procName = PsGetProcessImageFileName(process);
 					size_t procNameSize = strlen(procName) + 1;
 					_memcpy_s(data.ImageFileName, sizeof(data.ImageFileName), procName, procNameSize);

PCMgrKernel32/istructs.h

@@ -114,7 +114,7 @@ typedef struct tag_TIMER_DATA {
 	INT cmsRate;
 	UINT flags;
 	// 函数入口
-	ULONG pfn;
+	ULONG_PTR pfn;
 }TIMER_DATA, *PTIMER_DATA;
 
 

PCMgrLoader/PCMgrLoader.vcxproj

@@ -79,23 +79,27 @@
     <OutDir>$(SolutionDir)$(Configuration)_64\</OutDir>
     <TargetName>PCMgr64</TargetName>
     <EnableManagedIncrementalBuild>false</EnableManagedIncrementalBuild>
-    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);E:\主数据库\编程\范例\mono-master\msvc\include;</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>PCMgr32</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>PCMgr32</TargetName>
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)$(Configuration)_64\</OutDir>
     <TargetName>PCMgr64</TargetName>
-    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);</IncludePath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath);E:\主数据库\编程\范例\mono-master\msvc\include;</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

TaskMgr/Aero/CommandLink.cs

@@ -12,56 +12,28 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
-using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace PCMgr.Aero
 {
     [ToolboxBitmap(typeof(Button))]
-    public class CommandLink: System.Windows.Forms.Button
+    public class CommandLink : Button
     {
         public CommandLink()
         {
-            this.FlatStyle = FlatStyle.System;
-        }
-        const int VistaMajorVersion = 6;
-        const int SevenMinorVersion = 1;
-        const int EightMinorVersion = 2;
-        public static bool IsSevenOrBetter
-        {
-            get
-            {
-                if (Environment.OSVersion.Platform != PlatformID.Win32NT)
-                    return false;
-
-                var version = Environment.OSVersion.Version;
-
-                if (version.Major < VistaMajorVersion)
-                    return false;
-                else if (version.Major == VistaMajorVersion)
-                    return (version.Minor >= SevenMinorVersion);
-                else
-                    return true;
-            }
+            FlatStyle = FlatStyle.System;
         }
 
         protected override CreateParams CreateParams
         {
             get
             {
                 CreateParams cp = base.CreateParams;
-
-                //Fix for XP provided by jonpreece (http://windowsformsaero.codeplex.com/Thread/View.aspx?ThreadId=81391)
-                if (IsSevenOrBetter)
-                    cp.Style |= NativeMethods.BS_COMMANDLINK;
-                else
-                    cp.Style |= 1;
+                cp.Style |= NativeMethods.BS_COMMANDLINK;
                 return cp;
             }
         }
 
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        private static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
         private bool useicon = true; //Checks if user wants to use an icon instead of a bitmap
         private Bitmap image_;
 
@@ -126,7 +98,7 @@ public void SetImage()
             }
 
             //Set the button to use the icon. If no icon or bitmap is used, no image is set.
-            SendMessage(this.Handle, NativeMethods.BM_SETIMAGE, 1, (int)iconhandle);
+            NativeMethods.SendMessage(Handle, NativeMethods.BM_SETIMAGE, 1, (int)iconhandle);
         }
 
         private bool showshield_ = false;
@@ -150,7 +122,7 @@ public bool ShowShield
 
         public void SetShield(bool Value)
         {
-            NativeMethods.SendMessage(this.Handle, NativeMethods.BCM_SETSHIELD, IntPtr.Zero, new IntPtr(showshield_ ? 1 : 0));
+            NativeMethods.SendMessage(Handle, NativeMethods.BCM_SETSHIELD, IntPtr.Zero, new IntPtr(showshield_ ? 1 : 0));
         }
 
         private string note_ = string.Empty;
@@ -173,7 +145,7 @@ public string Note
         private void SetNote(string NoteText)
         {
             //Sets the note
-            NativeMethods.SendMessage(this.Handle, NativeMethods.BCM_SETNOTE, IntPtr.Zero, NoteText);
+            NativeMethods.SendMessage(Handle, NativeMethods.BCM_SETNOTE, IntPtr.Zero, NoteText);
         }
 
     }

TaskMgr/Aero/ExpandButton.cs

@@ -66,7 +66,7 @@ protected override void WndProc(ref Message m)
         {
             if (m.Msg == WM_UPDATEUISTATE)
             {
-                if (PCMgr.NativeMethods.LOWORD((uint)m.WParam.ToInt32()) == 1)
+                if (PCMgr.NativeMethods.Win32.LOWORD((uint)m.WParam.ToInt32()) == 1)
                 {
                     if (stringFormat.HotkeyPrefix == System.Drawing.Text.HotkeyPrefix.Show)
                         stringFormat.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;

TaskMgr/Aero/NativeMethods.cs

@@ -327,7 +327,7 @@ internal class NativeMethods
         public const int M_DRAW_EXPAND_HOVER = 2;
         public const int M_DRAW_EXPAND_PRESSED = 3;
 
-        [DllImport(FormMain.COREDLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(PCMgr.NativeMethods.COREDLLNAME, CallingConvention = CallingConvention.Cdecl)]
         public static extern void MExpandDrawButton(IntPtr hTheme, IntPtr hdc, int x, int y, int state, bool on);
     }
 }

TaskMgr/Aero/TaskDialog/NativeMethods.cs

@@ -17,13 +17,13 @@ namespace PCMgr.Aero.TaskDialog
     internal class NativeMethods {
 
         /// <summary>Direct Task Dialog call.</summary>
-        [DllImport(FormMain.COREDLLNAME, CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(PCMgr.NativeMethods.COREDLLNAME, CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
         public static extern int MTaskDialog(IntPtr hWndParent, IntPtr hInstance,
             string pszWindowTitle, string pszMainInstruction, string pszContent,
             int dwCommonButtons, IntPtr pszIcon, out int pnButton);
 
         /// <summary>Indirect Task Dialog call. Allows complex dialogs with interaction logic (via callback).</summary>
-        [DllImport(FormMain.COREDLLNAME, CharSet = CharSet.Unicode, PreserveSig = false, CallingConvention = CallingConvention.Cdecl)]
+        [DllImport(PCMgr.NativeMethods.COREDLLNAME, CharSet = CharSet.Unicode, PreserveSig = false, CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr MTaskDialogIndirect(ref TaskDialogConfig pTaskConfig,
             out int pnButton, out int pnRadioButton, out bool pfVerificationFlagChecked);
 

TaskMgr/Ctls/IPerformancePage.cs

@@ -6,6 +6,7 @@ interface IPerformancePage
         void PageShow();
         void PageHide();
         void PageUpdate();
+        double PageUpdateSimple();
         void PageSetGridUnit(string s);
         void PageFroceSetData(int s);
     }