Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 10:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TASKMGR] Process page: Don't hardcode string length (#5490)

Browse source 
Addendum to 59dcec1 (#4323).
This commit is contained in:
Thamatip Chitpong 2023-07-26 23:26:20 +07:00 committed by GitHub
parent 86e9fa717f
commit 41e3badc9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/applications/taskmgr/procpage.c
View file

@ -16,6 +16,8 @@
#define CMP(x1, x2)\ #define CMP(x1, x2)\
(x1 < x2 ? -1 : (x1 > x2 ? 1 : 0)) (x1 < x2 ? -1 : (x1 > x2 ? 1 : 0))
#define CONST_STR_LEN(str) (_countof(str) - 1)
typedef struct typedef struct
{ {
ULONG ProcessId; ULONG ProcessId;
@ -994,7 +996,7 @@ DevicePathToDosPath(
WCHAR szDeviceName[MAX_PATH]; WCHAR szDeviceName[MAX_PATH];
/* Check if lpDevicePath is a device path */ /* Check if lpDevicePath is a device path */
if (_wcsnicmp(lpDevicePath, L"\\Device\\", _countof(L"\\Device\\")-1) != 0) if (_wcsnicmp(lpDevicePath, L"\\Device\\", CONST_STR_LEN(L"\\Device\\")) != 0)
{ {
return 0; return 0;
} }
@ -1150,7 +1152,7 @@ GetProcessExecutablePathById(
if (GetSystemDirectoryW(pszSystemDir, uLength) != 0) if (GetSystemDirectoryW(pszSystemDir, uLength) != 0)
{ {
/* Get the required length, including the NULL terminator */ /* Get the required length, including the NULL terminator */
dwRet = uLength + _countof(szKernelExe) - 1; dwRet = uLength + CONST_STR_LEN(szKernelExe);
if (lpExePath && (dwLength >= dwRet)) if (lpExePath && (dwLength >= dwRet))
{ {
@ -1238,11 +1240,11 @@ void ProcessPage_OnOpenFileLocation(void)
goto Cleanup; goto Cleanup;
/* Build the shell command line */ /* Build the shell command line */
pszCmdLine = HeapAlloc(GetProcessHeap(), 0, (dwLength + 10) * sizeof(WCHAR)); pszCmdLine = HeapAlloc(GetProcessHeap(), 0, (dwLength + CONST_STR_LEN(L"/select,\"\"")) * sizeof(WCHAR));
if (!pszCmdLine) if (!pszCmdLine)
goto Cleanup; goto Cleanup;
StringCchPrintfW(pszCmdLine, dwLength + 10, L"/select,\"%s\"", pszExePath); StringCchPrintfW(pszCmdLine, dwLength + CONST_STR_LEN(L"/select,\"\""), L"/select,\"%s\"", pszExePath);
/* Call the shell to open the file location and select it */ /* Call the shell to open the file location and select it */
ShellExecuteW(NULL, L"open", L"explorer.exe", pszCmdLine, NULL, SW_SHOWNORMAL); ShellExecuteW(NULL, L"open", L"explorer.exe", pszCmdLine, NULL, SW_SHOWNORMAL);