From 3262bb60c3b7e76576c98266fa362b90580302a2 Mon Sep 17 00:00:00 2001 From: wj32 Date: Sun, 13 Jun 2010 09:11:11 +0000 Subject: [PATCH] changed Peak Pagefile Usage to Peak Private Bytes git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3203 21ef857c-d57f-4fe0-8362-d861dc6d29cd --- 2.x/trunk/ProcessHacker/ProcessHacker.rc | 20 ++++++++++---------- 2.x/trunk/ProcessHacker/TODO.txt | 2 ++ 2.x/trunk/ProcessHacker/include/settings.h | 3 +-- 2.x/trunk/ProcessHacker/procprp.c | 6 +++--- 2.x/trunk/ProcessHacker/resource.h | 1 + 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc index a58ab85b0..37c033936 100644 --- a/2.x/trunk/ProcessHacker/ProcessHacker.rc +++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc @@ -1062,19 +1062,19 @@ BEGIN RTEXT "Static",IDC_ZTOTALTIME_V,59,57,61,8,SS_ENDELLIPSIS GROUPBOX "Memory",IDC_STATIC,7,74,120,96 LTEXT "Private Bytes",IDC_STATIC,14,84,44,8 - LTEXT "Working Set",IDC_STATIC,14,94,40,8 - LTEXT "Peak Working Set",IDC_STATIC,14,104,57,8 - LTEXT "Virtual Size",IDC_STATIC,14,114,36,8 - LTEXT "Peak Virtual Size",IDC_STATIC,14,124,53,8 - LTEXT "Peak Pagefile Usage",IDC_STATIC,14,135,66,8 + LTEXT "Working Set",IDC_STATIC,14,105,40,8 + LTEXT "Peak Working Set",IDC_STATIC,14,115,57,8 + LTEXT "Virtual Size",IDC_STATIC,14,125,36,8 + LTEXT "Peak Virtual Size",IDC_STATIC,14,135,53,8 + LTEXT "Peak Private Bytes",IDC_STATIC,14,95,61,8 LTEXT "Page Faults",IDC_STATIC,14,145,38,8 LTEXT "Page Priority",IDC_STATIC,14,155,42,8 RTEXT "Static",IDC_ZPRIVATEBYTES_V,72,84,48,8,SS_ENDELLIPSIS - RTEXT "Static",IDC_ZWORKINGSET_V,72,94,48,8,SS_ENDELLIPSIS - RTEXT "Static",IDC_ZPEAKWORKINGSET_V,78,104,42,8,SS_ENDELLIPSIS - RTEXT "Static",IDC_ZVIRTUALSIZE_V,72,114,48,8,SS_ENDELLIPSIS - RTEXT "Static",IDC_ZPEAKVIRTUALSIZE_V,72,124,48,8,SS_ENDELLIPSIS - RTEXT "Static",IDC_ZPEAKPAGEFILEUSAGE_V,85,135,35,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZWORKINGSET_V,72,105,48,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZPEAKWORKINGSET_V,78,115,42,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZVIRTUALSIZE_V,72,125,48,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZPEAKVIRTUALSIZE_V,72,135,48,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZPEAKPRIVATEBYTES_V,80,95,40,8,SS_ENDELLIPSIS RTEXT "Static",IDC_ZPAGEFAULTS_V,72,145,48,8,SS_ENDELLIPSIS RTEXT "Static",IDC_ZPAGEPRIORITY_V,72,155,48,8,SS_ENDELLIPSIS LTEXT "Reads",IDC_STATIC,138,17,21,8 diff --git a/2.x/trunk/ProcessHacker/TODO.txt b/2.x/trunk/ProcessHacker/TODO.txt index b567473e8..a7989a87e 100644 --- a/2.x/trunk/ProcessHacker/TODO.txt +++ b/2.x/trunk/ProcessHacker/TODO.txt @@ -12,3 +12,5 @@ * Copy menu * Dump/view process information + +* Make settings based on atoms instead of strings diff --git a/2.x/trunk/ProcessHacker/include/settings.h b/2.x/trunk/ProcessHacker/include/settings.h index a04ad9b76..6c2545b5d 100644 --- a/2.x/trunk/ProcessHacker/include/settings.h +++ b/2.x/trunk/ProcessHacker/include/settings.h @@ -104,7 +104,6 @@ EXT ULONG PhCsColorProtectedHandles; EXT ULONG PhCsUseColorInheritHandles; EXT ULONG PhCsColorInheritHandles; -#define PH_SET_INTEGER_CACHED_SETTING(Name, Value) \ - (PhSetIntegerSetting(L#Name, (Value)), PhCs##Name = (Value)) +#define PH_SET_INTEGER_CACHED_SETTING(Name, Value) (PhSetIntegerSetting(L#Name, PhCs##Name = (Value))) #endif diff --git a/2.x/trunk/ProcessHacker/procprp.c b/2.x/trunk/ProcessHacker/procprp.c index 12268fe32..46a9eb22f 100644 --- a/2.x/trunk/ProcessHacker/procprp.c +++ b/2.x/trunk/ProcessHacker/procprp.c @@ -978,7 +978,9 @@ VOID PhpUpdateProcessStatistics( SetDlgItemText(hwndDlg, IDC_ZTOTALTIME_V, timeSpan); SetDlgItemText(hwndDlg, IDC_ZPRIVATEBYTES_V, ((PPH_STRING)PHA_DEREFERENCE( - PhFormatSize(ProcessItem->VmCounters.PrivateUsage, -1)))->Buffer); // private bytes + PhFormatSize(ProcessItem->VmCounters.PagefileUsage, -1)))->Buffer); // private bytes (same as PrivateUsage) + SetDlgItemText(hwndDlg, IDC_ZPEAKPRIVATEBYTES_V, ((PPH_STRING)PHA_DEREFERENCE( + PhFormatSize(ProcessItem->VmCounters.PeakPagefileUsage, -1)))->Buffer); // peak private bytes SetDlgItemText(hwndDlg, IDC_ZWORKINGSET_V, ((PPH_STRING)PHA_DEREFERENCE( PhFormatSize(ProcessItem->VmCounters.WorkingSetSize, -1)))->Buffer); // working set SetDlgItemText(hwndDlg, IDC_ZPEAKWORKINGSET_V, ((PPH_STRING)PHA_DEREFERENCE( @@ -987,8 +989,6 @@ VOID PhpUpdateProcessStatistics( PhFormatSize(ProcessItem->VmCounters.VirtualSize, -1)))->Buffer); // virtual size SetDlgItemText(hwndDlg, IDC_ZPEAKVIRTUALSIZE_V, ((PPH_STRING)PHA_DEREFERENCE( PhFormatSize(ProcessItem->VmCounters.PeakVirtualSize, -1)))->Buffer); // peak virtual size - SetDlgItemText(hwndDlg, IDC_ZPEAKPAGEFILEUSAGE_V, ((PPH_STRING)PHA_DEREFERENCE( - PhFormatSize(ProcessItem->VmCounters.PeakPagefileUsage, -1)))->Buffer); // peak pagefile usage SetDlgItemText(hwndDlg, IDC_ZPAGEFAULTS_V, ((PPH_STRING)PHA_DEREFERENCE( PhFormatUInt64(ProcessItem->VmCounters.PageFaultCount, TRUE)))->Buffer); // page faults diff --git a/2.x/trunk/ProcessHacker/resource.h b/2.x/trunk/ProcessHacker/resource.h index 571480d1a..7dae6768f 100644 --- a/2.x/trunk/ProcessHacker/resource.h +++ b/2.x/trunk/ProcessHacker/resource.h @@ -276,6 +276,7 @@ #define IDC_ZVIRTUALSIZE_V 1189 #define IDC_ZPEAKVIRTUALSIZE_V 1190 #define IDC_ZPEAKPAGEFILEUSAGE_V 1191 +#define IDC_ZPEAKPRIVATEBYTES_V 1191 #define IDC_ZPAGEPRIORITY_V 1192 #define IDC_ZIOPRIORITY_V 1194 #define IDC_ZHANDLES_V 1195