Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 11:04:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by maxime vernier (bugzilla bug 4661).

Browse source 
Fix the ghost bug and the graphical glitch with process id 0

svn path=/trunk/; revision=43066
This commit is contained in:
Art Yerkes 2009-09-17 16:07:37 +00:00
parent 1b035b748d
commit ac0cfa98e2
1 changed files with 29 additions and 16 deletions

45
reactos/base/applications/taskmgr/procpage.c
View file

@ -29,6 +29,7 @@
typedef struct typedef struct
{ {
ULONG Index; ULONG Index;
ULONG ProcessId;
} PROCESS_PAGE_LIST_ITEM, *LPPROCESS_PAGE_LIST_ITEM; } PROCESS_PAGE_LIST_ITEM, *LPPROCESS_PAGE_LIST_ITEM;
HWND hProcessPage; /* Process List Property Page */ HWND hProcessPage; /* Process List Property Page */
@ -51,6 +52,7 @@ void CommaSeparateNumberString(LPWSTR strNumber, int nMaxCount);
void ProcessPageShowContextMenu(DWORD dwProcessId); void ProcessPageShowContextMenu(DWORD dwProcessId);
BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount);
DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter);
int ProcessRunning(ULONG ProcessId);
DWORD GetSelectedProcessId(void) DWORD GetSelectedProcessId(void)
{ {
@ -411,12 +413,9 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
void UpdateProcesses() void UpdateProcesses()
{ {
int i; int i;
BOOL found = FALSE;
ULONG l; ULONG l;
ULONG pid;
LV_ITEM item; LV_ITEM item;
LPPROCESS_PAGE_LIST_ITEM pData; LPPROCESS_PAGE_LIST_ITEM pData;
PPERFDATA pPerfData;
/* Remove old processes */ /* Remove old processes */
for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++)
@ -426,19 +425,9 @@ void UpdateProcesses()
item.iItem = i; item.iItem = i;
(void)ListView_GetItem(hProcessPageListCtrl, &item); (void)ListView_GetItem(hProcessPageListCtrl, &item);
pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam;
(void)PerfDataGet(pData->Index, &pPerfData); if (!ProcessRunning(pData->ProcessId))
pid = PerfDataGetProcessId(pData->Index);
for (l = 0; l < PerfDataGetProcessCount(); l++)
{ {
if (PerfDataGetProcessId(l) == pid) (void)ListView_DeleteItem(hProcessPageListCtrl, i);
{
found = TRUE;
break;
}
}
if (!found)
{
(void)ListView_DeleteItem(hApplicationPageListCtrl, i);
HeapFree(GetProcessHeap(), 0, pData); HeapFree(GetProcessHeap(), 0, pData);
} }
} }
@ -452,6 +441,29 @@ void UpdateProcesses()
} }
} }
BOOL ProcessRunning(ULONG ProcessId)
{
HANDLE hProcess;
DWORD exitCode;
if (ProcessId == 0) {
return TRUE;
}
hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId);
if (hProcess == NULL) {
return FALSE;
}
if (GetExitCodeProcess(hProcess, &exitCode)) {
CloseHandle(hProcess);
return (exitCode == STILL_ACTIVE);
}
CloseHandle(hProcess);
return FALSE;
}
void AddProcess(ULONG Index) void AddProcess(ULONG Index)
{ {
LPPROCESS_PAGE_LIST_ITEM pData; LPPROCESS_PAGE_LIST_ITEM pData;
@ -480,7 +492,8 @@ void AddProcess(ULONG Index)
{ {
pData = (LPPROCESS_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(PROCESS_PAGE_LIST_ITEM)); pData = (LPPROCESS_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(PROCESS_PAGE_LIST_ITEM));
pData->Index = Index; pData->Index = Index;
pData->ProcessId = pid;
/* Add the item to the list */ /* Add the item to the list */
memset(&item, 0, sizeof(LV_ITEM)); memset(&item, 0, sizeof(LV_ITEM));
item.mask = LVIF_TEXT|LVIF_PARAM; item.mask = LVIF_TEXT|LVIF_PARAM;