Ros-diffs June 2023

ros-diffs@reactos.org

20 participants
155 discussions

[reactos] 06/07: [TASKMGR] Remove more dead code.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da0506f2a9fc02acede7… commit 2da0506f2a9fc02acede7d7ff479399013830fad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 21 03:01:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:44:37 2023 +0200 [TASKMGR] Remove more dead code. --- base/applications/taskmgr/taskmgr.c | 40 ------------------------------------- base/applications/taskmgr/taskmgr.h | 3 --- 2 files changed, 43 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 39c12df2ddd..820f85698ed 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -423,21 +423,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) } } break; -#if 0 - case WM_NCPAINT: - hdc = GetDC(hDlg); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - ReleaseDC(hDlg, hdc); - break; - case WM_PAINT: - hdc = BeginPaint(hDlg, &ps); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - EndPaint(hDlg, &ps); - break; -#endif case WM_SIZING: /* Make sure the user is sizing the dialog */ /* in an acceptable range */ @@ -527,32 +513,6 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr) ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, lpRect, NULL, 0, NULL); } -void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr) -{ - RECT rect; - - SetBkColor(hDC, clr); - rect.left = x; - rect.top = y; - rect.right = x + cx; - rect.bottom = y + cy; - ExtTextOutW(hDC, 0, 0, ETO_OPAQUE, &rect, NULL, 0, NULL); -} - -void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight) -{ - FillSolidRect2(hDC, x, y, cx - 1, 1, clrTopLeft); - FillSolidRect2(hDC, x, y, 1, cy - 1, clrTopLeft); - FillSolidRect2(hDC, x + cx, y, -1, cy, clrBottomRight); - FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); -} - -void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight) -{ - Draw3dRect(hDC, lpRect->left, lpRect->top, lpRect->right - lpRect->left, - lpRect->bottom - lpRect->top, clrTopLeft, clrBottomRight); -} - static void SetUpdateSpeed(HWND hWnd) { /* Setup update speed (pause=fall down) */ diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index 1557128adba..7a719a77a20 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -91,9 +91,6 @@ BOOL OnCreate(HWND hWnd); void OnSize(WPARAM nType, int cx, int cy); void OnMove(WPARAM nType, int cx, int cy); void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); -void FillSolidRect2(HDC hDC, int x, int y, int cx, int cy, COLORREF clr); -void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLeft, COLORREF clrBottomRight); -void Draw3dRect2(HDC hDC, LPRECT lpRect, COLORREF clrTopLeft, COLORREF clrBottomRight); void LoadSettings(void); void SaveSettings(void); void TaskManager_OnRestoreMainWindow(void);

1 0

[reactos] 05/07: [TASKMGR] Simplify tray icon code.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e77747b305add73133fa… commit 6e77747b305add73133faa2049b8bd34e3e2534e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 21 00:18:51 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:44:29 2023 +0200 [TASKMGR] Simplify tray icon code. --- base/applications/taskmgr/taskmgr.c | 6 +-- base/applications/taskmgr/trayicon.c | 83 ++++++++++++++---------------------- base/applications/taskmgr/trayicon.h | 9 ++-- 3 files changed, 39 insertions(+), 59 deletions(-) diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 28a2b4b3c8a..39c12df2ddd 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -475,7 +475,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_DESTROY: ShowWindow(hDlg, SW_HIDE); - TrayIcon_ShellRemoveTrayIcon(); + TrayIcon_RemoveIcon(); wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hDlg, &wp); TaskManagerSettings.Left = wp.rcNormalPosition.left; @@ -498,7 +498,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) RefreshApplicationPage(); RefreshProcessPage(); RefreshPerformancePage(); - TrayIcon_ShellUpdateTrayIcon(); + TrayIcon_UpdateIcon(); break; case WM_ENTERMENULOOP: @@ -763,7 +763,7 @@ BOOL OnCreate(HWND hWnd) RefreshProcessPage(); RefreshPerformancePage(); - TrayIcon_ShellAddTrayIcon(); + TrayIcon_AddIcon(); return TRUE; } diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index fb02d1cc88b..5da5d7d778a 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -8,7 +8,9 @@ #include "precomp.h" -HICON TrayIcon_GetProcessorUsageIcon(void) +static HICON +TrayIcon_GetProcessorUsageIcon( + _In_ ULONG CpuUsage) { HICON hTrayIcon = NULL; HDC hScreenDC = NULL; @@ -17,7 +19,6 @@ HICON TrayIcon_GetProcessorUsageIcon(void) HBITMAP hOldBitmap = NULL; HBITMAP hBitmapMask = NULL; ICONINFO iconInfo; - ULONG ProcessorUsage; int nLinesToDraw; HBRUSH hBitmapBrush = NULL; RECT rc; @@ -50,18 +51,13 @@ HICON TrayIcon_GetProcessorUsageIcon(void) */ hOldBitmap = SelectObject(hDC, hBitmap); - /* - * 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; + nLinesToDraw = (CpuUsage + (CpuUsage / 10)) / 11; rc.left = 3; rc.top = 12 - nLinesToDraw; rc.right = 13; @@ -103,29 +99,35 @@ done: return hTrayIcon; } -BOOL TrayIcon_ShellAddTrayIcon(void) +static BOOL +TrayIcon_Update( + _In_ DWORD dwMessage) { + static WCHAR szMsg[64] = L""; + NOTIFYICONDATAW nid; - HICON hIcon = NULL; - BOOL bRetVal; - WCHAR szMsg[64]; + ULONG CpuUsage; + HICON hIcon = NULL; + BOOL bRetVal; - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); + if (!*szMsg) + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szMsg, ARRAYSIZE(szMsg)); - hIcon = TrayIcon_GetProcessorUsageIcon(); + ZeroMemory(&nid, sizeof(nid)); - nid.cbSize = sizeof(NOTIFYICONDATAW); + CpuUsage = PerfDataGetProcessorUsage(); + hIcon = TrayIcon_GetProcessorUsageIcon(CpuUsage); + + nid.cbSize = sizeof(nid); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; + wsprintfW(nid.szTip, szMsg, CpuUsage); - LoadStringW( GetModuleHandleW(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - wsprintfW(nid.szTip, szMsg, PerfDataGetProcessorUsage()); - - bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); + bRetVal = Shell_NotifyIconW(dwMessage, &nid); if (hIcon) DestroyIcon(hIcon); @@ -133,48 +135,27 @@ BOOL TrayIcon_ShellAddTrayIcon(void) return bRetVal; } -BOOL TrayIcon_ShellRemoveTrayIcon(void) +BOOL TrayIcon_AddIcon(VOID) { - NOTIFYICONDATAW nid; - BOOL bRetVal; - - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - - nid.cbSize = sizeof(NOTIFYICONDATAW); - nid.hWnd = hMainWnd; - nid.uID = 0; - nid.uFlags = 0; - nid.uCallbackMessage = WM_ONTRAYICON; - - bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); - - return bRetVal; + return TrayIcon_Update(NIM_ADD); } -BOOL TrayIcon_ShellUpdateTrayIcon(void) +BOOL TrayIcon_RemoveIcon(VOID) { NOTIFYICONDATAW nid; - HICON hIcon = NULL; - BOOL bRetVal; - WCHAR szTemp[64]; - - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - hIcon = TrayIcon_GetProcessorUsageIcon(); + ZeroMemory(&nid, sizeof(nid)); - nid.cbSize = sizeof(NOTIFYICONDATAW); + nid.cbSize = sizeof(nid); nid.hWnd = hMainWnd; nid.uID = 0; - nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; + nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - nid.hIcon = hIcon; - LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, sizeof(szTemp)/sizeof(szTemp[0])); - wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); - bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid); - - if (hIcon) - DestroyIcon(hIcon); + return Shell_NotifyIconW(NIM_DELETE, &nid); +} - return bRetVal; +BOOL TrayIcon_UpdateIcon(VOID) +{ + return TrayIcon_Update(NIM_MODIFY); } diff --git a/base/applications/taskmgr/trayicon.h b/base/applications/taskmgr/trayicon.h index 5b120b4ab08..6d6c1dbc21c 100644 --- a/base/applications/taskmgr/trayicon.h +++ b/base/applications/taskmgr/trayicon.h @@ -8,9 +8,8 @@ #pragma once -#define WM_ONTRAYICON WM_USER + 5 +#define WM_ONTRAYICON (WM_USER + 5) -HICON TrayIcon_GetProcessorUsageIcon(void); -BOOL TrayIcon_ShellAddTrayIcon(void); -BOOL TrayIcon_ShellRemoveTrayIcon(void); -BOOL TrayIcon_ShellUpdateTrayIcon(void); +BOOL TrayIcon_AddIcon(VOID); +BOOL TrayIcon_RemoveIcon(VOID); +BOOL TrayIcon_UpdateIcon(VOID);

1 0

[reactos] 04/07: [TASKMGR] Clamp the values returned from PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage() inside these functions.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b4c8bdd1cb4cf1a50c10… commit 0b4c8bdd1cb4cf1a50c1076c7ded19ee7e9f9198 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 18 03:10:26 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:44:21 2023 +0200 [TASKMGR] Clamp the values returned from PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage() inside these functions. It's necessary to make this clamping there so that returned values are always used consistently in taskmgr, including in places where the values are directly fetched into other functions. This is a free adaptation from Wine commit a9742b3210c4cec67aca3c0012f3b9504a4368cf From: Gerald Pfeifer <gerald(a)pfeifer.com> taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage(). --- base/applications/taskmgr/graph.c | 4 ---- base/applications/taskmgr/perfdata.c | 4 ++-- base/applications/taskmgr/perfpage.c | 9 +-------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/base/applications/taskmgr/graph.c b/base/applications/taskmgr/graph.c index 3962e976fb5..0b30e1ffbbc 100644 --- a/base/applications/taskmgr/graph.c +++ b/base/applications/taskmgr/graph.c @@ -148,8 +148,6 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) * Get the CPU usage */ CpuUsage = PerfDataGetProcessorUsage(); - if (CpuUsage <= 0) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; wsprintfW(Text, L"%d%%", (int)CpuUsage); @@ -179,8 +177,6 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd) if (TaskManagerSettings.ShowKernelTimes) { CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuKernelUsage <= 0) CpuKernelUsage = 0; - if (CpuKernelUsage >= 100) CpuKernelUsage = 100; nBarsUsedKernel = (nBars * CpuKernelUsage) / 100; } else diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 573021d5f89..c4e80d5832a 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -458,7 +458,7 @@ ULONG PerfDataGetProcessorUsage(void) { ULONG Result; EnterCriticalSection(&PerfDataCriticalSection); - Result = (ULONG)dbIdleTime; + Result = (ULONG)min(max(dbIdleTime, 0.), 100.); LeaveCriticalSection(&PerfDataCriticalSection); return Result; } @@ -467,7 +467,7 @@ ULONG PerfDataGetProcessorSystemUsage(void) { ULONG Result; EnterCriticalSection(&PerfDataCriticalSection); - Result = (ULONG)dbKernelTime; + Result = (ULONG)min(max(dbKernelTime, 0.), 100.); LeaveCriticalSection(&PerfDataCriticalSection); return Result; } diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index df36c918859..62668e059c0 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -422,8 +422,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) * Get the CPU usage */ CpuUsage = PerfDataGetProcessorUsage(); - if (CpuUsage <= 0 ) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; + CpuKernelUsage = PerfDataGetProcessorSystemUsage(); if (!bInMenuLoop) { @@ -431,12 +430,6 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)Text); } - CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (CpuKernelUsage <= 0) - CpuKernelUsage = 0; - else if (CpuKernelUsage > 100) - CpuKernelUsage = 100; - /* * Get the memory usage */

1 0

[reactos] 03/07: [TASKMGR] Completely reformat perfpage.c, perfpage.h, procpage.h and trayicon.c
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b53126375ee8889cf246… commit 7b53126375ee8889cf24615fa2ea646feabee0ae Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 15 21:51:29 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:44:13 2023 +0200 [TASKMGR] Completely reformat perfpage.c, perfpage.h, procpage.h and trayicon.c - Rename also these stupidly long "hPerformancePageBlablabla" variables. - Remove unnecessary global variables in procpage.c/h. --- base/applications/taskmgr/perfpage.c | 528 +++++++++++++++++------------------ base/applications/taskmgr/perfpage.h | 13 +- base/applications/taskmgr/procpage.c | 4 +- base/applications/taskmgr/procpage.h | 18 +- base/applications/taskmgr/trayicon.c | 42 ++- 5 files changed, 295 insertions(+), 310 deletions(-) diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index e212581633e..df36c918859 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -13,41 +13,41 @@ extern BOOL bInMenuLoop; /* Tells us if we are in the menu loop - from ta TM_GRAPH_CONTROL PerformancePageCpuUsageHistoryGraph; TM_GRAPH_CONTROL 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 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 hPerformancePage; /* Performance Property Page */ +static HWND hCpuUsageGraph; /* CPU Usage Graph */ +static HWND hMemUsageGraph; /* MEM Usage Graph */ +HWND hPerformancePageCpuUsageHistoryGraph; /* CPU Usage History Graph */ +HWND hPerformancePageMemUsageHistoryGraph; /* Memory Usage History Graph */ +static HWND hTotalsFrame; /* Totals Frame */ +static HWND hCommitChargeFrame; /* Commit Charge Frame */ +static HWND hKernelMemoryFrame; /* Kernel Memory Frame */ +static HWND hPhysicalMemoryFrame; /* Physical Memory Frame */ +static HWND hCpuUsageFrame; +static HWND hMemUsageFrame; +static HWND hCpuUsageHistoryFrame; +static HWND hMemUsageHistoryFrame; +static HWND hCommitChargeTotalEdit; /* Commit Charge Total Edit Control */ +static HWND hCommitChargeLimitEdit; /* Commit Charge Limit Edit Control */ +static HWND hCommitChargePeakEdit; /* Commit Charge Peak Edit Control */ +static HWND hKernelMemoryTotalEdit; /* Kernel Memory Total Edit Control */ +static HWND hKernelMemoryPagedEdit; /* Kernel Memory Paged Edit Control */ +static HWND hKernelMemoryNonPagedEdit; /* Kernel Memory NonPaged Edit Control */ +static HWND hPhysicalMemoryTotalEdit; /* Physical Memory Total Edit Control */ +static HWND hPhysicalMemoryAvailableEdit; /* Physical Memory Available Edit Control */ +static HWND hPhysicalMemorySystemCacheEdit; /* Physical Memory System Cache Edit Control */ +static HWND hTotalsHandleCountEdit; /* Total Handles Edit Control */ +static HWND hTotalsProcessCountEdit; /* Total Processes Edit Control */ +static HWND hTotalsThreadCountEdit; /* Total Threads Edit Control */ #ifdef RUN_PERF_PAGE static HANDLE hPerformanceThread = NULL; static DWORD dwPerformanceThread; #endif -static int nPerformancePageWidth; -static int nPerformancePageHeight; -static int lastX, lastY; -DWORD WINAPI PerformancePageRefreshThread(void *lpParameter); +static int nPerformancePageWidth; +static int nPerformancePageHeight; +static int lastX, lastY; +DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter); void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference, int pos) { @@ -84,12 +84,14 @@ void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference, InvalidateRect(hCntrl, NULL, TRUE); } -static void AdjustControlPosition(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) +static inline +void AdjustControlPosition(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0); } -static void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference) +static inline +void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0); } @@ -97,197 +99,190 @@ static void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDiffe INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - RECT rc; - int nXDifference; - int nYDifference; -/* HDC hdc; */ -/* PAINTSTRUCT ps; */ - - switch (message) { - case WM_DESTROY: - GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph); - GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph); + RECT rc; + + switch (message) + { + case WM_DESTROY: + GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph); + GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph); #ifdef RUN_PERF_PAGE - EndLocalThread(&hPerformanceThread, dwPerformanceThread); + EndLocalThread(&hPerformanceThread, dwPerformanceThread); #endif - break; + break; - case WM_INITDIALOG: - { - BOOL bGraph; - TM_FORMAT fmt; - - /* Save the width and height */ - GetClientRect(hDlg, &rc); - nPerformancePageWidth = rc.right; - nPerformancePageHeight = rc.bottom; - - /* Update window position */ - SetWindowPos(hDlg, NULL, 15, 30, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - - /* - * 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); - hPerformancePagePhysicalMemoryFrame = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_FRAME); - - hPerformancePageCpuUsageFrame = GetDlgItem(hDlg, IDC_CPU_USAGE_FRAME); - hPerformancePageMemUsageFrame = GetDlgItem(hDlg, IDC_MEM_USAGE_FRAME); - hPerformancePageCpuUsageHistoryFrame = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_FRAME); - hPerformancePageMemUsageHistoryFrame = GetDlgItem(hDlg, IDC_MEMORY_USAGE_HISTORY_FRAME); - - hPerformancePageCommitChargeTotalEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_TOTAL); - hPerformancePageCommitChargeLimitEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_LIMIT); - hPerformancePageCommitChargePeakEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_PEAK); - hPerformancePageKernelMemoryTotalEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_TOTAL); - hPerformancePageKernelMemoryPagedEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_PAGED); - hPerformancePageKernelMemoryNonPagedEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_NONPAGED); - hPerformancePagePhysicalMemoryTotalEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_TOTAL); - hPerformancePagePhysicalMemoryAvailableEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_AVAILABLE); - hPerformancePagePhysicalMemorySystemCacheEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_SYSTEM_CACHE); - hPerformancePageTotalsHandleCountEdit = GetDlgItem(hDlg, IDC_TOTALS_HANDLE_COUNT); - hPerformancePageTotalsProcessCountEdit = GetDlgItem(hDlg, IDC_TOTALS_PROCESS_COUNT); - hPerformancePageTotalsThreadCountEdit = GetDlgItem(hDlg, IDC_TOTALS_THREAD_COUNT); - - hPerformancePageCpuUsageGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_GRAPH); - hPerformancePageMemUsageGraph = GetDlgItem(hDlg, IDC_MEM_USAGE_GRAPH); - hPerformancePageMemUsageHistoryGraph = GetDlgItem(hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); - hPerformancePageCpuUsageHistoryGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); - - /* Create the controls */ - fmt.clrBack = RGB(0, 0, 0); - fmt.clrGrid = RGB(0, 128, 64); - fmt.clrPlot0 = RGB(0, 255, 0); - fmt.clrPlot1 = RGB(255, 0, 0); - fmt.GridCellWidth = fmt.GridCellHeight = 12; - fmt.DrawSecondaryPlot = TaskManagerSettings.ShowKernelTimes; - bGraph = GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, &fmt); - if (!bGraph) + case WM_INITDIALOG: { - EndDialog(hDlg, 0); - return FALSE; - } + BOOL bGraph; + TM_FORMAT fmt; - fmt.clrPlot0 = RGB(255, 255, 0); - fmt.clrPlot1 = RGB(100, 255, 255); - fmt.DrawSecondaryPlot = TRUE; - bGraph = GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, &fmt); - if (!bGraph) - { - EndDialog(hDlg, 0); - return FALSE; - } + /* Save the width and height */ + GetClientRect(hDlg, &rc); + nPerformancePageWidth = rc.right; + nPerformancePageHeight = rc.bottom; - /* Start our refresh thread */ -#ifdef RUN_PERF_PAGE - hPerformanceThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, &dwPerformanceThread); -#endif + /* Update window position */ + SetWindowPos(hDlg, NULL, 15, 30, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); - /* - * Subclass graph buttons - */ - OldGraphWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); - SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); - OldGraphCtrlWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); - SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); - return TRUE; - } + /* + * Get handles to all the controls + */ + hTotalsFrame = GetDlgItem(hDlg, IDC_TOTALS_FRAME); + hCommitChargeFrame = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_FRAME); + hKernelMemoryFrame = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_FRAME); + hPhysicalMemoryFrame = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_FRAME); + + hCpuUsageFrame = GetDlgItem(hDlg, IDC_CPU_USAGE_FRAME); + hMemUsageFrame = GetDlgItem(hDlg, IDC_MEM_USAGE_FRAME); + hCpuUsageHistoryFrame = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_FRAME); + hMemUsageHistoryFrame = GetDlgItem(hDlg, IDC_MEMORY_USAGE_HISTORY_FRAME); + + hCommitChargeTotalEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_TOTAL); + hCommitChargeLimitEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_LIMIT); + hCommitChargePeakEdit = GetDlgItem(hDlg, IDC_COMMIT_CHARGE_PEAK); + hKernelMemoryTotalEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_TOTAL); + hKernelMemoryPagedEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_PAGED); + hKernelMemoryNonPagedEdit = GetDlgItem(hDlg, IDC_KERNEL_MEMORY_NONPAGED); + hPhysicalMemoryTotalEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_TOTAL); + hPhysicalMemoryAvailableEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_AVAILABLE); + hPhysicalMemorySystemCacheEdit = GetDlgItem(hDlg, IDC_PHYSICAL_MEMORY_SYSTEM_CACHE); + hTotalsHandleCountEdit = GetDlgItem(hDlg, IDC_TOTALS_HANDLE_COUNT); + hTotalsProcessCountEdit = GetDlgItem(hDlg, IDC_TOTALS_PROCESS_COUNT); + hTotalsThreadCountEdit = GetDlgItem(hDlg, IDC_TOTALS_THREAD_COUNT); + + hCpuUsageGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_GRAPH); + hMemUsageGraph = GetDlgItem(hDlg, IDC_MEM_USAGE_GRAPH); + hPerformancePageMemUsageHistoryGraph = GetDlgItem(hDlg, IDC_MEM_USAGE_HISTORY_GRAPH); + hPerformancePageCpuUsageHistoryGraph = GetDlgItem(hDlg, IDC_CPU_USAGE_HISTORY_GRAPH); + + /* Create the controls */ + fmt.clrBack = RGB(0, 0, 0); + fmt.clrGrid = RGB(0, 128, 64); + fmt.clrPlot0 = RGB(0, 255, 0); + fmt.clrPlot1 = RGB(255, 0, 0); + fmt.GridCellWidth = fmt.GridCellHeight = 12; + fmt.DrawSecondaryPlot = TaskManagerSettings.ShowKernelTimes; + bGraph = GraphCtrl_Create(&PerformancePageCpuUsageHistoryGraph, hPerformancePageCpuUsageHistoryGraph, hDlg, &fmt); + if (!bGraph) + { + EndDialog(hDlg, 0); + return FALSE; + } - case WM_COMMAND: - break; -#if 0 - case WM_NCPAINT: - hdc = GetDC(hDlg); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - ReleaseDC(hDlg, hdc); - break; - - case WM_PAINT: - hdc = BeginPaint(hDlg, &ps); - GetClientRect(hDlg, &rc); - Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); - EndPaint(hDlg, &ps); - break; + fmt.clrPlot0 = RGB(255, 255, 0); + fmt.clrPlot1 = RGB(100, 255, 255); + fmt.DrawSecondaryPlot = TRUE; + bGraph = GraphCtrl_Create(&PerformancePageMemUsageHistoryGraph, hPerformancePageMemUsageHistoryGraph, hDlg, &fmt); + if (!bGraph) + { + EndDialog(hDlg, 0); + return FALSE; + } + + /* Start our refresh thread */ +#ifdef RUN_PERF_PAGE + hPerformanceThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, &dwPerformanceThread); #endif - case WM_SIZE: - do { - int cx, cy; - if (wParam == SIZE_MINIMIZED) - return 0; + /* + * Subclass graph buttons + */ + OldGraphWndProc = (WNDPROC)SetWindowLongPtrW(hCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); + SetWindowLongPtrW(hMemUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc); + OldGraphCtrlWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc); + return TRUE; + } - cx = LOWORD(lParam); - cy = HIWORD(lParam); - nXDifference = cx - nPerformancePageWidth; - nYDifference = cy - nPerformancePageHeight; - nPerformancePageWidth = cx; - nPerformancePageHeight = cy; - } while (0); - - /* Reposition the performance page's controls */ - AdjustFrameSize(hPerformancePageTotalsFrame, hDlg, 0, nYDifference, 0); - AdjustFrameSize(hPerformancePageCommitChargeFrame, hDlg, 0, nYDifference, 0); - AdjustFrameSize(hPerformancePageKernelMemoryFrame, hDlg, 0, nYDifference, 0); - AdjustFrameSize(hPerformancePagePhysicalMemoryFrame, hDlg, 0, nYDifference, 0); - AdjustCntrlPos(IDS_COMMIT_CHARGE_TOTAL, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_COMMIT_CHARGE_LIMIT, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_COMMIT_CHARGE_PEAK, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_KERNEL_MEMORY_TOTAL, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_KERNEL_MEMORY_PAGED, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_KERNEL_MEMORY_NONPAGED, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_PHYSICAL_MEMORY_TOTAL, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_PHYSICAL_MEMORY_AVAILABLE, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_TOTALS_HANDLE_COUNT, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_TOTALS_PROCESS_COUNT, hDlg, 0, nYDifference); - AdjustCntrlPos(IDS_TOTALS_THREAD_COUNT, hDlg, 0, nYDifference); - - AdjustControlPosition(hPerformancePageCommitChargeTotalEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageCommitChargeLimitEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageCommitChargePeakEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageKernelMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageKernelMemoryPagedEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePagePhysicalMemoryTotalEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePagePhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePagePhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageTotalsHandleCountEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); - AdjustControlPosition(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); - - nXDifference += lastX; - nYDifference += lastY; - lastX = lastY = 0; - if (nXDifference % 2) { - if (nXDifference > 0) { - nXDifference--; - lastX++; - } else { - nXDifference++; - lastX--; + case WM_COMMAND: + break; + + case WM_SIZE: + { + int cx, cy; + int nXDifference; + int nYDifference; + + if (wParam == SIZE_MINIMIZED) + return 0; + + cx = LOWORD(lParam); + cy = HIWORD(lParam); + nXDifference = cx - nPerformancePageWidth; + nYDifference = cy - nPerformancePageHeight; + nPerformancePageWidth = cx; + nPerformancePageHeight = cy; + + /* Reposition the performance page's controls */ + AdjustFrameSize(hTotalsFrame, hDlg, 0, nYDifference, 0); + AdjustFrameSize(hCommitChargeFrame, hDlg, 0, nYDifference, 0); + AdjustFrameSize(hKernelMemoryFrame, hDlg, 0, nYDifference, 0); + AdjustFrameSize(hPhysicalMemoryFrame, hDlg, 0, nYDifference, 0); + AdjustCntrlPos(IDS_COMMIT_CHARGE_TOTAL, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_COMMIT_CHARGE_LIMIT, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_COMMIT_CHARGE_PEAK, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_KERNEL_MEMORY_TOTAL, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_KERNEL_MEMORY_PAGED, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_KERNEL_MEMORY_NONPAGED, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_PHYSICAL_MEMORY_TOTAL, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_PHYSICAL_MEMORY_AVAILABLE, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_PHYSICAL_MEMORY_SYSTEM_CACHE, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_TOTALS_HANDLE_COUNT, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_TOTALS_PROCESS_COUNT, hDlg, 0, nYDifference); + AdjustCntrlPos(IDS_TOTALS_THREAD_COUNT, hDlg, 0, nYDifference); + + AdjustControlPosition(hCommitChargeTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hCommitChargeLimitEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hCommitChargePeakEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hKernelMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hKernelMemoryPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hKernelMemoryNonPagedEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPhysicalMemoryTotalEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPhysicalMemoryAvailableEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hPhysicalMemorySystemCacheEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hTotalsHandleCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hTotalsProcessCountEdit, hDlg, 0, nYDifference); + AdjustControlPosition(hTotalsThreadCountEdit, hDlg, 0, nYDifference); + + nXDifference += lastX; + nYDifference += lastY; + lastX = lastY = 0; + if (nXDifference % 2) + { + if (nXDifference > 0) + { + nXDifference--; + lastX++; + } + else + { + nXDifference++; + lastX--; + } } - } - if (nYDifference % 2) { - if (nYDifference > 0) { - nYDifference--; - lastY++; - } else { - nYDifference++; - lastY--; + if (nYDifference % 2) + { + if (nYDifference > 0) + { + nYDifference--; + lastY++; + } + else + { + nYDifference++; + lastY--; + } } + AdjustFrameSize(hCpuUsageFrame, hDlg, nXDifference, nYDifference, 1); + AdjustFrameSize(hMemUsageFrame, hDlg, nXDifference, nYDifference, 2); + AdjustFrameSize(hCpuUsageHistoryFrame, hDlg, nXDifference, nYDifference, 3); + AdjustFrameSize(hMemUsageHistoryFrame, hDlg, nXDifference, nYDifference, 4); + AdjustFrameSize(hCpuUsageGraph, hDlg, nXDifference, nYDifference, 1); + AdjustFrameSize(hMemUsageGraph, hDlg, nXDifference, nYDifference, 2); + AdjustFrameSize(hPerformancePageCpuUsageHistoryGraph, hDlg, nXDifference, nYDifference, 3); + AdjustFrameSize(hPerformancePageMemUsageHistoryGraph, hDlg, nXDifference, nYDifference, 4); + break; } - AdjustFrameSize(hPerformancePageCpuUsageFrame, hDlg, nXDifference, nYDifference, 1); - AdjustFrameSize(hPerformancePageMemUsageFrame, hDlg, nXDifference, nYDifference, 2); - AdjustFrameSize(hPerformancePageCpuUsageHistoryFrame, hDlg, nXDifference, nYDifference, 3); - AdjustFrameSize(hPerformancePageMemUsageHistoryFrame, hDlg, nXDifference, nYDifference, 4); - AdjustFrameSize(hPerformancePageCpuUsageGraph, hDlg, nXDifference, nYDifference, 1); - AdjustFrameSize(hPerformancePageMemUsageGraph, hDlg, nXDifference, nYDifference, 2); - AdjustFrameSize(hPerformancePageCpuUsageHistoryGraph, hDlg, nXDifference, nYDifference, 3); - AdjustFrameSize(hPerformancePageMemUsageHistoryGraph, hDlg, nXDifference, nYDifference, 4); - break; } return 0; } @@ -295,41 +290,41 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) void RefreshPerformancePage(void) { #ifdef RUN_PERF_PAGE - /* 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 */ PostThreadMessage(dwPerformanceThread, WM_TIMER, 0, 0); #endif } -DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) +DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) { - ULONGLONG CommitChargeTotal; - ULONGLONG CommitChargeLimit; - ULONGLONG CommitChargePeak; + ULONGLONG CommitChargeTotal; + ULONGLONG CommitChargeLimit; + ULONGLONG CommitChargePeak; - ULONG CpuUsage; - ULONG CpuKernelUsage; + ULONG CpuUsage; + ULONG CpuKernelUsage; - ULONGLONG KernelMemoryTotal; - ULONGLONG KernelMemoryPaged; - ULONGLONG KernelMemoryNonPaged; + ULONGLONG KernelMemoryTotal; + ULONGLONG KernelMemoryPaged; + ULONGLONG KernelMemoryNonPaged; - ULONGLONG PhysicalMemoryTotal; - ULONGLONG PhysicalMemoryAvailable; - ULONGLONG PhysicalMemorySystemCache; + ULONGLONG PhysicalMemoryTotal; + ULONGLONG PhysicalMemoryAvailable; + ULONGLONG PhysicalMemorySystemCache; - ULONG TotalHandles; - ULONG TotalThreads; - ULONG TotalProcesses; + ULONG TotalHandles; + ULONG TotalThreads; + ULONG TotalProcesses; - MSG msg; + MSG msg; - WCHAR Text[260]; - WCHAR szMemUsage[256], szCpuUsage[256], szProcesses[256]; + WCHAR Text[260]; + WCHAR szMemUsage[256], szCpuUsage[256], szProcesses[256]; - LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); - LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); - LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); + LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, ARRAYSIZE(szCpuUsage)); + LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, ARRAYSIZE(szMemUsage)); + LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, ARRAYSIZE(szProcesses)); while (1) { @@ -339,32 +334,32 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) WCHAR szChargeTotalFormat[256]; WCHAR szChargeLimitFormat[256]; - /* Wait for an the event or application close */ + /* Wait for an the event or application close */ if (GetMessage(&msg, NULL, 0, 0) <= 0) return 0; if (msg.message == WM_TIMER) { /* - * Update the commit charge info + * Update the commit charge info */ CommitChargeTotal = PerfDataGetCommitChargeTotalK(); CommitChargeLimit = PerfDataGetCommitChargeLimitK(); CommitChargePeak = PerfDataGetCommitChargePeakK(); _ultow(CommitChargeTotal, Text, 10); - SetWindowTextW(hPerformancePageCommitChargeTotalEdit, Text); + SetWindowTextW(hCommitChargeTotalEdit, Text); _ultow(CommitChargeLimit, Text, 10); - SetWindowTextW(hPerformancePageCommitChargeLimitEdit, Text); + SetWindowTextW(hCommitChargeLimitEdit, Text); _ultow(CommitChargePeak, Text, 10); - SetWindowTextW(hPerformancePageCommitChargePeakEdit, Text); + SetWindowTextW(hCommitChargePeakEdit, Text); StrFormatByteSizeW(CommitChargeTotal * 1024, szChargeTotalFormat, - _countof(szChargeTotalFormat)); + ARRAYSIZE(szChargeTotalFormat)); StrFormatByteSizeW(CommitChargeLimit * 1024, szChargeLimitFormat, - _countof(szChargeLimitFormat)); + ARRAYSIZE(szChargeLimitFormat)); if (!bInMenuLoop) { @@ -374,43 +369,43 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) } /* - * Update the kernel memory info + * Update the kernel memory info */ KernelMemoryTotal = PerfDataGetKernelMemoryTotalK(); KernelMemoryPaged = PerfDataGetKernelMemoryPagedK(); KernelMemoryNonPaged = PerfDataGetKernelMemoryNonPagedK(); _ultow(KernelMemoryTotal, Text, 10); - SetWindowTextW(hPerformancePageKernelMemoryTotalEdit, Text); + SetWindowTextW(hKernelMemoryTotalEdit, Text); _ultow(KernelMemoryPaged, Text, 10); - SetWindowTextW(hPerformancePageKernelMemoryPagedEdit, Text); + SetWindowTextW(hKernelMemoryPagedEdit, Text); _ultow(KernelMemoryNonPaged, Text, 10); - SetWindowTextW(hPerformancePageKernelMemoryNonPagedEdit, Text); + SetWindowTextW(hKernelMemoryNonPagedEdit, Text); /* - * Update the physical memory info + * Update the physical memory info */ PhysicalMemoryTotal = PerfDataGetPhysicalMemoryTotalK(); PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); PhysicalMemorySystemCache = PerfDataGetPhysicalMemorySystemCacheK(); _ultow(PhysicalMemoryTotal, Text, 10); - SetWindowTextW(hPerformancePagePhysicalMemoryTotalEdit, Text); + SetWindowTextW(hPhysicalMemoryTotalEdit, Text); _ultow(PhysicalMemoryAvailable, Text, 10); - SetWindowTextW(hPerformancePagePhysicalMemoryAvailableEdit, Text); + SetWindowTextW(hPhysicalMemoryAvailableEdit, Text); _ultow(PhysicalMemorySystemCache, Text, 10); - SetWindowTextW(hPerformancePagePhysicalMemorySystemCacheEdit, Text); + SetWindowTextW(hPhysicalMemorySystemCacheEdit, Text); /* - * Update the totals info + * Update the totals info */ TotalHandles = PerfDataGetSystemHandleCount(); TotalThreads = PerfDataGetTotalThreadCount(); TotalProcesses = PerfDataGetProcessCount(); _ultow(TotalHandles, Text, 10); - SetWindowTextW(hPerformancePageTotalsHandleCountEdit, Text); + SetWindowTextW(hTotalsHandleCountEdit, Text); _ultow(TotalThreads, Text, 10); - SetWindowTextW(hPerformancePageTotalsThreadCountEdit, Text); + SetWindowTextW(hTotalsThreadCountEdit, Text); _ultow(TotalProcesses, Text, 10); - SetWindowTextW(hPerformancePageTotalsProcessCountEdit, Text); + SetWindowTextW(hTotalsProcessCountEdit, Text); if (!bInMenuLoop) { wsprintfW(Text, szProcesses, TotalProcesses); @@ -418,17 +413,17 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) } /* - * Redraw the graphs + * Redraw the graphs */ - InvalidateRect(hPerformancePageCpuUsageGraph, NULL, FALSE); - InvalidateRect(hPerformancePageMemUsageGraph, NULL, FALSE); + InvalidateRect(hCpuUsageGraph, NULL, FALSE); + InvalidateRect(hMemUsageGraph, NULL, FALSE); /* - * Get the CPU usage + * Get the CPU usage */ CpuUsage = PerfDataGetProcessorUsage(); - if (CpuUsage <= 0 ) CpuUsage = 0; - if (CpuUsage > 100) CpuUsage = 100; + if (CpuUsage <= 0 ) CpuUsage = 0; + if (CpuUsage > 100) CpuUsage = 100; if (!bInMenuLoop) { @@ -443,7 +438,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) CpuKernelUsage = 100; /* - * Get the memory usage + * Get the memory usage */ CommitChargeTotal = PerfDataGetCommitChargeTotalK(); CommitChargeLimit = PerfDataGetCommitChargeLimitK(); @@ -464,13 +459,13 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) void PerformancePage_OnViewShowKernelTimes(void) { - HMENU hMenu; - HMENU hViewMenu; + HMENU hMenu; + HMENU hViewMenu; 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); @@ -490,9 +485,9 @@ void PerformancePage_OnViewShowKernelTimes(void) void PerformancePage_OnViewCPUHistoryOneGraphAll(void) { - HMENU hMenu; - HMENU hViewMenu; - HMENU hCPUHistoryMenu; + HMENU hMenu; + HMENU hViewMenu; + HMENU hCPUHistoryMenu; hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); @@ -504,9 +499,9 @@ void PerformancePage_OnViewCPUHistoryOneGraphAll(void) void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void) { - HMENU hMenu; - HMENU hViewMenu; - HMENU hCPUHistoryMenu; + HMENU hMenu; + HMENU hViewMenu; + HMENU hCPUHistoryMenu; hMenu = GetMenu(hMainWnd); hViewMenu = GetSubMenu(hMenu, 2); @@ -515,4 +510,3 @@ void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void) TaskManagerSettings.CPUHistory_OneGraphPerCPU = TRUE; CheckMenuRadioItem(hCPUHistoryMenu, ID_VIEW_CPUHISTORY_ONEGRAPHALL, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, MF_BYCOMMAND); } - diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index 181423a9610..6eed9c34e61 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -11,12 +11,13 @@ extern "C" { #endif -extern HWND hPerformancePage; /* Performance Property Page */ -INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -void RefreshPerformancePage(void); -void PerformancePage_OnViewShowKernelTimes(void); -void PerformancePage_OnViewCPUHistoryOneGraphAll(void); -void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); +extern HWND hPerformancePage; /* Performance Property Page */ +INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +void RefreshPerformancePage(void); +void PerformancePage_OnViewShowKernelTimes(void); +void PerformancePage_OnViewCPUHistoryOneGraphAll(void); +void PerformancePage_OnViewCPUHistoryOneGraphPerCPU(void); #ifdef __cplusplus }; diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index 0af2e357831..7119e675239 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -27,8 +27,8 @@ HWND hProcessPage; /* Process List Property Page */ HWND hProcessPageListCtrl; /* Process ListCtrl Window */ HWND hProcessPageHeaderCtrl; /* Process Header Control */ -HWND hProcessPageEndProcessButton; /* Process End Process button */ -HWND hProcessPageShowAllProcessesButton;/* Process Show All Processes checkbox */ +static HWND hProcessPageEndProcessButton; /* Process End Process button */ +static HWND hProcessPageShowAllProcessesButton;/* Process Show All Processes checkbox */ BOOL bProcessPageSelectionMade = FALSE; /* Is item in ListCtrl selected */ static int nProcessPageWidth; diff --git a/base/applications/taskmgr/procpage.h b/base/applications/taskmgr/procpage.h index 4cab4191482..fdee980ae79 100644 --- a/base/applications/taskmgr/procpage.h +++ b/base/applications/taskmgr/procpage.h @@ -9,14 +9,12 @@ #pragma once -extern HWND hProcessPage; /* Process List Property Page */ -extern HWND hProcessPageListCtrl; /* Process ListCtrl Window */ -extern HWND hProcessPageHeaderCtrl; /* Process Header Control */ -extern HWND hProcessPageEndProcessButton; /* Process End Process button */ -extern HWND hProcessPageShowAllProcessesButton; /* Process Show All Processes checkbox */ +extern HWND hProcessPage; /* Process List Property Page */ +extern HWND hProcessPageListCtrl; /* Process ListCtrl Window */ +extern HWND hProcessPageHeaderCtrl; /* Process Header Control */ -INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -void RefreshProcessPage(void); -DWORD GetSelectedProcessId(void); -void ProcessPage_OnProperties(void); -void ProcessPage_OnOpenFileLocation(void); +INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +void RefreshProcessPage(void); +DWORD GetSelectedProcessId(void); +void ProcessPage_OnProperties(void); +void ProcessPage_OnOpenFileLocation(void); diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index 81127a3784b..fb02d1cc88b 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -10,28 +10,24 @@ 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; - - /* - * Get a handle to the screen DC - */ + 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 - */ + /* Create our own DC from it */ hDC = CreateCompatibleDC(hScreenDC); if (!hDC) goto done; @@ -52,7 +48,7 @@ HICON TrayIcon_GetProcessorUsageIcon(void) * Select the bitmap into our device context * so we can draw on it. */ - hOldBitmap = (HBITMAP) SelectObject(hDC, hBitmap); + hOldBitmap = SelectObject(hDC, hBitmap); /* * Get the cpu usage @@ -71,9 +67,7 @@ HICON TrayIcon_GetProcessorUsageIcon(void) rc.right = 13; rc.bottom = 13; - /* - * Now draw the cpu usage - */ + /* Now draw the cpu usage */ if (nLinesToDraw) FillRect(hDC, &rc, hBitmapBrush); @@ -105,9 +99,7 @@ done: if (hBitmapMask) DeleteObject(hBitmapMask); - /* - * Return the newly created tray icon (if successful) - */ + /* Return the newly created tray icon (if successful) */ return hTrayIcon; }

1 0

[reactos] 02/07: [TASKMGR] Reformat the files' headers. Add Valerij in graphctl.c/h who rewrote most of the graph control.
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da7dcec6a06c052339120… commit da7dcec6a06c052339120ed4baa3caf24594f163 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 16 02:25:32 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:44:01 2023 +0200 [TASKMGR] Reformat the files' headers. Add Valerij in graphctl.c/h who rewrote most of the graph control. --- base/applications/taskmgr/about.c | 23 ++++------------------- base/applications/taskmgr/about.h | 25 +++++-------------------- base/applications/taskmgr/affinity.c | 25 +++++-------------------- base/applications/taskmgr/affinity.h | 24 +++++------------------- base/applications/taskmgr/applpage.c | 27 ++++++--------------------- base/applications/taskmgr/applpage.h | 25 ++++++------------------- base/applications/taskmgr/column.c | 25 +++++-------------------- base/applications/taskmgr/column.h | 24 +++++------------------- base/applications/taskmgr/debug.c | 25 +++++-------------------- base/applications/taskmgr/debug.h | 24 +++++------------------- base/applications/taskmgr/endproc.c | 27 ++++++--------------------- base/applications/taskmgr/endproc.h | 25 ++++++------------------- base/applications/taskmgr/graph.c | 23 ++++------------------- base/applications/taskmgr/graph.h | 23 ++++------------------- base/applications/taskmgr/graphctl.c | 3 ++- base/applications/taskmgr/graphctl.h | 27 ++++++--------------------- base/applications/taskmgr/optnmenu.c | 29 ++++------------------------- base/applications/taskmgr/optnmenu.h | 29 +++++------------------------ base/applications/taskmgr/perfdata.c | 25 +++++-------------------- base/applications/taskmgr/perfdata.h | 24 +++++------------------- base/applications/taskmgr/perfpage.c | 23 ++++------------------- base/applications/taskmgr/perfpage.h | 23 ++++------------------- base/applications/taskmgr/precomp.h | 7 +++++++ base/applications/taskmgr/priority.c | 25 +++++-------------------- base/applications/taskmgr/priority.h | 24 +++++------------------- base/applications/taskmgr/proclist.c | 23 ++++------------------- base/applications/taskmgr/proclist.h | 27 ++++++--------------------- base/applications/taskmgr/procpage.c | 27 ++++++--------------------- base/applications/taskmgr/procpage.h | 25 ++++++------------------- base/applications/taskmgr/resource.h | 7 +++++++ base/applications/taskmgr/run.c | 25 +++++-------------------- base/applications/taskmgr/run.h | 27 +++++++-------------------- base/applications/taskmgr/shutdown.c | 27 ++++++--------------------- base/applications/taskmgr/shutdown.h | 27 ++++++--------------------- base/applications/taskmgr/taskmgr.c | 25 +++++-------------------- base/applications/taskmgr/taskmgr.h | 23 ++++------------------- base/applications/taskmgr/taskmgr.rc | 7 +++++++ base/applications/taskmgr/trayicon.c | 25 +++++-------------------- base/applications/taskmgr/trayicon.h | 24 +++++------------------- 39 files changed, 202 insertions(+), 701 deletions(-) diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index 63b9b3f4ad9..e3ebc1c0b7c 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * about.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: About Box. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #include "precomp.h" diff --git a/base/applications/taskmgr/about.h b/base/applications/taskmgr/about.h index 07269a8f7c7..cfe31132e2c 100644 --- a/base/applications/taskmgr/about.h +++ b/base/applications/taskmgr/about.h @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * about.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: About Box. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -void OnAbout(void); +void OnAbout(void); diff --git a/base/applications/taskmgr/affinity.c b/base/applications/taskmgr/affinity.c index 1b5ec4247ca..5bb596a63a0 100644 --- a/base/applications/taskmgr/affinity.c +++ b/base/applications/taskmgr/affinity.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * affinity.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processor Affinity. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/affinity.h b/base/applications/taskmgr/affinity.h index 7c93801d507..6aafd95cb8f 100644 --- a/base/applications/taskmgr/affinity.h +++ b/base/applications/taskmgr/affinity.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * affinity.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processor Affinity. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #pragma once diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index e21de9922cf..488ae8fd6af 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * applpage.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Applications Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/applpage.h b/base/applications/taskmgr/applpage.h index f75a76ad2a3..2f59e175c68 100644 --- a/base/applications/taskmgr/applpage.h +++ b/base/applications/taskmgr/applpage.h @@ -1,23 +1,10 @@ /* - * ReactOS Task Manager - * - * applicationpage.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Applications Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once diff --git a/base/applications/taskmgr/column.c b/base/applications/taskmgr/column.c index 71b8db3426f..bc98b06705d 100644 --- a/base/applications/taskmgr/column.c +++ b/base/applications/taskmgr/column.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * column.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes List Columns. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/column.h b/base/applications/taskmgr/column.h index a92efa313cf..cf68106c6e0 100644 --- a/base/applications/taskmgr/column.h +++ b/base/applications/taskmgr/column.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * column.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes List Columns. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #pragma once diff --git a/base/applications/taskmgr/debug.c b/base/applications/taskmgr/debug.c index 7659757567b..8e5701fceab 100644 --- a/base/applications/taskmgr/debug.c +++ b/base/applications/taskmgr/debug.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * debug.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Debugging. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/debug.h b/base/applications/taskmgr/debug.h index 85041340431..cecb974df67 100644 --- a/base/applications/taskmgr/debug.h +++ b/base/applications/taskmgr/debug.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * debug.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Debugging. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #pragma once diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c index 74ce95f3480..822790033d2 100644 --- a/base/applications/taskmgr/endproc.c +++ b/base/applications/taskmgr/endproc.c @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * endproc.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Termination. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/endproc.h b/base/applications/taskmgr/endproc.h index 2351e85967d..04744d7c1f1 100644 --- a/base/applications/taskmgr/endproc.h +++ b/base/applications/taskmgr/endproc.h @@ -1,23 +1,10 @@ /* - * ReactOS Task Manager - * - * endproc.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Termination. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #pragma once diff --git a/base/applications/taskmgr/graph.c b/base/applications/taskmgr/graph.c index 20e0ff45476..3962e976fb5 100644 --- a/base/applications/taskmgr/graph.c +++ b/base/applications/taskmgr/graph.c @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * graph.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Graph Meters. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #include "precomp.h" diff --git a/base/applications/taskmgr/graph.h b/base/applications/taskmgr/graph.h index d990f51f155..d79524b43b1 100644 --- a/base/applications/taskmgr/graph.h +++ b/base/applications/taskmgr/graph.h @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * graph.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Graph Meters. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 66cc9e60208..ef6bbf6b632 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -1,9 +1,10 @@ /* * PROJECT: ReactOS Task Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Graph plotting controls + * PURPOSE: Graph Plotting controls. * COPYRIGHT: Copyright 2002 Robert Dickenson <robd(a)reactos.org> * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> + * Copyright 2021 Valerij Zaporogeci <vlrzprgts(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/graphctl.h b/base/applications/taskmgr/graphctl.h index 5ea2aeaa82d..959ffab4122 100644 --- a/base/applications/taskmgr/graphctl.h +++ b/base/applications/taskmgr/graphctl.h @@ -1,23 +1,10 @@ /* - * ReactOS Task Manager - * - * graphctl.h - * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Graph Plotting controls. + * COPYRIGHT: Copyright 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> + * Copyright 2021 Valerij Zaporogeci <vlrzprgts(a)gmail.com> */ #pragma once @@ -29,8 +16,6 @@ extern "C" { #endif - - typedef struct _TM_GRAPH_CONTROL { HWND hParentWnd; diff --git a/base/applications/taskmgr/optnmenu.c b/base/applications/taskmgr/optnmenu.c index bb34fed2fd3..f6be7e209f6 100644 --- a/base/applications/taskmgr/optnmenu.c +++ b/base/applications/taskmgr/optnmenu.c @@ -1,29 +1,8 @@ /* - * ReactOS Task Manager - * - * optnmenu.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * options.c - * - * Menu item handlers for the options menu. + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Menu item handlers for the options menu. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #include "precomp.h" diff --git a/base/applications/taskmgr/optnmenu.h b/base/applications/taskmgr/optnmenu.h index 50a8251fa42..6f259c396bd 100644 --- a/base/applications/taskmgr/optnmenu.h +++ b/base/applications/taskmgr/optnmenu.h @@ -1,32 +1,13 @@ /* - * ReactOS Task Manager - * - * optnmenu.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* - * Menu item handlers for the options menu. + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Menu item handlers for the options menu. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -#define OPTIONS_MENU_INDEX 1 +#define OPTIONS_MENU_INDEX 1 void TaskManager_OnOptionsAlwaysOnTop(void); void TaskManager_OnOptionsMinimizeOnUse(void); diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 166f7a7ff07..573021d5f89 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * perfdata.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * Copyright (C) 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Counters. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/perfdata.h b/base/applications/taskmgr/perfdata.h index 51e11f47b2e..5bfc3bb31fb 100644 --- a/base/applications/taskmgr/perfdata.h +++ b/base/applications/taskmgr/perfdata.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * perfdata.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Counters. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> */ #pragma once diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index 4bf550a8ff1..e212581633e 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * perfpage.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #include "precomp.h" diff --git a/base/applications/taskmgr/perfpage.h b/base/applications/taskmgr/perfpage.h index f1e4403f37c..181423a9610 100644 --- a/base/applications/taskmgr/perfpage.h +++ b/base/applications/taskmgr/perfpage.h @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * performancepage.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Performance Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index 872cc76d0ae..4fbcf760c3d 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Precompiled Header. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + */ + #ifndef __PRECOMP_H #define __PRECOMP_H diff --git a/base/applications/taskmgr/priority.c b/base/applications/taskmgr/priority.c index 6364d161ecf..714bc76da72 100644 --- a/base/applications/taskmgr/priority.c +++ b/base/applications/taskmgr/priority.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * priority.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Priority. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/priority.h b/base/applications/taskmgr/priority.h index 5d8f18cc468..d7088b17211 100644 --- a/base/applications/taskmgr/priority.h +++ b/base/applications/taskmgr/priority.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * priority.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Process Priority. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #pragma once diff --git a/base/applications/taskmgr/proclist.c b/base/applications/taskmgr/proclist.c index 15f0c13b48d..7396be368ec 100644 --- a/base/applications/taskmgr/proclist.c +++ b/base/applications/taskmgr/proclist.c @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * proclist.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes List. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #include "precomp.h" diff --git a/base/applications/taskmgr/proclist.h b/base/applications/taskmgr/proclist.h index 1df2753384b..8822d1010f2 100644 --- a/base/applications/taskmgr/proclist.h +++ b/base/applications/taskmgr/proclist.h @@ -1,27 +1,12 @@ /* - * ReactOS Task Manager - * - * proclist.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes List. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once -INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); -extern WNDPROC OldProcessListWndProc; +extern WNDPROC OldProcessListWndProc; diff --git a/base/applications/taskmgr/procpage.c b/base/applications/taskmgr/procpage.c index dd2825d2c91..0af2e357831 100644 --- a/base/applications/taskmgr/procpage.c +++ b/base/applications/taskmgr/procpage.c @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * procpage.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * Copyright (C) 2009 Maxime Vernier <maxime.vernier(a)gmail.com> - * Copyright (C) 2022 Thamatip Chitpong <tangaming123456(a)outlook.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2009 Maxime Vernier <maxime.vernier(a)gmail.com> + * Copyright 2022 Thamatip Chitpong <tangaming123456(a)outlook.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/procpage.h b/base/applications/taskmgr/procpage.h index 2a22951bce8..4cab4191482 100644 --- a/base/applications/taskmgr/procpage.h +++ b/base/applications/taskmgr/procpage.h @@ -1,23 +1,10 @@ /* - * ReactOS Task Manager - * - * processpage.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Processes Page. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2009 Maxime Vernier <maxime.vernier(a)gmail.com> + * Copyright 2022 Thamatip Chitpong <tangaming123456(a)outlook.com> */ #pragma once diff --git a/base/applications/taskmgr/resource.h b/base/applications/taskmgr/resource.h index c5b9e84ebcf..7f5ef276afe 100644 --- a/base/applications/taskmgr/resource.h +++ b/base/applications/taskmgr/resource.h @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Resources header. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + */ + #pragma once #define IDS_IDLE_PROCESS 102 diff --git a/base/applications/taskmgr/run.c b/base/applications/taskmgr/run.c index 058bff6c6e2..09ed71e74d2 100644 --- a/base/applications/taskmgr/run.c +++ b/base/applications/taskmgr/run.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * run.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Run Task. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/run.h b/base/applications/taskmgr/run.h index fd87406fa93..ef1ffe53cb0 100644 --- a/base/applications/taskmgr/run.h +++ b/base/applications/taskmgr/run.h @@ -1,24 +1,11 @@ /* - * ReactOS Task Manager - * - * run.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Run Task. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> + */ +/* * run.h - definitions necessary to use Microsoft's "Run" dialog * Undocumented Windows call * use the type below to declare a function pointer diff --git a/base/applications/taskmgr/shutdown.c b/base/applications/taskmgr/shutdown.c index 4c3ca645747..9a64b0a3ed6 100644 --- a/base/applications/taskmgr/shutdown.c +++ b/base/applications/taskmgr/shutdown.c @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * shutdown.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2011 M�rio Kacm�r /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * 2014 Robert Naumann <gonzomdx(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: System Shutdown. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2011 Mário Kacmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> + * Copyright 2014 Robert Naumann <gonzomdx(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/taskmgr/shutdown.h b/base/applications/taskmgr/shutdown.h index 3358c5562b3..7c13c445e3a 100644 --- a/base/applications/taskmgr/shutdown.h +++ b/base/applications/taskmgr/shutdown.h @@ -1,25 +1,10 @@ /* - * ReactOS Task Manager - * - * shutdown.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2011 M�rio Kacm�r /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * 2014 Robert Naumann <gonzomdx(a)gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: System Shutdown. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2011 Mário Kacmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> + * Copyright 2014 Robert Naumann <gonzomdx(a)gmail.com> */ #pragma once diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 197b6f82e62..28a2b4b3c8a 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * taskmgr.c : Defines the entry point for the application. - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Application Entry-point. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index 5e7fed2f7c8..1557128adba 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -1,23 +1,8 @@ /* - * ReactOS Task Manager - * - * taskmgr.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main Header. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> */ #pragma once diff --git a/base/applications/taskmgr/taskmgr.rc b/base/applications/taskmgr/taskmgr.rc index b23bc2fdc56..521f83fbe78 100644 --- a/base/applications/taskmgr/taskmgr.rc +++ b/base/applications/taskmgr/taskmgr.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Resources file. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + */ + #include <windef.h> #include <winuser.h> #include <commctrl.h> diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index e34e4578743..81127a3784b 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -1,24 +1,9 @@ /* - * ReactOS Task Manager - * - * trayicon.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tray Icon. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #include "precomp.h" diff --git a/base/applications/taskmgr/trayicon.h b/base/applications/taskmgr/trayicon.h index 1b51c5571b8..5b120b4ab08 100644 --- a/base/applications/taskmgr/trayicon.h +++ b/base/applications/taskmgr/trayicon.h @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * trayicon.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tray Icon. + * COPYRIGHT: Copyright 1999-2001 Brian Palmer <brianp(a)reactos.org> + * Copyright 2005 Klemens Friedl <frik85(a)reactos.at> */ #pragma once

1 0

[reactos] 01/07: Revert "[TASKMGR] Follow-up of 'Refactor trayicon.c' (99fb812)"
by Hermès Bélusca-Maïto 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fc702b5882d7acbc0fd6… commit 3fc702b5882d7acbc0fd61232a9a839eed43b96a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 15 12:43:36 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 15 12:43:36 2023 +0200 Revert "[TASKMGR] Follow-up of 'Refactor trayicon.c' (99fb812)" This reverts commit ec93c2340d648c15ff3c1f6d56c993b96c33204b. Revert "[TASKMGR] Refactor trayicon.c" This reverts commit 99fb812be4ba86139438bf7961f2030ac9e016be. --- base/applications/taskmgr/trayicon.c | 56 ++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index dcff4a00f28..e34e4578743 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -1,16 +1,28 @@ /* - * PROJECT: ReactOS Task Manager - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Task Manager for ReactOS - * COPYRIGHT: Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.at> - * Copyright (C) 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * ReactOS Task Manager + * + * trayicon.c + * + * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "precomp.h" -#include <strsafe.h> - HICON TrayIcon_GetProcessorUsageIcon(void) { HICON hTrayIcon = NULL; @@ -117,13 +129,14 @@ done: BOOL TrayIcon_ShellAddTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon; + HICON hIcon = NULL; BOOL bRetVal; WCHAR szMsg[64]; + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); + hIcon = TrayIcon_GetProcessorUsageIcon(); - ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; @@ -131,8 +144,9 @@ BOOL TrayIcon_ShellAddTrayIcon(void) nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - LoadStringW(NULL, IDS_MSG_TRAYICONCPUUSAGE, szMsg, _countof(szMsg)); - StringCchPrintfW(nid.szTip, _countof(nid.szTip), szMsg, PerfDataGetProcessorUsage()); + + LoadStringW( GetModuleHandleW(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); + wsprintfW(nid.szTip, szMsg, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); @@ -145,36 +159,40 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL TrayIcon_ShellRemoveTrayIcon(void) { NOTIFYICONDATAW nid; + BOOL bRetVal; + + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - return Shell_NotifyIconW(NIM_DELETE, &nid); + bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); + + return bRetVal; } BOOL TrayIcon_ShellUpdateTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon; + HICON hIcon = NULL; BOOL bRetVal; WCHAR szTemp[64]; + memset(&nid, 0, sizeof(NOTIFYICONDATAW)); + hIcon = TrayIcon_GetProcessorUsageIcon(); - ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - - LoadStringW(NULL, IDS_MSG_TRAYICONCPUUSAGE, szTemp, _countof(szTemp)); - StringCchPrintfW(nid.szTip, _countof(nid.szTip), szTemp, PerfDataGetProcessorUsage()); + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, sizeof(szTemp)/sizeof(szTemp[0])); + wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid);

1 0

[reactos] 01/01: [TASKMGR] affinity.c: Use _countof instead of sizeof/sizeof
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36aea8e56eb6eb9f1cab5… commit 36aea8e56eb6eb9f1cab5fd6ce040b80ef6a302f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 16:22:43 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 16:22:43 2023 +0900 [TASKMGR] affinity.c: Use _countof instead of sizeof/sizeof CORE-18991 --- base/applications/taskmgr/affinity.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/taskmgr/affinity.c b/base/applications/taskmgr/affinity.c index 6172a79753d..1b5ec4247ca 100644 --- a/base/applications/taskmgr/affinity.c +++ b/base/applications/taskmgr/affinity.c @@ -51,8 +51,8 @@ void ProcessPage_OnSetAffinity(void) hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId); if (!hProcessAffinityHandle) { - GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + GetLastErrorText(strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, _countof(szTitle)); MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return; } @@ -80,13 +80,13 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * the number of CPUs present in the system */ if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask)) { - GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); + GetLastErrorText(strErrorText, _countof(strErrorText)); EndDialog(hDlg, 0); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, _countof(szTitle)); MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); } - for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { + for (nCpu = 0; nCpu < _countof(dwCpuTable); nCpu++) { /* * Enable a checkbox for each processor present in the system */ @@ -118,7 +118,7 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * to adjust the process affinity mask */ if (LOWORD(wParam) == IDOK) { - for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) { + for (nCpu = 0; nCpu < _countof(dwCpuTable); nCpu++) { /* * First we have to create a mask out of each * checkbox that the user checked. @@ -134,8 +134,8 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * of it's cpu time. */ if (!dwProcessAffinityMask) { - LoadStringW(hInst, IDS_MSG_PROCESSONEPRO, strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); - LoadStringW(hInst, IDS_MSG_INVALIDOPTION, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MSG_PROCESSONEPRO, strErrorText, _countof(strErrorText)); + LoadStringW(hInst, IDS_MSG_INVALIDOPTION, szTitle, _countof(szTitle)); MessageBoxW(hDlg, strErrorText, szTitle, MB_OK|MB_ICONSTOP); return TRUE; } @@ -144,9 +144,9 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * Try to set the process affinity */ if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) { - GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(WCHAR)); + GetLastErrorText(strErrorText, _countof(strErrorText)); EndDialog(hDlg, LOWORD(wParam)); - LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, sizeof(szTitle) / sizeof(WCHAR)); + LoadStringW(hInst, IDS_MSG_ACCESSPROCESSAFF, szTitle, _countof(szTitle)); MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); }

1 0

[reactos] 01/01: [TASKMGR] Fix PerfDataDeallocCommandLineCache
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a6c85f68aa0e2ec4595d… commit 9a6c85f68aa0e2ec4595d4673e59f5ade2521a6f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 15:36:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 15:36:19 2023 +0900 [TASKMGR] Fix PerfDataDeallocCommandLineCache Do not leak memory. CORE-18014 --- base/applications/taskmgr/perfdata.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 7eb1d90fd5d..166f7a7ff07 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -649,16 +649,15 @@ cleanup: void PerfDataDeallocCommandLineCache() { - PCMD_LINE_CACHE cache = global_cache; - PCMD_LINE_CACHE cache_old; + PCMD_LINE_CACHE cache, pnext; - while (cache && cache->pnext != NULL) + for (cache = global_cache; cache; cache = pnext) { - cache_old = cache; - cache = cache->pnext; - - HeapFree(GetProcessHeap(), 0, cache_old); + pnext = cache->pnext; + HeapFree(GetProcessHeap(), 0, cache); } + + global_cache = NULL; } ULONG PerfDataGetSessionId(ULONG Index)

1 0

[reactos] 01/01: [TASKMGR] GraphCtrl_Dispose: Delete hdcGraph first
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7989e3f26cafd74c9d8fd… commit 7989e3f26cafd74c9d8fdeef64deece0da591634 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 15:14:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 15:14:32 2023 +0900 [TASKMGR] GraphCtrl_Dispose: Delete hdcGraph first The pen might be selected at GraphCtrl_Dispose. Do not delete a drawing object (pen or brush) while it is still selected into a DC. CORE-18014 --- base/applications/taskmgr/graphctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 78bc157db3d..66cc9e60208 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -116,6 +116,9 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) if (inst->PointBuffer) HeapFree(GetProcessHeap(), 0, inst->PointBuffer); + if (inst->hdcGraph) + DeleteDC(inst->hdcGraph); + if (inst->hPenGrid) DeleteObject(inst->hPenGrid); @@ -130,9 +133,6 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) if (inst->hbmGraph) DeleteObject(inst->hbmGraph); - - if (inst->hdcGraph) - DeleteDC(inst->hdcGraph); } void

1 0

[reactos] 01/01: [TASKMGR] GraphCtrl: Use DeleteDC instead of DeleteObject to delete inst->hdcGraph
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc14a9f6e0d9b6ce3ccc8… commit dc14a9f6e0d9b6ce3ccc84daba923edb1cc0167f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 14:53:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 14:55:25 2023 +0900 [TASKMGR] GraphCtrl: Use DeleteDC instead of DeleteObject to delete inst->hdcGraph This reduces handle leak. CORE-18014 --- base/applications/taskmgr/graphctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 4253eeadc35..78bc157db3d 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -132,7 +132,7 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) DeleteObject(inst->hbmGraph); if (inst->hdcGraph) - DeleteObject(inst->hdcGraph); + DeleteDC(inst->hdcGraph); } void

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2023