Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 14:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
Sync with trunk head (r48826)

svn path=/branches/cmake-bringup/; revision=48831
This commit is contained in:
Timo Kreuzer 2010-09-20 17:27:52 +00:00
commit 912ce51ae6
1261 changed files with 77972 additions and 24019 deletions
Download patch file Download diff file Expand all files Collapse all files

46
base/applications/taskmgr/applpage.c
View file

@ -38,7 +38,6 @@ HWND hApplicationPageSwitchToButton; /* Application Switch To button
HWND hApplicationPageNewTaskButton; /* Application New Task button */
static int nApplicationPageWidth;
static int nApplicationPageHeight;
static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */
static BOOL bSortAscending = TRUE;
DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter);
BOOL noApps;
@ -51,6 +50,11 @@ void ApplicationPageShowContextMenu2(void);
int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
int ProcGetIndexByProcessId(DWORD dwProcessId);
#ifdef RUN_APPS_PAGE
static HANDLE hApplicationThread = NULL;
static DWORD dwApplicationThread;
#endif
#if 0
void SwitchToThisWindow (
HWND hWnd, /* Handle to the window that should be activated */
@ -92,7 +96,6 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
LV_COLUMN column;
WCHAR szTemp[256];
int cx, cy;
HANDLE hRefreshThread = NULL;
switch (message) {
case WM_INITDIALOG:
@ -132,15 +135,16 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
UpdateApplicationListControlViewSetting();
/* Start our refresh thread */
hRefreshThread = CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL);
#ifdef RUN_APPS_PAGE
hApplicationThread = CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, &dwApplicationThread);
#endif
return TRUE;
case WM_DESTROY:
/* Close the event handle, this will make the */
/* refresh thread exit when the wait fails */
CloseHandle(hApplicationPageEvent);
CloseHandle(hRefreshThread);
/* Close refresh thread */
#ifdef RUN_APPS_PAGE
EndLocalThread(&hApplicationThread, dwApplicationThread);
#endif
break;
case WM_COMMAND:
@ -213,9 +217,11 @@ ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
void RefreshApplicationPage(void)
{
#ifdef RUN_APPS_PAGE
/* Signal the event so that our refresh thread */
/* will wake up and refresh the application page */
SetEvent(hApplicationPageEvent);
PostThreadMessage(dwApplicationThread, WM_TIMER, 0, 0);
#endif
}
void UpdateApplicationListControlViewSetting(void)
@ -236,6 +242,7 @@ void UpdateApplicationListControlViewSetting(void)
DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter)
{
MSG msg;
INT i;
BOOL bItemRemoved = FALSE;
LV_ITEM item;
@ -243,30 +250,15 @@ DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter)
HIMAGELIST hImageListLarge;
HIMAGELIST hImageListSmall;
/* Create the event */
hApplicationPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL);
/* If we couldn't create the event then exit the thread */
if (!hApplicationPageEvent)
return 0;
while (1)
{
DWORD dwWaitVal;
/* Wait on the event */
dwWaitVal = WaitForSingleObject(hApplicationPageEvent, INFINITE);
/* If the wait failed then the event object must have been */
/* closed and the task manager is exiting so exit this thread */
if (dwWaitVal == WAIT_FAILED)
/* Wait for an the event or application close */
if (GetMessage(&msg, NULL, 0, 0) <= 0)
return 0;
if (dwWaitVal == WAIT_OBJECT_0)
if (msg.message == WM_TIMER)
{
/* Reset our event */
ResetEvent(hApplicationPageEvent);
/*
* FIXME:
*

2
base/applications/taskmgr/debug.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* debug.cpp
* debug.c
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
* 2005 Klemens Friedl <frik85@reactos.at>

2
base/applications/taskmgr/endproc.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* endproc.cpp
* endproc.c
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
* 2005 Klemens Friedl <frik85@reactos.at>

2
base/applications/taskmgr/graph.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* graph.cpp
* graph.c
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
*

4
base/applications/taskmgr/graphctl.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* GraphCtrl.cpp
* graphctl.c
*
* Copyright (C) 2002 Robert Dickenson <robd@reactos.org>
*
@ -425,7 +425,7 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this)
* note: the m_dcPlot covers the entire client
* but we only shift bitmap that is the size
* of the plot rectangle
* grab the right side of the plot (exluding m_nShiftPixels on the left)
* grab the right side of the plot (excluding m_nShiftPixels on the left)
* move this grabbed bitmap to the left by m_nShiftPixels
*/
BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top+1,

2
base/applications/taskmgr/graphctl.h
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* GraphCtrl.h
* graphctl.h
*
* Copyright (C) 2002 Robert Dickenson <robd@reactos.org>
*

1
base/applications/taskmgr/lang/bg-BG.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/cs-CZ.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/da-DK.rc
View file

@ -159,6 +159,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/de-DE.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/el-GR.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

129
base/applications/taskmgr/lang/es-ES.rc
View file

@ -45,67 +45,54 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Iconos &Grandes", ID_VIEW_LARGE
MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL
MENUITEM "&Detalles", ID_VIEW_DETAILS,
CHECKED
MENUITEM "&Seleccionar Columnas...",
ID_VIEW_SELECTCOLUMNS
MENUITEM "Iconos &Grandes", ID_VIEW_LARGE
MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL
MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED
MENUITEM "&Seleccionar Columnas...", ID_VIEW_SELECTCOLUMNS
POPUP "Historial de la &CPU"
BEGIN
MENUITEM "&Una Gráfica, Todas las CPUs",
ID_VIEW_CPUHISTORY_ONEGRAPHALL
MENUITEM "&Una Gráfica, Todas las CPUs", ID_VIEW_CPUHISTORY_ONEGRAPHALL
MENUITEM "Una Gráfica, &Por CPU",
ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU
, CHECKED
MENUITEM "Una Gráfica, &Por CPU", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
END
MENUITEM "&Mostrar tiempos del Núcleo",
ID_VIEW_SHOWKERNELTIMES
MENUITEM "&Mostrar tiempos del Núcleo", ID_VIEW_SHOWKERNELTIMES
END
POPUP "&Ventanas"
BEGIN
MENUITEM "Mosaico &Horizontal",
ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical",
ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "&Cascada", ID_WINDOWS_CASCADE
MENUITEM "&Traer al Frente",
ID_WINDOWS_BRINGTOFRONT
MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "&Cascada", ID_WINDOWS_CASCADE
MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT
END
POPUP "A&yuda"
BEGIN
MENUITEM "&Temas de Ayuda del Administrador de Tareas",
ID_HELP_TOPICS
MENUITEM "&Temas de Ayuda del Administrador de Tareas", ID_HELP_TOPICS
MENUITEM SEPARATOR
MENUITEM "&Acerca del Administrador de Tareas",
ID_HELP_ABOUT
MENUITEM "&Acerca del Administrador de Tareas", ID_HELP_ABOUT
END
END
IDR_WINDOWSMENU MENU DISCARDABLE
BEGIN
MENUITEM "Mosaico &Horizontal",
ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "&Cascada", ID_WINDOWS_CASCADE
MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT
MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT
END
IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE
BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "&Nueva Tarea (Ejecutar...)", ID_FILE_NEW
MENUITEM "&Nueva Tarea (Ejecutar...)", ID_FILE_NEW
MENUITEM SEPARATOR
MENUITEM "Iconos &Grandes", ID_VIEW_LARGE
MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL
MENUITEM "&Detalles", ID_VIEW_DETAILS,
CHECKED
MENUITEM "Iconos &Grandes", ID_VIEW_LARGE
MENUITEM "Iconos &Pequeños", ID_VIEW_SMALL
MENUITEM "&Detalles", ID_VIEW_DETAILS, CHECKED
END
END
@ -113,21 +100,17 @@ IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE
BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "&Cambiar A",
ID_APPLICATION_PAGE_SWITCHTO
MENUITEM "&Traer al Frente",
ID_WINDOWS_BRINGTOFRONT
MENUITEM "&Cambiar A", ID_APPLICATION_PAGE_SWITCHTO
MENUITEM "&Traer al Frente", ID_WINDOWS_BRINGTOFRONT
MENUITEM SEPARATOR
MENUITEM "Mosaico &Horizontal",
ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical",
ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "Ca&scada", ID_WINDOWS_CASCADE
MENUITEM "Mosaico &Horizontal", ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Mosaico &Vertical", ID_WINDOWS_TILEVERTICALLY
MENUITEM "&Minimizar", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizar", ID_WINDOWS_MAXIMIZE
MENUITEM "Ca&scada", ID_WINDOWS_CASCADE
MENUITEM SEPARATOR
MENUITEM "&Finalizar Tarea", ID_APPLICATION_PAGE_ENDTASK
MENUITEM "&Ir al Proceso", ID_APPLICATION_PAGE_GOTOPROCESS
MENUITEM "&Finalizar Tarea", ID_APPLICATION_PAGE_ENDTASK
MENUITEM "&Ir al Proceso", ID_APPLICATION_PAGE_GOTOPROCESS
END
END
@ -136,10 +119,10 @@ IDR_TRAY_POPUP MENU DISCARDABLE
BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "&Restaurar", ID_RESTORE
MENUITEM "&Cerrar", ID_FILE_EXIT
MENUITEM "&Restaurar", ID_RESTORE
MENUITEM "&Cerrar", ID_FILE_EXIT
MENUITEM SEPARATOR
MENUITEM "&Siempre Visible", ID_OPTIONS_ALWAYSONTOP
MENUITEM "&Siempre Visible", ID_OPTIONS_ALWAYSONTOP
END
END
@ -147,27 +130,27 @@ IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE
BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "&Finalizar Proceso", ID_PROCESS_PAGE_ENDPROCESS
MENUITEM "Finalizar &Árbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE
MENUITEM "&Finalizar Proceso", ID_PROCESS_PAGE_ENDPROCESS
MENUITEM "Finalizar &Árbol de Procesos", ID_PROCESS_PAGE_ENDPROCESSTREE
MENUITEM "&Depurador", ID_PROCESS_PAGE_DEBUG
MENUITEM SEPARATOR
POPUP "Establecer &Prioridad"
BEGIN
MENUITEM "Tiempo-&Real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
MENUITEM "Tiempo-&Real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
MENUITEM "&Alta", ID_PROCESS_PAGE_SETPRIORITY_HIGH
MENUITEM "Arr&iba de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
MENUITEM "Arr&iba de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
MENUITEM "&Normal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL
MENUITEM "&Debajo de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
MENUITEM "&Debajo de lo Normal", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
MENUITEM "&Baja", ID_PROCESS_PAGE_SETPRIORITY_LOW
MENUITEM "&Baja", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
MENUITEM "Establecer &Afinidad...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Establecer &Afinidad...", ID_PROCESS_PAGE_SETAFFINITY
MENUITEM "Editar &Canales de Depuración...", ID_PROCESS_PAGE_DEBUGCHANNELS
END
END
@ -177,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
@ -186,8 +170,7 @@ CAPTION "Administrador de Tareas"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL
"Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228
CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228
END
IDD_APPLICATION_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210
@ -195,8 +178,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT |
LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP,7,7,233,177
LVS_SHOWSELALWAYS | WS_BORDER |WS_TABSTOP,7,7,233,177
PUSHBUTTON "&Nueva Tarea...",IDC_NEWTASK,187,189,53,14
PUSHBUTTON "&Cambiar A",IDC_SWITCHTO,131,189,53,14,WS_DISABLED
PUSHBUTTON "&Finalizar Tarea",IDC_ENDTASK,75,189,53,14,WS_DISABLED
@ -206,8 +188,7 @@ IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT
|
CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS |
WS_BORDER | WS_TABSTOP,7,7,233,177
PUSHBUTTON "&Finalizar Proceso",IDC_ENDPROCESS,171,189,69,14
@ -251,8 +232,7 @@ BEGIN
ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT |
ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
EDITTEXT
IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT |
EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT |
ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
LTEXT "Total",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8
LTEXT "Paginado",IDS_KERNEL_MEMORY_PAGED,137,184,30,8
@ -265,10 +245,8 @@ IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT |
ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
GROUPBOX "Historial de uso de la CPU",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT
GROUPBOX "Historial de uso de la Memoria",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT
PUSHBUTTON "Display de uso de la CPU",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,
WS_EX_CLIENTEDGE
PUSHBUTTON "Display de uso de la Memoria",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,
WS_EX_CLIENTEDGE
PUSHBUTTON "Display de uso de la CPU",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
PUSHBUTTON "Display de uso de la Memoria",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
PUSHBUTTON "Historial de uso de la CPU",IDC_CPU_USAGE_HISTORY_GRAPH,81,17,
153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
PUSHBUTTON "Historial de uso de la Memoria",IDC_MEM_USAGE_HISTORY_GRAPH,81,75,
@ -281,8 +259,7 @@ CAPTION "Canales de Depuraci
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER |
WS_TABSTOP |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP |
LVS_SORTASCENDING,7,7,233,177
PUSHBUTTON "Cerrar",IDOK,171,189,69,14
END
@ -389,8 +366,7 @@ BEGIN
WS_TABSTOP,7,105,80,10 //53
CONTROL "O&bjetos de USUARIO",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,116,80,10 //62
CONTROL "Lecturas E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX
|
CONTROL "Lecturas E/S",IDC_IOREADS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,127,60,10 //49
CONTROL "Bytes E/S Leidos",IDC_IOREADBYTES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10
@ -610,7 +586,6 @@ BEGIN
ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
"Establece el proceso en prioridad ABAJO DE LO NORMAL"
ID_PROCESS_PAGE_SETPRIORITY_LOW "Establece el proceso en prioridad BAJA"
END // Spanish (SPAIN) resources by Carlos Garcia Gomez

1
base/applications/taskmgr/lang/fr-FR.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/hu-HU.rc
View file

@ -161,6 +161,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/id-ID.rc
View file

@ -159,6 +159,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/it-IT.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/ja-JP.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/ko-KR.rc
View file

@ -163,6 +163,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/nl-NL.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

3
base/applications/taskmgr/lang/no-NO.rc
View file

@ -160,12 +160,13 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "Oppgavebehandler"
CAPTION "Oppgavebehandling"
MENU IDR_TASKMANAGER
FONT 8, "MS Shell Dlg"
BEGIN

1
base/applications/taskmgr/lang/pl-PL.rc
View file

@ -165,6 +165,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

1
base/applications/taskmgr/lang/pt-BR.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

5
base/applications/taskmgr/lang/ro-RO.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
@ -520,8 +521,8 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_APP_TITLE "Gestionar de activități"
IDC_TASKMGR "Gestoinar de activități"
IDS_APP_TITLE "Gestionarul de activități"
IDC_TASKMGR "Gestionarul de activități"
IDS_IDLE_PROCESS "Proces sistem inactiv"
END

1
base/applications/taskmgr/lang/ru-RU.rc
View file

@ -159,6 +159,7 @@ END
//
// Äèàëîãè
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

5
base/applications/taskmgr/lang/sk-SK.rc
View file

@ -159,6 +159,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
@ -521,8 +522,8 @@ END
STRINGTABLE DISCARDABLE
BEGIN
IDS_APP_TITLE "Správca úloh"
IDC_TASKMGR "Správca úloh"
IDS_APP_TITLE "Správca úloh systému"
IDC_TASKMGR "Správca úloh systému"
IDS_IDLE_PROCESS "Procesy systémovej neèinnosti"
END

1
base/applications/taskmgr/lang/sv-SE.rc
View file

@ -177,6 +177,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

47
base/applications/taskmgr/lang/uk-UA.rc
View file

@ -160,6 +160,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
@ -338,65 +339,65 @@ BEGIN
WS_DISABLED | WS_TABSTOP,175,119,41,10
END
IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199
IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 227, 199
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Âèá³ð ñòîâïö³â"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "Òàê",IDOK,84,178,50,14
PUSHBUTTON "ͳ",IDCANCEL,138,178,50,14
LTEXT "Âèáåð³òü ñòîâïö³, ÿê³ ñë³ä â³äîáðàæàòè íà âêëàäö³ Ïðîöåñ äèñïåò÷åðà çàâäàíü.",
DEFPUSHBUTTON "ÎÊ",IDOK,116,178,50,14
PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,170,178,50,14
LTEXT "Âèáåð³òü ñòîâïö³, ÿê³ ñë³ä â³äîáðàæàòè íà âêëàäö³ Ïðîöåñè äèñïåò÷åðà çàâäàíü.",
IDC_STATIC,7,7,181,17
CONTROL "&²ì'ÿ îáðàçó",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX |
WS_DISABLED | WS_TABSTOP,7,28,56,10
CONTROL "²äåíòè&ô. ïðîöåñó (PID)",IDC_PID,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,39,91,10
CONTROL "&Âèêîðèñòàííÿ ÖÏ",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,50,53,10
WS_TABSTOP,7,50,71,10
CONTROL "&×àñ ÖÏ",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,61,48,10
CONTROL "&Ïàì'ÿòü - âèêîðèñòàííÿ",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,72,63,10
WS_TABSTOP,7,72,92,10
CONTROL "Ïàì'ÿòü - çì³&íà",IDC_MEMORYUSAGEDELTA,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10
CONTROL "Ïàì'ÿòü - &ìàêñèìóì",IDC_PEAKMEMORYUSAGE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10
CONTROL "Ï&îìèëîê ñòîð³íêè",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,105,53,10
WS_TABSTOP,7,105,73,10
CONTROL "Î&á'ºêòè USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,116,62,10
CONTROL "ʳëüê³ñòü ÷èòàíü",IDC_IOREADS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,127,49,10
WS_TABSTOP,7,127,68,10
CONTROL "Ïðî÷èòàíî áàéò³â",IDC_IOREADBYTES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10
BS_AUTOCHECKBOX | WS_TABSTOP,7,138,72,10
CONTROL "Êîä ñå&àíñó",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,149,50,10
CONTROL "²ì'&ÿ êîðèñòóâà÷à",IDC_USERNAME,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,160,51,10
WS_TABSTOP,7,160,70,10
CONTROL "Ïîìèëîê &ñòîð³íêè - çì³íà",IDC_PAGEFAULTSDELTA,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10
CONTROL "Îá'ºì â³ðòóàë&üíî¿ ïàì'ÿò³",IDC_VIRTUALMEMORYSIZE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10
BS_AUTOCHECKBOX | WS_TABSTOP,107,39,100,10
CONTROL "Âèâàíòà&æóâàíèé ïóë",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,50,53,10
WS_TABSTOP,107,50,88,10
CONTROL "Íåâèâàíòàæ&óâàíèé ïóë",IDC_NONPAGEDPOOL,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10
BS_AUTOCHECKBOX | WS_TABSTOP,107,61,96,10
CONTROL "Áàçîâè&é ïð³îðèòåò",IDC_BASEPRIORITY,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10
BS_AUTOCHECKBOX | WS_TABSTOP,107,72,75,10
CONTROL "˳÷èëüíèê &äåñêðèïòîð³â",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,83,59,10
WS_TABSTOP,107,83,98,10
CONTROL "&˳÷èëüíèê ïîòîê³â",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,94,59,10
WS_TABSTOP,107,94,79,10
CONTROL "Îá'&ºêòè GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,105,55,10
CONTROL "ʳëüê³ñòü çàïèñ³â",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,116,49,10
WS_TABSTOP,107,116,73,10
CONTROL "Çàïèñàíî áàéò³â",IDC_IOWRITEBYTES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10
BS_AUTOCHECKBOX | WS_TABSTOP,107,127,67,10
CONTROL "²íøèé ââ³ä-âèâ³ä",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,107,138,46,10
CONTROL "²íøèõ áàéò³â ï³ä ÷àñ ââîäó-âèâîäó",IDC_IOOTHERBYTES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10
WS_TABSTOP,107,138,71,10
CONTROL "²íøèõ áàéò³â ïðè ââîä³-âèâîä³",IDC_IOOTHERBYTES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,107,149,114,10
END
@ -522,7 +523,7 @@ STRINGTABLE DISCARDABLE
BEGIN
IDS_APP_TITLE "Äèñïåò÷åð çàâäàíü"
IDC_TASKMGR "Äèñïåò÷åð çàâäàíü"
IDS_IDLE_PROCESS "Íåä³ÿííÿ ñèñòåìè"
IDS_IDLE_PROCESS "Áåçä³ÿëüí³ñòü ñèñòåìè"
END
STRINGTABLE DISCARDABLE

1
base/applications/taskmgr/lang/zh-CN.rc
View file

@ -168,6 +168,7 @@ END
//
// Dialog
//
// TRANSLATORS: CAPTION must be the same as IDS_APP_TITLE to be brought back to focus when already opened
IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246
STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |

4
base/applications/taskmgr/optnmenu.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* optnmenu.cpp
* optnmenu.c
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
*
@ -110,7 +110,7 @@ void TaskManager_OnOptionsShow16BitTasks(void)
/*
* FIXME: Currently this is useless because the
* current implemetation doesn't list the 16-bit
* current implementation doesn't list the 16-bit
* processes. I believe that would require querying
* each ntvdm.exe process for it's children.
*/

2
base/applications/taskmgr/perfdata.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* perfdata.cpp
* perfdata.c
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
*

46
base/applications/taskmgr/perfpage.c
View file

@ -51,11 +51,14 @@ HWND hPerformancePageTotalsHandleCountEdit; /* Total Handles Edit Con
HWND hPerformancePageTotalsProcessCountEdit; /* Total Processes Edit Control */
HWND hPerformancePageTotalsThreadCountEdit; /* 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;
static HANDLE hPerformancePageEvent = NULL; /* When this event becomes signaled then we refresh the performance page */
DWORD WINAPI PerformancePageRefreshThread(void *lpParameter);
void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference, int pos)
@ -94,12 +97,12 @@ void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference,
InvalidateRect(hCntrl, NULL, TRUE);
}
void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference)
static void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference)
{
AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0);
}
void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference)
static void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference)
{
AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0);
}
@ -110,9 +113,6 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
RECT rc;
int nXDifference;
int nYDifference;
#ifdef RUN_PERF_PAGE
HANDLE hRefreshThread = NULL;
#endif
/* HDC hdc; */
/* PAINTSTRUCT ps; */
@ -121,7 +121,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph);
GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph);
#ifdef RUN_PERF_PAGE
CloseHandle(hRefreshThread);
EndLocalThread(&hPerformanceThread, dwPerformanceThread);
#endif
break;
@ -192,7 +192,7 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ;
/* Start our refresh thread */
#ifdef RUN_PERF_PAGE
hRefreshThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL);
hPerformanceThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, &dwPerformanceThread);
#endif
/*
@ -303,9 +303,11 @@ 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 */
SetEvent(hPerformancePageEvent);
PostThreadMessage(dwPerformanceThread, WM_TIMER, 0, 0);
#endif
}
DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
@ -332,35 +334,21 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
WCHAR Text[260];
WCHAR szMemUsage[256];
/* Create the event */
hPerformancePageEvent = CreateEventW(NULL, TRUE, TRUE, NULL);
/* If we couldn't create the event then exit the thread */
if (!hPerformancePageEvent)
return 0;
MSG msg;
LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256);
while (1)
{
DWORD dwWaitVal;
int nBarsUsed1;
int nBarsUsed2;
/* Wait on the event */
dwWaitVal = WaitForSingleObject(hPerformancePageEvent, INFINITE);
/* If the wait failed then the event object must have been */
/* closed and the task manager is exiting so exit this thread */
if (dwWaitVal == WAIT_FAILED)
/* Wait for an the event or application close */
if (GetMessage(&msg, NULL, 0, 0) <= 0)
return 0;
if (dwWaitVal == WAIT_OBJECT_0)
if (msg.message == WM_TIMER)
{
/* Reset our event */
ResetEvent(hPerformancePageEvent);
/*
* Update the commit charge info
*/
@ -449,8 +437,6 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK();
nBarsUsed2 = PhysicalMemoryTotal ? ((PhysicalMemoryAvailable * 100) / PhysicalMemoryTotal) : 0;
GraphCtrl_AppendPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage, 0.0, 0.0);
GraphCtrl_AppendPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2, 0.0, 0.0);
/* PerformancePageMemUsageHistoryGraph.SetRange(0.0, 100.0, 10) ; */
@ -458,7 +444,7 @@ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
InvalidateRect(hPerformancePageCpuUsageHistoryGraph, NULL, FALSE);
}
}
return 0;
return 0;
}
void PerformancePage_OnViewShowKernelTimes(void)

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

@ -40,7 +40,10 @@ HWND hProcessPageShowAllProcessesButton;/* Process Show All Processes checkbox *
static int nProcessPageWidth;
static int nProcessPageHeight;
static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */
#ifdef RUN_PROC_PAGE
static HANDLE hProcessThread = NULL;
static DWORD dwProcessThread;
#endif
int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort);
void AddProcess(ULONG Index);
@ -104,7 +107,6 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
int nXDifference;
int nYDifference;
int cx, cy;
HANDLE hRefreshThread = NULL;
switch (message) {
case WM_INITDIALOG:
@ -139,19 +141,19 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
*/
OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWL_WNDPROC, (LONG_PTR)ProcessListWndProc);
#ifdef RUN_PROC_PAGE
/* Start our refresh thread */
hRefreshThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL);
hProcessThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, &dwProcessThread);
#endif
return TRUE;
case WM_DESTROY:
/* Close the event handle, this will make the */
/* refresh thread exit when the wait fails */
CloseHandle(hProcessPageEvent);
CloseHandle(hRefreshThread);
#ifdef RUN_PROC_PAGE
EndLocalThread(&hProcessThread, dwProcessThread);
#endif
SaveColumnSettings();
break;
case WM_COMMAND:
@ -194,11 +196,9 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
cy = rc.top + nYDifference;
SetWindowPos(hProcessPageShowAllProcessesButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
InvalidateRect(hProcessPageShowAllProcessesButton, NULL, TRUE);
break;
case WM_NOTIFY:
ProcessPageOnNotify(wParam, lParam);
break;
}
@ -372,9 +372,11 @@ void ProcessPageShowContextMenu(DWORD dwProcessId)
void RefreshProcessPage(void)
{
#ifdef RUN_PROC_PAGE
/* Signal the event so that our refresh thread */
/* will wake up and refresh the process page */
SetEvent(hProcessPageEvent);
PostThreadMessage(dwProcessThread, WM_TIMER, 0, 0);
#endif
}
DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
@ -382,34 +384,19 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter)
ULONG OldProcessorUsage = 0;
ULONG OldProcessCount = 0;
WCHAR szCpuUsage[256], szProcesses[256];
/* Create the event */
hProcessPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL);
/* If we couldn't create the event then exit the thread */
if (!hProcessPageEvent)
return 0;
MSG msg;
LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256);
LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256);
while (1) {
DWORD dwWaitVal;
/* Wait on the event */
dwWaitVal = WaitForSingleObject(hProcessPageEvent, INFINITE);
/* If the wait failed then the event object must have been */
/* closed and the task manager is exiting so exit this thread */
if (dwWaitVal == WAIT_FAILED)
/* Wait for an the event or application close */
if (GetMessage(&msg, NULL, 0, 0) <= 0)
return 0;
if (dwWaitVal == WAIT_OBJECT_0) {
if (msg.message == WM_TIMER) {
WCHAR text[260];
/* Reset our event */
ResetEvent(hProcessPageEvent);
UpdateProcesses();
if (IsWindowVisible(hProcessPage))

31
base/applications/taskmgr/taskmgr.c
View file

@ -1,7 +1,7 @@
/*
* ReactOS Task Manager
*
* TaskMgr.c : Defines the entry point for the application.
* taskmgr.c : Defines the entry point for the application.
*
* Copyright (C) 1999 - 2001 Brian Palmer <brianp@reactos.org>
* 2005 Klemens Friedl <frik85@reactos.at>
@ -856,11 +856,6 @@ void TaskManager_OnViewUpdateSpeed(DWORD dwSpeed)
SetUpdateSpeed(hMainWnd);
}
void TaskManager_OnViewRefresh(void)
{
PostMessageW(hMainWnd, WM_TIMER, 0, 0);
}
void TaskManager_OnTabWndSelChange(void)
{
int i;
@ -1012,3 +1007,27 @@ LPWSTR GetLastErrorText(LPWSTR lpszBuf, DWORD dwSize)
}
return lpszBuf;
}
DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread)
{
DWORD dwExitCodeThread = 0;
if (*hThread != NULL) {
PostThreadMessage(dwThread,WM_QUIT,0,0);
for (;;) {
MSG msg;
if (WAIT_OBJECT_0 == WaitForSingleObject(*hThread, 500))
break;
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
GetExitCodeThread(*hThread, &dwExitCodeThread);
CloseHandle(*hThread);
*hThread = NULL;
}
return dwExitCodeThread;
}

2
base/applications/taskmgr/taskmgr.h
View file

@ -116,9 +116,9 @@ void TaskManager_OnEnterMenuLoop(HWND hWnd);
void TaskManager_OnExitMenuLoop(HWND hWnd);
void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu);
void TaskManager_OnViewUpdateSpeed(DWORD);
void TaskManager_OnViewRefresh(void);
void TaskManager_OnTabWndSelChange(void);
LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize );
DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);
#ifdef __cplusplus
}