Author: dgorbachev
Date: Wed Sep 30 22:59:21 2009
New Revision: 43245
URL:
http://svn.reactos.org/svn/reactos?rev=43245&view=rev
Log:
Patch by Viliam Lejcik (lejcik =at= gmail com). Fixes bug #4858. With the blessing of Ged
Murphy.
Modified:
trunk/reactos/base/applications/mscutils/servman/dependencies.c
trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc
trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc
trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc
trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc
trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc
trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc
trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc
trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc
trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc
trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc
trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc
trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc
trunk/reactos/base/applications/mscutils/servman/mainwnd.c
Modified: trunk/reactos/base/applications/mscutils/servman/dependencies.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] Wed Sep
30 22:59:21 2009
@@ -88,7 +88,7 @@
DWORD dwCount;
if (EnumDependentServices(hService,
- SERVICE_ACTIVE,
+ SERVICE_STATE_ALL,
NULL,
0,
&dwBytesNeeded,
@@ -108,7 +108,7 @@
if (lpDependencies)
{
if (EnumDependentServices(hService,
- SERVICE_ACTIVE,
+ SERVICE_STATE_ALL,
lpDependencies,
dwBytesNeeded,
&dwBytesNeeded,
@@ -141,7 +141,7 @@
if (hService)
{
if (!EnumDependentServices(hService,
- SERVICE_ACTIVE,
+ SERVICE_STATE_ALL,
NULL,
0,
&dwBytesNeeded,
Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -194,6 +194,8 @@
BEGIN
/* IDS_NUM_SERVICES "Num Services: %d" */
IDS_NUM_SERVICES "Áðîé óñëóãè: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -191,6 +191,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Anzahl der Dienste: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od.
ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software
Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere
Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.\r\n\r\nYou should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -191,6 +191,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Num Services: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -191,6 +191,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Núm Servicios: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -195,6 +195,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Services: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer
et/ou le modifier tout en respectant les termes de la ""GNU General Public
License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon
votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans
l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE; sans même
une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ A UNE UTILISATION PARTICULIÈRE.
\r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir
reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est
pas le cas, écrivez à la Free Software Foundation Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -191,6 +191,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Jumlah Layanan: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan
dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh
Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi
berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi
TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN
UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih
jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan
dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -194,6 +194,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "¸ðµç ¼ºñ½º: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -191,6 +191,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Num tjeneste: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det
og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free
Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere
versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET
ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN
ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha
motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke
har motatt det, skriv til Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
02139, USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -198,6 +198,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Numer us³ugi: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; mo¿esz go rozprowadzaæ
dalej i/lub modyfikowaæ na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez
Fundacjê Wolnego Oprogramowania - wed³ug wersji 2 tej Licencji lub (wed³ug Twojego wyboru)
której z póniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej¹,
i¿ bêdzie on u¿yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domylnej gwarancji
PRZYDATNOCI HANDLOWEJ albo PRZYDATNOCI DO OKRELONYCH ZASTOSOWAÑ. W celu uzyskania
bli¿szych informacji siêgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnoci¹
wraz z niniejszym programem otrzyma³e te¿ egzemplarz Powszechnej Licencji Publicznej GNU
(GNU General Public License); jeli nie - napisz do Free Software Foundation, Inc., 59
Temple Place, Fifth Floor, Boston, MA 02110-1301 USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -190,6 +190,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Íîìåð ñëóæáû: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; Âû ìîæåòå
ðàñïðîñòðàíÿòü è/èëè èçìåíÿòü åå â ñîîòâåòñòâèè ñ ëèöåíçèåé GNU General Public License
âåðñèè 2 èëè áîëåå ïîçäíåé, îïóáëèêîâàííîé Free Software Foundation.\r\n\r\nÝòà ïðîãðàììà
ðàñïðîñòðàíÿåòñÿ ñ íàäåæäîé, ÷òî îíà ìîæåò áûòü ïîëåçíà, íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; íå
ïîäðàçóìåâàåòñÿ äàæå ÐÀÁÎÒÎÑÏÎÑÎÁÍÎÑÒÜ èëè ÏÐÈÃÎÄÍÎÑÒÜ ÄËß ÂÛÏÎËÍÅÍÈß ÍÅÎÁÕÎÄÈÌÛÕ ÇÀÄÀ×.
Ñì. GNU General Public License äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíûõ ñâåäåíèé.\r\n\r\nÂû äîëæíû
ïîëó÷èòü êîïèþ ëèöåíçèè GNU âìåñòå ñ ýòîé ïðîãðàììîé, â ïðîòèâíîì ñëó÷àå îáðàùàéòåñü â
Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -210,6 +210,7 @@
BEGIN
IDS_NUM_SERVICES "Poèet sluieb: %d"
IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<iadne závislosti>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -200,6 +200,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Num Services: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -199,6 +199,8 @@
STRINGTABLE DISCARDABLE
BEGIN
IDS_NUM_SERVICES "Íîìåð ñëóæáè: %d"
+ IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
+ IDS_NO_DEPENDS "<No Dependencies>"
IDS_LICENSE "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.\r\n\r\nThis program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou
should have received a copy of the GNU General Public License along with this program; if
not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
USA."
END
Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Wed Sep 30
22:59:21 2009
@@ -643,11 +643,14 @@
if (!InitMainWnd(Info))
return -1;
+ /* Fill the list-view before showing the main window */
+ RefreshServiceList(Info);
+
/* Show the window */
ShowWindow(hwnd,
Info->nCmdShow);
- RefreshServiceList(Info);
+ SetFocus(Info->hListView);
}
break;
@@ -683,6 +686,16 @@
}
//OpenPropSheet(Info);
+ }
+ break;
+
+ case NM_RETURN:
+ {
+ SendMessage(hwnd,
+ WM_COMMAND,
+ //ID_PROP,
+ MAKEWPARAM((WORD)ID_PROP, (WORD)0),
+ 0);
}
break;