ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- implement restarting of services

Browse Source 
- update the main interface to reflect the state of the service after an attempt to change it's status

svn path=/trunk/; revision=28549
This commit is contained in:
Ged Murphy
2007-08-25 15:51:55 +00:00
parent 8ec5ae847a
commit b0f23f18e1
11 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/mscutils/servman/control.c
-3
View File
@@ -140,7 +140,6 @@ BOOL DoStop(PMAIN_WND_INFO Info)
hProgDlg = CreateProgressDialog(Info->hMainWnd,
Info->CurrentService->lpServiceName,
IDS_PROGRESS_INFO_STOP);
if (hProgDlg)
{
ret = Control(Info,
@@ -161,7 +160,6 @@ BOOL DoPause(PMAIN_WND_INFO Info)
hProgDlg = CreateProgressDialog(Info->hMainWnd,
Info->CurrentService->lpServiceName,
IDS_PROGRESS_INFO_PAUSE);
if (hProgDlg)
{
ret = Control(Info,
@@ -182,7 +180,6 @@ BOOL DoResume(PMAIN_WND_INFO Info)
hProgDlg = CreateProgressDialog(Info->hMainWnd,
Info->CurrentService->lpServiceName,
IDS_PROGRESS_INFO_RESUME);
if (hProgDlg)
{
ret = Control(Info,
reactos/base/applications/mscutils/servman/lang/bg-BG.rc
+1 -1
View File
@@ -68,7 +68,7 @@ CAPTION "
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/de-DE.rc
+1 -1
View File
@@ -68,7 +68,7 @@ CAPTION "Info
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/en-US.rc
+1 -1
View File
@@ -68,7 +68,7 @@ CAPTION "About Service Manager"
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/fr-FR.rc
+1 -1
View File
@@ -69,7 +69,7 @@ CAPTION "
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/id-ID.rc
+1 -1
View File
@@ -68,7 +68,7 @@ CAPTION "Tentang Manajer Layanan"
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2006\noleh Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2007\noleh Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/it-IT.rc
+1 -1
View File
@@ -68,7 +68,7 @@ CAPTION "Informazioni su Gestione Servizi"
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/pl-PL.rc
+1 -1
View File
@@ -75,7 +75,7 @@ CAPTION "Service Manager - informacje"
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/ru-RU.rc
+1 -1
View File
@@ -67,7 +67,7 @@ CAPTION "
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2006\nîò Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 30
LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2007\nîò Ged Murphy ([email protected])", IDC_STATIC, 48, 7, 130, 30
PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/lang/th-TH.rc
+1 -1
View File
@@ -77,7 +77,7 @@ CAPTION "
FONT 8, "MS Shell Dlg",0,0
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
BEGIN
LTEXT "â»Ãá¡ÃÁ¡ÒúÃÔ¡ÒèѴ¡Òà ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2006\nâ´Â à¡é´ àÁÍÃì¿Õè ([email protected])", IDC_STATIC, 48, 7, 130, 26
LTEXT "â»Ãá¡ÃÁ¡ÒúÃÔ¡ÒèѴ¡Òà ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè ([email protected])", IDC_STATIC, 48, 7, 130, 26
PUSHBUTTON "»Ô´", IDOK, 75, 162, 44, 15
ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
reactos/base/applications/mscutils/servman/mainwnd.c
+55 -11
View File
@@ -639,13 +639,48 @@ MainWndCommand(PMAIN_WND_INFO Info,
case ID_START:
{
if (DoStart(Info))
{
LVITEM item;
TCHAR szStatus[64];
TCHAR buf[25];
LoadString(hInstance,
IDS_SERVICES_STARTED,
szStatus,
sizeof(szStatus) / sizeof(TCHAR));
item.pszText = szStatus;
item.iItem = Info->SelectedItem;
item.iSubItem = 2;
SendMessage(Info->hListView,
LVM_SETITEMTEXT,
item.iItem,
(LPARAM) &item);
Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_RUNNING;
SetMenuAndButtonStates(Info);
SetFocus(Info->hListView);
}
}
break;
case ID_STOP:
if (DoStop(Info))
{
LVITEM item;
TCHAR buf[25];
item.pszText = 0;
item.iItem = Info->SelectedItem;
item.iSubItem = 2;
SendMessage(Info->hListView,
LVM_SETITEMTEXT,
item.iItem,
(LPARAM) &item);
Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED;
SetMenuAndButtonStates(Info);
SetFocus(Info->hListView);
}
break;
case ID_PAUSE:
@@ -657,17 +692,26 @@ MainWndCommand(PMAIN_WND_INFO Info,
break;
case ID_RESTART:
{
/* FIXME: remove this hack */
SendMessage(Info->hMainWnd,
WM_COMMAND,
0,
ID_STOP);
SendMessage(Info->hMainWnd,
WM_COMMAND,
0,
ID_START);
}
if (DoStop(Info))
{
if(!DoStart(Info))
{
LVITEM item;
TCHAR buf[25];
item.pszText = 0;
item.iItem = Info->SelectedItem;
item.iSubItem = 2;
SendMessage(Info->hListView,
LVM_SETITEMTEXT,
item.iItem,
(LPARAM) &item);
Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED;
SetMenuAndButtonStates(Info);
SetFocus(Info->hListView);
}
}
break;
case ID_HELP: