From 7a53ba6050b212778be6cee223d191174a5d606f Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Fri, 9 Jan 2004 23:00:43 +0000 Subject: [PATCH] Removed the last of the C++ style comments. Adjusted the coding style a bit. svn path=/trunk/; revision=7537 --- rosapps/taskmgr/about.c | 45 +- rosapps/taskmgr/affinity.c | 572 ++++++++++---------- rosapps/taskmgr/applpage.c | 8 +- rosapps/taskmgr/applpage.h | 42 +- rosapps/taskmgr/column.c | 912 +++++++++++++++---------------- rosapps/taskmgr/column.h | 54 +- rosapps/taskmgr/debug.c | 128 ++--- rosapps/taskmgr/endproc.c | 138 ++--- rosapps/taskmgr/font.c | 56 +- rosapps/taskmgr/graph.c | 756 +++++++++++++------------- rosapps/taskmgr/graphctl.c | 322 ++++++----- rosapps/taskmgr/optnmenu.c | 170 +++--- rosapps/taskmgr/perfdata.c | 1048 ++++++++++++++++++------------------ rosapps/taskmgr/perfpage.c | 160 +++--- rosapps/taskmgr/priority.c | 402 +++++++------- rosapps/taskmgr/proclist.c | 144 ++--- rosapps/taskmgr/procpage.c | 802 +++++++++++++-------------- rosapps/taskmgr/run.c | 54 +- rosapps/taskmgr/taskmgr.c | 2 +- rosapps/taskmgr/trayicon.c | 296 +++++----- 20 files changed, 3043 insertions(+), 3068 deletions(-) diff --git a/rosapps/taskmgr/about.c b/rosapps/taskmgr/about.c index 5401e8fab58..96eebf64233 100644 --- a/rosapps/taskmgr/about.c +++ b/rosapps/taskmgr/about.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -28,47 +28,44 @@ #include #include #include - + #include "taskmgr.h" #include "about.h" - LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void OnAbout(void) { - - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc); - + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc); } LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - HWND hLicenseEditWnd; - TCHAR strLicense[0x1000]; + HWND hLicenseEditWnd; + TCHAR strLicense[0x1000]; - switch (message) - { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); + LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); - SetWindowText(hLicenseEditWnd, strLicense); + SetWindowText(hLicenseEditWnd, strLicense); - return TRUE; + return TRUE; - case WM_COMMAND: + case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - break; - } + break; + } return 0; } diff --git a/rosapps/taskmgr/affinity.c b/rosapps/taskmgr/affinity.c index e7cdfe26c69..08f2f76456a 100644 --- a/rosapps/taskmgr/affinity.c +++ b/rosapps/taskmgr/affinity.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,318 +29,318 @@ #include #include #include - + #include "taskmgr.h" #include "procpage.h" #include "affinity.h" #include "perfdata.h" -HANDLE hProcessAffinityHandle; +HANDLE hProcessAffinityHandle; LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void ProcessPage_OnSetAffinity(void) { - LV_ITEM lvitem; - ULONG Index; - DWORD dwProcessId; - TCHAR strErrorText[260]; + LV_ITEM lvitem; + ULONG Index; + DWORD dwProcessId; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LV_ITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } - dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; - hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcessAffinityHandle) { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); - return; - } - DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, (DLGPROC)AffinityDialogWndProc); - if (hProcessAffinityHandle) { - CloseHandle(hProcessAffinityHandle); - hProcessAffinityHandle = NULL; - } + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { + memset(&lvitem, 0, sizeof(LV_ITEM)); + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; + ListView_GetItem(hProcessPageListCtrl, &lvitem); + if (lvitem.state & LVIS_SELECTED) + break; + } + dwProcessId = PerfDataGetProcessId(Index); + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; + hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); + if (!hProcessAffinityHandle) { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + return; + } + DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, (DLGPROC)AffinityDialogWndProc); + if (hProcessAffinityHandle) { + CloseHandle(hProcessAffinityHandle); + hProcessAffinityHandle = NULL; + } } LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - DWORD dwProcessAffinityMask = 0; - DWORD dwSystemAffinityMask = 0; - TCHAR strErrorText[260]; + DWORD dwProcessAffinityMask = 0; + DWORD dwSystemAffinityMask = 0; + TCHAR strErrorText[260]; - switch (message) { - case WM_INITDIALOG: + switch (message) { + case WM_INITDIALOG: - /* - * Get the current affinity mask for the process and - * the number of CPUs present in the system - */ - if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { - GetLastErrorText(strErrorText, 260); - EndDialog(hDlg, 0); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); - } + /* + * Get the current affinity mask for the process and + * the number of CPUs present in the system + */ + if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { + GetLastErrorText(strErrorText, 260); + EndDialog(hDlg, 0); + MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + } - /* - * Enable a checkbox for each processor present in the system - */ - if (dwSystemAffinityMask & 0x00000001) - EnableWindow(GetDlgItem(hDlg, IDC_CPU0), TRUE); - if (dwSystemAffinityMask & 0x00000002) - EnableWindow(GetDlgItem(hDlg, IDC_CPU1), TRUE); - if (dwSystemAffinityMask & 0x00000004) - EnableWindow(GetDlgItem(hDlg, IDC_CPU2), TRUE); - if (dwSystemAffinityMask & 0x00000008) - EnableWindow(GetDlgItem(hDlg, IDC_CPU3), TRUE); - if (dwSystemAffinityMask & 0x00000010) - EnableWindow(GetDlgItem(hDlg, IDC_CPU4), TRUE); - if (dwSystemAffinityMask & 0x00000020) - EnableWindow(GetDlgItem(hDlg, IDC_CPU5), TRUE); - if (dwSystemAffinityMask & 0x00000040) - EnableWindow(GetDlgItem(hDlg, IDC_CPU6), TRUE); - if (dwSystemAffinityMask & 0x00000080) - EnableWindow(GetDlgItem(hDlg, IDC_CPU7), TRUE); - if (dwSystemAffinityMask & 0x00000100) - EnableWindow(GetDlgItem(hDlg, IDC_CPU8), TRUE); - if (dwSystemAffinityMask & 0x00000200) - EnableWindow(GetDlgItem(hDlg, IDC_CPU9), TRUE); - if (dwSystemAffinityMask & 0x00000400) - EnableWindow(GetDlgItem(hDlg, IDC_CPU10), TRUE); - if (dwSystemAffinityMask & 0x00000800) - EnableWindow(GetDlgItem(hDlg, IDC_CPU11), TRUE); - if (dwSystemAffinityMask & 0x00001000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU12), TRUE); - if (dwSystemAffinityMask & 0x00002000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU13), TRUE); - if (dwSystemAffinityMask & 0x00004000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU14), TRUE); - if (dwSystemAffinityMask & 0x00008000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU15), TRUE); - if (dwSystemAffinityMask & 0x00010000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU16), TRUE); - if (dwSystemAffinityMask & 0x00020000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU17), TRUE); - if (dwSystemAffinityMask & 0x00040000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU18), TRUE); - if (dwSystemAffinityMask & 0x00080000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU19), TRUE); - if (dwSystemAffinityMask & 0x00100000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU20), TRUE); - if (dwSystemAffinityMask & 0x00200000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU21), TRUE); - if (dwSystemAffinityMask & 0x00400000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU22), TRUE); - if (dwSystemAffinityMask & 0x00800000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU23), TRUE); - if (dwSystemAffinityMask & 0x01000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU24), TRUE); - if (dwSystemAffinityMask & 0x02000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU25), TRUE); - if (dwSystemAffinityMask & 0x04000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU26), TRUE); - if (dwSystemAffinityMask & 0x08000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU27), TRUE); - if (dwSystemAffinityMask & 0x10000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU28), TRUE); - if (dwSystemAffinityMask & 0x20000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU29), TRUE); - if (dwSystemAffinityMask & 0x40000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU30), TRUE); - if (dwSystemAffinityMask & 0x80000000) - EnableWindow(GetDlgItem(hDlg, IDC_CPU31), TRUE); + /* + * Enable a checkbox for each processor present in the system + */ + if (dwSystemAffinityMask & 0x00000001) + EnableWindow(GetDlgItem(hDlg, IDC_CPU0), TRUE); + if (dwSystemAffinityMask & 0x00000002) + EnableWindow(GetDlgItem(hDlg, IDC_CPU1), TRUE); + if (dwSystemAffinityMask & 0x00000004) + EnableWindow(GetDlgItem(hDlg, IDC_CPU2), TRUE); + if (dwSystemAffinityMask & 0x00000008) + EnableWindow(GetDlgItem(hDlg, IDC_CPU3), TRUE); + if (dwSystemAffinityMask & 0x00000010) + EnableWindow(GetDlgItem(hDlg, IDC_CPU4), TRUE); + if (dwSystemAffinityMask & 0x00000020) + EnableWindow(GetDlgItem(hDlg, IDC_CPU5), TRUE); + if (dwSystemAffinityMask & 0x00000040) + EnableWindow(GetDlgItem(hDlg, IDC_CPU6), TRUE); + if (dwSystemAffinityMask & 0x00000080) + EnableWindow(GetDlgItem(hDlg, IDC_CPU7), TRUE); + if (dwSystemAffinityMask & 0x00000100) + EnableWindow(GetDlgItem(hDlg, IDC_CPU8), TRUE); + if (dwSystemAffinityMask & 0x00000200) + EnableWindow(GetDlgItem(hDlg, IDC_CPU9), TRUE); + if (dwSystemAffinityMask & 0x00000400) + EnableWindow(GetDlgItem(hDlg, IDC_CPU10), TRUE); + if (dwSystemAffinityMask & 0x00000800) + EnableWindow(GetDlgItem(hDlg, IDC_CPU11), TRUE); + if (dwSystemAffinityMask & 0x00001000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU12), TRUE); + if (dwSystemAffinityMask & 0x00002000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU13), TRUE); + if (dwSystemAffinityMask & 0x00004000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU14), TRUE); + if (dwSystemAffinityMask & 0x00008000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU15), TRUE); + if (dwSystemAffinityMask & 0x00010000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU16), TRUE); + if (dwSystemAffinityMask & 0x00020000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU17), TRUE); + if (dwSystemAffinityMask & 0x00040000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU18), TRUE); + if (dwSystemAffinityMask & 0x00080000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU19), TRUE); + if (dwSystemAffinityMask & 0x00100000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU20), TRUE); + if (dwSystemAffinityMask & 0x00200000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU21), TRUE); + if (dwSystemAffinityMask & 0x00400000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU22), TRUE); + if (dwSystemAffinityMask & 0x00800000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU23), TRUE); + if (dwSystemAffinityMask & 0x01000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU24), TRUE); + if (dwSystemAffinityMask & 0x02000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU25), TRUE); + if (dwSystemAffinityMask & 0x04000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU26), TRUE); + if (dwSystemAffinityMask & 0x08000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU27), TRUE); + if (dwSystemAffinityMask & 0x10000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU28), TRUE); + if (dwSystemAffinityMask & 0x20000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU29), TRUE); + if (dwSystemAffinityMask & 0x40000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU30), TRUE); + if (dwSystemAffinityMask & 0x80000000) + EnableWindow(GetDlgItem(hDlg, IDC_CPU31), TRUE); - /* - * Check each checkbox that the current process - * has affinity with - */ - if (dwProcessAffinityMask & 0x00000001) - SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000002) - SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000004) - SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000008) - SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000010) - SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000020) - SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000040) - SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000080) - SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000100) - SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000200) - SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000400) - SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00000800) - SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00001000) - SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00002000) - SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00004000) - SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00008000) - SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00010000) - SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00020000) - SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00040000) - SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00080000) - SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00100000) - SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00200000) - SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00400000) - SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x00800000) - SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x01000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x02000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x04000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x08000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x10000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x20000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x40000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_SETCHECK, BST_CHECKED, 0); - if (dwProcessAffinityMask & 0x80000000) - SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_SETCHECK, BST_CHECKED, 0); + /* + * Check each checkbox that the current process + * has affinity with + */ + if (dwProcessAffinityMask & 0x00000001) + SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000002) + SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000004) + SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000008) + SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000010) + SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000020) + SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000040) + SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000080) + SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000100) + SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000200) + SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000400) + SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00000800) + SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00001000) + SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00002000) + SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00004000) + SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00008000) + SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00010000) + SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00020000) + SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00040000) + SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00080000) + SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00100000) + SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00200000) + SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00400000) + SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x00800000) + SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x01000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x02000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x04000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x08000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x10000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x20000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x40000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_SETCHECK, BST_CHECKED, 0); + if (dwProcessAffinityMask & 0x80000000) + SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_SETCHECK, BST_CHECKED, 0); - return TRUE; + return TRUE; - case WM_COMMAND: + case WM_COMMAND: - /* - * If the user has cancelled the dialog box - * then just close it - */ - if (LOWORD(wParam) == IDCANCEL) { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + /* + * If the user has cancelled the dialog box + * then just close it + */ + if (LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - /* - * The user has clicked OK -- so now we have - * to adjust the process affinity mask - */ - if (LOWORD(wParam) == IDOK) { - /* - * First we have to create a mask out of each - * checkbox that the user checked. - */ - if (SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000001; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000002; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000004; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000008; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000010; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000020; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000040; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000080; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000100; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000200; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000400; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00000800; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00001000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00002000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00004000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00008000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00010000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00020000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00040000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00080000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00100000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00200000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00400000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x00800000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x01000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x02000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x04000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x08000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x10000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x20000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x40000000; - if (SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_GETCHECK, 0, 0)) - dwProcessAffinityMask |= 0x80000000; + /* + * The user has clicked OK -- so now we have + * to adjust the process affinity mask + */ + if (LOWORD(wParam) == IDOK) { + /* + * First we have to create a mask out of each + * checkbox that the user checked. + */ + if (SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000001; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000002; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000004; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000008; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000010; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000020; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000040; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000080; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000100; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000200; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000400; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00000800; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00001000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00002000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00004000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00008000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00010000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00020000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00040000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00080000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00100000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00200000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00400000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x00800000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x01000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x02000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x04000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x08000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x10000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x20000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x40000000; + if (SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_GETCHECK, 0, 0)) + dwProcessAffinityMask |= 0x80000000; - /* - * Make sure they are giving the process affinity - * with at least one processor. I'd hate to see a - * process that is not in a wait state get deprived - * of it's cpu time. - */ - if (!dwProcessAffinityMask) { - MessageBox(hDlg, _T("The process must have affinity with at least one processor."), _T("Invalid Option"), MB_OK|MB_ICONSTOP); - return TRUE; - } + /* + * Make sure they are giving the process affinity + * with at least one processor. I'd hate to see a + * process that is not in a wait state get deprived + * of it's cpu time. + */ + if (!dwProcessAffinityMask) { + MessageBox(hDlg, _T("The process must have affinity with at least one processor."), _T("Invalid Option"), MB_OK|MB_ICONSTOP); + return TRUE; + } - /* - * Try to set the process affinity - */ - if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { - GetLastErrorText(strErrorText, 260); - EndDialog(hDlg, LOWORD(wParam)); - MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); - } + /* + * Try to set the process affinity + */ + if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { + GetLastErrorText(strErrorText, 260); + EndDialog(hDlg, LOWORD(wParam)); + MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP); + } - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - break; - } + break; + } return 0; } diff --git a/rosapps/taskmgr/applpage.c b/rosapps/taskmgr/applpage.c index f66dfb53993..ccc4a059a60 100644 --- a/rosapps/taskmgr/applpage.c +++ b/rosapps/taskmgr/applpage.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -885,7 +885,7 @@ void ApplicationPage_OnSwitchTo(void) SwitchToThisWindow = (PROCSWITCHTOTHISWINDOW)GetProcAddress(hUser32, "SwitchToThisWindow"); if (SwitchToThisWindow) { SwitchToThisWindow(pAPLI->hWnd, TRUE); - } else { + } else { if (IsIconic(pAPLI->hWnd)) ShowWindow(pAPLI->hWnd, SW_RESTORE); BringWindowToTop(pAPLI->hWnd); @@ -956,10 +956,10 @@ int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM l LPAPPLICATION_PAGE_LIST_ITEM Param1; LPAPPLICATION_PAGE_LIST_ITEM Param2; - if (bSortAscending) { + if (bSortAscending) { Param1 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam1; Param2 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam2; - } else { + } else { Param1 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam2; Param2 = (LPAPPLICATION_PAGE_LIST_ITEM)lParam1; } diff --git a/rosapps/taskmgr/applpage.h b/rosapps/taskmgr/applpage.h index f332c130a8f..0c48d106344 100644 --- a/rosapps/taskmgr/applpage.h +++ b/rosapps/taskmgr/applpage.h @@ -19,32 +19,32 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + #ifndef __APPLICATIONPAGE_H #define __APPLICATIONPAGE_H -extern HWND hApplicationPage; /* Application List Property Page */ +extern HWND hApplicationPage; /* Application List Property Page */ -extern HWND hApplicationPageListCtrl; /* Application ListCtrl Window */ -extern HWND hApplicationPageEndTaskButton; /* Application End Task button */ -extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ -extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ +extern HWND hApplicationPageListCtrl; /* Application ListCtrl Window */ +extern HWND hApplicationPageEndTaskButton; /* Application End Task button */ +extern HWND hApplicationPageSwitchToButton; /* Application Switch To button */ +extern HWND hApplicationPageNewTaskButton; /* Application New Task button */ -LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -void RefreshApplicationPage(void); -void UpdateApplicationListControlViewSetting(void); +LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +void RefreshApplicationPage(void); +void UpdateApplicationListControlViewSetting(void); -void ApplicationPage_OnViewLargeIcons(void); -void ApplicationPage_OnViewSmallIcons(void); -void ApplicationPage_OnViewDetails(void); -void ApplicationPage_OnWindowsTileHorizontally(void); -void ApplicationPage_OnWindowsTileVertically(void); -void ApplicationPage_OnWindowsMinimize(void); -void ApplicationPage_OnWindowsMaximize(void); -void ApplicationPage_OnWindowsCascade(void); -void ApplicationPage_OnWindowsBringToFront(void); -void ApplicationPage_OnSwitchTo(void); -void ApplicationPage_OnEndTask(void); -void ApplicationPage_OnGotoProcess(void); +void ApplicationPage_OnViewLargeIcons(void); +void ApplicationPage_OnViewSmallIcons(void); +void ApplicationPage_OnViewDetails(void); +void ApplicationPage_OnWindowsTileHorizontally(void); +void ApplicationPage_OnWindowsTileVertically(void); +void ApplicationPage_OnWindowsMinimize(void); +void ApplicationPage_OnWindowsMaximize(void); +void ApplicationPage_OnWindowsCascade(void); +void ApplicationPage_OnWindowsBringToFront(void); +void ApplicationPage_OnSwitchTo(void); +void ApplicationPage_OnEndTask(void); +void ApplicationPage_OnGotoProcess(void); #endif /* __APPLICATIONPAGE_H */ diff --git a/rosapps/taskmgr/column.c b/rosapps/taskmgr/column.c index 3cad7ac160c..06a19e4eb41 100644 --- a/rosapps/taskmgr/column.c +++ b/rosapps/taskmgr/column.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -28,519 +28,519 @@ #include #include #include - + #include "taskmgr.h" #include "column.h" #include "procpage.h" -UINT ColumnDataHints[25]; +UINT ColumnDataHints[25]; -int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); -LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem); +LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); void AddColumns(void) { - int size; + int size; - if (TaskManagerSettings.Column_ImageName) - InsertColumn(0, _T("Image Name"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); - if (TaskManagerSettings.Column_PID) - InsertColumn(1, _T("PID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[1], -1); - if (TaskManagerSettings.Column_UserName) - InsertColumn(2, _T("Username"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[2], -1); - if (TaskManagerSettings.Column_SessionID) - InsertColumn(3, _T("Session ID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[3], -1); - if (TaskManagerSettings.Column_CPUUsage) - InsertColumn(4, _T("CPU"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[4], -1); - if (TaskManagerSettings.Column_CPUTime) - InsertColumn(5, _T("CPU Time"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[5], -1); - if (TaskManagerSettings.Column_MemoryUsage) - InsertColumn(6, _T("Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[6], -1); - if (TaskManagerSettings.Column_PeakMemoryUsage) - InsertColumn(7, _T("Peak Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[7], -1); - if (TaskManagerSettings.Column_MemoryUsageDelta) - InsertColumn(8, _T("Mem Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[8], -1); - if (TaskManagerSettings.Column_PageFaults) - InsertColumn(9, _T("Page Faults"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[9], -1); - if (TaskManagerSettings.Column_PageFaultsDelta) - InsertColumn(10, _T("PF Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[10], -1); - if (TaskManagerSettings.Column_VirtualMemorySize) - InsertColumn(11, _T("VM Size"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[11], -1); - if (TaskManagerSettings.Column_PagedPool) - InsertColumn(12, _T("Paged Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[12], -1); - if (TaskManagerSettings.Column_NonPagedPool) - InsertColumn(13, _T("NP Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[13], -1); - if (TaskManagerSettings.Column_BasePriority) - InsertColumn(14, _T("Base Pri"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[14], -1); - if (TaskManagerSettings.Column_HandleCount) - InsertColumn(15, _T("Handles"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[15], -1); - if (TaskManagerSettings.Column_ThreadCount) - InsertColumn(16, _T("Threads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[16], -1); - if (TaskManagerSettings.Column_USERObjects) - InsertColumn(17, _T("USER Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[17], -1); - if (TaskManagerSettings.Column_GDIObjects) - InsertColumn(18, _T("GDI Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[18], -1); - if (TaskManagerSettings.Column_IOReads) - InsertColumn(19, _T("I/O Reads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[19], -1); - if (TaskManagerSettings.Column_IOWrites) - InsertColumn(20, _T("I/O Writes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[20], -1); - if (TaskManagerSettings.Column_IOOther) - InsertColumn(21, _T("I/O Other"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[21], -1); - if (TaskManagerSettings.Column_IOReadBytes) - InsertColumn(22, _T("I/O Read Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[22], -1); - if (TaskManagerSettings.Column_IOWriteBytes) - InsertColumn(23, _T("I/O Write Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[23], -1); - if (TaskManagerSettings.Column_IOOtherBytes) - InsertColumn(24, _T("I/O Other Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[24], -1); + if (TaskManagerSettings.Column_ImageName) + InsertColumn(0, _T("Image Name"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); + if (TaskManagerSettings.Column_PID) + InsertColumn(1, _T("PID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[1], -1); + if (TaskManagerSettings.Column_UserName) + InsertColumn(2, _T("Username"), LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[2], -1); + if (TaskManagerSettings.Column_SessionID) + InsertColumn(3, _T("Session ID"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[3], -1); + if (TaskManagerSettings.Column_CPUUsage) + InsertColumn(4, _T("CPU"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[4], -1); + if (TaskManagerSettings.Column_CPUTime) + InsertColumn(5, _T("CPU Time"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[5], -1); + if (TaskManagerSettings.Column_MemoryUsage) + InsertColumn(6, _T("Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[6], -1); + if (TaskManagerSettings.Column_PeakMemoryUsage) + InsertColumn(7, _T("Peak Mem Usage"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[7], -1); + if (TaskManagerSettings.Column_MemoryUsageDelta) + InsertColumn(8, _T("Mem Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[8], -1); + if (TaskManagerSettings.Column_PageFaults) + InsertColumn(9, _T("Page Faults"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[9], -1); + if (TaskManagerSettings.Column_PageFaultsDelta) + InsertColumn(10, _T("PF Delta"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[10], -1); + if (TaskManagerSettings.Column_VirtualMemorySize) + InsertColumn(11, _T("VM Size"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[11], -1); + if (TaskManagerSettings.Column_PagedPool) + InsertColumn(12, _T("Paged Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[12], -1); + if (TaskManagerSettings.Column_NonPagedPool) + InsertColumn(13, _T("NP Pool"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[13], -1); + if (TaskManagerSettings.Column_BasePriority) + InsertColumn(14, _T("Base Pri"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[14], -1); + if (TaskManagerSettings.Column_HandleCount) + InsertColumn(15, _T("Handles"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[15], -1); + if (TaskManagerSettings.Column_ThreadCount) + InsertColumn(16, _T("Threads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[16], -1); + if (TaskManagerSettings.Column_USERObjects) + InsertColumn(17, _T("USER Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[17], -1); + if (TaskManagerSettings.Column_GDIObjects) + InsertColumn(18, _T("GDI Objects"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[18], -1); + if (TaskManagerSettings.Column_IOReads) + InsertColumn(19, _T("I/O Reads"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[19], -1); + if (TaskManagerSettings.Column_IOWrites) + InsertColumn(20, _T("I/O Writes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[20], -1); + if (TaskManagerSettings.Column_IOOther) + InsertColumn(21, _T("I/O Other"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[21], -1); + if (TaskManagerSettings.Column_IOReadBytes) + InsertColumn(22, _T("I/O Read Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[22], -1); + if (TaskManagerSettings.Column_IOWriteBytes) + InsertColumn(23, _T("I/O Write Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[23], -1); + if (TaskManagerSettings.Column_IOOtherBytes) + InsertColumn(24, _T("I/O Other Bytes"), LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[24], -1); - size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessage(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); + SendMessage(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); - UpdateColumnDataHints(); + UpdateColumnDataHints(); } int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) { - LVCOLUMN column; + LVCOLUMN column; - column.mask = LVCF_TEXT|LVCF_FMT; - column.pszText = (LPTSTR)lpszColumnHeading; - column.fmt = nFormat; + column.mask = LVCF_TEXT|LVCF_FMT; + column.pszText = (LPTSTR)lpszColumnHeading; + column.fmt = nFormat; - if (nWidth != -1) - { - column.mask |= LVCF_WIDTH; - column.cx = nWidth; - } + if (nWidth != -1) + { + column.mask |= LVCF_WIDTH; + column.cx = nWidth; + } - if (nSubItem != -1) - { - column.mask |= LVCF_SUBITEM; - column.iSubItem = nSubItem; - } + if (nSubItem != -1) + { + column.mask |= LVCF_SUBITEM; + column.iSubItem = nSubItem; + } - return ListView_InsertColumn(hProcessPageListCtrl, nCol, &column); + return ListView_InsertColumn(hProcessPageListCtrl, nCol, &column); } void SaveColumnSettings(void) { - HDITEM hditem; - int i; - TCHAR text[260]; - int size; + HDITEM hditem; + int i; + TCHAR text[260]; + int size; - /* Reset column data */ - for (i=0; i<25; i++) - TaskManagerSettings.ColumnOrderArray[i] = i; + /* Reset column data */ + for (i=0; i<25; i++) + TaskManagerSettings.ColumnOrderArray[i] = i; - TaskManagerSettings.Column_ImageName = FALSE; - TaskManagerSettings.Column_PID = FALSE; - TaskManagerSettings.Column_CPUUsage = FALSE; - TaskManagerSettings.Column_CPUTime = FALSE; - TaskManagerSettings.Column_MemoryUsage = FALSE; - TaskManagerSettings.Column_MemoryUsageDelta = FALSE; - TaskManagerSettings.Column_PeakMemoryUsage = FALSE; - TaskManagerSettings.Column_PageFaults = FALSE; - TaskManagerSettings.Column_USERObjects = FALSE; - TaskManagerSettings.Column_IOReads = FALSE; - TaskManagerSettings.Column_IOReadBytes = FALSE; - TaskManagerSettings.Column_SessionID = FALSE; - TaskManagerSettings.Column_UserName = FALSE; - TaskManagerSettings.Column_PageFaultsDelta = FALSE; - TaskManagerSettings.Column_VirtualMemorySize = FALSE; - TaskManagerSettings.Column_PagedPool = FALSE; - TaskManagerSettings.Column_NonPagedPool = FALSE; - TaskManagerSettings.Column_BasePriority = FALSE; - TaskManagerSettings.Column_HandleCount = FALSE; - TaskManagerSettings.Column_ThreadCount = FALSE; - TaskManagerSettings.Column_GDIObjects = FALSE; - TaskManagerSettings.Column_IOWrites = FALSE; - TaskManagerSettings.Column_IOWriteBytes = FALSE; - TaskManagerSettings.Column_IOOther = FALSE; - TaskManagerSettings.Column_IOOtherBytes = FALSE; - TaskManagerSettings.ColumnSizeArray[0] = 105; - TaskManagerSettings.ColumnSizeArray[1] = 50; - TaskManagerSettings.ColumnSizeArray[2] = 107; - TaskManagerSettings.ColumnSizeArray[3] = 70; - TaskManagerSettings.ColumnSizeArray[4] = 35; - TaskManagerSettings.ColumnSizeArray[5] = 70; - TaskManagerSettings.ColumnSizeArray[6] = 70; - TaskManagerSettings.ColumnSizeArray[7] = 100; - TaskManagerSettings.ColumnSizeArray[8] = 70; - TaskManagerSettings.ColumnSizeArray[9] = 70; - TaskManagerSettings.ColumnSizeArray[10] = 70; - TaskManagerSettings.ColumnSizeArray[11] = 70; - TaskManagerSettings.ColumnSizeArray[12] = 70; - TaskManagerSettings.ColumnSizeArray[13] = 70; - TaskManagerSettings.ColumnSizeArray[14] = 60; - TaskManagerSettings.ColumnSizeArray[15] = 60; - TaskManagerSettings.ColumnSizeArray[16] = 60; - TaskManagerSettings.ColumnSizeArray[17] = 60; - TaskManagerSettings.ColumnSizeArray[18] = 60; - TaskManagerSettings.ColumnSizeArray[19] = 70; - TaskManagerSettings.ColumnSizeArray[20] = 70; - TaskManagerSettings.ColumnSizeArray[21] = 70; - TaskManagerSettings.ColumnSizeArray[22] = 70; - TaskManagerSettings.ColumnSizeArray[23] = 70; - TaskManagerSettings.ColumnSizeArray[24] = 70; + TaskManagerSettings.Column_ImageName = FALSE; + TaskManagerSettings.Column_PID = FALSE; + TaskManagerSettings.Column_CPUUsage = FALSE; + TaskManagerSettings.Column_CPUTime = FALSE; + TaskManagerSettings.Column_MemoryUsage = FALSE; + TaskManagerSettings.Column_MemoryUsageDelta = FALSE; + TaskManagerSettings.Column_PeakMemoryUsage = FALSE; + TaskManagerSettings.Column_PageFaults = FALSE; + TaskManagerSettings.Column_USERObjects = FALSE; + TaskManagerSettings.Column_IOReads = FALSE; + TaskManagerSettings.Column_IOReadBytes = FALSE; + TaskManagerSettings.Column_SessionID = FALSE; + TaskManagerSettings.Column_UserName = FALSE; + TaskManagerSettings.Column_PageFaultsDelta = FALSE; + TaskManagerSettings.Column_VirtualMemorySize = FALSE; + TaskManagerSettings.Column_PagedPool = FALSE; + TaskManagerSettings.Column_NonPagedPool = FALSE; + TaskManagerSettings.Column_BasePriority = FALSE; + TaskManagerSettings.Column_HandleCount = FALSE; + TaskManagerSettings.Column_ThreadCount = FALSE; + TaskManagerSettings.Column_GDIObjects = FALSE; + TaskManagerSettings.Column_IOWrites = FALSE; + TaskManagerSettings.Column_IOWriteBytes = FALSE; + TaskManagerSettings.Column_IOOther = FALSE; + TaskManagerSettings.Column_IOOtherBytes = FALSE; + TaskManagerSettings.ColumnSizeArray[0] = 105; + TaskManagerSettings.ColumnSizeArray[1] = 50; + TaskManagerSettings.ColumnSizeArray[2] = 107; + TaskManagerSettings.ColumnSizeArray[3] = 70; + TaskManagerSettings.ColumnSizeArray[4] = 35; + TaskManagerSettings.ColumnSizeArray[5] = 70; + TaskManagerSettings.ColumnSizeArray[6] = 70; + TaskManagerSettings.ColumnSizeArray[7] = 100; + TaskManagerSettings.ColumnSizeArray[8] = 70; + TaskManagerSettings.ColumnSizeArray[9] = 70; + TaskManagerSettings.ColumnSizeArray[10] = 70; + TaskManagerSettings.ColumnSizeArray[11] = 70; + TaskManagerSettings.ColumnSizeArray[12] = 70; + TaskManagerSettings.ColumnSizeArray[13] = 70; + TaskManagerSettings.ColumnSizeArray[14] = 60; + TaskManagerSettings.ColumnSizeArray[15] = 60; + TaskManagerSettings.ColumnSizeArray[16] = 60; + TaskManagerSettings.ColumnSizeArray[17] = 60; + TaskManagerSettings.ColumnSizeArray[18] = 60; + TaskManagerSettings.ColumnSizeArray[19] = 70; + TaskManagerSettings.ColumnSizeArray[20] = 70; + TaskManagerSettings.ColumnSizeArray[21] = 70; + TaskManagerSettings.ColumnSizeArray[22] = 70; + TaskManagerSettings.ColumnSizeArray[23] = 70; + TaskManagerSettings.ColumnSizeArray[24] = 70; - /* Get header order */ - size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessage(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + /* Get header order */ + size = SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); + SendMessage(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); - /* Get visible columns */ - for (i=0; i=0; i--) - { - ListView_DeleteColumn(hProcessPageListCtrl, i); - } + if (DialogBox(hInst, MAKEINTRESOURCE(IDD_COLUMNS_DIALOG), hMainWnd, (DLGPROC)ColumnsDialogWndProc) == IDOK) + { + for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--) + { + ListView_DeleteColumn(hProcessPageListCtrl, i); + } - for (i=0; i<25; i++) - TaskManagerSettings.ColumnOrderArray[i] = i; + for (i=0; i<25; i++) + TaskManagerSettings.ColumnOrderArray[i] = i; - TaskManagerSettings.ColumnSizeArray[0] = 105; - TaskManagerSettings.ColumnSizeArray[1] = 50; - TaskManagerSettings.ColumnSizeArray[2] = 107; - TaskManagerSettings.ColumnSizeArray[3] = 70; - TaskManagerSettings.ColumnSizeArray[4] = 35; - TaskManagerSettings.ColumnSizeArray[5] = 70; - TaskManagerSettings.ColumnSizeArray[6] = 70; - TaskManagerSettings.ColumnSizeArray[7] = 100; - TaskManagerSettings.ColumnSizeArray[8] = 70; - TaskManagerSettings.ColumnSizeArray[9] = 70; - TaskManagerSettings.ColumnSizeArray[10] = 70; - TaskManagerSettings.ColumnSizeArray[11] = 70; - TaskManagerSettings.ColumnSizeArray[12] = 70; - TaskManagerSettings.ColumnSizeArray[13] = 70; - TaskManagerSettings.ColumnSizeArray[14] = 60; - TaskManagerSettings.ColumnSizeArray[15] = 60; - TaskManagerSettings.ColumnSizeArray[16] = 60; - TaskManagerSettings.ColumnSizeArray[17] = 60; - TaskManagerSettings.ColumnSizeArray[18] = 60; - TaskManagerSettings.ColumnSizeArray[19] = 70; - TaskManagerSettings.ColumnSizeArray[20] = 70; - TaskManagerSettings.ColumnSizeArray[21] = 70; - TaskManagerSettings.ColumnSizeArray[22] = 70; - TaskManagerSettings.ColumnSizeArray[23] = 70; - TaskManagerSettings.ColumnSizeArray[24] = 70; + TaskManagerSettings.ColumnSizeArray[0] = 105; + TaskManagerSettings.ColumnSizeArray[1] = 50; + TaskManagerSettings.ColumnSizeArray[2] = 107; + TaskManagerSettings.ColumnSizeArray[3] = 70; + TaskManagerSettings.ColumnSizeArray[4] = 35; + TaskManagerSettings.ColumnSizeArray[5] = 70; + TaskManagerSettings.ColumnSizeArray[6] = 70; + TaskManagerSettings.ColumnSizeArray[7] = 100; + TaskManagerSettings.ColumnSizeArray[8] = 70; + TaskManagerSettings.ColumnSizeArray[9] = 70; + TaskManagerSettings.ColumnSizeArray[10] = 70; + TaskManagerSettings.ColumnSizeArray[11] = 70; + TaskManagerSettings.ColumnSizeArray[12] = 70; + TaskManagerSettings.ColumnSizeArray[13] = 70; + TaskManagerSettings.ColumnSizeArray[14] = 60; + TaskManagerSettings.ColumnSizeArray[15] = 60; + TaskManagerSettings.ColumnSizeArray[16] = 60; + TaskManagerSettings.ColumnSizeArray[17] = 60; + TaskManagerSettings.ColumnSizeArray[18] = 60; + TaskManagerSettings.ColumnSizeArray[19] = 70; + TaskManagerSettings.ColumnSizeArray[20] = 70; + TaskManagerSettings.ColumnSizeArray[21] = 70; + TaskManagerSettings.ColumnSizeArray[22] = 70; + TaskManagerSettings.ColumnSizeArray[23] = 70; + TaskManagerSettings.ColumnSizeArray[24] = 70; - AddColumns(); - } + AddColumns(); + } } LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: - if (TaskManagerSettings.Column_ImageName) - SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PID) - SendMessage(GetDlgItem(hDlg, IDC_PID), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_UserName) - SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_SessionID) - SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_CPUUsage) - SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_CPUTime) - SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_MemoryUsage) - SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PeakMemoryUsage) - SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_MemoryUsageDelta) - SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PageFaults) - SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PageFaultsDelta) - SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_VirtualMemorySize) - SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_PagedPool) - SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_NonPagedPool) - SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_BasePriority) - SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_HandleCount) - SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_ThreadCount) - SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_USERObjects) - SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_GDIObjects) - SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOReads) - SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOWrites) - SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOOther) - SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOReadBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOWriteBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_SETCHECK, BST_CHECKED, 0); - if (TaskManagerSettings.Column_IOOtherBytes) - SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_ImageName) + SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_PID) + SendMessage(GetDlgItem(hDlg, IDC_PID), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_UserName) + SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_SessionID) + SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_CPUUsage) + SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_CPUTime) + SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_MemoryUsage) + SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_PeakMemoryUsage) + SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_MemoryUsageDelta) + SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_PageFaults) + SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_PageFaultsDelta) + SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_VirtualMemorySize) + SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_PagedPool) + SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_NonPagedPool) + SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_BasePriority) + SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_HandleCount) + SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_ThreadCount) + SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_USERObjects) + SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_GDIObjects) + SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOReads) + SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOWrites) + SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOOther) + SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOReadBytes) + SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOWriteBytes) + SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_SETCHECK, BST_CHECKED, 0); + if (TaskManagerSettings.Column_IOOtherBytes) + SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_SETCHECK, BST_CHECKED, 0); - return TRUE; + return TRUE; - case WM_COMMAND: + case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + if (LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - if (LOWORD(wParam) == IDOK) - { - TaskManagerSettings.Column_ImageName = SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PID = SendMessage(GetDlgItem(hDlg, IDC_PID), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_UserName = SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_SessionID = SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_CPUUsage = SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_CPUTime = SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_MemoryUsage = SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PeakMemoryUsage = SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_MemoryUsageDelta = SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PageFaults = SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PageFaultsDelta = SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_VirtualMemorySize = SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_PagedPool = SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_NonPagedPool = SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_BasePriority = SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_HandleCount = SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_ThreadCount = SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_USERObjects = SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_GDIObjects = SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOReads = SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOWrites = SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOOther = SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOReadBytes = SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOWriteBytes = SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_GETCHECK, 0, 0); - TaskManagerSettings.Column_IOOtherBytes = SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_GETCHECK, 0, 0); + if (LOWORD(wParam) == IDOK) + { + TaskManagerSettings.Column_ImageName = SendMessage(GetDlgItem(hDlg, IDC_IMAGENAME), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_PID = SendMessage(GetDlgItem(hDlg, IDC_PID), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_UserName = SendMessage(GetDlgItem(hDlg, IDC_USERNAME), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_SessionID = SendMessage(GetDlgItem(hDlg, IDC_SESSIONID), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_CPUUsage = SendMessage(GetDlgItem(hDlg, IDC_CPUUSAGE), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_CPUTime = SendMessage(GetDlgItem(hDlg, IDC_CPUTIME), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_MemoryUsage = SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGE), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_PeakMemoryUsage = SendMessage(GetDlgItem(hDlg, IDC_PEAKMEMORYUSAGE), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_MemoryUsageDelta = SendMessage(GetDlgItem(hDlg, IDC_MEMORYUSAGEDELTA), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_PageFaults = SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTS), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_PageFaultsDelta = SendMessage(GetDlgItem(hDlg, IDC_PAGEFAULTSDELTA), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_VirtualMemorySize = SendMessage(GetDlgItem(hDlg, IDC_VIRTUALMEMORYSIZE), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_PagedPool = SendMessage(GetDlgItem(hDlg, IDC_PAGEDPOOL), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_NonPagedPool = SendMessage(GetDlgItem(hDlg, IDC_NONPAGEDPOOL), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_BasePriority = SendMessage(GetDlgItem(hDlg, IDC_BASEPRIORITY), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_HandleCount = SendMessage(GetDlgItem(hDlg, IDC_HANDLECOUNT), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_ThreadCount = SendMessage(GetDlgItem(hDlg, IDC_THREADCOUNT), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_USERObjects = SendMessage(GetDlgItem(hDlg, IDC_USEROBJECTS), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_GDIObjects = SendMessage(GetDlgItem(hDlg, IDC_GDIOBJECTS), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOReads = SendMessage(GetDlgItem(hDlg, IDC_IOREADS), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOWrites = SendMessage(GetDlgItem(hDlg, IDC_IOWRITES), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOOther = SendMessage(GetDlgItem(hDlg, IDC_IOOTHER), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOReadBytes = SendMessage(GetDlgItem(hDlg, IDC_IOREADBYTES), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOWriteBytes = SendMessage(GetDlgItem(hDlg, IDC_IOWRITEBYTES), BM_GETCHECK, 0, 0); + TaskManagerSettings.Column_IOOtherBytes = SendMessage(GetDlgItem(hDlg, IDC_IOOTHERBYTES), BM_GETCHECK, 0, 0); - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - break; - } + break; + } return 0; } void UpdateColumnDataHints(void) { - HDITEM hditem; - TCHAR text[260]; - ULONG Index; + HDITEM hditem; + TCHAR text[260]; + ULONG Index; - for (Index=0; Index<(ULONG)SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); Index++) - { - memset(&hditem, 0, sizeof(HDITEM)); + for (Index=0; Index<(ULONG)SendMessage(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); Index++) + { + memset(&hditem, 0, sizeof(HDITEM)); - hditem.mask = HDI_TEXT; - hditem.pszText = text; - hditem.cchTextMax = 260; + hditem.mask = HDI_TEXT; + hditem.pszText = text; + hditem.cchTextMax = 260; - SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); + SendMessage(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem); - if (_tcsicmp(text, _T("Image Name")) == 0) - ColumnDataHints[Index] = COLUMN_IMAGENAME; - if (_tcsicmp(text, _T("PID")) == 0) - ColumnDataHints[Index] = COLUMN_PID; - if (_tcsicmp(text, _T("Username")) == 0) - ColumnDataHints[Index] = COLUMN_USERNAME; - if (_tcsicmp(text, _T("Session ID")) == 0) - ColumnDataHints[Index] = COLUMN_SESSIONID; - if (_tcsicmp(text, _T("CPU")) == 0) - ColumnDataHints[Index] = COLUMN_CPUUSAGE; - if (_tcsicmp(text, _T("CPU Time")) == 0) - ColumnDataHints[Index] = COLUMN_CPUTIME; - if (_tcsicmp(text, _T("Mem Usage")) == 0) - ColumnDataHints[Index] = COLUMN_MEMORYUSAGE; - if (_tcsicmp(text, _T("Peak Mem Usage")) == 0) - ColumnDataHints[Index] = COLUMN_PEAKMEMORYUSAGE; - if (_tcsicmp(text, _T("Mem Delta")) == 0) - ColumnDataHints[Index] = COLUMN_MEMORYUSAGEDELTA; - if (_tcsicmp(text, _T("Page Faults")) == 0) - ColumnDataHints[Index] = COLUMN_PAGEFAULTS; - if (_tcsicmp(text, _T("PF Delta")) == 0) - ColumnDataHints[Index] = COLUMN_PAGEFAULTSDELTA; - if (_tcsicmp(text, _T("VM Size")) == 0) - ColumnDataHints[Index] = COLUMN_VIRTUALMEMORYSIZE; - if (_tcsicmp(text, _T("Paged Pool")) == 0) - ColumnDataHints[Index] = COLUMN_PAGEDPOOL; - if (_tcsicmp(text, _T("NP Pool")) == 0) - ColumnDataHints[Index] = COLUMN_NONPAGEDPOOL; - if (_tcsicmp(text, _T("Base Pri")) == 0) - ColumnDataHints[Index] = COLUMN_BASEPRIORITY; - if (_tcsicmp(text, _T("Handles")) == 0) - ColumnDataHints[Index] = COLUMN_HANDLECOUNT; - if (_tcsicmp(text, _T("Threads")) == 0) - ColumnDataHints[Index] = COLUMN_THREADCOUNT; - if (_tcsicmp(text, _T("USER Objects")) == 0) - ColumnDataHints[Index] = COLUMN_USEROBJECTS; - if (_tcsicmp(text, _T("GDI Objects")) == 0) - ColumnDataHints[Index] = COLUMN_GDIOBJECTS; - if (_tcsicmp(text, _T("I/O Reads")) == 0) - ColumnDataHints[Index] = COLUMN_IOREADS; - if (_tcsicmp(text, _T("I/O Writes")) == 0) - ColumnDataHints[Index] = COLUMN_IOWRITES; - if (_tcsicmp(text, _T("I/O Other")) == 0) - ColumnDataHints[Index] = COLUMN_IOOTHER; - if (_tcsicmp(text, _T("I/O Read Bytes")) == 0) - ColumnDataHints[Index] = COLUMN_IOREADBYTES; - if (_tcsicmp(text, _T("I/O Write Bytes")) == 0) - ColumnDataHints[Index] = COLUMN_IOWRITEBYTES; - if (_tcsicmp(text, _T("I/O Other Bytes")) == 0) - ColumnDataHints[Index] = COLUMN_IOOTHERBYTES; - } + if (_tcsicmp(text, _T("Image Name")) == 0) + ColumnDataHints[Index] = COLUMN_IMAGENAME; + if (_tcsicmp(text, _T("PID")) == 0) + ColumnDataHints[Index] = COLUMN_PID; + if (_tcsicmp(text, _T("Username")) == 0) + ColumnDataHints[Index] = COLUMN_USERNAME; + if (_tcsicmp(text, _T("Session ID")) == 0) + ColumnDataHints[Index] = COLUMN_SESSIONID; + if (_tcsicmp(text, _T("CPU")) == 0) + ColumnDataHints[Index] = COLUMN_CPUUSAGE; + if (_tcsicmp(text, _T("CPU Time")) == 0) + ColumnDataHints[Index] = COLUMN_CPUTIME; + if (_tcsicmp(text, _T("Mem Usage")) == 0) + ColumnDataHints[Index] = COLUMN_MEMORYUSAGE; + if (_tcsicmp(text, _T("Peak Mem Usage")) == 0) + ColumnDataHints[Index] = COLUMN_PEAKMEMORYUSAGE; + if (_tcsicmp(text, _T("Mem Delta")) == 0) + ColumnDataHints[Index] = COLUMN_MEMORYUSAGEDELTA; + if (_tcsicmp(text, _T("Page Faults")) == 0) + ColumnDataHints[Index] = COLUMN_PAGEFAULTS; + if (_tcsicmp(text, _T("PF Delta")) == 0) + ColumnDataHints[Index] = COLUMN_PAGEFAULTSDELTA; + if (_tcsicmp(text, _T("VM Size")) == 0) + ColumnDataHints[Index] = COLUMN_VIRTUALMEMORYSIZE; + if (_tcsicmp(text, _T("Paged Pool")) == 0) + ColumnDataHints[Index] = COLUMN_PAGEDPOOL; + if (_tcsicmp(text, _T("NP Pool")) == 0) + ColumnDataHints[Index] = COLUMN_NONPAGEDPOOL; + if (_tcsicmp(text, _T("Base Pri")) == 0) + ColumnDataHints[Index] = COLUMN_BASEPRIORITY; + if (_tcsicmp(text, _T("Handles")) == 0) + ColumnDataHints[Index] = COLUMN_HANDLECOUNT; + if (_tcsicmp(text, _T("Threads")) == 0) + ColumnDataHints[Index] = COLUMN_THREADCOUNT; + if (_tcsicmp(text, _T("USER Objects")) == 0) + ColumnDataHints[Index] = COLUMN_USEROBJECTS; + if (_tcsicmp(text, _T("GDI Objects")) == 0) + ColumnDataHints[Index] = COLUMN_GDIOBJECTS; + if (_tcsicmp(text, _T("I/O Reads")) == 0) + ColumnDataHints[Index] = COLUMN_IOREADS; + if (_tcsicmp(text, _T("I/O Writes")) == 0) + ColumnDataHints[Index] = COLUMN_IOWRITES; + if (_tcsicmp(text, _T("I/O Other")) == 0) + ColumnDataHints[Index] = COLUMN_IOOTHER; + if (_tcsicmp(text, _T("I/O Read Bytes")) == 0) + ColumnDataHints[Index] = COLUMN_IOREADBYTES; + if (_tcsicmp(text, _T("I/O Write Bytes")) == 0) + ColumnDataHints[Index] = COLUMN_IOWRITEBYTES; + if (_tcsicmp(text, _T("I/O Other Bytes")) == 0) + ColumnDataHints[Index] = COLUMN_IOOTHERBYTES; + } } diff --git a/rosapps/taskmgr/column.h b/rosapps/taskmgr/column.h index 5e653439a88..7525c7b52c4 100644 --- a/rosapps/taskmgr/column.h +++ b/rosapps/taskmgr/column.h @@ -19,37 +19,37 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + #ifndef __COLUMN_H #define __COLUMN_H -#define COLUMN_IMAGENAME 0 -#define COLUMN_PID 1 -#define COLUMN_USERNAME 2 -#define COLUMN_SESSIONID 3 -#define COLUMN_CPUUSAGE 4 -#define COLUMN_CPUTIME 5 -#define COLUMN_MEMORYUSAGE 6 -#define COLUMN_PEAKMEMORYUSAGE 7 -#define COLUMN_MEMORYUSAGEDELTA 8 -#define COLUMN_PAGEFAULTS 9 -#define COLUMN_PAGEFAULTSDELTA 10 -#define COLUMN_VIRTUALMEMORYSIZE 11 -#define COLUMN_PAGEDPOOL 12 -#define COLUMN_NONPAGEDPOOL 13 -#define COLUMN_BASEPRIORITY 14 -#define COLUMN_HANDLECOUNT 15 -#define COLUMN_THREADCOUNT 16 -#define COLUMN_USEROBJECTS 17 -#define COLUMN_GDIOBJECTS 18 -#define COLUMN_IOREADS 19 -#define COLUMN_IOWRITES 20 -#define COLUMN_IOOTHER 21 -#define COLUMN_IOREADBYTES 22 -#define COLUMN_IOWRITEBYTES 23 -#define COLUMN_IOOTHERBYTES 24 +#define COLUMN_IMAGENAME 0 +#define COLUMN_PID 1 +#define COLUMN_USERNAME 2 +#define COLUMN_SESSIONID 3 +#define COLUMN_CPUUSAGE 4 +#define COLUMN_CPUTIME 5 +#define COLUMN_MEMORYUSAGE 6 +#define COLUMN_PEAKMEMORYUSAGE 7 +#define COLUMN_MEMORYUSAGEDELTA 8 +#define COLUMN_PAGEFAULTS 9 +#define COLUMN_PAGEFAULTSDELTA 10 +#define COLUMN_VIRTUALMEMORYSIZE 11 +#define COLUMN_PAGEDPOOL 12 +#define COLUMN_NONPAGEDPOOL 13 +#define COLUMN_BASEPRIORITY 14 +#define COLUMN_HANDLECOUNT 15 +#define COLUMN_THREADCOUNT 16 +#define COLUMN_USEROBJECTS 17 +#define COLUMN_GDIOBJECTS 18 +#define COLUMN_IOREADS 19 +#define COLUMN_IOWRITES 20 +#define COLUMN_IOOTHER 21 +#define COLUMN_IOREADBYTES 22 +#define COLUMN_IOWRITEBYTES 23 +#define COLUMN_IOOTHERBYTES 24 -extern UINT ColumnDataHints[25]; +extern UINT ColumnDataHints[25]; void ProcessPage_OnViewSelectColumns(void); void AddColumns(void); diff --git a/rosapps/taskmgr/debug.c b/rosapps/taskmgr/debug.c index 948fed4fe26..0675a9233ef 100644 --- a/rosapps/taskmgr/debug.c +++ b/rosapps/taskmgr/debug.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,7 +29,7 @@ #include #include #include - + #include "taskmgr.h" #include "debug.h" #include "procpage.h" @@ -37,80 +37,80 @@ void ProcessPage_OnDebug(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - TCHAR strErrorText[260]; - HKEY hKey; - TCHAR strDebugPath[260]; - TCHAR strDebugger[260]; - DWORD dwDebuggerSize; - PROCESS_INFORMATION pi; - STARTUPINFO si; - HANDLE hDebugEvent; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + TCHAR strErrorText[260]; + HKEY hKey; + TCHAR strDebugPath[260]; + TCHAR strDebugger[260]; + DWORD dwDebuggerSize; + PROCESS_INFORMATION pi; + STARTUPINFO si; + HANDLE hDebugEvent; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); - return; - } + if (MessageBox(hMainWnd, _T("WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + return; + } - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); - return; - } + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + return; + } - dwDebuggerSize = 260; - if (RegQueryValueEx(hKey, _T("Debugger"), NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); - RegCloseKey(hKey); - return; - } + dwDebuggerSize = 260; + if (RegQueryValueEx(hKey, _T("Debugger"), NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + RegCloseKey(hKey); + return; + } - RegCloseKey(hKey); + RegCloseKey(hKey); - hDebugEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - if (!hDebugEvent) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); - return; - } + hDebugEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (!hDebugEvent) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + return; + } - wsprintf(strDebugPath, strDebugger, dwProcessId, hDebugEvent); + wsprintf(strDebugPath, strDebugger, dwProcessId, hDebugEvent); - memset(&pi, 0, sizeof(PROCESS_INFORMATION)); - memset(&si, 0, sizeof(STARTUPINFO)); - si.cb = sizeof(STARTUPINFO); - if (!CreateProcess(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); - } + memset(&pi, 0, sizeof(PROCESS_INFORMATION)); + memset(&si, 0, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); + if (!CreateProcess(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Debug Process"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hDebugEvent); + CloseHandle(hDebugEvent); } diff --git a/rosapps/taskmgr/endproc.c b/rosapps/taskmgr/endproc.c index da072c5eb5b..6740d58518b 100644 --- a/rosapps/taskmgr/endproc.c +++ b/rosapps/taskmgr/endproc.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,7 +29,7 @@ #include #include #include - + #include "taskmgr.h" #include "endproc.h" #include "procpage.h" @@ -37,96 +37,96 @@ void ProcessPage_OnEndProcess(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + return; + } - if (!TerminateProcess(hProcess, 0)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); - } + if (!TerminateProcess(hProcess, 0)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnEndProcessTree(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + return; + } - if (!TerminateProcess(hProcess, 0)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); - } + if (!TerminateProcess(hProcess, 0)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Terminate Process"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } diff --git a/rosapps/taskmgr/font.c b/rosapps/taskmgr/font.c index 66263f1d377..8fff992abe1 100644 --- a/rosapps/taskmgr/font.c +++ b/rosapps/taskmgr/font.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -28,36 +28,36 @@ #include #include #include - + #include "taskmgr.h" #include "font.h" void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) { - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); - hOldBitmap = (HBITMAP)SelectObject(hFontDC, hFontBitmap); - - for (i = 0; i < (int)_tcslen(lpszText); i++) { - if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); + HDC hFontDC; + HBITMAP hFontBitmap; + HBITMAP hOldBitmap; + int i; + + hFontDC = CreateCompatibleDC(hDC); + hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); + hOldBitmap = (HBITMAP)SelectObject(hFontDC, hFontBitmap); + + for (i = 0; i < (int)_tcslen(lpszText); i++) { + if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { + BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); + } + else if (lpszText[i] == 'K') + { + BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); + } + else if (lpszText[i] == '%') + { + BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); + } + } + SelectObject(hFontDC, hOldBitmap); + DeleteObject(hFontBitmap); + DeleteDC(hFontDC); } diff --git a/rosapps/taskmgr/graph.c b/rosapps/taskmgr/graph.c index 587cfc0a4bd..b87e94533b9 100644 --- a/rosapps/taskmgr/graph.c +++ b/rosapps/taskmgr/graph.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,207 +29,207 @@ #include #include #include - + #include "taskmgr.h" #include "graph.h" #include "font.h" #include "perfdata.h" -LONG OldGraphWndProc; +LONG OldGraphWndProc; -void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd); -void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd); -void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd); +void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd); +void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd); +void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd); LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - HDC hdc; - PAINTSTRUCT ps; - LONG WindowId; - - switch (message) - { - case WM_ERASEBKGND: - return TRUE; + HDC hdc; + PAINTSTRUCT ps; + LONG WindowId; + + switch (message) + { + case WM_ERASEBKGND: + return TRUE; - /* - * Filter out mouse & keyboard messages - */ - /* case WM_APPCOMMAND: */ - case WM_CAPTURECHANGED: - case WM_LBUTTONDBLCLK: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_MBUTTONDBLCLK: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MOUSEACTIVATE: - case WM_MOUSEHOVER: - case WM_MOUSELEAVE: - case WM_MOUSEMOVE: - /* case WM_MOUSEWHEEL: */ - case WM_NCHITTEST: - case WM_NCLBUTTONDBLCLK: - case WM_NCLBUTTONDOWN: - case WM_NCLBUTTONUP: - case WM_NCMBUTTONDBLCLK: - case WM_NCMBUTTONDOWN: - case WM_NCMBUTTONUP: - /* case WM_NCMOUSEHOVER: */ - /* case WM_NCMOUSELEAVE: */ - case WM_NCMOUSEMOVE: - case WM_NCRBUTTONDBLCLK: - case WM_NCRBUTTONDOWN: - case WM_NCRBUTTONUP: - /* case WM_NCXBUTTONDBLCLK: */ - /* case WM_NCXBUTTONDOWN: */ - /* case WM_NCXBUTTONUP: */ - case WM_RBUTTONDBLCLK: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - /* case WM_XBUTTONDBLCLK: */ - /* case WM_XBUTTONDOWN: */ - /* case WM_XBUTTONUP: */ - case WM_ACTIVATE: - case WM_CHAR: - case WM_DEADCHAR: - case WM_GETHOTKEY: - case WM_HOTKEY: - case WM_KEYDOWN: - case WM_KEYUP: - case WM_KILLFOCUS: - case WM_SETFOCUS: - case WM_SETHOTKEY: - case WM_SYSCHAR: - case WM_SYSDEADCHAR: - case WM_SYSKEYDOWN: - case WM_SYSKEYUP: - - case WM_NCCALCSIZE: - return 0; + /* + * Filter out mouse & keyboard messages + */ + /* case WM_APPCOMMAND: */ + case WM_CAPTURECHANGED: + case WM_LBUTTONDBLCLK: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_MBUTTONDBLCLK: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEACTIVATE: + case WM_MOUSEHOVER: + case WM_MOUSELEAVE: + case WM_MOUSEMOVE: + /* case WM_MOUSEWHEEL: */ + case WM_NCHITTEST: + case WM_NCLBUTTONDBLCLK: + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONUP: + case WM_NCMBUTTONDBLCLK: + case WM_NCMBUTTONDOWN: + case WM_NCMBUTTONUP: + /* case WM_NCMOUSEHOVER: */ + /* case WM_NCMOUSELEAVE: */ + case WM_NCMOUSEMOVE: + case WM_NCRBUTTONDBLCLK: + case WM_NCRBUTTONDOWN: + case WM_NCRBUTTONUP: + /* case WM_NCXBUTTONDBLCLK: */ + /* case WM_NCXBUTTONDOWN: */ + /* case WM_NCXBUTTONUP: */ + case WM_RBUTTONDBLCLK: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + /* case WM_XBUTTONDBLCLK: */ + /* case WM_XBUTTONDOWN: */ + /* case WM_XBUTTONUP: */ + case WM_ACTIVATE: + case WM_CHAR: + case WM_DEADCHAR: + case WM_GETHOTKEY: + case WM_HOTKEY: + case WM_KEYDOWN: + case WM_KEYUP: + case WM_KILLFOCUS: + case WM_SETFOCUS: + case WM_SETHOTKEY: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + + case WM_NCCALCSIZE: + return 0; - case WM_PAINT: - - hdc = BeginPaint(hWnd, &ps); + case WM_PAINT: + + hdc = BeginPaint(hWnd, &ps); - WindowId = GetWindowLong(hWnd, GWL_ID); + WindowId = GetWindowLong(hWnd, GWL_ID); - switch (WindowId) - { - case IDC_CPU_USAGE_GRAPH: - Graph_DrawCpuUsageGraph(hdc, hWnd); - break; - case IDC_MEM_USAGE_GRAPH: - Graph_DrawMemUsageGraph(hdc, hWnd); - break; - case IDC_MEM_USAGE_HISTORY_GRAPH: - Graph_DrawMemUsageHistoryGraph(hdc, hWnd); - break; - } - - EndPaint(hWnd, &ps); - - return 0; - - } - - /* - * We pass on all non-handled messages - */ - return CallWindowProc((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); + switch (WindowId) + { + case IDC_CPU_USAGE_GRAPH: + Graph_DrawCpuUsageGraph(hdc, hWnd); + break; + case IDC_MEM_USAGE_GRAPH: + Graph_DrawMemUsageGraph(hdc, hWnd); + break; + case IDC_MEM_USAGE_HISTORY_GRAPH: + Graph_DrawMemUsageHistoryGraph(hdc, hWnd); + break; + } + + EndPaint(hWnd, &ps); + + return 0; + + } + + /* + * We pass on all non-handled messages + */ + return CallWindowProc((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam); } void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) { - RECT rcClient; - RECT rcBarLeft; - RECT rcBarRight; - TCHAR Text[260]; - ULONG CpuUsage; - ULONG CpuKernelUsage; - int nBars; - int nBarsUsed; + RECT rcClient; + RECT rcBarLeft; + RECT rcBarRight; + TCHAR Text[260]; + ULONG CpuUsage; + ULONG CpuKernelUsage; + int nBars; + int nBarsUsed; /* Bottom bars that are "used", i.e. are bright green, representing used cpu time */ - int nBarsUsedKernel; + int nBarsUsedKernel; /* Bottom bars that are "used", i.e. are bright green, representing used cpu kernel time */ - int nBarsFree; + int nBarsFree; /* Top bars that are "unused", i.e. are dark green, representing free cpu time */ - int i; - - /* - * Get the client area rectangle - */ - GetClientRect(hWnd, &rcClient); - - /* - * Fill it with blackness - */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); - - /* - * Get the CPU usage - */ - CpuUsage = PerfDataGetProcessorUsage(); - CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuUsage < 0) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; - if (CpuKernelUsage < 0) CpuKernelUsage = 0; - if (CpuKernelUsage > 100) CpuKernelUsage = 100; + int i; + + /* + * Get the client area rectangle + */ + GetClientRect(hWnd, &rcClient); + + /* + * Fill it with blackness + */ + FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + + /* + * Get the CPU usage + */ + CpuUsage = PerfDataGetProcessorUsage(); + CpuKernelUsage = PerfDataGetProcessorSystemUsage(); + if (CpuUsage < 0) CpuUsage = 0; + if (CpuUsage > 100) CpuUsage = 100; + if (CpuKernelUsage < 0) CpuKernelUsage = 0; + if (CpuKernelUsage > 100) CpuKernelUsage = 100; - /* - * Check and see how many digits it will take - * so we get the indentation right every time. - */ - if (CpuUsage == 100) - { - _stprintf(Text, _T("%d%%"), (int)CpuUsage); - } - else if (CpuUsage < 10) - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } - else - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } - - /* - * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text - */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + /* + * Check and see how many digits it will take + * so we get the indentation right every time. + */ + if (CpuUsage == 100) + { + _stprintf(Text, _T("%d%%"), (int)CpuUsage); + } + else if (CpuUsage < 10) + { + _stprintf(Text, _T(" %d%%"), (int)CpuUsage); + } + else + { + _stprintf(Text, _T(" %d%%"), (int)CpuUsage); + } + + /* + * Draw the font text onto the graph + * The bottom 20 pixels are reserved for the text + */ + Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); - /* - * Now we have to draw the graph - * So first find out how many bars we can fit - */ - nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; - nBarsUsed = (nBars * CpuUsage) / 100; - if ((CpuUsage) && (nBarsUsed == 0)) - { - nBarsUsed = 1; - } - nBarsFree = nBars - nBarsUsed; - if (TaskManagerSettings.ShowKernelTimes) - { - nBarsUsedKernel = ((nBars * 2) * CpuKernelUsage) / 100; - nBarsUsed -= (nBarsUsedKernel / 2); - } - else - { - nBarsUsedKernel = 0; - } + /* + * Now we have to draw the graph + * So first find out how many bars we can fit + */ + nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; + nBarsUsed = (nBars * CpuUsage) / 100; + if ((CpuUsage) && (nBarsUsed == 0)) + { + nBarsUsed = 1; + } + nBarsFree = nBars - nBarsUsed; + if (TaskManagerSettings.ShowKernelTimes) + { + nBarsUsedKernel = ((nBars * 2) * CpuKernelUsage) / 100; + nBarsUsed -= (nBarsUsedKernel / 2); + } + else + { + nBarsUsedKernel = 0; + } - /* - * Now draw the bar graph - */ - rcBarLeft.left = ((rcClient.right - rcClient.left) - 33) / 2; - rcBarLeft.right = rcBarLeft.left + 16; - rcBarRight.left = rcBarLeft.left + 17; - rcBarRight.right = rcBarLeft.right + 17; - rcBarLeft.top = rcBarRight.top = 5; - rcBarLeft.bottom = rcBarRight.bottom = 7; + /* + * Now draw the bar graph + */ + rcBarLeft.left = ((rcClient.right - rcClient.left) - 33) / 2; + rcBarLeft.right = rcBarLeft.left + 16; + rcBarRight.left = rcBarLeft.left + 17; + rcBarRight.right = rcBarLeft.right + 17; + rcBarLeft.top = rcBarRight.top = 5; + rcBarLeft.bottom = rcBarRight.bottom = 7; if (nBarsUsed < 0) nBarsUsed = 0; if (nBarsUsed > nBars) nBarsUsed = nBars; @@ -240,133 +240,133 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) if (nBarsUsedKernel < 0) nBarsUsedKernel = 0; if (nBarsUsedKernel > nBars) nBarsUsedKernel = nBars; - /* - * Draw the "free" bars - */ - for (i=0; i 5000) nBarsUsed = 5000; - FillSolidRect(hDC, &rcBarLeft, BRIGHT_GREEN); - FillSolidRect(hDC, &rcBarRight, BRIGHT_GREEN); - - rcBarLeft.top += 3; - rcBarLeft.bottom += 3; - - rcBarRight.top += 3; - rcBarRight.bottom += 3; - } - - /* - * Draw the "used" kernel bars - */ - rcBarLeft.bottom--; - rcBarRight.bottom--; - if (nBarsUsedKernel && nBarsUsedKernel % 2) - { - rcBarLeft.top -= 2; - rcBarLeft.bottom -= 2; - - rcBarRight.top -= 2; - rcBarRight.bottom -= 2; + FillSolidRect(hDC, &rcBarLeft, BRIGHT_GREEN); + FillSolidRect(hDC, &rcBarRight, BRIGHT_GREEN); + + rcBarLeft.top += 3; + rcBarLeft.bottom += 3; + + rcBarRight.top += 3; + rcBarRight.bottom += 3; + } + + /* + * Draw the "used" kernel bars + */ + rcBarLeft.bottom--; + rcBarRight.bottom--; + if (nBarsUsedKernel && nBarsUsedKernel % 2) + { + rcBarLeft.top -= 2; + rcBarLeft.bottom -= 2; + + rcBarRight.top -= 2; + rcBarRight.bottom -= 2; - FillSolidRect(hDC, &rcBarLeft, RED); - FillSolidRect(hDC, &rcBarRight, RED); - - rcBarLeft.top += 2; - rcBarLeft.bottom += 2; - - rcBarRight.top += 2; - rcBarRight.bottom += 2; + FillSolidRect(hDC, &rcBarLeft, RED); + FillSolidRect(hDC, &rcBarRight, RED); + + rcBarLeft.top += 2; + rcBarLeft.bottom += 2; + + rcBarRight.top += 2; + rcBarRight.bottom += 2; - nBarsUsedKernel--; - } - for (i=0; i 5000) nBarsUsedKernel = 5000; - FillSolidRect(hDC, &rcBarLeft, RED); - FillSolidRect(hDC, &rcBarRight, RED); - - rcBarLeft.top++; - rcBarLeft.bottom++; - - rcBarRight.top++; - rcBarRight.bottom++; + FillSolidRect(hDC, &rcBarLeft, RED); + FillSolidRect(hDC, &rcBarRight, RED); + + rcBarLeft.top++; + rcBarLeft.bottom++; + + rcBarRight.top++; + rcBarRight.bottom++; - if (i % 2) - { - rcBarLeft.top++; - rcBarLeft.bottom++; - - rcBarRight.top++; - rcBarRight.bottom++; - } - } + if (i % 2) + { + rcBarLeft.top++; + rcBarLeft.bottom++; + + rcBarRight.top++; + rcBarRight.bottom++; + } + } } void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) { - RECT rcClient; - RECT rcBarLeft; - RECT rcBarRight; - TCHAR Text[260]; - ULONGLONG CommitChargeTotal; - ULONGLONG CommitChargeLimit; - int nBars; - int nBarsUsed = 0; + RECT rcClient; + RECT rcBarLeft; + RECT rcBarRight; + TCHAR Text[260]; + ULONGLONG CommitChargeTotal; + ULONGLONG CommitChargeLimit; + int nBars; + int nBarsUsed = 0; /* Bottom bars that are "used", i.e. are bright green, representing used memory */ - int nBarsFree; + int nBarsFree; /* Top bars that are "unused", i.e. are dark green, representing free memory */ - int i; - - /* - * Get the client area rectangle - */ - GetClientRect(hWnd, &rcClient); - - /* - * Fill it with blackness - */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); - - /* - * Get the memory usage - */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + int i; + + /* + * Get the client area rectangle + */ + GetClientRect(hWnd, &rcClient); + + /* + * Fill it with blackness + */ + FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + + /* + * Get the memory usage + */ + CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - _stprintf(Text, _T("%dK"), (int)CommitChargeTotal); - - /* - * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text - */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (_tcslen(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + _stprintf(Text, _T("%dK"), (int)CommitChargeTotal); + + /* + * Draw the font text onto the graph + * The bottom 20 pixels are reserved for the text + */ + Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (_tcslen(Text) * 8)) / 2, rcClient.bottom - 11 - 5); - /* - * Now we have to draw the graph - * So first find out how many bars we can fit - */ - nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; + /* + * Now we have to draw the graph + * So first find out how many bars we can fit + */ + nBars = ((rcClient.bottom - rcClient.top) - 25) / 3; if (CommitChargeLimit) - nBarsUsed = (nBars * (int)((CommitChargeTotal * 100) / CommitChargeLimit)) / 100; - nBarsFree = nBars - nBarsUsed; + nBarsUsed = (nBars * (int)((CommitChargeTotal * 100) / CommitChargeLimit)) / 100; + nBarsFree = nBars - nBarsUsed; if (nBarsUsed < 0) nBarsUsed = 0; if (nBarsUsed > nBars) nBarsUsed = nBars; @@ -374,99 +374,99 @@ void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) if (nBarsFree < 0) nBarsFree = 0; if (nBarsFree > nBars) nBarsFree = nBars; - /* - * Now draw the bar graph - */ - rcBarLeft.left = ((rcClient.right - rcClient.left) - 33) / 2; - rcBarLeft.right = rcBarLeft.left + 16; - rcBarRight.left = rcBarLeft.left + 17; - rcBarRight.right = rcBarLeft.right + 17; - rcBarLeft.top = rcBarRight.top = 5; - rcBarLeft.bottom = rcBarRight.bottom = 7; - - /* - * Draw the "free" bars - */ - for (i=0; i= 10) - offset = 0; - - /* - * Get the client area rectangle - */ - GetClientRect(hWnd, &rcClient); - - /* - * Fill it with blackness - */ - FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); + RECT rcClient; + ULONGLONG CommitChargeLimit; + int i; + static int offset = 0; + + if (offset++ >= 10) + offset = 0; + + /* + * Get the client area rectangle + */ + GetClientRect(hWnd, &rcClient); + + /* + * Fill it with blackness + */ + FillSolidRect(hDC, &rcClient, RGB(0, 0, 0)); - /* - * Get the memory usage - */ - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + /* + * Get the memory usage + */ + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - /* - * Draw the graph background - * - * Draw the horizontal bars - */ - for (i=0; i=0; i--) - { - } + /* + * Draw the memory usage + */ + for (i=rcClient.right; i>=0; i--) + { + } } diff --git a/rosapps/taskmgr/graphctl.c b/rosapps/taskmgr/graphctl.c index 5f3377b94af..c4a02b4849d 100644 --- a/rosapps/taskmgr/graphctl.c +++ b/rosapps/taskmgr/graphctl.c @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -73,55 +73,55 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_dPreviousPosition[2] = 0.0; this->m_dPreviousPosition[3] = 0.0; - // public variable for the number of decimal places on the y axis + /* public variable for the number of decimal places on the y axis */ this->m_nYDecimals = 3; - // set some initial values for the scaling until "SetRange" is called. - // these are protected varaibles and must be set with SetRange - // in order to ensure that m_dRange is updated accordingly - // m_dLowerLimit = -10.0; - // m_dUpperLimit = 10.0; + /* set some initial values for the scaling until "SetRange" is called. + * these are protected varaibles and must be set with SetRange + * in order to ensure that m_dRange is updated accordingly + */ + /* m_dLowerLimit = -10.0; */ + /* m_dUpperLimit = 10.0; */ this->m_dLowerLimit = 0.0; this->m_dUpperLimit = 100.0; - this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; // protected member variable + this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; /* protected member variable */ - // m_nShiftPixels determines how much the plot shifts (in terms of pixels) - // with the addition of a new data point + /* m_nShiftPixels determines how much the plot shifts (in terms of pixels) */ + /* with the addition of a new data point */ this->m_nShiftPixels = 4; - this->m_nHalfShiftPixels = this->m_nShiftPixels/2; // protected - this->m_nPlotShiftPixels = this->m_nShiftPixels + this->m_nHalfShiftPixels; // protected + this->m_nHalfShiftPixels = this->m_nShiftPixels/2; /* protected */ + this->m_nPlotShiftPixels = this->m_nShiftPixels + this->m_nHalfShiftPixels; /* protected */ - // background, grid and data colors - // these are public variables and can be set directly - this->m_crBackColor = RGB( 0, 0, 0); // see also SetBackgroundColor - this->m_crGridColor = RGB( 0, 255, 255); // see also SetGridColor - this->m_crPlotColor[0] = RGB(255, 255, 255); // see also SetPlotColor - this->m_crPlotColor[1] = RGB(100, 255, 255); // see also SetPlotColor - this->m_crPlotColor[2] = RGB(255, 100, 255); // see also SetPlotColor - this->m_crPlotColor[3] = RGB(255, 255, 100); // see also SetPlotColor + /* background, grid and data colors */ + /* these are public variables and can be set directly */ + this->m_crBackColor = RGB( 0, 0, 0); /* see also SetBackgroundColor */ + this->m_crGridColor = RGB( 0, 255, 255); /* see also SetGridColor */ + this->m_crPlotColor[0] = RGB(255, 255, 255); /* see also SetPlotColor */ + this->m_crPlotColor[1] = RGB(100, 255, 255); /* see also SetPlotColor */ + this->m_crPlotColor[2] = RGB(255, 100, 255); /* see also SetPlotColor */ + this->m_crPlotColor[3] = RGB(255, 255, 100); /* see also SetPlotColor */ - // protected variables + /* protected variables */ for (i = 0; i < MAX_PLOTS; i++) { this->m_penPlot[i] = CreatePen(PS_SOLID, 0, this->m_crPlotColor[i]); } this->m_brushBack = CreateSolidBrush(this->m_crBackColor); - // public member variables, can be set directly - strcpy(this->m_strXUnitsString, "Samples"); // can also be set with SetXUnits - strcpy(this->m_strYUnitsString, "Y units"); // can also be set with SetYUnits + /* public member variables, can be set directly */ + strcpy(this->m_strXUnitsString, "Samples"); /* can also be set with SetXUnits */ + strcpy(this->m_strYUnitsString, "Y units"); /* can also be set with SetYUnits */ - // protected bitmaps to restore the memory DC's + /* protected bitmaps to restore the memory DC's */ this->m_bitmapOldGrid = NULL; this->m_bitmapOldPlot = NULL; } #if 0 -///////////////////////////////////////////////////////////////////////////// TGraphCtrl::~TGraphCtrl() { - // just to be picky restore the bitmaps for the two memory dc's - // (these dc's are being destroyed so there shouldn't be any leaks) + /* just to be picky restore the bitmaps for the two memory dc's */ + /* (these dc's are being destroyed so there shouldn't be any leaks) */ if (m_bitmapOldGrid != NULL) SelectObject(m_dcGrid, m_bitmapOldGrid); if (m_bitmapOldPlot != NULL) SelectObject(m_dcPlot, m_bitmapOldPlot); if (m_bitmapGrid != NULL) DeleteObject(m_bitmapGrid); @@ -132,7 +132,6 @@ TGraphCtrl::~TGraphCtrl() } #endif -///////////////////////////////////////////////////////////////////////////// BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) { BOOL result = 0; @@ -146,85 +145,78 @@ BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) return result; } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDecimalPlaces) { - //ASSERT(dUpper > dLower); + /* ASSERT(dUpper > dLower); */ this->m_dLowerLimit = dLower; this->m_dUpperLimit = dUpper; this->m_nYDecimals = nDecimalPlaces; this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ GraphCtrl_InvalidateCtrl(this); } #if 0 -///////////////////////////////////////////////////////////////////////////// void TGraphCtrl::SetXUnits(const char* string) { strncpy(m_strXUnitsString, string, sizeof(m_strXUnitsString) - 1); - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ InvalidateCtrl(); } -///////////////////////////////////////////////////////////////////////////// void TGraphCtrl::SetYUnits(const char* string) { strncpy(m_strYUnitsString, string, sizeof(m_strYUnitsString) - 1); - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ InvalidateCtrl(); } #endif -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_SetGridColor(TGraphCtrl* this, COLORREF color) { this->m_crGridColor = color; - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ GraphCtrl_InvalidateCtrl(this); } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_SetPlotColor(TGraphCtrl* this, int plot, COLORREF color) { this->m_crPlotColor[plot] = color; DeleteObject(this->m_penPlot[plot]); this->m_penPlot[plot] = CreatePen(PS_SOLID, 0, this->m_crPlotColor[plot]); - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ GraphCtrl_InvalidateCtrl(this); } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF color) { this->m_crBackColor = color; DeleteObject(this->m_brushBack); this->m_brushBack = CreateSolidBrush(this->m_crBackColor); - // clear out the existing garbage, re-start with a clean plot + /* clear out the existing garbage, re-start with a clean plot */ GraphCtrl_InvalidateCtrl(this); } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) { - // There is a lot of drawing going on here - particularly in terms of - // drawing the grid. Don't panic, this is all being drawn (only once) - // to a bitmap. The result is then BitBlt'd to the control whenever needed. + /* There is a lot of drawing going on here - particularly in terms of */ + /* drawing the grid. Don't panic, this is all being drawn (only once) */ + /* to a bitmap. The result is then BitBlt'd to the control whenever needed. */ int i, j; int nCharacters; int nTopGridPix, nMidGridPix, nBottomGridPix; HPEN oldPen; HPEN solidPen = CreatePen(PS_SOLID, 0, this->m_crGridColor); - //HFONT axisFont, yUnitFont, oldFont; - //char strTemp[50]; + /* HFONT axisFont, yUnitFont, oldFont; */ + /* char strTemp[50]; */ - // in case we haven't established the memory dc's - //CClientDC dc(this); + /* in case we haven't established the memory dc's */ + /* CClientDC dc(this); */ HDC dc = GetDC(this->m_hParentWnd); - // if we don't have one yet, set up a memory dc for the grid + /* if we don't have one yet, set up a memory dc for the grid */ if (this->m_dcGrid == NULL) { this->m_dcGrid = CreateCompatibleDC(dc); @@ -234,37 +226,38 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) SetBkColor(this->m_dcGrid, this->m_crBackColor); - // fill the grid background + /* fill the grid background */ FillRect(this->m_dcGrid, &this->m_rectClient, this->m_brushBack); - // draw the plot rectangle: - // determine how wide the y axis scaling values are + /* draw the plot rectangle: */ + /* determine how wide the y axis scaling values are */ nCharacters = abs((int)log10(fabs(this->m_dUpperLimit))); nCharacters = max(nCharacters, abs((int)log10(fabs(this->m_dLowerLimit)))); - // add the units digit, decimal point and a minus sign, and an extra space - // as well as the number of decimal places to display + /* add the units digit, decimal point and a minus sign, and an extra space */ + /* as well as the number of decimal places to display */ nCharacters = nCharacters + 4 + this->m_nYDecimals; - // adjust the plot rectangle dimensions - // assume 6 pixels per character (this may need to be adjusted) - // m_rectPlot.left = m_rectClient.left + 6*(nCharacters); + /* adjust the plot rectangle dimensions */ + /* assume 6 pixels per character (this may need to be adjusted) */ + /* m_rectPlot.left = m_rectClient.left + 6*(nCharacters); */ this->m_rectPlot.left = this->m_rectClient.left; - this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;//m_rectPlot.Width(); + this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;/* m_rectPlot.Width(); */ - // draw the plot rectangle + /* draw the plot rectangle */ oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); MoveToEx(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top, NULL); LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.top); LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.bottom+1); LineTo(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.bottom+1); - // LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); + /* LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); */ SelectObject(this->m_dcGrid, oldPen); DeleteObject(solidPen); - // draw the dotted lines, - // use SetPixel instead of a dotted pen - this allows for a - // finer dotted line and a more "technical" look + /* draw the dotted lines, + * use SetPixel instead of a dotted pen - this allows for a + * finer dotted line and a more "technical" look + */ nMidGridPix = (this->m_rectPlot.top + this->m_rectPlot.bottom)/2; nTopGridPix = nMidGridPix - this->m_nPlotHeight/4; nBottomGridPix = nMidGridPix + this->m_nPlotHeight/4; @@ -281,15 +274,15 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) for (j=this->m_rectPlot.top; jm_rectPlot.bottom; j+=2) { SetPixel(this->m_dcGrid, i, j, this->m_crGridColor); - // SetPixel(m_dcGrid, i, j, m_crGridColor); - // SetPixel(m_dcGrid, i, j, m_crGridColor); + /* SetPixel(m_dcGrid, i, j, m_crGridColor); */ + /* SetPixel(m_dcGrid, i, j, m_crGridColor); */ } } #if 0 - // create some fonts (horizontal and vertical) - // use a height of 14 pixels and 300 weight - // (these may need to be adjusted depending on the display) + /* create some fonts (horizontal and vertical) */ + /* use a height of 14 pixels and 300 weight */ + /* (these may need to be adjusted depending on the display) */ axisFont = CreateFont (14, 0, 0, 0, 300, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, @@ -303,48 +296,48 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) DEFAULT_QUALITY, DEFAULT_PITCH|FF_SWISS, "Arial"); - // grab the horizontal font + /* grab the horizontal font */ oldFont = (HFONT)SelectObject(m_dcGrid, axisFont); - // y max + /* y max */ SetTextColor(m_dcGrid, m_crGridColor); SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); sprintf(strTemp, "%.*lf", m_nYDecimals, m_dUpperLimit); TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.top, strTemp, _tcslen(strTemp)); - // y min + /* y min */ SetTextAlign(m_dcGrid, TA_RIGHT|TA_BASELINE); sprintf(strTemp, "%.*lf", m_nYDecimals, m_dLowerLimit); TextOut(m_dcGrid, m_rectPlot.left-4, m_rectPlot.bottom, strTemp, _tcslen(strTemp)); - // x min + /* x min */ SetTextAlign(m_dcGrid, TA_LEFT|TA_TOP); TextOut(m_dcGrid, m_rectPlot.left, m_rectPlot.bottom+4, "0", 1); - // x max + /* x max */ SetTextAlign(m_dcGrid, TA_RIGHT|TA_TOP); sprintf(strTemp, "%d", m_nPlotWidth/m_nShiftPixels); TextOut(m_dcGrid, m_rectPlot.right, m_rectPlot.bottom+4, strTemp, _tcslen(strTemp)); - // x units + /* x units */ SetTextAlign(m_dcGrid, TA_CENTER|TA_TOP); TextOut(m_dcGrid, (m_rectPlot.left+m_rectPlot.right)/2, m_rectPlot.bottom+4, m_strXUnitsString, _tcslen(m_strXUnitsString)); - // restore the font + /* restore the font */ SelectObject(m_dcGrid, oldFont); - // y units + /* y units */ oldFont = (HFONT)SelectObject(m_dcGrid, yUnitFont); SetTextAlign(m_dcGrid, TA_CENTER|TA_BASELINE); TextOut(m_dcGrid, (m_rectClient.left+m_rectPlot.left)/2, (m_rectPlot.bottom+m_rectPlot.top)/2, m_strYUnitsString, _tcslen(m_strYUnitsString)); SelectObject(m_dcGrid, oldFont); #endif - // at this point we are done filling the the grid bitmap, - // no more drawing to this bitmap is needed until the setting are changed + /* at this point we are done filling the the grid bitmap, */ + /* no more drawing to this bitmap is needed until the setting are changed */ - // if we don't have one yet, set up a memory dc for the plot + /* if we don't have one yet, set up a memory dc for the plot */ if (this->m_dcPlot == NULL) { this->m_dcPlot = CreateCompatibleDC(dc); @@ -352,21 +345,20 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) this->m_bitmapOldPlot = (HBITMAP)SelectObject(this->m_dcPlot, this->m_bitmapPlot); } - // make sure the plot bitmap is cleared + /* make sure the plot bitmap is cleared */ SetBkColor(this->m_dcPlot, this->m_crBackColor); FillRect(this->m_dcPlot, &this->m_rectClient, this->m_brushBack); - // finally, force the plot area to redraw + /* finally, force the plot area to redraw */ InvalidateRect(this->m_hParentWnd, &this->m_rectClient, TRUE); ReleaseDC(this->m_hParentWnd, dc); } -///////////////////////////////////////////////////////////////////////////// double GraphCtrl_AppendPoint(TGraphCtrl* this, double dNewPoint0, double dNewPoint1, double dNewPoint2, double dNewPoint3) { - // append a data point to the plot & return the previous point + /* append a data point to the plot & return the previous point */ double dPrevious; dPrevious = this->m_dCurrentPosition[0]; @@ -375,40 +367,39 @@ double GraphCtrl_AppendPoint(TGraphCtrl* this, this->m_dCurrentPosition[2] = dNewPoint2; this->m_dCurrentPosition[3] = dNewPoint3; GraphCtrl_DrawPoint(this); - //Invalidate(); + /* Invalidate(); */ return dPrevious; } - -//////////////////////////////////////////////////////////////////////////// + void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) { HDC memDC; HBITMAP memBitmap; - HBITMAP oldBitmap; // bitmap originally found in CMemDC + HBITMAP oldBitmap; /* bitmap originally found in CMemDC */ -// RECT rcClient; -// GetClientRect(hWnd, &rcClient); -// FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); -// m_nClientWidth = rcClient.right - rcClient.left; -// m_nClientHeight = rcClient.bottom - rcClient.top; +/* RECT rcClient; */ +/* GetClientRect(hWnd, &rcClient); */ +/* FillSolidRect(dc, &rcClient, RGB(255, 0, 255)); */ +/* m_nClientWidth = rcClient.right - rcClient.left; */ +/* m_nClientHeight = rcClient.bottom - rcClient.top; */ - // no real plotting work is performed here, - // just putting the existing bitmaps on the client + /* no real plotting work is performed here, */ + /* just putting the existing bitmaps on the client */ - // to avoid flicker, establish a memory dc, draw to it - // and then BitBlt it to the client + /* to avoid flicker, establish a memory dc, draw to it */ + /* and then BitBlt it to the client */ memDC = CreateCompatibleDC(dc); memBitmap = (HBITMAP)CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); oldBitmap = (HBITMAP)SelectObject(memDC, memBitmap); if (memDC != NULL) { - // first drop the grid on the memory dc + /* first drop the grid on the memory dc */ BitBlt(memDC, 0, 0, this->m_nClientWidth, this->m_nClientHeight, this->m_dcGrid, 0, 0, SRCCOPY); - // now add the plot on top as a "pattern" via SRCPAINT. - // works well with dark background and a light plot - BitBlt(memDC, 0, 0, this->m_nClientWidth, this->m_nClientHeight, this->m_dcPlot, 0, 0, SRCPAINT); //SRCPAINT - // finally send the result to the display + /* now add the plot on top as a "pattern" via SRCPAINT. */ + /* works well with dark background and a light plot */ + BitBlt(memDC, 0, 0, this->m_nClientWidth, this->m_nClientHeight, this->m_dcPlot, 0, 0, SRCPAINT); /* SRCPAINT */ + /* finally send the result to the display */ BitBlt(dc, 0, 0, this->m_nClientWidth, this->m_nClientHeight, memDC, 0, 0, SRCCOPY); } SelectObject(memDC, oldBitmap); @@ -416,14 +407,13 @@ void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) DeleteDC(memDC); } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_DrawPoint(TGraphCtrl* this) { - // this does the work of "scrolling" the plot to the left - // and appending a new data point all of the plotting is - // directed to the memory based bitmap associated with m_dcPlot - // the will subsequently be BitBlt'd to the client in Paint - + /* this does the work of "scrolling" the plot to the left + * and appending a new data point all of the plotting is + * directed to the memory based bitmap associated with m_dcPlot + * the will subsequently be BitBlt'd to the client in Paint + */ int currX, prevX, currY, prevY; HPEN oldPen; RECT rectCleanUp; @@ -431,52 +421,52 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this) if (this->m_dcPlot != NULL) { - // shift the plot by BitBlt'ing it to itself - // note: the m_dcPlot covers the entire client - // but we only shift bitmap that is the size - // of the plot rectangle - // grab the right side of the plot (exluding m_nShiftPixels on the left) - // move this grabbed bitmap to the left by m_nShiftPixels - + /* shift the plot by BitBlt'ing it to itself + * note: the m_dcPlot covers the entire client + * but we only shift bitmap that is the size + * of the plot rectangle + * grab the right side of the plot (exluding m_nShiftPixels on the left) + * move this grabbed bitmap to the left by m_nShiftPixels + */ BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top+1, this->m_nPlotWidth, this->m_nPlotHeight, this->m_dcPlot, this->m_rectPlot.left+this->m_nShiftPixels, this->m_rectPlot.top+1, SRCCOPY); - // establish a rectangle over the right side of plot - // which now needs to be cleaned up proir to adding the new point + /* establish a rectangle over the right side of plot */ + /* which now needs to be cleaned up proir to adding the new point */ rectCleanUp = this->m_rectPlot; rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; - // fill the cleanup area with the background + /* fill the cleanup area with the background */ FillRect(this->m_dcPlot, &rectCleanUp, this->m_brushBack); - // draw the next line segement + /* draw the next line segement */ for (i = 0; i < MAX_PLOTS; i++) { - // grab the plotting pen + /* grab the plotting pen */ oldPen = (HPEN)SelectObject(this->m_dcPlot, this->m_penPlot[i]); - // move to the previous point + /* move to the previous point */ prevX = this->m_rectPlot.right-this->m_nPlotShiftPixels; prevY = this->m_rectPlot.bottom - (long)((this->m_dPreviousPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); MoveToEx(this->m_dcPlot, prevX, prevY, NULL); - // draw to the current point + /* draw to the current point */ currX = this->m_rectPlot.right-this->m_nHalfShiftPixels; currY = this->m_rectPlot.bottom - (long)((this->m_dCurrentPosition[i] - this->m_dLowerLimit) * this->m_dVerticalFactor); LineTo(this->m_dcPlot, currX, currY); - // Restore the pen + /* Restore the pen */ SelectObject(this->m_dcPlot, oldPen); - // if the data leaks over the upper or lower plot boundaries - // fill the upper and lower leakage with the background - // this will facilitate clipping on an as needed basis - // as opposed to always calling IntersectClipRect - + /* if the data leaks over the upper or lower plot boundaries + * fill the upper and lower leakage with the background + * this will facilitate clipping on an as needed basis + * as opposed to always calling IntersectClipRect + */ if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) { RECT rc; @@ -493,28 +483,27 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this) rc.left = prevX; rc.right = currX+1; rc.top = this->m_rectPlot.bottom+1; - //RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); + /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ FillRect(this->m_dcPlot, &rc, this->m_brushBack); } - // store the current point for connection to the next point + /* store the current point for connection to the next point */ this->m_dPreviousPosition[i] = this->m_dCurrentPosition[i]; } } } -///////////////////////////////////////////////////////////////////////////// void GraphCtrl_Resize(TGraphCtrl* this) { - // NOTE: Resize automatically gets called during the setup of the control + /* NOTE: Resize automatically gets called during the setup of the control */ GetClientRect(this->m_hWnd, &this->m_rectClient); - // set some member variables to avoid multiple function calls - this->m_nClientHeight = this->m_rectClient.bottom - this->m_rectClient.top;//m_rectClient.Height(); - this->m_nClientWidth = this->m_rectClient.right - this->m_rectClient.left;//m_rectClient.Width(); + /* set some member variables to avoid multiple function calls */ + this->m_nClientHeight = this->m_rectClient.bottom - this->m_rectClient.top;/* m_rectClient.Height(); */ + this->m_nClientWidth = this->m_rectClient.right - this->m_rectClient.left;/* m_rectClient.Width(); */ - // the "left" coordinate and "width" will be modified in - // InvalidateCtrl to be based on the width of the y axis scaling + /* the "left" coordinate and "width" will be modified in */ + /* InvalidateCtrl to be based on the width of the y axis scaling */ #if 0 this->m_rectPlot.left = 20; this->m_rectPlot.top = 10; @@ -527,21 +516,20 @@ void GraphCtrl_Resize(TGraphCtrl* this) this->m_rectPlot.bottom = this->m_rectClient.bottom-0; #endif - // set some member variables to avoid multiple function calls - this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;//m_rectPlot.Height(); - this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;//m_rectPlot.Width(); + /* set some member variables to avoid multiple function calls */ + this->m_nPlotHeight = this->m_rectPlot.bottom - this->m_rectPlot.top;/* m_rectPlot.Height(); */ + this->m_nPlotWidth = this->m_rectPlot.right - this->m_rectPlot.left;/* m_rectPlot.Width(); */ - // set the scaling factor for now, this can be adjusted - // in the SetRange functions + /* set the scaling factor for now, this can be adjusted */ + /* in the SetRange functions */ this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; } #if 0 -///////////////////////////////////////////////////////////////////////////// void TGraphCtrl::Reset() { - // to clear the existing data (in the form of a bitmap) - // simply invalidate the entire control + /* to clear the existing data (in the form of a bitmap) */ + /* simply invalidate the entire control */ InvalidateCtrl(); } #endif @@ -553,18 +541,18 @@ extern HWND hPerformancePageMemUsageHistoryGraph; LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - RECT rcClient; - HDC hdc; - PAINTSTRUCT ps; - + RECT rcClient; + HDC hdc; + PAINTSTRUCT ps; + switch (message) { case WM_ERASEBKGND: return TRUE; - // - // Filter out mouse & keyboard messages - // - //case WM_APPCOMMAND: + /* + * Filter out mouse & keyboard messages + */ + /* case WM_APPCOMMAND: */ case WM_CAPTURECHANGED: case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: @@ -576,7 +564,7 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA case WM_MOUSEHOVER: case WM_MOUSELEAVE: case WM_MOUSEMOVE: - //case WM_MOUSEWHEEL: + /* case WM_MOUSEWHEEL: */ case WM_NCHITTEST: case WM_NCLBUTTONDBLCLK: case WM_NCLBUTTONDOWN: @@ -584,21 +572,21 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA case WM_NCMBUTTONDBLCLK: case WM_NCMBUTTONDOWN: case WM_NCMBUTTONUP: - //case WM_NCMOUSEHOVER: - //case WM_NCMOUSELEAVE: + /* case WM_NCMOUSEHOVER: */ + /* case WM_NCMOUSELEAVE: */ case WM_NCMOUSEMOVE: case WM_NCRBUTTONDBLCLK: case WM_NCRBUTTONDOWN: case WM_NCRBUTTONUP: - //case WM_NCXBUTTONDBLCLK: - //case WM_NCXBUTTONDOWN: - //case WM_NCXBUTTONUP: + /* case WM_NCXBUTTONDBLCLK: */ + /* case WM_NCXBUTTONDOWN: */ + /* case WM_NCXBUTTONUP: */ case WM_RBUTTONDBLCLK: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - //case WM_XBUTTONDBLCLK: - //case WM_XBUTTONDOWN: - //case WM_XBUTTONUP: + /* case WM_XBUTTONDBLCLK: */ + /* case WM_XBUTTONDOWN: */ + /* case WM_XBUTTONUP: */ case WM_ACTIVATE: case WM_CHAR: case WM_DEADCHAR: @@ -641,9 +629,9 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA EndPaint(hWnd, &ps); return 0; } - - // - // We pass on all non-handled messages - // + + /* + * We pass on all non-handled messages + */ return CallWindowProc((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); } diff --git a/rosapps/taskmgr/optnmenu.c b/rosapps/taskmgr/optnmenu.c index 19e208097a5..886dd7ab9db 100644 --- a/rosapps/taskmgr/optnmenu.c +++ b/rosapps/taskmgr/optnmenu.c @@ -19,14 +19,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /* * options.c * * Menu item handlers for the options menu. */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -34,116 +34,116 @@ #include #include #include - + #include "taskmgr.h" #include "optnmenu.h" #include "procpage.h" -#define OPTIONS_MENU_INDEX 1 +#define OPTIONS_MENU_INDEX 1 void TaskManager_OnOptionsAlwaysOnTop(void) { - HMENU hMenu; - HMENU hOptionsMenu; + HMENU hMenu; + HMENU hOptionsMenu; - hMenu = GetMenu(hMainWnd); - hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); + hMenu = GetMenu(hMainWnd); + hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - /* - * Check or uncheck the always on top menu item - * and update main window. - */ - if (GetMenuState(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND) & MF_CHECKED) - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); - TaskManagerSettings.AlwaysOnTop = FALSE; - SetWindowPos(hMainWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); - } - else - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_CHECKED); - TaskManagerSettings.AlwaysOnTop = TRUE; - SetWindowPos(hMainWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); - } + /* + * Check or uncheck the always on top menu item + * and update main window. + */ + if (GetMenuState(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND) & MF_CHECKED) + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_UNCHECKED); + TaskManagerSettings.AlwaysOnTop = FALSE; + SetWindowPos(hMainWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); + } + else + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_ALWAYSONTOP, MF_BYCOMMAND|MF_CHECKED); + TaskManagerSettings.AlwaysOnTop = TRUE; + SetWindowPos(hMainWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); + } } void TaskManager_OnOptionsMinimizeOnUse(void) { - HMENU hMenu; - HMENU hOptionsMenu; + HMENU hMenu; + HMENU hOptionsMenu; - hMenu = GetMenu(hMainWnd); - hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); + hMenu = GetMenu(hMainWnd); + hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - /* - * Check or uncheck the minimize on use menu item. - */ - if (GetMenuState(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND) & MF_CHECKED) - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND|MF_UNCHECKED); - TaskManagerSettings.MinimizeOnUse = FALSE; - } - else - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND|MF_CHECKED); - TaskManagerSettings.MinimizeOnUse = TRUE; - } + /* + * Check or uncheck the minimize on use menu item. + */ + if (GetMenuState(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND) & MF_CHECKED) + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND|MF_UNCHECKED); + TaskManagerSettings.MinimizeOnUse = FALSE; + } + else + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_MINIMIZEONUSE, MF_BYCOMMAND|MF_CHECKED); + TaskManagerSettings.MinimizeOnUse = TRUE; + } } void TaskManager_OnOptionsHideWhenMinimized(void) { - HMENU hMenu; - HMENU hOptionsMenu; + HMENU hMenu; + HMENU hOptionsMenu; - hMenu = GetMenu(hMainWnd); - hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); + hMenu = GetMenu(hMainWnd); + hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - /* - * Check or uncheck the hide when minimized menu item. - */ - if (GetMenuState(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND) & MF_CHECKED) - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND|MF_UNCHECKED); - TaskManagerSettings.HideWhenMinimized = FALSE; - } - else - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND|MF_CHECKED); - TaskManagerSettings.HideWhenMinimized = TRUE; - } + /* + * Check or uncheck the hide when minimized menu item. + */ + if (GetMenuState(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND) & MF_CHECKED) + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND|MF_UNCHECKED); + TaskManagerSettings.HideWhenMinimized = FALSE; + } + else + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_HIDEWHENMINIMIZED, MF_BYCOMMAND|MF_CHECKED); + TaskManagerSettings.HideWhenMinimized = TRUE; + } } void TaskManager_OnOptionsShow16BitTasks(void) { - HMENU hMenu; - HMENU hOptionsMenu; + HMENU hMenu; + HMENU hOptionsMenu; - hMenu = GetMenu(hMainWnd); - hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); + hMenu = GetMenu(hMainWnd); + hOptionsMenu = GetSubMenu(hMenu, OPTIONS_MENU_INDEX); - /* - * FIXME: Currently this is useless because the - * current implemetation doesn't list the 16-bit - * processes. I believe that would require querying - * each ntvdm.exe process for it's children. - */ + /* + * FIXME: Currently this is useless because the + * current implemetation doesn't list the 16-bit + * processes. I believe that would require querying + * each ntvdm.exe process for it's children. + */ - /* - * Check or uncheck the show 16-bit tasks menu item - */ - if (GetMenuState(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND) & MF_CHECKED) - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_UNCHECKED); - TaskManagerSettings.Show16BitTasks = FALSE; - } - else - { - CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); - TaskManagerSettings.Show16BitTasks = TRUE; - } + /* + * Check or uncheck the show 16-bit tasks menu item + */ + if (GetMenuState(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND) & MF_CHECKED) + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_UNCHECKED); + TaskManagerSettings.Show16BitTasks = FALSE; + } + else + { + CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); + TaskManagerSettings.Show16BitTasks = TRUE; + } - /* - * Refresh the list of processes. - */ - RefreshProcessPage(); + /* + * Refresh the list of processes. + */ + RefreshProcessPage(); } diff --git a/rosapps/taskmgr/perfdata.c b/rosapps/taskmgr/perfdata.c index 32a9e736f54..5f0a8390d06 100644 --- a/rosapps/taskmgr/perfdata.c +++ b/rosapps/taskmgr/perfdata.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -32,842 +32,842 @@ #include "taskmgr.h" #include "perfdata.h" -PROCNTQSI NtQuerySystemInformation = NULL; -PROCGGR pGetGuiResources = NULL; -PROCGPIC pGetProcessIoCounters = NULL; -CRITICAL_SECTION PerfDataCriticalSection; -PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ -PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ -ULONG ProcessCountOld = 0; -ULONG ProcessCount = 0; -double dbIdleTime; -double dbKernelTime; -double dbSystemTime; -LARGE_INTEGER liOldIdleTime = {{0,0}}; -double OldKernelTime = 0; -LARGE_INTEGER liOldSystemTime = {{0,0}}; -SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; -SYSTEM_BASIC_INFORMATION SystemBasicInfo; -SYSTEM_CACHE_INFORMATION SystemCacheInfo; -SYSTEM_HANDLE_INFORMATION SystemHandleInfo; -PSYSTEM_PROCESSORTIME_INFO SystemProcessorTimeInfo = NULL; +PROCNTQSI NtQuerySystemInformation = NULL; +PROCGGR pGetGuiResources = NULL; +PROCGPIC pGetProcessIoCounters = NULL; +CRITICAL_SECTION PerfDataCriticalSection; +PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ +PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ +ULONG ProcessCountOld = 0; +ULONG ProcessCount = 0; +double dbIdleTime; +double dbKernelTime; +double dbSystemTime; +LARGE_INTEGER liOldIdleTime = {{0,0}}; +double OldKernelTime = 0; +LARGE_INTEGER liOldSystemTime = {{0,0}}; +SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; +SYSTEM_BASIC_INFORMATION SystemBasicInfo; +SYSTEM_CACHE_INFORMATION SystemCacheInfo; +SYSTEM_HANDLE_INFORMATION SystemHandleInfo; +PSYSTEM_PROCESSORTIME_INFO SystemProcessorTimeInfo = NULL; BOOL PerfDataInitialize(void) { - LONG status; + LONG status; - NtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandle(_T("ntdll.dll")), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandle(_T("user32.dll")), "GetGuiResources"); - pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandle(_T("kernel32.dll")), "GetProcessIoCounters"); - - InitializeCriticalSection(&PerfDataCriticalSection); - - if (!NtQuerySystemInformation) - return FALSE; - - /* - * Get number of processors in the system - */ - status = NtQuerySystemInformation(SystemBasicInformation, &SystemBasicInfo, sizeof(SystemBasicInfo), NULL); - if (status != NO_ERROR) - return FALSE; - - return TRUE; + NtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandle(_T("ntdll.dll")), "NtQuerySystemInformation"); + pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandle(_T("user32.dll")), "GetGuiResources"); + pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandle(_T("kernel32.dll")), "GetProcessIoCounters"); + + InitializeCriticalSection(&PerfDataCriticalSection); + + if (!NtQuerySystemInformation) + return FALSE; + + /* + * Get number of processors in the system + */ + status = NtQuerySystemInformation(SystemBasicInformation, &SystemBasicInfo, sizeof(SystemBasicInfo), NULL); + if (status != NO_ERROR) + return FALSE; + + return TRUE; } void PerfDataUninitialize(void) { - NtQuerySystemInformation = NULL; + NtQuerySystemInformation = NULL; - DeleteCriticalSection(&PerfDataCriticalSection); + DeleteCriticalSection(&PerfDataCriticalSection); } void PerfDataRefresh(void) { - ULONG ulSize; - LONG status; - LPBYTE pBuffer; - ULONG BufferSize; - PSYSTEM_PROCESS_INFORMATION pSPI; - PPERFDATA pPDOld; - ULONG Idx, Idx2; - HANDLE hProcess; - HANDLE hProcessToken; - TCHAR szTemp[MAX_PATH]; - DWORD dwSize; - SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; - SYSTEM_TIME_INFORMATION SysTimeInfo; - SYSTEM_CACHE_INFORMATION SysCacheInfo; - LPBYTE SysHandleInfoData; - PSYSTEM_PROCESSORTIME_INFO SysProcessorTimeInfo; - double CurrentKernelTime; + ULONG ulSize; + LONG status; + LPBYTE pBuffer; + ULONG BufferSize; + PSYSTEM_PROCESS_INFORMATION pSPI; + PPERFDATA pPDOld; + ULONG Idx, Idx2; + HANDLE hProcess; + HANDLE hProcessToken; + TCHAR szTemp[MAX_PATH]; + DWORD dwSize; + SYSTEM_PERFORMANCE_INFORMATION SysPerfInfo; + SYSTEM_TIME_INFORMATION SysTimeInfo; + SYSTEM_CACHE_INFORMATION SysCacheInfo; + LPBYTE SysHandleInfoData; + PSYSTEM_PROCESSORTIME_INFO SysProcessorTimeInfo; + double CurrentKernelTime; - if (!NtQuerySystemInformation) - return; + if (!NtQuerySystemInformation) + return; - /* Get new system time */ - status = NtQuerySystemInformation(SystemTimeInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); - if (status != NO_ERROR) - return; + /* Get new system time */ + status = NtQuerySystemInformation(SystemTimeInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); + if (status != NO_ERROR) + return; - /* Get new CPU's idle time */ - status = NtQuerySystemInformation(SystemPerformanceInformation, &SysPerfInfo, sizeof(SysPerfInfo), NULL); - if (status != NO_ERROR) - return; + /* Get new CPU's idle time */ + status = NtQuerySystemInformation(SystemPerformanceInformation, &SysPerfInfo, sizeof(SysPerfInfo), NULL); + if (status != NO_ERROR) + return; - /* Get system cache information */ - status = NtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL); - if (status != NO_ERROR) - return; + /* Get system cache information */ + status = NtQuerySystemInformation(SystemCacheInformation, &SysCacheInfo, sizeof(SysCacheInfo), NULL); + if (status != NO_ERROR) + return; - /* Get processor time information */ - //SysProcessorTimeInfo = new SYSTEM_PROCESSORTIME_INFO[SystemBasicInfo.bKeNumberProcessors]; - SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors); - status = NtQuerySystemInformation(SystemProcessorTimeInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors, &ulSize); - if (status != NO_ERROR) - return; + /* Get processor time information */ + /* SysProcessorTimeInfo = new SYSTEM_PROCESSORTIME_INFO[SystemBasicInfo.bKeNumberProcessors]; */ + SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors); + status = NtQuerySystemInformation(SystemProcessorTimeInformation, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.bKeNumberProcessors, &ulSize); + if (status != NO_ERROR) + return; - /* Get handle information - * We don't know how much data there is so just keep - * increasing the buffer size until the call succeeds - */ - BufferSize = 0; - do - { - BufferSize += 0x10000; - //SysHandleInfoData = new BYTE[BufferSize]; - SysHandleInfoData = (LPBYTE)malloc(BufferSize); + /* Get handle information + * We don't know how much data there is so just keep + * increasing the buffer size until the call succeeds + */ + BufferSize = 0; + do + { + BufferSize += 0x10000; + /* SysHandleInfoData = new BYTE[BufferSize]; */ + SysHandleInfoData = (LPBYTE)malloc(BufferSize); - status = NtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize); + status = NtQuerySystemInformation(SystemHandleInformation, SysHandleInfoData, BufferSize, &ulSize); - if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { - //delete[] SysHandleInfoData; - free(SysHandleInfoData); - } + if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { + /* delete[] SysHandleInfoData; */ + free(SysHandleInfoData); + } - } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); + } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); - /* Get process information - * We don't know how much data there is so just keep - * increasing the buffer size until the call succeeds - */ - BufferSize = 0; - do - { - BufferSize += 0x10000; - //pBuffer = new BYTE[BufferSize]; - pBuffer = (LPBYTE)malloc(BufferSize); + /* Get process information + * We don't know how much data there is so just keep + * increasing the buffer size until the call succeeds + */ + BufferSize = 0; + do + { + BufferSize += 0x10000; + /* pBuffer = new BYTE[BufferSize]; */ + pBuffer = (LPBYTE)malloc(BufferSize); - status = NtQuerySystemInformation(SystemProcessInformation, pBuffer, BufferSize, &ulSize); + status = NtQuerySystemInformation(SystemProcessInformation, pBuffer, BufferSize, &ulSize); - if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { - //delete[] pBuffer; - free(pBuffer); - } + if (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/) { + /* delete[] pBuffer; */ + free(pBuffer); + } - } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); + } while (status == 0xC0000004 /*STATUS_INFO_LENGTH_MISMATCH*/); - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - /* - * Save system performance info - */ - memcpy(&SystemPerfInfo, &SysPerfInfo, sizeof(SYSTEM_PERFORMANCE_INFORMATION)); + /* + * Save system performance info + */ + memcpy(&SystemPerfInfo, &SysPerfInfo, sizeof(SYSTEM_PERFORMANCE_INFORMATION)); - /* - * Save system cache info - */ - memcpy(&SystemCacheInfo, &SysCacheInfo, sizeof(SYSTEM_CACHE_INFORMATION)); - - /* - * Save system processor time info - */ - if (SystemProcessorTimeInfo) { - //delete[] SystemProcessorTimeInfo; - free(SystemProcessorTimeInfo); - } - SystemProcessorTimeInfo = SysProcessorTimeInfo; - - /* - * Save system handle info - */ - memcpy(&SystemHandleInfo, SysHandleInfoData, sizeof(SYSTEM_HANDLE_INFORMATION)); - //delete[] SysHandleInfoData; - free(SysHandleInfoData); - - for (CurrentKernelTime=0, Idx=0; IdxRelativeOffset == 0) - break; - pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); - } + /* Determine the process count + * We loop through the data we got from NtQuerySystemInformation + * and count how many structures there are (until RelativeOffset is 0) + */ + ProcessCountOld = ProcessCount; + ProcessCount = 0; + pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; + while (pSPI) { + ProcessCount++; + if (pSPI->RelativeOffset == 0) + break; + pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); + } - /* Now alloc a new PERFDATA array and fill in the data */ - if (pPerfDataOld) { - //delete[] pPerfDataOld; - free(pPerfDataOld); - } - pPerfDataOld = pPerfData; - //pPerfData = new PERFDATA[ProcessCount]; - pPerfData = (PPERFDATA)malloc(sizeof(PERFDATA) * ProcessCount); - pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; - for (Idx=0; IdxProcessId) { - pPDOld = &pPerfDataOld[Idx2]; - break; - } - } + /* Now alloc a new PERFDATA array and fill in the data */ + if (pPerfDataOld) { + /* delete[] pPerfDataOld; */ + free(pPerfDataOld); + } + pPerfDataOld = pPerfData; + /* pPerfData = new PERFDATA[ProcessCount]; */ + pPerfData = (PPERFDATA)malloc(sizeof(PERFDATA) * ProcessCount); + pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer; + for (Idx=0; IdxProcessId) { + pPDOld = &pPerfDataOld[Idx2]; + break; + } + } - /* Clear out process perf data structure */ - memset(&pPerfData[Idx], 0, sizeof(PERFDATA)); + /* Clear out process perf data structure */ + memset(&pPerfData[Idx], 0, sizeof(PERFDATA)); - if (pSPI->Name.Buffer) - wcscpy(pPerfData[Idx].ImageName, pSPI->Name.Buffer); - else - wcscpy(pPerfData[Idx].ImageName, L"System Idle Process"); + if (pSPI->Name.Buffer) + wcscpy(pPerfData[Idx].ImageName, pSPI->Name.Buffer); + else + wcscpy(pPerfData[Idx].ImageName, L"System Idle Process"); - pPerfData[Idx].ProcessId = pSPI->ProcessId; + pPerfData[Idx].ProcessId = pSPI->ProcessId; - if (pPDOld) { - double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); - double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); - double CpuTime = (CurTime - OldTime) / dbSystemTime; - CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.bKeNumberProcessors; /* + 0.5; */ - pPerfData[Idx].CPUUsage = (ULONG)CpuTime; - } - pPerfData[Idx].CPUTime.QuadPart = pSPI->UserTime.QuadPart + pSPI->KernelTime.QuadPart; - pPerfData[Idx].WorkingSetSizeBytes = pSPI->TotalWorkingSetSizeBytes; - pPerfData[Idx].PeakWorkingSetSizeBytes = pSPI->PeakWorkingSetSizeBytes; - if (pPDOld) - pPerfData[Idx].WorkingSetSizeDelta = labs((LONG)pSPI->TotalWorkingSetSizeBytes - (LONG)pPDOld->WorkingSetSizeBytes); - else - pPerfData[Idx].WorkingSetSizeDelta = 0; - pPerfData[Idx].PageFaultCount = pSPI->PageFaultCount; - if (pPDOld) - pPerfData[Idx].PageFaultCountDelta = labs((LONG)pSPI->PageFaultCount - (LONG)pPDOld->PageFaultCount); - else - pPerfData[Idx].PageFaultCountDelta = 0; - pPerfData[Idx].VirtualMemorySizeBytes = pSPI->TotalVirtualSizeBytes; - pPerfData[Idx].PagedPoolUsagePages = pSPI->TotalPagedPoolUsagePages; - pPerfData[Idx].NonPagedPoolUsagePages = pSPI->TotalNonPagedPoolUsagePages; - pPerfData[Idx].BasePriority = pSPI->BasePriority; - pPerfData[Idx].HandleCount = pSPI->HandleCount; - pPerfData[Idx].ThreadCount = pSPI->ThreadCount; - pPerfData[Idx].SessionId = pSPI->SessionId; - - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pSPI->ProcessId); - if (hProcess) { - if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { - ImpersonateLoggedOnUser(hProcessToken); - memset(szTemp, 0, sizeof(TCHAR[MAX_PATH])); - dwSize = MAX_PATH; - GetUserName(szTemp, &dwSize); + if (pPDOld) { + double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); + double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); + double CpuTime = (CurTime - OldTime) / dbSystemTime; + CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.bKeNumberProcessors; /* + 0.5; */ + pPerfData[Idx].CPUUsage = (ULONG)CpuTime; + } + pPerfData[Idx].CPUTime.QuadPart = pSPI->UserTime.QuadPart + pSPI->KernelTime.QuadPart; + pPerfData[Idx].WorkingSetSizeBytes = pSPI->TotalWorkingSetSizeBytes; + pPerfData[Idx].PeakWorkingSetSizeBytes = pSPI->PeakWorkingSetSizeBytes; + if (pPDOld) + pPerfData[Idx].WorkingSetSizeDelta = labs((LONG)pSPI->TotalWorkingSetSizeBytes - (LONG)pPDOld->WorkingSetSizeBytes); + else + pPerfData[Idx].WorkingSetSizeDelta = 0; + pPerfData[Idx].PageFaultCount = pSPI->PageFaultCount; + if (pPDOld) + pPerfData[Idx].PageFaultCountDelta = labs((LONG)pSPI->PageFaultCount - (LONG)pPDOld->PageFaultCount); + else + pPerfData[Idx].PageFaultCountDelta = 0; + pPerfData[Idx].VirtualMemorySizeBytes = pSPI->TotalVirtualSizeBytes; + pPerfData[Idx].PagedPoolUsagePages = pSPI->TotalPagedPoolUsagePages; + pPerfData[Idx].NonPagedPoolUsagePages = pSPI->TotalNonPagedPoolUsagePages; + pPerfData[Idx].BasePriority = pSPI->BasePriority; + pPerfData[Idx].HandleCount = pSPI->HandleCount; + pPerfData[Idx].ThreadCount = pSPI->ThreadCount; + pPerfData[Idx].SessionId = pSPI->SessionId; + + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pSPI->ProcessId); + if (hProcess) { + if (OpenProcessToken(hProcess, TOKEN_QUERY|TOKEN_DUPLICATE|TOKEN_IMPERSONATE, &hProcessToken)) { + ImpersonateLoggedOnUser(hProcessToken); + memset(szTemp, 0, sizeof(TCHAR[MAX_PATH])); + dwSize = MAX_PATH; + GetUserName(szTemp, &dwSize); #ifndef UNICODE - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTemp, -1, pPerfData[Idx].UserName, MAX_PATH); /* int MultiByteToWideChar( UINT CodePage, // code page - DWORD dwFlags, // character-type options - LPCSTR lpMultiByteStr, // string to map - int cbMultiByte, // number of bytes in string - LPWSTR lpWideCharStr, // wide-character buffer - int cchWideChar // size of buffer + DWORD dwFlags, // character-type options + LPCSTR lpMultiByteStr, // string to map + int cbMultiByte, // number of bytes in string + LPWSTR lpWideCharStr, // wide-character buffer + int cchWideChar // size of buffer ); */ #endif - RevertToSelf(); - CloseHandle(hProcessToken); - } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } - if (pGetProcessIoCounters) - pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); - CloseHandle(hProcess); - } - pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; - pPerfData[Idx].KernelTime.QuadPart = pSPI->KernelTime.QuadPart; - pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); - } - //delete[] pBuffer; - free(pBuffer); - LeaveCriticalSection(&PerfDataCriticalSection); + RevertToSelf(); + CloseHandle(hProcessToken); + } + if (pGetGuiResources) { + pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); + } + if (pGetProcessIoCounters) + pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + CloseHandle(hProcess); + } + pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; + pPerfData[Idx].KernelTime.QuadPart = pSPI->KernelTime.QuadPart; + pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + pSPI->RelativeOffset); + } + /* delete[] pBuffer; */ + free(pBuffer); + LeaveCriticalSection(&PerfDataCriticalSection); } ULONG PerfDataGetProcessCount(void) { - return ProcessCount; + return ProcessCount; } ULONG PerfDataGetProcessorUsage(void) { - return (ULONG)dbIdleTime; + return (ULONG)dbIdleTime; } ULONG PerfDataGetProcessorSystemUsage(void) { - return (ULONG)dbKernelTime; + return (ULONG)dbKernelTime; } BOOL PerfDataGetImageName(ULONG Index, LPTSTR lpImageName, int nMaxCount) { - BOOL bSuccessful; + BOOL bSuccessful; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) { - #ifdef _UNICODE - wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); - #else - WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].ImageName, -1, lpImageName, nMaxCount, NULL, NULL); - #endif + if (Index < ProcessCount) { + #ifdef _UNICODE + wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); + #else + WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].ImageName, -1, lpImageName, nMaxCount, NULL, NULL); + #endif - bSuccessful = TRUE; - } else { - bSuccessful = FALSE; - } - LeaveCriticalSection(&PerfDataCriticalSection); - return bSuccessful; + bSuccessful = TRUE; + } else { + bSuccessful = FALSE; + } + LeaveCriticalSection(&PerfDataCriticalSection); + return bSuccessful; } ULONG PerfDataGetProcessId(ULONG Index) { - ULONG ProcessId; + ULONG ProcessId; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - ProcessId = pPerfData[Index].ProcessId; - else - ProcessId = 0; + if (Index < ProcessCount) + ProcessId = pPerfData[Index].ProcessId; + else + ProcessId = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return ProcessId; + return ProcessId; } BOOL PerfDataGetUserName(ULONG Index, LPTSTR lpUserName, int nMaxCount) { - BOOL bSuccessful; + BOOL bSuccessful; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) { - #ifdef _UNICODE - wcsncpy(lpUserName, pPerfData[Index].UserName, nMaxCount); - #else - WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].UserName, -1, lpUserName, nMaxCount, NULL, NULL); - #endif + if (Index < ProcessCount) { + #ifdef _UNICODE + wcsncpy(lpUserName, pPerfData[Index].UserName, nMaxCount); + #else + WideCharToMultiByte(CP_ACP, 0, pPerfData[Index].UserName, -1, lpUserName, nMaxCount, NULL, NULL); + #endif - bSuccessful = TRUE; - } else { - bSuccessful = FALSE; - } + bSuccessful = TRUE; + } else { + bSuccessful = FALSE; + } - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return bSuccessful; + return bSuccessful; } ULONG PerfDataGetSessionId(ULONG Index) { - ULONG SessionId; + ULONG SessionId; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - SessionId = pPerfData[Index].SessionId; - else - SessionId = 0; + if (Index < ProcessCount) + SessionId = pPerfData[Index].SessionId; + else + SessionId = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return SessionId; + return SessionId; } ULONG PerfDataGetCPUUsage(ULONG Index) { - ULONG CpuUsage; + ULONG CpuUsage; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - CpuUsage = pPerfData[Index].CPUUsage; - else - CpuUsage = 0; + if (Index < ProcessCount) + CpuUsage = pPerfData[Index].CPUUsage; + else + CpuUsage = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return CpuUsage; + return CpuUsage; } TIME PerfDataGetCPUTime(ULONG Index) { - TIME CpuTime = {{0,0}}; + TIME CpuTime = {{0,0}}; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - CpuTime = pPerfData[Index].CPUTime; + if (Index < ProcessCount) + CpuTime = pPerfData[Index].CPUTime; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return CpuTime; + return CpuTime; } ULONG PerfDataGetWorkingSetSizeBytes(ULONG Index) { - ULONG WorkingSetSizeBytes; + ULONG WorkingSetSizeBytes; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - WorkingSetSizeBytes = pPerfData[Index].WorkingSetSizeBytes; - else - WorkingSetSizeBytes = 0; + if (Index < ProcessCount) + WorkingSetSizeBytes = pPerfData[Index].WorkingSetSizeBytes; + else + WorkingSetSizeBytes = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return WorkingSetSizeBytes; + return WorkingSetSizeBytes; } ULONG PerfDataGetPeakWorkingSetSizeBytes(ULONG Index) { - ULONG PeakWorkingSetSizeBytes; + ULONG PeakWorkingSetSizeBytes; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - PeakWorkingSetSizeBytes = pPerfData[Index].PeakWorkingSetSizeBytes; - else - PeakWorkingSetSizeBytes = 0; + if (Index < ProcessCount) + PeakWorkingSetSizeBytes = pPerfData[Index].PeakWorkingSetSizeBytes; + else + PeakWorkingSetSizeBytes = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return PeakWorkingSetSizeBytes; + return PeakWorkingSetSizeBytes; } ULONG PerfDataGetWorkingSetSizeDelta(ULONG Index) { - ULONG WorkingSetSizeDelta; + ULONG WorkingSetSizeDelta; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - WorkingSetSizeDelta = pPerfData[Index].WorkingSetSizeDelta; - else - WorkingSetSizeDelta = 0; + if (Index < ProcessCount) + WorkingSetSizeDelta = pPerfData[Index].WorkingSetSizeDelta; + else + WorkingSetSizeDelta = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return WorkingSetSizeDelta; + return WorkingSetSizeDelta; } ULONG PerfDataGetPageFaultCount(ULONG Index) { - ULONG PageFaultCount; + ULONG PageFaultCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - PageFaultCount = pPerfData[Index].PageFaultCount; - else - PageFaultCount = 0; + if (Index < ProcessCount) + PageFaultCount = pPerfData[Index].PageFaultCount; + else + PageFaultCount = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return PageFaultCount; + return PageFaultCount; } ULONG PerfDataGetPageFaultCountDelta(ULONG Index) { - ULONG PageFaultCountDelta; + ULONG PageFaultCountDelta; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - PageFaultCountDelta = pPerfData[Index].PageFaultCountDelta; - else - PageFaultCountDelta = 0; + if (Index < ProcessCount) + PageFaultCountDelta = pPerfData[Index].PageFaultCountDelta; + else + PageFaultCountDelta = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return PageFaultCountDelta; + return PageFaultCountDelta; } ULONG PerfDataGetVirtualMemorySizeBytes(ULONG Index) { - ULONG VirtualMemorySizeBytes; + ULONG VirtualMemorySizeBytes; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - VirtualMemorySizeBytes = pPerfData[Index].VirtualMemorySizeBytes; - else - VirtualMemorySizeBytes = 0; + if (Index < ProcessCount) + VirtualMemorySizeBytes = pPerfData[Index].VirtualMemorySizeBytes; + else + VirtualMemorySizeBytes = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return VirtualMemorySizeBytes; + return VirtualMemorySizeBytes; } ULONG PerfDataGetPagedPoolUsagePages(ULONG Index) { - ULONG PagedPoolUsagePages; + ULONG PagedPoolUsagePages; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - PagedPoolUsagePages = pPerfData[Index].PagedPoolUsagePages; - else - PagedPoolUsagePages = 0; + if (Index < ProcessCount) + PagedPoolUsagePages = pPerfData[Index].PagedPoolUsagePages; + else + PagedPoolUsagePages = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return PagedPoolUsagePages; + return PagedPoolUsagePages; } ULONG PerfDataGetNonPagedPoolUsagePages(ULONG Index) { - ULONG NonPagedPoolUsagePages; + ULONG NonPagedPoolUsagePages; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - NonPagedPoolUsagePages = pPerfData[Index].NonPagedPoolUsagePages; - else - NonPagedPoolUsagePages = 0; + if (Index < ProcessCount) + NonPagedPoolUsagePages = pPerfData[Index].NonPagedPoolUsagePages; + else + NonPagedPoolUsagePages = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return NonPagedPoolUsagePages; + return NonPagedPoolUsagePages; } ULONG PerfDataGetBasePriority(ULONG Index) { - ULONG BasePriority; + ULONG BasePriority; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - BasePriority = pPerfData[Index].BasePriority; - else - BasePriority = 0; + if (Index < ProcessCount) + BasePriority = pPerfData[Index].BasePriority; + else + BasePriority = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return BasePriority; + return BasePriority; } ULONG PerfDataGetHandleCount(ULONG Index) { - ULONG HandleCount; + ULONG HandleCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - HandleCount = pPerfData[Index].HandleCount; - else - HandleCount = 0; + if (Index < ProcessCount) + HandleCount = pPerfData[Index].HandleCount; + else + HandleCount = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return HandleCount; + return HandleCount; } ULONG PerfDataGetThreadCount(ULONG Index) { - ULONG ThreadCount; + ULONG ThreadCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - ThreadCount = pPerfData[Index].ThreadCount; - else - ThreadCount = 0; + if (Index < ProcessCount) + ThreadCount = pPerfData[Index].ThreadCount; + else + ThreadCount = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return ThreadCount; + return ThreadCount; } ULONG PerfDataGetUSERObjectCount(ULONG Index) { - ULONG USERObjectCount; + ULONG USERObjectCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - USERObjectCount = pPerfData[Index].USERObjectCount; - else - USERObjectCount = 0; + if (Index < ProcessCount) + USERObjectCount = pPerfData[Index].USERObjectCount; + else + USERObjectCount = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return USERObjectCount; + return USERObjectCount; } ULONG PerfDataGetGDIObjectCount(ULONG Index) { - ULONG GDIObjectCount; + ULONG GDIObjectCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - GDIObjectCount = pPerfData[Index].GDIObjectCount; - else - GDIObjectCount = 0; + if (Index < ProcessCount) + GDIObjectCount = pPerfData[Index].GDIObjectCount; + else + GDIObjectCount = 0; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return GDIObjectCount; + return GDIObjectCount; } BOOL PerfDataGetIOCounters(ULONG Index, PIO_COUNTERS pIoCounters) { - BOOL bSuccessful; + BOOL bSuccessful; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - if (Index < ProcessCount) - { - memcpy(pIoCounters, &pPerfData[Index].IOCounters, sizeof(IO_COUNTERS)); - bSuccessful = TRUE; - } - else - bSuccessful = FALSE; + if (Index < ProcessCount) + { + memcpy(pIoCounters, &pPerfData[Index].IOCounters, sizeof(IO_COUNTERS)); + bSuccessful = TRUE; + } + else + bSuccessful = FALSE; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return bSuccessful; + return bSuccessful; } ULONG PerfDataGetCommitChargeTotalK(void) { - ULONG Total; - ULONG PageSize; + ULONG Total; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemPerfInfo.MmTotalCommitedPages; - PageSize = SystemBasicInfo.uPageSize; + Total = SystemPerfInfo.MmTotalCommitedPages; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Total = Total * (PageSize / 1024); + Total = Total * (PageSize / 1024); - return Total; + return Total; } ULONG PerfDataGetCommitChargeLimitK(void) { - ULONG Limit; - ULONG PageSize; + ULONG Limit; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Limit = SystemPerfInfo.MmTotalCommitLimit; - PageSize = SystemBasicInfo.uPageSize; + Limit = SystemPerfInfo.MmTotalCommitLimit; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Limit = Limit * (PageSize / 1024); + Limit = Limit * (PageSize / 1024); - return Limit; + return Limit; } ULONG PerfDataGetCommitChargePeakK(void) { - ULONG Peak; - ULONG PageSize; + ULONG Peak; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Peak = SystemPerfInfo.MmPeakLimit; - PageSize = SystemBasicInfo.uPageSize; + Peak = SystemPerfInfo.MmPeakLimit; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Peak = Peak * (PageSize / 1024); + Peak = Peak * (PageSize / 1024); - return Peak; + return Peak; } ULONG PerfDataGetKernelMemoryTotalK(void) { - ULONG Total; - ULONG Paged; - ULONG NonPaged; - ULONG PageSize; + ULONG Total; + ULONG Paged; + ULONG NonPaged; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PoolPagedBytes; - NonPaged = SystemPerfInfo.PoolNonPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + Paged = SystemPerfInfo.PoolPagedBytes; + NonPaged = SystemPerfInfo.PoolNonPagedBytes; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Paged = Paged * (PageSize / 1024); - NonPaged = NonPaged * (PageSize / 1024); + Paged = Paged * (PageSize / 1024); + NonPaged = NonPaged * (PageSize / 1024); - Total = Paged + NonPaged; + Total = Paged + NonPaged; - return Total; + return Total; } ULONG PerfDataGetKernelMemoryPagedK(void) { - ULONG Paged; - ULONG PageSize; + ULONG Paged; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Paged = SystemPerfInfo.PoolPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + Paged = SystemPerfInfo.PoolPagedBytes; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Paged = Paged * (PageSize / 1024); + Paged = Paged * (PageSize / 1024); - return Paged; + return Paged; } ULONG PerfDataGetKernelMemoryNonPagedK(void) { - ULONG NonPaged; - ULONG PageSize; + ULONG NonPaged; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - NonPaged = SystemPerfInfo.PoolNonPagedBytes; - PageSize = SystemBasicInfo.uPageSize; + NonPaged = SystemPerfInfo.PoolNonPagedBytes; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - NonPaged = NonPaged * (PageSize / 1024); + NonPaged = NonPaged * (PageSize / 1024); - return NonPaged; + return NonPaged; } ULONG PerfDataGetPhysicalMemoryTotalK(void) { - ULONG Total; - ULONG PageSize; + ULONG Total; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Total = SystemBasicInfo.uMmNumberOfPhysicalPages; - PageSize = SystemBasicInfo.uPageSize; + Total = SystemBasicInfo.uMmNumberOfPhysicalPages; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Total = Total * (PageSize / 1024); + Total = Total * (PageSize / 1024); - return Total; + return Total; } ULONG PerfDataGetPhysicalMemoryAvailableK(void) { - ULONG Available; - ULONG PageSize; + ULONG Available; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - Available = SystemPerfInfo.MmAvailablePages; - PageSize = SystemBasicInfo.uPageSize; + Available = SystemPerfInfo.MmAvailablePages; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - Available = Available * (PageSize / 1024); + Available = Available * (PageSize / 1024); - return Available; + return Available; } ULONG PerfDataGetPhysicalMemorySystemCacheK(void) { - ULONG SystemCache; - ULONG PageSize; + ULONG SystemCache; + ULONG PageSize; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - SystemCache = SystemCacheInfo.CurrentSize; - PageSize = SystemBasicInfo.uPageSize; + SystemCache = SystemCacheInfo.CurrentSize; + PageSize = SystemBasicInfo.uPageSize; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - //SystemCache = SystemCache * (PageSize / 1024); - SystemCache = SystemCache / 1024; + /* SystemCache = SystemCache * (PageSize / 1024); */ + SystemCache = SystemCache / 1024; - return SystemCache; + return SystemCache; } ULONG PerfDataGetSystemHandleCount(void) { - ULONG HandleCount; + ULONG HandleCount; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - HandleCount = SystemHandleInfo.Count; + HandleCount = SystemHandleInfo.Count; - LeaveCriticalSection(&PerfDataCriticalSection); + LeaveCriticalSection(&PerfDataCriticalSection); - return HandleCount; + return HandleCount; } ULONG PerfDataGetTotalThreadCount(void) { - ULONG ThreadCount = 0; - ULONG i; + ULONG ThreadCount = 0; + ULONG i; - EnterCriticalSection(&PerfDataCriticalSection); + EnterCriticalSection(&PerfDataCriticalSection); - for (i=0; i #include #include @@ -40,51 +40,42 @@ TGraphCtrl PerformancePageCpuUsageHistoryGraph; TGraphCtrl PerformancePageMemUsageHistoryGraph; -HWND hPerformancePage; // Performance Property Page - -HWND hPerformancePageCpuUsageGraph; // CPU Usage Graph -HWND hPerformancePageMemUsageGraph; // MEM Usage Graph -HWND hPerformancePageCpuUsageHistoryGraph; // CPU Usage History Graph -HWND hPerformancePageMemUsageHistoryGraph; // Memory Usage History Graph - -HWND hPerformancePageTotalsFrame; // Totals Frame -HWND hPerformancePageCommitChargeFrame; // Commit Charge Frame -HWND hPerformancePageKernelMemoryFrame; // Kernel Memory Frame -HWND hPerformancePagePhysicalMemoryFrame; // Physical Memory Frame - +HWND hPerformancePage; /* Performance Property Page */ +HWND hPerformancePageCpuUsageGraph; /* CPU Usage Graph */ +HWND hPerformancePageMemUsageGraph; /* MEM Usage Graph */ +HWND hPerformancePageCpuUsageHistoryGraph; /* CPU Usage History Graph */ +HWND hPerformancePageMemUsageHistoryGraph; /* Memory Usage History Graph */ +HWND hPerformancePageTotalsFrame; /* Totals Frame */ +HWND hPerformancePageCommitChargeFrame; /* Commit Charge Frame */ +HWND hPerformancePageKernelMemoryFrame; /* Kernel Memory Frame */ +HWND hPerformancePagePhysicalMemoryFrame; /* Physical Memory Frame */ HWND hPerformancePageCpuUsageFrame; HWND hPerformancePageMemUsageFrame; HWND hPerformancePageCpuUsageHistoryFrame; HWND hPerformancePageMemUsageHistoryFrame; - -HWND hPerformancePageCommitChargeTotalEdit; // Commit Charge Total Edit Control -HWND hPerformancePageCommitChargeLimitEdit; // Commit Charge Limit Edit Control -HWND hPerformancePageCommitChargePeakEdit; // Commit Charge Peak Edit Control - -HWND hPerformancePageKernelMemoryTotalEdit; // Kernel Memory Total Edit Control -HWND hPerformancePageKernelMemoryPagedEdit; // Kernel Memory Paged Edit Control -HWND hPerformancePageKernelMemoryNonPagedEdit; // Kernel Memory NonPaged Edit Control - -HWND hPerformancePagePhysicalMemoryTotalEdit; // Physical Memory Total Edit Control -HWND hPerformancePagePhysicalMemoryAvailableEdit; // Physical Memory Available Edit Control -HWND hPerformancePagePhysicalMemorySystemCacheEdit; // Physical Memory System Cache Edit Control - -HWND hPerformancePageTotalsHandleCountEdit; // Total Handles Edit Control -HWND hPerformancePageTotalsProcessCountEdit; // Total Processes Edit Control -HWND hPerformancePageTotalsThreadCountEdit; // Total Threads Edit Control +HWND hPerformancePageCommitChargeTotalEdit; /* Commit Charge Total Edit Control */ +HWND hPerformancePageCommitChargeLimitEdit; /* Commit Charge Limit Edit Control */ +HWND hPerformancePageCommitChargePeakEdit; /* Commit Charge Peak Edit Control */ +HWND hPerformancePageKernelMemoryTotalEdit; /* Kernel Memory Total Edit Control */ +HWND hPerformancePageKernelMemoryPagedEdit; /* Kernel Memory Paged Edit Control */ +HWND hPerformancePageKernelMemoryNonPagedEdit; /* Kernel Memory NonPaged Edit Control */ +HWND hPerformancePagePhysicalMemoryTotalEdit; /* Physical Memory Total Edit Control */ +HWND hPerformancePagePhysicalMemoryAvailableEdit; /* Physical Memory Available Edit Control */ +HWND hPerformancePagePhysicalMemorySystemCacheEdit; /* Physical Memory System Cache Edit Control */ +HWND hPerformancePageTotalsHandleCountEdit; /* Total Handles Edit Control */ +HWND hPerformancePageTotalsProcessCountEdit; /* Total Processes Edit Control */ +HWND hPerformancePageTotalsThreadCountEdit; /* Total Threads Edit Control */ static int nPerformancePageWidth; static int nPerformancePageHeight; - -static HANDLE hPerformancePageEvent = NULL; // When this event becomes signaled then we refresh the performance page - +static HANDLE hPerformancePageEvent = NULL; /* When this event becomes signaled then we refresh the performance page */ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter); void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference, int pos) { RECT rc; - int cx, cy, sx, sy; + int cx, cy, sx, sy; GetClientRect(hCntrl, &rc); MapWindowPoints(hCntrl, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT))); @@ -133,23 +124,23 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, int nXDifference; int nYDifference; -// HDC hdc; -// PAINTSTRUCT ps; +/* HDC hdc; */ +/* PAINTSTRUCT ps; */ switch (message) { case WM_INITDIALOG: - // Save the width and height + /* Save the width and height */ GetClientRect(hDlg, &rc); nPerformancePageWidth = rc.right; nPerformancePageHeight = rc.bottom; - // Update window position + /* Update window position */ SetWindowPos(hDlg, NULL, 15, 30, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - // - // Get handles to all the controls - // + /* + * Get handles to all the controls + */ hPerformancePageTotalsFrame = GetDlgItem(hDlg, IDC_TOTALS_FRAME); hPerformancePageCommitChargeFrame = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_FRAME); hPerformancePageKernelMemoryFrame = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_FRAME); @@ -179,16 +170,16 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, hPerformancePageCpuUsageHistoryGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); GetClientRect(hPerformancePageCpuUsageHistoryGraph, &rc); - // create the control - //PerformancePageCpuUsageHistoryGraph.Create(0, rc, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); + /* create the control */ + /* PerformancePageCpuUsageHistoryGraph.Create(0, rc, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); */ GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); - // customize the control + /* customize the control */ GraphCtrl_SetRange(&PerformancePageCpuUsageHistoryGraph, 0.0, 100.0, 10); -// PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; -// PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; -// PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; -// PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; -// PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; +/* PerformancePageCpuUsageHistoryGraph.SetYUnits("Current") ; */ +/* PerformancePageCpuUsageHistoryGraph.SetXUnits("Samples (Windows Timer: 100 msec)") ; */ +/* PerformancePageCpuUsageHistoryGraph.SetBackgroundColor(RGB(0, 0, 64)) ; */ +/* PerformancePageCpuUsageHistoryGraph.SetGridColor(RGB(192, 192, 255)) ; */ +/* PerformancePageCpuUsageHistoryGraph.SetPlotColor(RGB(255, 255, 255)) ; */ GraphCtrl_SetBackgroundColor(&PerformancePageCpuUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageCpuUsageHistoryGraph, RGB(152, 205, 152)) ; GraphCtrl_SetPlotColor(&PerformancePageCpuUsageHistoryGraph, 0, RGB(255, 0, 0)) ; @@ -200,14 +191,14 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, GraphCtrl_SetBackgroundColor(&PerformancePageMemUsageHistoryGraph, RGB(0, 0, 0)) ; GraphCtrl_SetGridColor(&PerformancePageMemUsageHistoryGraph, RGB(152, 215, 152)) ; GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; - // Start our refresh thread + /* Start our refresh thread */ #ifdef RUN_PERF_PAGE CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL); #endif - // - // Subclass graph buttons - // + /* + * Subclass graph buttons + */ OldGraphWndProc = SetWindowLong(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc); SetWindowLong(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc); OldGraphCtrlWndProc = SetWindowLong(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc); @@ -246,7 +237,7 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, nPerformancePageHeight = cy; } while (0); - // Reposition the performance page's controls + /* Reposition the performance page's controls */ AdjustFrameSize(hPerformancePageTotalsFrame, hDlg, 0, nYDifference, 0); AdjustFrameSize(hPerformancePageCommitChargeFrame, hDlg, 0, nYDifference, 0); AdjustFrameSize(hPerformancePageKernelMemoryFrame, hDlg, 0, nYDifference, 0); @@ -315,8 +306,8 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, void RefreshPerformancePage(void) { - // Signal the event so that our refresh thread - // will wake up and refresh the performance page + /* Signal the event so that our refresh thread */ + /* will wake up and refresh the performance page */ SetEvent(hPerformancePageEvent); } @@ -340,10 +331,10 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) TCHAR Text[260]; - // Create the event + /* Create the event */ hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, _T("Performance Page Event")); - // If we couldn't create the event then exit the thread + /* If we couldn't create the event then exit the thread */ if (!hPerformancePageEvent) return 0; @@ -351,22 +342,22 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) { DWORD dwWaitVal; - // Wait on the event + /* Wait on the event */ dwWaitVal = WaitForSingleObject(hPerformancePageEvent, INFINITE); - // If the wait failed then the event object must have been - // closed and the task manager is exiting so exit this thread + /* If the wait failed then the event object must have been */ + /* closed and the task manager is exiting so exit this thread */ if (dwWaitVal == WAIT_FAILED) return 0; if (dwWaitVal == WAIT_OBJECT_0) { - // Reset our event + /* Reset our event */ ResetEvent(hPerformancePageEvent); - // - // Update the commit charge info - // + /* + * Update the commit charge info + */ CommitChargeTotal = PerfDataGetCommitChargeTotalK(); CommitChargeLimit = PerfDataGetCommitChargeLimitK(); CommitChargePeak = PerfDataGetCommitChargePeakK(); @@ -379,9 +370,9 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) wsprintf(Text, _T("Mem Usage: %dK / %dK"), CommitChargeTotal, CommitChargeLimit); SendMessage(hStatusWnd, SB_SETTEXT, 2, (LPARAM)Text); - // - // Update the kernel memory info - // + /* + * Update the kernel memory info + */ KernelMemoryTotal = PerfDataGetKernelMemoryTotalK(); KernelMemoryPaged = PerfDataGetKernelMemoryPagedK(); KernelMemoryNonPaged = PerfDataGetKernelMemoryNonPagedK(); @@ -392,9 +383,9 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) _ultot(KernelMemoryNonPaged, Text, 10); SetWindowText(hPerformancePageKernelMemoryNonPagedEdit, Text); - // - // Update the physical memory info - // + /* + * Update the physical memory info + */ PhysicalMemoryTotal = PerfDataGetPhysicalMemoryTotalK(); PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); PhysicalMemorySystemCache = PerfDataGetPhysicalMemorySystemCacheK(); @@ -405,9 +396,9 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) _ultot(PhysicalMemorySystemCache, Text, 10); SetWindowText(hPerformancePagePhysicalMemorySystemCacheEdit, Text); - // - // Update the totals info - // + /* + * Update the totals info + */ TotalHandles = PerfDataGetSystemHandleCount(); TotalThreads = PerfDataGetTotalThreadCount(); TotalProcesses = PerfDataGetProcessCount(); @@ -418,13 +409,12 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) _ultot(TotalProcesses, Text, 10); SetWindowText(hPerformancePageTotalsProcessCountEdit, Text); - // - // Redraw the graphs - // + /* + * Redraw the graphs + */ InvalidateRect(hPerformancePageCpuUsageGraph, NULL, FALSE); InvalidateRect(hPerformancePageMemUsageGraph, NULL, FALSE); - // ULONG CpuUsage; ULONG CpuKernelUsage; @@ -435,9 +425,9 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) int nBarsUsed1; int nBarsUsed2; - // - // Get the CPU usage - // + /* + * Get the CPU usage + */ CpuUsage = PerfDataGetProcessorUsage(); CpuKernelUsage = PerfDataGetProcessorSystemUsage(); if (CpuUsage < 0 ) CpuUsage = 0; @@ -445,9 +435,9 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) if (CpuKernelUsage < 0) CpuKernelUsage = 0; if (CpuKernelUsage > 100) CpuKernelUsage = 100; - // - // Get the memory usage - // + /* + * Get the memory usage + */ CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); nBarsUsed1 = CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0; @@ -459,7 +449,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) GraphCtrl_AppendPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage, 0.0, 0.0); GraphCtrl_AppendPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2, 0.0, 0.0); - //PerformancePageMemUsageHistoryGraph.SetRange(0.0, 100.0, 10) ; + /* PerformancePageMemUsageHistoryGraph.SetRange(0.0, 100.0, 10) ; */ InvalidateRect(hPerformancePageMemUsageHistoryGraph, NULL, FALSE); InvalidateRect(hPerformancePageCpuUsageHistoryGraph, NULL, FALSE); } @@ -475,7 +465,7 @@ void PerformancePage_OnViewShowKernelTimes(void) hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); - // Check or uncheck the show 16-bit tasks menu item + /* Check or uncheck the show 16-bit tasks menu item */ if (GetMenuState(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND) & MF_CHECKED) { CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_UNCHECKED); diff --git a/rosapps/taskmgr/priority.c b/rosapps/taskmgr/priority.c index 6840177b9f6..f418370f4e1 100644 --- a/rosapps/taskmgr/priority.c +++ b/rosapps/taskmgr/priority.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,7 +29,7 @@ #include #include #include - + #include "taskmgr.h" #include "priority.h" #include "procpage.h" @@ -37,288 +37,288 @@ void ProcessPage_OnSetPriorityRealTime(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, REALTIME_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnSetPriorityHigh(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnSetPriorityAboveNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, ABOVE_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, ABOVE_NORMAL_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnSetPriorityNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, NORMAL_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnSetPriorityBelowNormal(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, BELOW_NORMAL_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, BELOW_NORMAL_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } void ProcessPage_OnSetPriorityLow(void) { - LVITEM lvitem; - ULONG Index; - DWORD dwProcessId; - HANDLE hProcess; - TCHAR strErrorText[260]; + LVITEM lvitem; + ULONG Index; + DWORD dwProcessId; + HANDLE hProcess; + TCHAR strErrorText[260]; - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - dwProcessId = PerfDataGetProcessId(Index); + dwProcessId = PerfDataGetProcessId(Index); - if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) - return; + if ((ListView_GetSelectedCount(hProcessPageListCtrl) != 1) || (dwProcessId == 0)) + return; - if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) - return; + if (MessageBox(hMainWnd, _T("WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?"), _T("Task Manager Warning"), MB_YESNO|MB_ICONWARNING) != IDYES) + return; - hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); + hProcess = OpenProcess(PROCESS_SET_INFORMATION, FALSE, dwProcessId); - if (!hProcess) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - return; - } + if (!hProcess) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + return; + } - if (!SetPriorityClass(hProcess, IDLE_PRIORITY_CLASS)) - { - GetLastErrorText(strErrorText, 260); - MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); - } + if (!SetPriorityClass(hProcess, IDLE_PRIORITY_CLASS)) + { + GetLastErrorText(strErrorText, 260); + MessageBox(hMainWnd, strErrorText, _T("Unable to Change Priority"), MB_OK|MB_ICONSTOP); + } - CloseHandle(hProcess); + CloseHandle(hProcess); } diff --git a/rosapps/taskmgr/proclist.c b/rosapps/taskmgr/proclist.c index d88ad1d7a5f..c217c7fd9b6 100644 --- a/rosapps/taskmgr/proclist.c +++ b/rosapps/taskmgr/proclist.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,94 +29,94 @@ #include #include #include - + #include "taskmgr.h" #include "procpage.h" #include "proclist.h" #include "perfdata.h" -LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); -LONG OldProcessListWndProc; +LONG OldProcessListWndProc; LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - HBRUSH hbrBackground; - RECT rcItem; - RECT rcClip; - HDC hDC; - int DcSave; + HBRUSH hbrBackground; + RECT rcItem; + RECT rcClip; + HDC hDC; + int DcSave; - switch (message) - { - case WM_ERASEBKGND: + switch (message) + { + case WM_ERASEBKGND: - /* - * The list control produces a nasty flicker - * when the user is resizing the window because - * it erases the background to white, then - * paints the list items over it. - * - * We will clip the drawing so that it only - * erases the parts of the list control that - * show only the background. - */ + /* + * The list control produces a nasty flicker + * when the user is resizing the window because + * it erases the background to white, then + * paints the list items over it. + * + * We will clip the drawing so that it only + * erases the parts of the list control that + * show only the background. + */ - /* - * Get the device context and save it's state - * to be restored after we're done - */ - hDC = (HDC) wParam; - DcSave = SaveDC(hDC); + /* + * Get the device context and save it's state + * to be restored after we're done + */ + hDC = (HDC) wParam; + DcSave = SaveDC(hDC); - /* - * Get the background brush - */ - hbrBackground = (HBRUSH) GetClassLong(hWnd, GCL_HBRBACKGROUND); + /* + * Get the background brush + */ + hbrBackground = (HBRUSH) GetClassLong(hWnd, GCL_HBRBACKGROUND); - /* - * Calculate the clip rect by getting the RECT - * of the first and last items and adding them up. - * - * We also have to get the item's icon RECT and - * subtract it from our clip rect because we don't - * use icons in this list control. - */ - ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); - ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); - rcClip.bottom = rcItem.bottom; - ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); - rcClip.left = rcItem.right; + /* + * Calculate the clip rect by getting the RECT + * of the first and last items and adding them up. + * + * We also have to get the item's icon RECT and + * subtract it from our clip rect because we don't + * use icons in this list control. + */ + ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); + ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); + rcClip.bottom = rcItem.bottom; + ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); + rcClip.left = rcItem.right; - /* - * Now exclude the clip rect - */ - ExcludeClipRect(hDC, rcClip.left, rcClip.top, rcClip.right, rcClip.bottom); + /* + * Now exclude the clip rect + */ + ExcludeClipRect(hDC, rcClip.left, rcClip.top, rcClip.right, rcClip.bottom); - /* - * Now erase the background - * - * - * FIXME: Should I erase it myself or - * pass down the updated HDC and let - * the default handler do it? - */ - GetClientRect(hWnd, &rcItem); - FillRect(hDC, &rcItem, hbrBackground); + /* + * Now erase the background + * + * + * FIXME: Should I erase it myself or + * pass down the updated HDC and let + * the default handler do it? + */ + GetClientRect(hWnd, &rcItem); + FillRect(hDC, &rcItem, hbrBackground); - /* - * Now restore the DC state that we - * saved earlier - */ - RestoreDC(hDC, DcSave); - - return TRUE; - } + /* + * Now restore the DC state that we + * saved earlier + */ + RestoreDC(hDC, DcSave); + + return TRUE; + } - /* - * We pass on all messages except WM_ERASEBKGND - */ - return CallWindowProc((WNDPROC)OldProcessListWndProc, hWnd, message, wParam, lParam); + /* + * We pass on all messages except WM_ERASEBKGND + */ + return CallWindowProc((WNDPROC)OldProcessListWndProc, hWnd, message, wParam, lParam); } diff --git a/rosapps/taskmgr/procpage.c b/rosapps/taskmgr/procpage.c index 93d82ee9c9f..61b513bf905 100644 --- a/rosapps/taskmgr/procpage.c +++ b/rosapps/taskmgr/procpage.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,7 +29,7 @@ #include #include #include - + #include "taskmgr.h" #include "procpage.h" #include "perfdata.h" @@ -37,17 +37,17 @@ #include "proclist.h" #include -HWND hProcessPage; /* Process List Property Page */ +HWND hProcessPage; /* Process List Property Page */ -HWND hProcessPageListCtrl; /* Process ListCtrl Window */ -HWND hProcessPageHeaderCtrl; /* Process Header Control */ -HWND hProcessPageEndProcessButton; /* Process End Process button */ +HWND hProcessPageListCtrl; /* Process ListCtrl Window */ +HWND hProcessPageHeaderCtrl; /* Process Header Control */ +HWND hProcessPageEndProcessButton; /* Process End Process button */ HWND hProcessPageShowAllProcessesButton;/* Process Show All Processes checkbox */ -static int nProcessPageWidth; -static int nProcessPageHeight; +static int nProcessPageWidth; +static int nProcessPageHeight; -static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ +static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam); void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount); @@ -56,487 +56,487 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - RECT rc; - int nXDifference; - int nYDifference; - int cx, cy; + RECT rc; + int nXDifference; + int nYDifference; + int cx, cy; - switch (message) { - case WM_INITDIALOG: - /* - * Save the width and height - */ - GetClientRect(hDlg, &rc); - nProcessPageWidth = rc.right; - nProcessPageHeight = rc.bottom; + switch (message) { + case WM_INITDIALOG: + /* + * Save the width and height + */ + GetClientRect(hDlg, &rc); + nProcessPageWidth = rc.right; + nProcessPageHeight = rc.bottom; - /* Update window position */ - SetWindowPos(hDlg, NULL, 15, 30, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); + /* Update window position */ + SetWindowPos(hDlg, NULL, 15, 30, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - /* - * Get handles to the controls - */ - hProcessPageListCtrl = GetDlgItem(hDlg, IDC_PROCESSLIST); - hProcessPageHeaderCtrl = ListView_GetHeader(hProcessPageListCtrl); - hProcessPageEndProcessButton = GetDlgItem(hDlg, IDC_ENDPROCESS); - hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); + /* + * Get handles to the controls + */ + hProcessPageListCtrl = GetDlgItem(hDlg, IDC_PROCESSLIST); + hProcessPageHeaderCtrl = ListView_GetHeader(hProcessPageListCtrl); + hProcessPageEndProcessButton = GetDlgItem(hDlg, IDC_ENDPROCESS); + hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); - /* - * Set the font, title, and extended window styles for the list control - */ - SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); - SetWindowText(hProcessPageListCtrl, _T("Processes")); - ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + /* + * Set the font, title, and extended window styles for the list control + */ + SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); + SetWindowText(hProcessPageListCtrl, _T("Processes")); + ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); - AddColumns(); + AddColumns(); - /* - * Subclass the process list control so we can intercept WM_ERASEBKGND - */ - OldProcessListWndProc = SetWindowLong(hProcessPageListCtrl, GWL_WNDPROC, (LONG)ProcessListWndProc); + /* + * Subclass the process list control so we can intercept WM_ERASEBKGND + */ + OldProcessListWndProc = SetWindowLong(hProcessPageListCtrl, GWL_WNDPROC, (LONG)ProcessListWndProc); - /* Start our refresh thread */ - CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); + /* Start our refresh thread */ + CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); - return TRUE; + return TRUE; - case WM_DESTROY: - /* Close the event handle, this will make the */ - /* refresh thread exit when the wait fails */ - CloseHandle(hProcessPageEvent); + case WM_DESTROY: + /* Close the event handle, this will make the */ + /* refresh thread exit when the wait fails */ + CloseHandle(hProcessPageEvent); - SaveColumnSettings(); + SaveColumnSettings(); - break; + break; - case WM_COMMAND: - break; + case WM_COMMAND: + break; - case WM_SIZE: - if (wParam == SIZE_MINIMIZED) - return 0; + case WM_SIZE: + if (wParam == SIZE_MINIMIZED) + return 0; - cx = LOWORD(lParam); - cy = HIWORD(lParam); - nXDifference = cx - nProcessPageWidth; - nYDifference = cy - nProcessPageHeight; - nProcessPageWidth = cx; - nProcessPageHeight = cy; + cx = LOWORD(lParam); + cy = HIWORD(lParam); + nXDifference = cx - nProcessPageWidth; + nYDifference = cy - nProcessPageHeight; + nProcessPageWidth = cx; + nProcessPageHeight = cy; - /* Reposition the application page's controls */ - GetWindowRect(hProcessPageListCtrl, &rc); - cx = (rc.right - rc.left) + nXDifference; - cy = (rc.bottom - rc.top) + nYDifference; - SetWindowPos(hProcessPageListCtrl, NULL, 0, 0, cx, cy, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOZORDER); - InvalidateRect(hProcessPageListCtrl, NULL, TRUE); - - GetClientRect(hProcessPageEndProcessButton, &rc); - MapWindowPoints(hProcessPageEndProcessButton, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); - cx = rc.left + nXDifference; - cy = rc.top + nYDifference; - SetWindowPos(hProcessPageEndProcessButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - InvalidateRect(hProcessPageEndProcessButton, NULL, TRUE); - - GetClientRect(hProcessPageShowAllProcessesButton, &rc); - MapWindowPoints(hProcessPageShowAllProcessesButton, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); - cx = rc.left; - cy = rc.top + nYDifference; - SetWindowPos(hProcessPageShowAllProcessesButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - InvalidateRect(hProcessPageShowAllProcessesButton, NULL, TRUE); + /* Reposition the application page's controls */ + GetWindowRect(hProcessPageListCtrl, &rc); + cx = (rc.right - rc.left) + nXDifference; + cy = (rc.bottom - rc.top) + nYDifference; + SetWindowPos(hProcessPageListCtrl, NULL, 0, 0, cx, cy, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOMOVE|SWP_NOZORDER); + InvalidateRect(hProcessPageListCtrl, NULL, TRUE); + + GetClientRect(hProcessPageEndProcessButton, &rc); + MapWindowPoints(hProcessPageEndProcessButton, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + cx = rc.left + nXDifference; + cy = rc.top + nYDifference; + SetWindowPos(hProcessPageEndProcessButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); + InvalidateRect(hProcessPageEndProcessButton, NULL, TRUE); + + GetClientRect(hProcessPageShowAllProcessesButton, &rc); + MapWindowPoints(hProcessPageShowAllProcessesButton, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT)) ); + cx = rc.left; + cy = rc.top + nYDifference; + SetWindowPos(hProcessPageShowAllProcessesButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); + InvalidateRect(hProcessPageShowAllProcessesButton, NULL, TRUE); - break; + break; - case WM_NOTIFY: + case WM_NOTIFY: - ProcessPageOnNotify(wParam, lParam); - break; - } + ProcessPageOnNotify(wParam, lParam); + break; + } return 0; } void ProcessPageOnNotify(WPARAM wParam, LPARAM lParam) { - int idctrl; - LPNMHDR pnmh; - LPNMLISTVIEW pnmv; - NMLVDISPINFO* pnmdi; - LPNMHEADER pnmhdr; - LVITEM lvitem; - ULONG Index; - ULONG ColumnIndex; - IO_COUNTERS iocounters; - TIME time; + int idctrl; + LPNMHDR pnmh; + LPNMLISTVIEW pnmv; + NMLVDISPINFO* pnmdi; + LPNMHEADER pnmhdr; + LVITEM lvitem; + ULONG Index; + ULONG ColumnIndex; + IO_COUNTERS iocounters; + TIME time; - idctrl = (int) wParam; - pnmh = (LPNMHDR) lParam; - pnmv = (LPNMLISTVIEW) lParam; - pnmdi = (NMLVDISPINFO*) lParam; - pnmhdr = (LPNMHEADER) lParam; + idctrl = (int) wParam; + pnmh = (LPNMHDR) lParam; + pnmv = (LPNMLISTVIEW) lParam; + pnmdi = (NMLVDISPINFO*) lParam; + pnmhdr = (LPNMHEADER) lParam; - if (pnmh->hwndFrom == hProcessPageListCtrl) - { - switch (pnmh->code) - { - #if 0 - case LVN_ITEMCHANGED: - ProcessPageUpdate(); - break; - #endif - - case LVN_GETDISPINFO: + if (pnmh->hwndFrom == hProcessPageListCtrl) + { + switch (pnmh->code) + { + #if 0 + case LVN_ITEMCHANGED: + ProcessPageUpdate(); + break; + #endif + + case LVN_GETDISPINFO: - if (!(pnmdi->item.mask & LVIF_TEXT)) - break; - - ColumnIndex = pnmdi->item.iSubItem; - Index = pnmdi->item.iItem; + if (!(pnmdi->item.mask & LVIF_TEXT)) + break; + + ColumnIndex = pnmdi->item.iSubItem; + Index = pnmdi->item.iItem; - if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) - PerfDataGetImageName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); - if (ColumnDataHints[ColumnIndex] == COLUMN_PID) - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetProcessId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) - PerfDataGetUserName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); - if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetSessionId(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) - wsprintf(pnmdi->item.pszText, _T("%02d"), PerfDataGetCPUUsage(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) - { - DWORD dwHours; - DWORD dwMinutes; - DWORD dwSeconds; + if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME) + PerfDataGetImageName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); + if (ColumnDataHints[ColumnIndex] == COLUMN_PID) + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetProcessId(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME) + PerfDataGetUserName(Index, pnmdi->item.pszText, pnmdi->item.cchTextMax); + if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID) + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetSessionId(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE) + wsprintf(pnmdi->item.pszText, _T("%02d"), PerfDataGetCPUUsage(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME) + { + DWORD dwHours; + DWORD dwMinutes; + DWORD dwSeconds; - time = PerfDataGetCPUTime(Index); + time = PerfDataGetCPUTime(Index); #ifdef _MSC_VER - dwHours = (DWORD)(time.QuadPart / 36000000000L); - dwMinutes = (DWORD)((time.QuadPart % 36000000000L) / 600000000L); - dwSeconds = (DWORD)(((time.QuadPart % 36000000000L) % 600000000L) / 10000000L); + dwHours = (DWORD)(time.QuadPart / 36000000000L); + dwMinutes = (DWORD)((time.QuadPart % 36000000000L) / 600000000L); + dwSeconds = (DWORD)(((time.QuadPart % 36000000000L) % 600000000L) / 10000000L); #else - dwHours = (DWORD)(time.QuadPart / 36000000000LL); - dwMinutes = (DWORD)((time.QuadPart % 36000000000LL) / 600000000LL); - dwSeconds = (DWORD)(((time.QuadPart % 36000000000LL) % 600000000LL) / 10000000LL); + dwHours = (DWORD)(time.QuadPart / 36000000000LL); + dwMinutes = (DWORD)((time.QuadPart % 36000000000LL) / 600000000LL); + dwSeconds = (DWORD)(((time.QuadPart % 36000000000LL) % 600000000LL) / 10000000LL); #endif - wsprintf(pnmdi->item.pszText, _T("%d:%02d:%02d"), dwHours, dwMinutes, dwSeconds); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetWorkingSetSizeDelta(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPageFaultCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPageFaultCountDelta(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetVirtualMemorySizeBytes(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetNonPagedPoolUsagePages(Index) / 1024); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - _tcscat(pnmdi->item.pszText, _T(" K")); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetBasePriority(Index)); - if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetHandleCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetThreadCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetUSERObjectCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) - { - wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetGDIObjectCount(Index)); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.ReadOperationCount); + wsprintf(pnmdi->item.pszText, _T("%d:%02d:%02d"), dwHours, dwMinutes, dwSeconds); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetWorkingSetSizeBytes(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetWorkingSetSizeDelta(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPageFaultCount(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPageFaultCountDelta(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetVirtualMemorySizeBytes(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetPagedPoolUsagePages(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetNonPagedPoolUsagePages(Index) / 1024); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + _tcscat(pnmdi->item.pszText, _T(" K")); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY) + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetBasePriority(Index)); + if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetHandleCount(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetThreadCount(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetUSERObjectCount(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS) + { + wsprintf(pnmdi->item.pszText, _T("%d"), PerfDataGetGDIObjectCount(Index)); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.ReadOperationCount); */ #ifdef UNICODE #define _ui64toa _ui64tow #else #endif - _ui64toa(iocounters.ReadOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.WriteOperationCount); - _ui64toa(iocounters.WriteOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.OtherOperationCount); - _ui64toa(iocounters.OtherOperationCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.ReadTransferCount); - _ui64toa(iocounters.ReadTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.WriteTransferCount); - _ui64toa(iocounters.WriteTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } - if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) - { - PerfDataGetIOCounters(Index, &iocounters); - //wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.OtherTransferCount); - _ui64toa(iocounters.OtherTransferCount, pnmdi->item.pszText, 10); - CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); - } + _ui64toa(iocounters.ReadOperationCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.WriteOperationCount); */ + _ui64toa(iocounters.WriteOperationCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHER) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.OtherOperationCount); */ + _ui64toa(iocounters.OtherOperationCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.ReadTransferCount); */ + _ui64toa(iocounters.ReadTransferCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOWRITEBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.WriteTransferCount); */ + _ui64toa(iocounters.WriteTransferCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } + if (ColumnDataHints[ColumnIndex] == COLUMN_IOOTHERBYTES) + { + PerfDataGetIOCounters(Index, &iocounters); + /* wsprintf(pnmdi->item.pszText, _T("%d"), iocounters.OtherTransferCount); */ + _ui64toa(iocounters.OtherTransferCount, pnmdi->item.pszText, 10); + CommaSeparateNumberString(pnmdi->item.pszText, pnmdi->item.cchTextMax); + } - break; + break; - case NM_RCLICK: + case NM_RCLICK: - for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) - { - memset(&lvitem, 0, sizeof(LVITEM)); + for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) + { + memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; - lvitem.stateMask = LVIS_SELECTED; - lvitem.iItem = Index; + lvitem.mask = LVIF_STATE; + lvitem.stateMask = LVIS_SELECTED; + lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + ListView_GetItem(hProcessPageListCtrl, &lvitem); - if (lvitem.state & LVIS_SELECTED) - break; - } + if (lvitem.state & LVIS_SELECTED) + break; + } - if ((ListView_GetSelectedCount(hProcessPageListCtrl) == 1) && - (PerfDataGetProcessId(Index) != 0)) - { - ProcessPageShowContextMenu(PerfDataGetProcessId(Index)); - } + if ((ListView_GetSelectedCount(hProcessPageListCtrl) == 1) && + (PerfDataGetProcessId(Index) != 0)) + { + ProcessPageShowContextMenu(PerfDataGetProcessId(Index)); + } - break; + break; - } - } - else if (pnmh->hwndFrom == hProcessPageHeaderCtrl) - { - switch (pnmh->code) - { - case HDN_ITEMCLICK: + } + } + else if (pnmh->hwndFrom == hProcessPageHeaderCtrl) + { + switch (pnmh->code) + { + case HDN_ITEMCLICK: - /* - * FIXME: Fix the column sorting - * - *ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, NULL); - *bSortAscending = !bSortAscending; - */ + /* + * FIXME: Fix the column sorting + * + *ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, NULL); + *bSortAscending = !bSortAscending; + */ - break; + break; - case HDN_ITEMCHANGED: + case HDN_ITEMCHANGED: - UpdateColumnDataHints(); + UpdateColumnDataHints(); - break; + break; - case HDN_ENDDRAG: + case HDN_ENDDRAG: - UpdateColumnDataHints(); + UpdateColumnDataHints(); - break; + break; - } - } + } + } } void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount) { - TCHAR temp[260]; - UINT i, j, k; + TCHAR temp[260]; + UINT i, j, k; - for (i=0,j=0; i<(_tcslen(strNumber) % 3); i++, j++) - temp[j] = strNumber[i]; - for (k=0; i<_tcslen(strNumber); i++,j++,k++) { - if ((k % 3 == 0) && (j > 0)) - temp[j++] = _T(','); - temp[j] = strNumber[i]; - } - temp[j] = _T('\0'); - _tcsncpy(strNumber, temp, nMaxCount); + for (i=0,j=0; i<(_tcslen(strNumber) % 3); i++, j++) + temp[j] = strNumber[i]; + for (k=0; i<_tcslen(strNumber); i++,j++,k++) { + if ((k % 3 == 0) && (j > 0)) + temp[j++] = _T(','); + temp[j] = strNumber[i]; + } + temp[j] = _T('\0'); + _tcsncpy(strNumber, temp, nMaxCount); } void ProcessPageShowContextMenu(DWORD dwProcessId) { - HMENU hMenu; - HMENU hSubMenu; - HMENU hPriorityMenu; - POINT pt; - SYSTEM_INFO si; - HANDLE hProcess; - DWORD dwProcessPriorityClass; - TCHAR strDebugger[260]; - DWORD dwDebuggerSize; - HKEY hKey; - UINT Idx; + HMENU hMenu; + HMENU hSubMenu; + HMENU hPriorityMenu; + POINT pt; + SYSTEM_INFO si; + HANDLE hProcess; + DWORD dwProcessPriorityClass; + TCHAR strDebugger[260]; + DWORD dwDebuggerSize; + HKEY hKey; + UINT Idx; - memset(&si, 0, sizeof(SYSTEM_INFO)); + memset(&si, 0, sizeof(SYSTEM_INFO)); - GetCursorPos(&pt); - GetSystemInfo(&si); + GetCursorPos(&pt); + GetSystemInfo(&si); - hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_PROCESS_PAGE_CONTEXT)); - hSubMenu = GetSubMenu(hMenu, 0); - hPriorityMenu = GetSubMenu(hSubMenu, 4); + hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_PROCESS_PAGE_CONTEXT)); + hSubMenu = GetSubMenu(hMenu, 0); + hPriorityMenu = GetSubMenu(hSubMenu, 4); - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwProcessId); - dwProcessPriorityClass = GetPriorityClass(hProcess); - CloseHandle(hProcess); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwProcessId); + dwProcessPriorityClass = GetPriorityClass(hProcess); + CloseHandle(hProcess); - if (si.dwNumberOfProcessors < 2) - RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND); + if (si.dwNumberOfProcessors < 2) + RemoveMenu(hSubMenu, ID_PROCESS_PAGE_SETAFFINITY, MF_BYCOMMAND); - switch (dwProcessPriorityClass) { - case REALTIME_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, MF_BYCOMMAND); - break; - case HIGH_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_HIGH, MF_BYCOMMAND); - break; - case ABOVE_NORMAL_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL, MF_BYCOMMAND); - break; - case NORMAL_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_NORMAL, MF_BYCOMMAND); - break; - case BELOW_NORMAL_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL, MF_BYCOMMAND); - break; - case IDLE_PRIORITY_CLASS: - CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_LOW, MF_BYCOMMAND); - break; - } + switch (dwProcessPriorityClass) { + case REALTIME_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, MF_BYCOMMAND); + break; + case HIGH_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_HIGH, MF_BYCOMMAND); + break; + case ABOVE_NORMAL_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL, MF_BYCOMMAND); + break; + case NORMAL_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_NORMAL, MF_BYCOMMAND); + break; + case BELOW_NORMAL_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL, MF_BYCOMMAND); + break; + case IDLE_PRIORITY_CLASS: + CheckMenuRadioItem(hPriorityMenu, ID_PROCESS_PAGE_SETPRIORITY_REALTIME, ID_PROCESS_PAGE_SETPRIORITY_LOW, ID_PROCESS_PAGE_SETPRIORITY_LOW, MF_BYCOMMAND); + break; + } - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - dwDebuggerSize = 260; - if (RegQueryValueEx(hKey, _T("Debugger"), NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) - { - for (Idx=0; Idx<_tcslen(strDebugger); Idx++) - strDebugger[Idx] = toupper(strDebugger[Idx]); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwDebuggerSize = 260; + if (RegQueryValueEx(hKey, _T("Debugger"), NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) == ERROR_SUCCESS) + { + for (Idx=0; Idx<_tcslen(strDebugger); Idx++) + strDebugger[Idx] = toupper(strDebugger[Idx]); - if (_tcsstr(strDebugger, _T("DRWTSN32"))) - EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); - } - else - EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); + if (_tcsstr(strDebugger, _T("DRWTSN32"))) + EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); + } + else + EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); - RegCloseKey(hKey); - } else { - EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); - } - TrackPopupMenu(hSubMenu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, hMainWnd, NULL); - DestroyMenu(hMenu); + RegCloseKey(hKey); + } else { + EnableMenuItem(hSubMenu, ID_PROCESS_PAGE_DEBUG, MF_BYCOMMAND|MF_DISABLED|MF_GRAYED); + } + TrackPopupMenu(hSubMenu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, hMainWnd, NULL); + DestroyMenu(hMenu); } void RefreshProcessPage(void) { - /* Signal the event so that our refresh thread */ - /* will wake up and refresh the process page */ - SetEvent(hProcessPageEvent); + /* Signal the event so that our refresh thread */ + /* will wake up and refresh the process page */ + SetEvent(hProcessPageEvent); } DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) { - ULONG OldProcessorUsage = 0; - ULONG OldProcessCount = 0; + ULONG OldProcessorUsage = 0; + ULONG OldProcessCount = 0; - /* Create the event */ - hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, _T("Process Page Event")); + /* Create the event */ + hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, _T("Process Page Event")); - /* If we couldn't create the event then exit the thread */ - if (!hProcessPageEvent) - return 0; + /* If we couldn't create the event then exit the thread */ + if (!hProcessPageEvent) + return 0; - while (1) { - DWORD dwWaitVal; + while (1) { + DWORD dwWaitVal; - /* Wait on the event */ - dwWaitVal = WaitForSingleObject(hProcessPageEvent, INFINITE); + /* Wait on the event */ + dwWaitVal = WaitForSingleObject(hProcessPageEvent, INFINITE); - /* If the wait failed then the event object must have been */ - /* closed and the task manager is exiting so exit this thread */ - if (dwWaitVal == WAIT_FAILED) - return 0; + /* If the wait failed then the event object must have been */ + /* closed and the task manager is exiting so exit this thread */ + if (dwWaitVal == WAIT_FAILED) + return 0; - if (dwWaitVal == WAIT_OBJECT_0) { - TCHAR text[260]; + if (dwWaitVal == WAIT_OBJECT_0) { + TCHAR text[260]; - /* Reset our event */ - ResetEvent(hProcessPageEvent); + /* Reset our event */ + ResetEvent(hProcessPageEvent); - if ((ULONG)SendMessage(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0) != PerfDataGetProcessCount()) - SendMessage(hProcessPageListCtrl, LVM_SETITEMCOUNT, PerfDataGetProcessCount(), /*LVSICF_NOINVALIDATEALL|*/LVSICF_NOSCROLL); + if ((ULONG)SendMessage(hProcessPageListCtrl, LVM_GETITEMCOUNT, 0, 0) != PerfDataGetProcessCount()) + SendMessage(hProcessPageListCtrl, LVM_SETITEMCOUNT, PerfDataGetProcessCount(), /*LVSICF_NOINVALIDATEALL|*/LVSICF_NOSCROLL); - if (IsWindowVisible(hProcessPage)) - InvalidateRect(hProcessPageListCtrl, NULL, FALSE); + if (IsWindowVisible(hProcessPage)) + InvalidateRect(hProcessPageListCtrl, NULL, FALSE); - if (OldProcessorUsage != PerfDataGetProcessorUsage()) { - OldProcessorUsage = PerfDataGetProcessorUsage(); - wsprintf(text, _T("CPU Usage: %3d%%"), OldProcessorUsage); - SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); - } - if (OldProcessCount != PerfDataGetProcessCount()) { - OldProcessCount = PerfDataGetProcessCount(); - wsprintf(text, _T("Processes: %d"), OldProcessCount); - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); - } - } - } + if (OldProcessorUsage != PerfDataGetProcessorUsage()) { + OldProcessorUsage = PerfDataGetProcessorUsage(); + wsprintf(text, _T("CPU Usage: %3d%%"), OldProcessorUsage); + SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); + } + if (OldProcessCount != PerfDataGetProcessCount()) { + OldProcessCount = PerfDataGetProcessCount(); + wsprintf(text, _T("Processes: %d"), OldProcessCount); + SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); + } + } + } return 0; } diff --git a/rosapps/taskmgr/run.c b/rosapps/taskmgr/run.c index ebb146fe4f2..8f5d2472f79 100644 --- a/rosapps/taskmgr/run.c +++ b/rosapps/taskmgr/run.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -28,38 +28,38 @@ #include #include #include - + #include "taskmgr.h" #include "run.h" void TaskManager_OnFileNew(void) { - HMODULE hShell32; - RUNFILEDLG RunFileDlg; - OSVERSIONINFO versionInfo; - WCHAR wTitle[40]; - WCHAR wText[256]; - char szTitle[40] = "Create New Task"; - char szText[256] = "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you."; + HMODULE hShell32; + RUNFILEDLG RunFileDlg; + OSVERSIONINFO versionInfo; + WCHAR wTitle[40]; + WCHAR wText[256]; + char szTitle[40] = "Create New Task"; + char szText[256] = "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you."; - hShell32 = LoadLibrary(_T("SHELL32.DLL")); - RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D)); + hShell32 = LoadLibrary(_T("SHELL32.DLL")); + RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (char*)((long)0x3D)); - /* Show "Run..." dialog */ - if (RunFileDlg) - { - versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&versionInfo); + /* Show "Run..." dialog */ + if (RunFileDlg) + { + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&versionInfo); - if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) - { - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTitle, -1, wTitle, 40); - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szText, -1, wText, 256); - RunFileDlg(hMainWnd, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY); - } - else - RunFileDlg(hMainWnd, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); - } + if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) + { + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szTitle, -1, wTitle, 40); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szText, -1, wText, 256); + RunFileDlg(hMainWnd, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY); + } + else + RunFileDlg(hMainWnd, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + } - FreeLibrary(hShell32); + FreeLibrary(hShell32); } diff --git a/rosapps/taskmgr/taskmgr.c b/rosapps/taskmgr/taskmgr.c index 1ec5f1faa67..088a1462503 100644 --- a/rosapps/taskmgr/taskmgr.c +++ b/rosapps/taskmgr/taskmgr.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include diff --git a/rosapps/taskmgr/trayicon.c b/rosapps/taskmgr/trayicon.c index 2adc8f5dd49..b253a169fe2 100644 --- a/rosapps/taskmgr/trayicon.c +++ b/rosapps/taskmgr/trayicon.c @@ -19,8 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include #include @@ -29,7 +29,7 @@ #include #include #include - + #include "taskmgr.h" #include "trayicon.h" #include "perfdata.h" @@ -37,177 +37,177 @@ HICON TrayIcon_GetProcessorUsageIcon(void) { - HICON hTrayIcon = NULL; - HDC hScreenDC = NULL; - HDC hDC = NULL; - HBITMAP hBitmap = NULL; - HBITMAP hOldBitmap = NULL; - HBITMAP hBitmapMask = NULL; - ICONINFO iconInfo; - ULONG ProcessorUsage; - int nLinesToDraw; - HBRUSH hBitmapBrush = NULL; - RECT rc; + HICON hTrayIcon = NULL; + HDC hScreenDC = NULL; + HDC hDC = NULL; + HBITMAP hBitmap = NULL; + HBITMAP hOldBitmap = NULL; + HBITMAP hBitmapMask = NULL; + ICONINFO iconInfo; + ULONG ProcessorUsage; + int nLinesToDraw; + HBRUSH hBitmapBrush = NULL; + RECT rc; - /* - * Get a handle to the screen DC - */ - hScreenDC = GetDC(NULL); - if (!hScreenDC) - goto done; - - /* - * Create our own DC from it - */ - hDC = CreateCompatibleDC(hScreenDC); - if (!hDC) - goto done; + /* + * Get a handle to the screen DC + */ + hScreenDC = GetDC(NULL); + if (!hScreenDC) + goto done; + + /* + * Create our own DC from it + */ + hDC = CreateCompatibleDC(hScreenDC); + if (!hDC) + goto done; - /* - * Load the bitmaps - */ - hBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYICON)); - hBitmapMask = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYMASK)); - if (!hBitmap || !hBitmapMask) - goto done; + /* + * Load the bitmaps + */ + hBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYICON)); + hBitmapMask = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TRAYMASK)); + if (!hBitmap || !hBitmapMask) + goto done; - hBitmapBrush = CreateSolidBrush(RGB(0, 255, 0)); - if (!hBitmapBrush) - goto done; - - /* - * Select the bitmap into our device context - * so we can draw on it. - */ - hOldBitmap = (HBITMAP) SelectObject(hDC, hBitmap); + hBitmapBrush = CreateSolidBrush(RGB(0, 255, 0)); + if (!hBitmapBrush) + goto done; + + /* + * Select the bitmap into our device context + * so we can draw on it. + */ + hOldBitmap = (HBITMAP) SelectObject(hDC, hBitmap); - /* - * Get the cpu usage - */ - ProcessorUsage = PerfDataGetProcessorUsage(); + /* + * Get the cpu usage + */ + ProcessorUsage = PerfDataGetProcessorUsage(); - /* - * Calculate how many lines to draw - * since we have 11 rows of space - * to draw the cpu usage instead of - * just having 10. - */ - nLinesToDraw = (ProcessorUsage + (ProcessorUsage / 10)) / 11; - rc.left = 3; - rc.top = 12 - nLinesToDraw; - rc.right = 13; - rc.bottom = 13; + /* + * Calculate how many lines to draw + * since we have 11 rows of space + * to draw the cpu usage instead of + * just having 10. + */ + nLinesToDraw = (ProcessorUsage + (ProcessorUsage / 10)) / 11; + rc.left = 3; + rc.top = 12 - nLinesToDraw; + rc.right = 13; + rc.bottom = 13; - /* - * Now draw the cpu usage - */ - if (nLinesToDraw) - FillRect(hDC, &rc, hBitmapBrush); + /* + * Now draw the cpu usage + */ + if (nLinesToDraw) + FillRect(hDC, &rc, hBitmapBrush); - /* - * Now that we are done drawing put the - * old bitmap back. - */ - SelectObject(hDC, hOldBitmap); - hOldBitmap = NULL; - - iconInfo.fIcon = TRUE; - iconInfo.xHotspot = 0; - iconInfo.yHotspot = 0; - iconInfo.hbmMask = hBitmapMask; - iconInfo.hbmColor = hBitmap; + /* + * Now that we are done drawing put the + * old bitmap back. + */ + SelectObject(hDC, hOldBitmap); + hOldBitmap = NULL; + + iconInfo.fIcon = TRUE; + iconInfo.xHotspot = 0; + iconInfo.yHotspot = 0; + iconInfo.hbmMask = hBitmapMask; + iconInfo.hbmColor = hBitmap; - hTrayIcon = CreateIconIndirect(&iconInfo); + hTrayIcon = CreateIconIndirect(&iconInfo); done: - /* - * Cleanup - */ - if (hScreenDC) - ReleaseDC(NULL, hScreenDC); - if (hOldBitmap) - SelectObject(hDC, hOldBitmap); - if (hDC) - DeleteDC(hDC); - if (hBitmapBrush) - DeleteObject(hBitmapBrush); - if (hBitmap) - DeleteObject(hBitmap); - if (hBitmapMask) - DeleteObject(hBitmapMask); - - /* - * Return the newly created tray icon (if successful) - */ - return hTrayIcon; + /* + * Cleanup + */ + if (hScreenDC) + ReleaseDC(NULL, hScreenDC); + if (hOldBitmap) + SelectObject(hDC, hOldBitmap); + if (hDC) + DeleteDC(hDC); + if (hBitmapBrush) + DeleteObject(hBitmapBrush); + if (hBitmap) + DeleteObject(hBitmap); + if (hBitmapMask) + DeleteObject(hBitmapMask); + + /* + * Return the newly created tray icon (if successful) + */ + return hTrayIcon; } BOOL TrayIcon_ShellAddTrayIcon(void) { - NOTIFYICONDATA nid; - HICON hIcon = NULL; - BOOL bRetVal; + NOTIFYICONDATA nid; + HICON hIcon = NULL; + BOOL bRetVal; - memset(&nid, 0, sizeof(NOTIFYICONDATA)); + memset(&nid, 0, sizeof(NOTIFYICONDATA)); - hIcon = TrayIcon_GetProcessorUsageIcon(); + hIcon = TrayIcon_GetProcessorUsageIcon(); - nid.cbSize = sizeof(NOTIFYICONDATA); - nid.hWnd = hMainWnd; - nid.uID = 0; - nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; - /* nid.uCallbackMessage = ??; */ - nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + nid.cbSize = sizeof(NOTIFYICONDATA); + nid.hWnd = hMainWnd; + nid.uID = 0; + nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + /* nid.uCallbackMessage = ??; */ + nid.hIcon = hIcon; + wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIcon(NIM_ADD, &nid); + bRetVal = Shell_NotifyIcon(NIM_ADD, &nid); - if (hIcon) - DeleteObject(hIcon); + if (hIcon) + DeleteObject(hIcon); - return bRetVal; + return bRetVal; } BOOL TrayIcon_ShellRemoveTrayIcon(void) { - NOTIFYICONDATA nid; - BOOL bRetVal; - - memset(&nid, 0, sizeof(NOTIFYICONDATA)); - - nid.cbSize = sizeof(NOTIFYICONDATA); - nid.hWnd = hMainWnd; - nid.uID = 0; - nid.uFlags = 0; - /* nid.uCallbackMessage = ??; */ - - bRetVal = Shell_NotifyIcon(NIM_DELETE, &nid); - - return bRetVal; + NOTIFYICONDATA nid; + BOOL bRetVal; + + memset(&nid, 0, sizeof(NOTIFYICONDATA)); + + nid.cbSize = sizeof(NOTIFYICONDATA); + nid.hWnd = hMainWnd; + nid.uID = 0; + nid.uFlags = 0; + /* nid.uCallbackMessage = ??; */ + + bRetVal = Shell_NotifyIcon(NIM_DELETE, &nid); + + return bRetVal; } BOOL TrayIcon_ShellUpdateTrayIcon(void) { - NOTIFYICONDATA nid; - HICON hIcon = NULL; - BOOL bRetVal; - - memset(&nid, 0, sizeof(NOTIFYICONDATA)); - - hIcon = TrayIcon_GetProcessorUsageIcon(); - - nid.cbSize = sizeof(NOTIFYICONDATA); - nid.hWnd = hMainWnd; - nid.uID = 0; - nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; - /* nid.uCallbackMessage = ??; */ - nid.hIcon = hIcon; - wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); - - bRetVal = Shell_NotifyIcon(NIM_MODIFY, &nid); - - if (hIcon) - DeleteObject(hIcon); - - return bRetVal; + NOTIFYICONDATA nid; + HICON hIcon = NULL; + BOOL bRetVal; + + memset(&nid, 0, sizeof(NOTIFYICONDATA)); + + hIcon = TrayIcon_GetProcessorUsageIcon(); + + nid.cbSize = sizeof(NOTIFYICONDATA); + nid.hWnd = hMainWnd; + nid.uID = 0; + nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + /* nid.uCallbackMessage = ??; */ + nid.hIcon = hIcon; + wsprintf(nid.szTip, _T("CPU Usage: %d%%"), PerfDataGetProcessorUsage()); + + bRetVal = Shell_NotifyIcon(NIM_MODIFY, &nid); + + if (hIcon) + DeleteObject(hIcon); + + return bRetVal; }