diff --git a/reactos/base/applications/taskmgr/about.c b/reactos/base/applications/taskmgr/about.c index ec8e5c12407..66510ac98c3 100644 --- a/reactos/base/applications/taskmgr/about.c +++ b/reactos/base/applications/taskmgr/about.c @@ -24,10 +24,10 @@ void OnAbout(void) { - TCHAR szTaskmgr[128]; + WCHAR szTaskmgr[128]; HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER)); - LoadString(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(TCHAR)); - ShellAbout(hMainWnd, szTaskmgr, 0, taskmgrIcon); + LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); + ShellAboutW(hMainWnd, szTaskmgr, 0, taskmgrIcon); DeleteObject(taskmgrIcon); } diff --git a/reactos/base/applications/taskmgr/proclist.c b/reactos/base/applications/taskmgr/proclist.c index b8754be42f6..15f0c13b48d 100644 --- a/reactos/base/applications/taskmgr/proclist.c +++ b/reactos/base/applications/taskmgr/proclist.c @@ -76,7 +76,7 @@ ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) rcItem.left = LVIR_BOUNDS; SendMessageW(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM)&rcItem); rcClip.bottom = rcItem.bottom; - rcClip.right = rcItem.right; + rcClip.right = rcItem.right; rcItem.left = LVIR_ICON; SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcItem); rcClip.left = rcItem.right; diff --git a/reactos/base/applications/taskmgr/procpage.c b/reactos/base/applications/taskmgr/procpage.c index fe85b6ce569..007e678532d 100644 --- a/reactos/base/applications/taskmgr/procpage.c +++ b/reactos/base/applications/taskmgr/procpage.c @@ -470,25 +470,25 @@ void UpdateProcesses() BOOL ProcessRunning(ULONG ProcessId) { - HANDLE hProcess; - DWORD exitCode; + HANDLE hProcess; + DWORD exitCode; - if (ProcessId == 0) { - return TRUE; - } - - hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId); - if (hProcess == NULL) { - return FALSE; - } + if (ProcessId == 0) { + return TRUE; + } - if (GetExitCodeProcess(hProcess, &exitCode)) { - CloseHandle(hProcess); - return (exitCode == STILL_ACTIVE); - } + hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId); + if (hProcess == NULL) { + return FALSE; + } - CloseHandle(hProcess); - return FALSE; + if (GetExitCodeProcess(hProcess, &exitCode)) { + CloseHandle(hProcess); + return (exitCode == STILL_ACTIVE); + } + + CloseHandle(hProcess); + return FALSE; } void AddProcess(ULONG Index)