mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 21:44:31 +00:00
26e854e2f8
Some commits I do port back all the way down till releases/0.4.7: partially 0.4.15-dev-6768-g63eaf2bd52
[TASKMGR] *.rc Deduplicate dynamic menu strings (#5772) (I left out the FIXME-comments) 0.4.15-dev-6712-g46b4b5581d
[TASKMGR] Favor _countof(), no functional change intended (#5757) 0.4.15-dev-6703-g6528ab8fcb
[TASKMGR] de-DE.rc Update part 3 0.4.15-dev-6702-g65ce20896a
[TASKMGR] *.rc Strip unused IDD_DEBUG_CHANNELS_DIALOG 0.4.15-dev-6700-ge15d68ba5d
[TASKMGR] de-DE German Update & bug-fixes partially 0.4.15-dev-6447-g016acd170d
[TASKMGR] Do not free shared icon for ShellAbout() calls (I picked just the taskmgr part) (was part of larger PR5519) 0.4.15-dev-6297-g831288fe69
[TASKMGR] Fix text truncation for fr-FR.rc (#5380) CORE-18523 0.4.15-dev-6127-gc706222f3f
[TASKMGR] Fix the license. Turns out it's LGPL-2.1-or-later from the texts. 0.4.15-dev-6124-g9927163455
[TASKMGR] Reorder page controls to have natural TAB-ordering. 0.4.15-dev-6122-gd5707eefe2
[TASKMGR] High speed update is twice per second, and not every second. 0.4.15-dev-6121-g2da0506f2a
[TASKMGR] Remove more dead code. partially 0.4.15-dev-6120-g6e77747b30
[TASKMGR] Simplify tray icon code. (I left out using the strsafe.h-dependent stuff, as this is safe also in old-style) 0.4.15-dev-6119-g0b4c8bdd1c
[TASKMGR] Clamp the values returned from PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage() inside these functions. 0.4.15-dev-6118-g7b53126375
[TASKMGR] Completely reformat perfpage.c, perfpage.h, procpage.h and trayicon.c partially 0.4.15-dev-6117-gda7dcec6a0
[TASKMGR] Reformat the files' headers 0.4.15-dev-6115-g36aea8e56e
[TASKMGR] affinity.c: Use _countof instead of sizeof/sizeof (was part of the larger CORE18991) partially 0.4.15-dev-6109-g99fb812be4
[TASKMGR] Refactor trayicon.c 0.4.15-dev-5404-gc093d4f803
[TASKMGR] Prevent context menu on idle process (#4889) CORE-18640 0.4.15-dev-5031-g46ea5171bd
[TASKMGR] Pixel-perfection for left border (#4680) CORE-18061 0.4.15-dev-4988-gde5af76811
[TASKMGR] Fix overlapping controls (French only) (#4658) 0.4.15-dev-4987-gf8c28b9773
[TASKMGR] Fix UI on SwitchTo for multiple application (#4652) 0.4.15-dev-3497-ge8a7e0da2b
[TASKMGR] Make 'Hide When Minimized' non-default (#4169) 0.4.15-dev-3085-g515e0cf38f
[TASKMGR] Handles: Get number only, skip data (#3910) and a few *.rc improvements that are not explicitly mentioned here, especially I stripped the menuLoop-statusbar-help-texts within the older branches. I also port back the following feature into all releases down to releases/0.4.8, but I left out releases/0.4.7 for now: 0.4.13-dev-875-g3276824586
[TASKMGR] Implement proper process tree ending (#1738) A few improvements are still left to be done in a future commit (mostly around the plotgraphs and the trayicon-handling), but I need to have a closer look at them and their impact on binary size, so I do not want to squash them into this bigger backport, where I concentrated on the safe/obvious and easy things. Binary size decreases for all branches: master taskmgr.exe RosBEWin2.2.2 GCC8.4.0dbg 708.608 -> 696.832 (0.4.15-dev-6768-g63eaf2b) 0.4.14 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 660.992 -> 549.888 0.4.13 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 659.968 -> 542.720 0.4.12 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 662.016 -> 545.792 0.4.11 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 662.016 -> 545.792 0.4.10 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 645.120 -> 532.480 0.4. 9 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 645.120 -> 532.480 0.4. 8 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 645.120 -> 532.480 0.4. 7 taskmgr.exe RosBEWin2.1.6 GCC4.7.2dbg 645.120 -> 531.456 taskmgr.exe MS XPSP3 german 140.800 Bytes 0.4.14 taskmgr.exe RosBEWin2.1.6 MSVC2010SP1rls I18N=de-DE -> 110.080 Bytes (my current taskmgr of choice) 0.4. 8 taskmgr.exe RosBEWin2.1.6 MSVC2010SP1rls I18N=en-US -> 108.032 Bytes 0.4. 7 taskmgr.exe RosBEWin2.1.6 MSVC2010SP1rls I18N=en-US -> 107.520 Bytes
213 lines
6.6 KiB
C
213 lines
6.6 KiB
C
/*
|
|
* PROJECT: ReactOS Task Manager
|
|
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
|
|
* COPYRIGHT: 1999-2001 Brian Palmer <brianp@reactos.org>
|
|
* 2005 Klemens Friedl <frik85@reactos.at>
|
|
*/
|
|
|
|
#include "precomp.h"
|
|
|
|
UINT ColumnDataHints[COLUMN_NMAX];
|
|
|
|
#define DECLARE_COLUMN_PRESET(_name, _size, _state) \
|
|
{ IDS_TAB_##_name, IDC_##_name, _size, _state },
|
|
|
|
const PresetColumnEntry ColumnPresets[COLUMN_NMAX] = {
|
|
DECLARE_COLUMN_PRESET(IMAGENAME, 105, TRUE)
|
|
DECLARE_COLUMN_PRESET(PID, 50, TRUE)
|
|
DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE)
|
|
DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE)
|
|
DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE)
|
|
DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE)
|
|
DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE)
|
|
DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(PAGEFAULTS, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE)
|
|
DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE)
|
|
DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE)
|
|
DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE)
|
|
DECLARE_COLUMN_PRESET(GDIOBJECTS, 60, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE)
|
|
DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE)
|
|
};
|
|
|
|
static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
|
|
INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
|
|
|
void AddColumns(void)
|
|
{
|
|
LRESULT size;
|
|
WCHAR szTemp[256];
|
|
unsigned int n;
|
|
|
|
for (n=0; n<COLUMN_NMAX; n++) {
|
|
if (TaskManagerSettings.Columns[n]) {
|
|
LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, _countof(szTemp));
|
|
InsertColumn(n, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[n], -1);
|
|
}
|
|
}
|
|
|
|
size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0);
|
|
SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM)size, (LPARAM)&TaskManagerSettings.ColumnOrderArray);
|
|
|
|
UpdateColumnDataHints();
|
|
}
|
|
|
|
static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem)
|
|
{
|
|
LVCOLUMN column;
|
|
|
|
column.mask = LVCF_TEXT|LVCF_FMT;
|
|
column.pszText = (LPWSTR)lpszColumnHeading;
|
|
column.fmt = nFormat;
|
|
|
|
if (nWidth != -1)
|
|
{
|
|
column.mask |= LVCF_WIDTH;
|
|
column.cx = nWidth;
|
|
}
|
|
|
|
if (nSubItem != -1)
|
|
{
|
|
column.mask |= LVCF_SUBITEM;
|
|
column.iSubItem = nSubItem;
|
|
}
|
|
|
|
return ListView_InsertColumn(hProcessPageListCtrl, nCol, &column);
|
|
}
|
|
|
|
void SaveColumnSettings(void)
|
|
{
|
|
HDITEM hditem;
|
|
int i, n;
|
|
WCHAR text[260];
|
|
WCHAR szTemp[256];
|
|
LRESULT size;
|
|
|
|
/* Reset column data */
|
|
for (i=0; i<COLUMN_NMAX; i++) {
|
|
TaskManagerSettings.ColumnOrderArray[i] = i;
|
|
TaskManagerSettings.Columns[i] = FALSE;
|
|
TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size;
|
|
}
|
|
|
|
/* Get header order */
|
|
size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0);
|
|
SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM)size, (LPARAM)&TaskManagerSettings.ColumnOrderArray);
|
|
|
|
/* Get visible columns */
|
|
for (i = 0; i < SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) {
|
|
memset(&hditem, 0, sizeof(HDITEM));
|
|
|
|
hditem.mask = HDI_TEXT|HDI_WIDTH;
|
|
hditem.pszText = text;
|
|
hditem.cchTextMax = 260;
|
|
|
|
SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem);
|
|
|
|
for (n = 0; n < COLUMN_NMAX; n++) {
|
|
LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, _countof(szTemp));
|
|
if (_wcsicmp(text, szTemp) == 0)
|
|
{
|
|
TaskManagerSettings.Columns[n] = TRUE;
|
|
TaskManagerSettings.ColumnSizeArray[n] = hditem.cxy;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void ProcessPage_OnViewSelectColumns(void)
|
|
{
|
|
int i;
|
|
|
|
if (DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK)
|
|
{
|
|
for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--)
|
|
{
|
|
(void)ListView_DeleteColumn(hProcessPageListCtrl, i);
|
|
}
|
|
|
|
for (i=0; i<COLUMN_NMAX; i++) {
|
|
TaskManagerSettings.ColumnOrderArray[i] = i;
|
|
TaskManagerSettings.ColumnSizeArray[i] = ColumnPresets[i].size;
|
|
}
|
|
|
|
AddColumns();
|
|
}
|
|
}
|
|
|
|
INT_PTR CALLBACK
|
|
ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
|
{
|
|
unsigned int i;
|
|
|
|
switch (message)
|
|
{
|
|
case WM_INITDIALOG:
|
|
for (i=0; i<COLUMN_NMAX; i++) {
|
|
if (TaskManagerSettings.Columns[i])
|
|
CheckDlgButton(hDlg, ColumnPresets[i].dwIdcCtrl, BST_CHECKED);
|
|
}
|
|
return TRUE;
|
|
|
|
case WM_COMMAND:
|
|
if (LOWORD(wParam) == IDCANCEL)
|
|
{
|
|
EndDialog(hDlg, LOWORD(wParam));
|
|
return TRUE;
|
|
}
|
|
|
|
if (LOWORD(wParam) == IDOK)
|
|
{
|
|
for (i=0; i<COLUMN_NMAX; i++)
|
|
TaskManagerSettings.Columns[i] = (BOOL)IsDlgButtonChecked(hDlg, ColumnPresets[i].dwIdcCtrl);
|
|
|
|
EndDialog(hDlg, LOWORD(wParam));
|
|
return TRUE;
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void UpdateColumnDataHints(void)
|
|
{
|
|
HDITEM hditem;
|
|
WCHAR text[260];
|
|
ULONG Index;
|
|
ULONG uItems;
|
|
WCHAR szTemp[256];
|
|
UINT i;
|
|
|
|
uItems = min(SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0), COLUMN_NMAX);
|
|
|
|
for (Index=0; Index<uItems; Index++)
|
|
{
|
|
memset(&hditem, 0, sizeof(HDITEM));
|
|
|
|
hditem.mask = HDI_TEXT;
|
|
hditem.pszText = text;
|
|
hditem.cchTextMax = 260;
|
|
|
|
SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, Index, (LPARAM) &hditem);
|
|
|
|
for (i=0; i<COLUMN_NMAX; i++) {
|
|
LoadStringW(hInst, ColumnPresets[i].dwIdsName, szTemp, _countof(szTemp));
|
|
if (_wcsicmp(text, szTemp) == 0)
|
|
ColumnDataHints[Index] = i;
|
|
}
|
|
}
|
|
}
|