Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[janderwald] 28558: - fix typo
by janderwald＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: janderwald Date: Sat Aug 25 22:40:23 2007 New Revision: 28558 URL: http://svn.reactos.org/svn/reactos?rev=28558&view=rev Log: - fix typo Modified: trunk/reactos/dll/win32/gdi32/gdi32.def Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 22:40:23 2007 @@ -205,7 +205,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -EngUnlockSurface@4=NtGdiEngLockSurface@4 +EngUnlockSurface@4=NtGdiEngUnlockSurface@4 EngWideCharToMultiByte@20 EnumEnhMetaFile@20 EnumFontFamiliesA@16

1 0

[janderwald] 28557: -fix build some broke
by janderwald＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: janderwald Date: Sat Aug 25 22:35:14 2007 New Revision: 28557 URL: http://svn.reactos.org/svn/reactos?rev=28557&view=rev Log: -fix build some broke Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Sat Aug 25 22:35:14 2007 @@ -563,7 +563,7 @@ * @implemented */ VOID STDCALL -NtGdiEngUnLockSurface(IN SURFOBJ *Surface) +NtGdiEngUnlockSurface(IN SURFOBJ *Surface) { EngUnlockSurface(Surface); }

1 0

[dreimer] 28556: Some fixes in my translation to let the text better fit.
by dreimer＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: dreimer Date: Sat Aug 25 21:38:23 2007 New Revision: 28556 URL: http://svn.reactos.org/svn/reactos?rev=28556&view=rev Log: Some fixes in my translation to let the text better fit. Modified: trunk/rosapps/magnify/lang/de-DE.rc Modified: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc (original) +++ trunk/rosapps/magnify/lang/de-DE.rc Sat Aug 25 21:38:23 2007 @@ -30,12 +30,12 @@ IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Bildschirm-Lupe Einstellungen" +CAPTION "Einstellungen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Beenden",IDOK,96,161,50,14 PUSHBUTTON "Hilfe",IDOK,38,161,50,14 - LTEXT "Vergrößerungsfaktor:",IDC_STATIC,6,12,68,8 + LTEXT "Vergrößerungsgrad:",IDC_STATIC,6,12,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Folgen",IDC_STATIC,7,25,139,59 GROUPBOX "Präsentation",IDC_STATIC,7,87,139,57

1 0

[greatlrd] 28555: implement EngUnlockSurface
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:36:45 2007 New Revision: 28555 URL: http://svn.reactos.org/svn/reactos?rev=28555&view=rev Log: implement EngUnlockSurface Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 25 21:36:45 2007 @@ -205,7 +205,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -EngUnlockSurface@4 +EngUnlockSurface@4=NtGdiEngLockSurface@4 EngWideCharToMultiByte@20 EnumEnhMetaFile@20 EnumFontFamiliesA@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 21:36:45 2007 @@ -2503,15 +2503,6 @@ return NtGdiEllipse(hdc,nLeftRect,nTopRect,nRightRect,nBottomRect); } -/* - * @unimplemented - */ -VOID STDCALL -EngUnlockSurface(SURFOBJ *pso) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} /* * @unimplemented

1 0

[greatlrd] 28554: implement NtGdiEngLockSurface (not tested)
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:34:03 2007 New Revision: 28554 URL: http://svn.reactos.org/svn/reactos?rev=28554&view=rev Log: implement NtGdiEngLockSurface (not tested) Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Sat Aug 25 21:34:03 2007 @@ -558,6 +558,16 @@ return NULL; } + +/* + * @implemented + */ +VOID STDCALL +NtGdiEngUnLockSurface(IN SURFOBJ *Surface) +{ + EngUnlockSurface(Surface); +} + /* * @implemented */ @@ -567,4 +577,6 @@ if (Surface != NULL) GDIOBJ_UnlockObjByPtr(GdiHandleTable, Surface); } + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Aug 25 21:34:03 2007 @@ -615,7 +615,7 @@ NtGdiEngDeletePalette 1 NtGdiEngDeleteSurface 1 NtGdiEngEraseSurface 3 -# NtGdiEngUnlockSurface 1 +NtGdiEngUnlockSurface 1 NtGdiEngLockSurface 1 NtGdiEngBitBlt 11 NtGdiEngStretchBlt 11

1 0

[cfinck] 28553: - Hardcode the Window Class string, there is no reason for it to be in localized resource files - Remove duplicate header inclusions
by cfinck＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: cfinck Date: Sat Aug 25 21:24:27 2007 New Revision: 28553 URL: http://svn.reactos.org/svn/reactos?rev=28553&view=rev Log: - Hardcode the Window Class string, there is no reason for it to be in localized resource files - Remove duplicate header inclusions Modified: trunk/rosapps/magnify/lang/de-DE.rc trunk/rosapps/magnify/lang/en-US.rc trunk/rosapps/magnify/lang/fr-FR.rc trunk/rosapps/magnify/lang/uk-UA.rc trunk/rosapps/magnify/magnifier.c Modified: trunk/rosapps/magnify/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/de-DE.rc (original) +++ trunk/rosapps/magnify/lang/de-DE.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Bildschirm-Lupe" - IDC_MAGNIFIER "BILDSCHIRM-LUPE" END Modified: trunk/rosapps/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/en-US.rc (original) +++ trunk/rosapps/magnify/lang/en-US.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Magnifier" - IDC_MAGNIFIER "MAGNIFIER" END Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc Sat Aug 25 21:24:27 2007 @@ -61,5 +61,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Loupe" - IDC_MAGNIFIER "LOUPE" END Modified: trunk/rosapps/magnify/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/uk-UA.rc (original) +++ trunk/rosapps/magnify/lang/uk-UA.rc Sat Aug 25 21:24:27 2007 @@ -69,5 +69,4 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Åêðàííà ëóïà" - IDC_MAGNIFIER "MAGNIFIER" END Modified: trunk/rosapps/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/magnifier.c?rev=28… ============================================================================== --- trunk/rosapps/magnify/magnifier.c (original) +++ trunk/rosapps/magnify/magnifier.c Sat Aug 25 21:24:27 2007 @@ -8,14 +8,11 @@ */ #include <windows.h> -//#include <stdio.h> #include <shellapi.h> - -#include "shellapi.h" -#include "windows.h" - #include "magnifier.h" #include "resource.h" + +const TCHAR szWindowClass[] = TEXT("MAGNIFIER"); #define MAX_LOADSTRING 100 @@ -24,7 +21,6 @@ HWND hMainWnd; TCHAR szTitle[MAX_LOADSTRING]; // The title bar text -TCHAR szWindowClass[MAX_LOADSTRING]; // the main window class name #define REPAINT_SPEED 100 @@ -57,7 +53,6 @@ // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadString(hInstance, IDC_MAGNIFIER, szWindowClass, MAX_LOADSTRING); MyRegisterClass(hInstance); // Perform application initialization:

1 0

[greatlrd] 28552: partly implement EngComputeGlyphSet in eng.c move EngMultiByteToWideChar, EngQueryLocalTime, EngReleaseSemaphore from stub.c to eng.c start implement of EngQueryEMFInfo need bit more figout how it is done
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:12:59 2007 New Revision: 28552 URL: http://svn.reactos.org/svn/reactos?rev=28552&view=rev Log: partly implement EngComputeGlyphSet in eng.c move EngMultiByteToWideChar, EngQueryLocalTime, EngReleaseSemaphore from stub.c to eng.c start implement of EngQueryEMFInfo need bit more figout how it is done Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/eng.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Aug 25 21:12:59 2007 @@ -2446,16 +2446,7 @@ } -/* - * @unimplemented - */ -FD_GLYPHSET* STDCALL -EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2468,58 +2459,33 @@ return 0; } - -/* - * @implemented - */ -INT STDCALL -EngMultiByteToWideChar(UINT CodePage, - LPWSTR WideCharString, - INT BytesInWideCharString, - LPSTR MultiByteString, - INT BytesInMultiByteString) -{ - return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); -} - -/* - * @implemented - * Obsolete GDI Function - * http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm +/* + * @unimplemented + * wrong info it is not Obsolete GDI Function as http://www.osronline.com/DDKx/graphics/gdioview_20tj.htm say */ BOOL STDCALL EngQueryEMFInfo(HDEV hdev,EMFINFO *pEMFInfo) { - return FALSE; -} - -/* - * @implemented - */ -VOID STDCALL -EngQueryLocalTime(PENG_TIME_FIELDS etf) -{ - SYSTEMTIME SystemTime; - GetLocalTime( &SystemTime ); - etf->usYear = SystemTime.wYear; - etf->usMonth = SystemTime.wMonth; - etf->usWeekday = SystemTime.wDayOfWeek; - etf->usDay = SystemTime.wDay; - etf->usHour = SystemTime.wHour; - etf->usMinute = SystemTime.wMinute; - etf->usSecond = SystemTime.wSecond; - etf->usMilliseconds = SystemTime.wMilliseconds; -} - -/* - * @implemented - */ -VOID -STDCALL -EngReleaseSemaphore ( IN HSEMAPHORE hsem ) -{ - RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); -} +#if 0 + BOOL retValue = FALSE; + DHPDEV Dhpdev; + + if ((!hdev) && (!pEMFInfo)) + { + if ((Dhpdev = NtGdiGetDhpdev(hdev))) + { + /* FIXME check if it support or if it is pEMFInfo we got */ + /* FIXME copy the data from Dhpdev to pEMFInfo */ + } + } + return retValue; +#else + return FALSE; +#endif +} + + + /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c Sat Aug 25 21:12:59 2007 @@ -118,4 +118,88 @@ return LoadLibraryExW ( pwsz, NULL, LOAD_LIBRARY_AS_DATAFILE); } - +/* + * @implemented + */ +INT STDCALL +EngMultiByteToWideChar(UINT CodePage, + LPWSTR WideCharString, + INT BytesInWideCharString, + LPSTR MultiByteString, + INT BytesInMultiByteString) +{ + return MultiByteToWideChar(CodePage,0,MultiByteString,BytesInMultiByteString,WideCharString,BytesInWideCharString / sizeof(WCHAR)); +} + +/* + * @implemented + */ +VOID STDCALL +EngQueryLocalTime(PENG_TIME_FIELDS etf) +{ + SYSTEMTIME SystemTime; + GetLocalTime( &SystemTime ); + etf->usYear = SystemTime.wYear; + etf->usMonth = SystemTime.wMonth; + etf->usWeekday = SystemTime.wDayOfWeek; + etf->usDay = SystemTime.wDay; + etf->usHour = SystemTime.wHour; + etf->usMinute = SystemTime.wMinute; + etf->usSecond = SystemTime.wSecond; + etf->usMilliseconds = SystemTime.wMilliseconds; +} + +/* + * @implemented + */ +VOID +STDCALL +EngReleaseSemaphore ( IN HSEMAPHORE hsem ) +{ + RtlLeaveCriticalSection( (PRTL_CRITICAL_SECTION) hsem); +} + +BOOL +copy_my_glyphset( FD_GLYPHSET *dst_glyphset , FD_GLYPHSET * src_glyphset, ULONG Size) +{ + BOOL retValue = FALSE; + + memcpy(src_glyphset, dst_glyphset, Size); + if (src_glyphset->cRuns == 0) + { + retValue = TRUE; + } + + /* FIXME copy wrun */ + return retValue; +} + +/* + * @unimplemented + */ +FD_GLYPHSET* STDCALL +EngComputeGlyphSet(INT nCodePage,INT nFirstChar,INT cChars) +{ + FD_GLYPHSET * ntfd_glyphset; + FD_GLYPHSET * myfd_glyphset = NULL; + + ntfd_glyphset = NtGdiEngComputeGlyphSet(nCodePage,nFirstChar,cChars); + + if (!ntfd_glyphset) + { + if (ntfd_glyphset->cjThis) + { + myfd_glyphset = GlobalAlloc(0,ntfd_glyphset->cjThis); + + if (!myfd_glyphset) + { + if (copy_my_glyphset(myfd_glyphset,ntfd_glyphset,ntfd_glyphset->cjThis) == FALSE) + { + GlobalFree(myfd_glyphset); + myfd_glyphset = NULL; + } + } + } + } + return myfd_glyphset; +}

1 0

[greatlrd] 28551: implement stub for NtGdiEngComputeGlyphSet
by greatlrd＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: greatlrd Date: Sat Aug 25 21:09:10 2007 New Revision: 28551 URL: http://svn.reactos.org/svn/reactos?rev=28551&view=rev Log: implement stub for NtGdiEngComputeGlyphSet Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Aug 25 21:09:10 2007 @@ -1666,4 +1666,13 @@ return FALSE; } - +FD_GLYPHSET* STDCALL +NtGdiEngComputeGlyphSet( INT nCodePage, + INT nFirstChar, + INT cChars) +{ + UNIMPLEMENTED; + return NULL; +} + + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Aug 25 21:09:10 2007 @@ -610,7 +610,7 @@ NtGdiEngCreateDeviceSurface 4 NtGdiEngCreateDeviceBitmap 4 NtGdiEngCreatePalette 6 -# NtGdiEngComputeGlyphSet 3 +NtGdiEngComputeGlyphSet 3 NtGdiEngCopyBits 6 NtGdiEngDeletePalette 1 NtGdiEngDeleteSurface 1

1 0

[gedmurphy] 28550: fix the contact address
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 19:57:27 2007 New Revision: 28550 URL: http://svn.reactos.org/svn/reactos?rev=28550&view=rev Log: fix the contact address Modified: 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/en-US.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/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Sat Aug 25 19:57:27 2007 @@ -68,7 +68,7 @@ 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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Sat Aug 25 19:57:27 2007 @@ -68,7 +68,7 @@ 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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", 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 Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Sat Aug 25 19:57:27 2007 @@ -68,7 +68,7 @@ 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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Sat Aug 25 19:57:27 2007 @@ -69,7 +69,7 @@ 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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Sat Aug 25 19:57:27 2007 @@ -68,7 +68,7 @@ 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-2007\noleh Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Sat Aug 25 19:57:27 2007 @@ -75,7 +75,7 @@ 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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Sat Aug 25 19:57:27 2007 @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Sat Aug 25 19:57:27 2007 @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)reactos.org)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Sat Aug 25 19:57:27 2007 @@ -642,7 +642,6 @@ { LVITEM item; TCHAR szStatus[64]; - TCHAR buf[25]; LoadString(hInstance, IDS_SERVICES_STARTED, @@ -667,7 +666,6 @@ if (DoStop(Info)) { LVITEM item; - TCHAR buf[25]; item.pszText = 0; item.iItem = Info->SelectedItem; @@ -697,7 +695,6 @@ if(!DoStart(Info)) { LVITEM item; - TCHAR buf[25]; item.pszText = 0; item.iItem = Info->SelectedItem;

1 0

[gedmurphy] 28549: - implement restarting of services - update the main interface to reflect the state of the service after an attempt to change it's status
by gedmurphy＠svn.reactos.org 25 Aug '07

25 Aug '07

Author: gedmurphy Date: Sat Aug 25 19:51:55 2007 New Revision: 28549 URL: http://svn.reactos.org/svn/reactos?rev=28549&view=rev Log: - implement restarting of services - update the main interface to reflect the state of the service after an attempt to change it's status Modified: trunk/reactos/base/applications/mscutils/servman/control.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/en-US.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/it-IT.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/th-TH.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c Sat Aug 25 19:51:55 2007 @@ -140,7 +140,6 @@ hProgDlg = CreateProgressDialog(Info->hMainWnd, Info->CurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); - if (hProgDlg) { ret = Control(Info, @@ -161,7 +160,6 @@ hProgDlg = CreateProgressDialog(Info->hMainWnd, Info->CurrentService->lpServiceName, IDS_PROGRESS_INFO_PAUSE); - if (hProgDlg) { ret = Control(Info, @@ -182,7 +180,6 @@ hProgDlg = CreateProgressDialog(Info->hMainWnd, Info->CurrentService->lpServiceName, IDS_PROGRESS_INFO_RESUME); - if (hProgDlg) { ret = Control(Info, 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Sat Aug 25 19:51:55 2007 @@ -68,7 +68,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Sat Aug 25 19:51:55 2007 @@ -68,7 +68,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc Sat Aug 25 19:51:55 2007 @@ -68,7 +68,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Sat Aug 25 19:51:55 2007 @@ -69,7 +69,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Sat Aug 25 19:51:55 2007 @@ -68,7 +68,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy(a)gmail.com)", 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 Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc Sat Aug 25 19:51:55 2007 @@ -68,7 +68,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Sat Aug 25 19:51:55 2007 @@ -75,7 +75,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Sat Aug 25 19:51:55 2007 @@ -67,7 +67,7 @@ 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 (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Ìåíåäæåð ñëóæá v0.5\nCopyright (C) 2005-2007\nîò Ged Murphy (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Sat Aug 25 19:51:55 2007 @@ -77,7 +77,7 @@ 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â´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.5.1\nÅÔ¢ÊÔ·¸Ôì (C) 2005-2007\nâ´Â à¡é´ àÁÍÃì¿Õè (gedmurphy(a)gmail.com)", 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 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Sat Aug 25 19:51:55 2007 @@ -639,13 +639,48 @@ 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 @@ 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:

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007