Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[hpoussin] 28699: Fix build
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 15:38:51 2007 New Revision: 28699 URL: http://svn.reactos.org/svn/reactos?rev=28699&view=rev Log: Fix build Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Aug 31 15:38:51 2007 @@ -216,7 +216,7 @@ @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop @ stub InstallStopEx -@ stdcall IsUserAdmin=shell32.IsUserAnAdmin() +@ stdcall IsUserAdmin() shell32.IsUserAnAdmin @ stub LookUpStringInTable @ stub MemoryInitialize @ stdcall MultiByteToUnicode(str long)

1 0

[greatlrd] 28698: revert back the typo change I did in AddFontResourceExW
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 15:36:44 2007 New Revision: 28698 URL: http://svn.reactos.org/svn/reactos?rev=28698&view=rev Log: revert back the typo change I did in AddFontResourceExW Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Aug 31 15:36:44 2007 @@ -1093,7 +1093,7 @@ { int retVal = 0; - if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + if (fl & (FR_PRIVATE | FR_NOT_ENUM)) { retVal = GdiAddFontResourceW(lpszFilename, fl,0); }

1 0

[greatlrd] 28697: Fix typo in : AddFontResourceExW Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys implement : GetEUDCTimeStamp add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 15:28:45 2007 New Revision: 28697 URL: http://svn.reactos.org/svn/reactos?rev=28697&view=rev Log: Fix typo in : AddFontResourceExW Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys implement : GetEUDCTimeStamp add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/font.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 Fri Aug 31 15:28:45 2007 @@ -286,7 +286,36 @@ GetCharABCWidthsFloatA@16 GetCharABCWidthsFloatW@16 GetCharABCWidthsI@20 - +GetCharABCWidthsW@16 +GetCharWidth32A@16 +GetCharWidth32W@16 +GetCharWidthA@16 +GetCharWidthFloatA@16 +GetCharWidthFloatW@16 +GetCharWidthI@20 +GetCharWidthInfo@8=NtGdiGetCharWidthInfo@8 +GetCharWidthW@16 +GetCharacterPlacementA@24 +GetCharacterPlacementW@24 +GetClipBox@8 +GetClipRgn@8 +GetColorAdjustment@8=NtGdiGetColorAdjustment@8 +GetColorSpace@4 +GetCurrentObject@8 +GetCurrentPositionEx@8 +GetDCBrushColor@4 +GetDCOrgEx@8 +GetDCPenColor@4 +GetDIBColorTable@16 +GetDIBits@28 +GetDeviceCaps@8 +GetDeviceGammaRamp@8 +GetETM@8 +GetEUDCTimeStamp@0 +GetEUDCTimeStampExW@4 +GetEnhMetaFileA@4 +GetEnhMetaFileBits@12 +GetEnhMetaFileDescriptionA@12 ClearBitmapAttributes@8 @@ -350,41 +379,11 @@ GdiDrawStream@12 GetBitmapAttributes@4 GetBrushAttributes@4 -GetCharABCWidthsW@16=NtGdiGetCharABCWidths@16 -GetCharWidth32A@16 -GetCharWidth32W@16=NtGdiGetCharWidth32@16 -GetCharWidthA@16 -GetCharWidthFloatA@16 -GetCharWidthFloatW@16=NtGdiGetCharWidthFloat@16 -GetCharWidthI@20 -GetCharWidthInfo@8 -GetCharWidthW@16 -GetCharacterPlacementA@24 -GetCharacterPlacementW@24 -GetClipBox@8=NtGdiGetClipBox@8 -GetClipRgn@8 -GetColorAdjustment@8 -GetColorSpace@4 -GetCurrentObject@8=NtGdiGetCurrentObject@8 -GetCurrentPositionEx@8=NtGdiGetCurrentPositionEx@8 -GetDCBrushColor@4 -GetDCOrgEx@8 -GetDCPenColor@4 -GetDIBColorTable@16 -GetDIBits@28 -GetDeviceCaps@8=NtGdiGetDeviceCaps@8 -GetDeviceGammaRamp@8 -GetEnhMetaFileA@4 -GetEnhMetaFileBits@12 -GetEnhMetaFileDescriptionA@12 GetEnhMetaFileDescriptionW@12 GetEnhMetaFileHeader@12 GetEnhMetaFilePaletteEntries@12 GetEnhMetaFilePixelFormat@12 GetEnhMetaFileW@4 -GetETM@8 -GetEUDCTimeStamp@0 -GetEUDCTimeStampExW@4 GetFontAssocStatus@4 GetFontData@20=NtGdiGetFontData@20 GetFontLanguageInfo@4 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 Fri Aug 31 15:28:45 2007 @@ -609,20 +609,7 @@ } -/* - * @unimplemented - */ -BOOL -STDCALL -GetColorAdjustment( - HDC hdc, - LPCOLORADJUSTMENT a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} + /* @@ -1435,7 +1422,7 @@ STDCALL GdiConvertFont(HFONT hfont) { - return hfont; + return hfont; } /* @@ -1445,7 +1432,7 @@ STDCALL GdiConvertPalette(HPALETTE hpal) { - return hpal; + return hpal; } /* @@ -1455,7 +1442,7 @@ STDCALL GdiConvertRegion(HRGN hregion) { - return hregion; + return hregion; } /* @@ -1692,15 +1679,13 @@ } /* - * @unimplemented + * @implemented */ ULONG STDCALL GetEUDCTimeStamp(VOID) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiGetEudcTimeStampEx(NULL,0,TRUE); } /* @@ -2002,17 +1987,7 @@ return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -GetCharWidthInfo(HDC hdc,PCHWIDTHINFO pChWidthInfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2840,3 +2815,100 @@ return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF); } +/* + * @implemented + * + */ +int +STDCALL +GetDeviceCaps(HDC hdc, + int i) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetDeviceCaps(hdc,i); +} + + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCurrentPositionEx(HDC hdc, + LPPOINT lpPoint) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCurrentPositionEx(hdc, lpPoint); +} + +/* + * @implemented + * + */ +HGDIOBJ +STDCALL +GetCurrentObject(HDC hdc, + UINT uObjectType) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCurrentObject(hdc, uObjectType); +} + +/* + * @implemented + * + */ +int +STDCALL +GetClipBox(HDC hdc, + LPRECT lprc) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetClipBox(hdc, lprc); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidthFloatW(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + PFLOAT pxBuffer) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharWidth32W(HDC hdc, + UINT iFirstChar, + UINT iLastChar, + LPINT lpBuffer) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +GetCharABCWidths(HDC hdc, + UINT uFirstChar, + UINT uLastChar, + LPABC lpabc) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc); +} Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Aug 31 15:28:45 2007 @@ -1093,7 +1093,7 @@ { int retVal = 0; - if (fl & (FR_PRIVATE | FR_NOT_ENUM)) + if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) { retVal = GdiAddFontResourceW(lpszFilename, fl,0); } @@ -1170,7 +1170,7 @@ STDCALL AddFontResourceW ( LPCWSTR lpszFilename ) { - return GdiAddFontResourceW ( lpszFilename, 0, 0 ); + return GdiAddFontResourceW ( lpszFilename, 0, 0 ); }

1 0

[gedmurphy] 28696: not sure how/why I copied the number instead of the id
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 15:08:26 2007 New Revision: 28696 URL: http://svn.reactos.org/svn/reactos?rev=28696&view=rev Log: not sure how/why I copied the number instead of the id Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Fri Aug 31 15:08:26 2007 @@ -27,7 +27,7 @@ Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; - for (i = IDC_START; i <= 10104; i++) + for (i = IDC_START; i <= IDC_RESUME; i++) { hButton = GetDlgItem(hwndDlg, i); EnableWindow (hButton, FALSE);

1 0

[gedmurphy] 28695: fix controlling a service from the properties dialog and update the listview accordingly
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 15:03:29 2007 New Revision: 28695 URL: http://svn.reactos.org/svn/reactos?rev=28695&view=rev Log: fix controlling a service from the properties dialog and update the listview accordingly Modified: trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/resource.h Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/misc.c (original) +++ trunk/reactos/base/applications/mscutils/servman/misc.c Fri Aug 31 15:03:29 2007 @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/servman/misc.c * PURPOSE: miscallanous functions - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005 Thomas Weidenmueller <w3seek(a)reactos.org> + * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Fri Aug 31 15:03:29 2007 @@ -22,10 +22,17 @@ { HWND hButton; DWORD Flags, State; + UINT i; Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; + for (i = IDC_START; i <= 10104; i++) + { + hButton = GetDlgItem(hwndDlg, i); + EnableWindow (hButton, FALSE); + } + if (State == SERVICE_STOPPED) { hButton = GetDlgItem(hwndDlg, IDC_START); @@ -43,11 +50,37 @@ hButton = GetDlgItem(hwndDlg, IDC_PAUSE); EnableWindow (hButton, TRUE); } - - if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) - { - hButton = GetDlgItem(hwndDlg, IDC_PAUSE); - EnableWindow (hButton, TRUE); +} + + +static VOID +SetServiceStatusText(PSERVICEPROPSHEET dlgInfo, + HWND hwndDlg) +{ + LPTSTR lpStatus; + UINT id; + + if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + id = IDS_SERVICES_STARTED; + } + else + { + id = IDS_SERVICES_STOPPED; + } + + if (AllocAndLoadString(&lpStatus, + hInstance, + id)) + { + SendDlgItemMessage(hwndDlg, + IDC_SERV_STATUS, + WM_SETTEXT, + 0, + (LPARAM)lpStatus); + HeapFree(ProcessHeap, + 0, + lpStatus); } } @@ -159,37 +192,8 @@ /* set startup type */ SetStartupType(dlgInfo->pService->lpServiceName, hwndDlg); - /* set service status */ - if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - TCHAR szServiceStatus[32]; - - LoadString(hInstance, - IDS_SERVICES_STARTED, - szServiceStatus, - _tcslen(szServiceStatus) + 1); - - SendDlgItemMessage(hwndDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)szServiceStatus); - } - else - { - TCHAR szServiceStatus[32]; - - LoadString(hInstance, - IDS_SERVICES_STOPPED, - szServiceStatus, - _tcslen(szServiceStatus) + 1); - - SendDlgItemMessage(hwndDlg, - IDC_SERV_STATUS, - WM_SETTEXT, - 0, - (LPARAM)szServiceStatus); - } + SetServiceStatusText(dlgInfo, + hwndDlg); if (dlgInfo->Info->bIsUserAnAdmin) { @@ -292,22 +296,41 @@ case IDC_START: if (DoStart(dlgInfo->Info)) { - //UpdateServiceStatus(dlgInfo->pService); - //ChangeListViewText(dlgInfo, LVSTATUS); - //SetMenuAndButtonStates(Info); + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); } break; case IDC_STOP: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); + if (DoStop(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_PAUSE: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); + if (DoPause(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_RESUME: - //SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); + if (DoResume(dlgInfo->Info)) + { + UpdateServiceStatus(dlgInfo->pService); + ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); + SetButtonStates(dlgInfo, hwndDlg); + SetServiceStatusText(dlgInfo, hwndDlg); + } break; case IDC_EDIT: @@ -396,36 +419,6 @@ } -static INT CALLBACK -AddEditButton(HWND hwnd, UINT message, LPARAM lParam) -{ - HWND hEditButton; - - switch (message) - { - case PSCB_PRECREATE: - /*hEditButton = CreateWindowEx(0, - WC_BUTTON, - NULL, - WS_CHILD | WS_VISIBLE, - 20, 300, 30, 15, - hwnd, - NULL, - hInstance, - NULL); - if (hEditButton == NULL) - GetError(0);*/ - - hEditButton = GetDlgItem(hwnd, PSBTN_OK); - DestroyWindow(hEditButton); - //SetWindowText(hEditButton, _T("test")); - - return TRUE; - } - return TRUE; -} - - static VOID InitPropSheetPage(PROPSHEETPAGE *psp, PSERVICEPROPSHEET dlgInfo, @@ -459,7 +452,6 @@ psh.pszCaption = Info->pCurrentService->lpDisplayName; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; - psh.pfnCallback = AddEditButton; psh.ppsp = psp; Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h Fri Aug 31 15:03:29 2007 @@ -121,18 +121,18 @@ /* properties dialog */ #define IDD_DLG_GENERAL 10001 -#define IDC_SERV_NAME 10041 -#define IDC_DISP_NAME 10051 -#define IDC_DESCRIPTION 10061 -#define IDC_EXEPATH 10062 -#define IDC_START_TYPE 10101 -#define IDC_SERV_STATUS 10121 -#define IDC_START 10131 -#define IDC_STOP 10141 -#define IDC_PAUSE 10151 -#define IDC_RESUME 10161 -#define IDC_START_PARAM 10191 -#define IDC_EDIT 10192 +#define IDC_SERV_NAME 10002 +#define IDC_DISP_NAME 10003 +#define IDC_DESCRIPTION 10004 +#define IDC_EXEPATH 10005 +#define IDC_START_TYPE 10006 +#define IDC_SERV_STATUS 10007 +#define IDC_START_PARAM 10008 +#define IDC_EDIT 10009 +#define IDC_START 10101 +#define IDC_STOP 10102 +#define IDC_PAUSE 10103 +#define IDC_RESUME 10104 /* dependancies dialog */ #define IDD_DLG_DEPEND 20001

1 0

[dreimer] 28694: Update the German Translation of Ged's Service Manager.
by dreimer＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: dreimer Date: Fri Aug 31 13:54:27 2007 New Revision: 28694 URL: http://svn.reactos.org/svn/reactos?rev=28694&view=rev Log: Update the German Translation of Ged's Service Manager. Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc 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 Fri Aug 31 13:54:27 2007 @@ -211,10 +211,10 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS versucht den folgenden Dienst zu starten" IDS_PROGRESS_INFO_STOP "ReactOS versucht den folgenden Dienst zu beenden" - IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" - IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" - IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt" - IDS_DELETE_SUCCESS "Service Deleted Succesfully" + IDS_PROGRESS_INFO_PAUSE "ReactOS versucht den folgenden Dienst zu pausieren" + IDS_PROGRESS_INFO_RESUME "ReactOS versucht den folgenden Dienst fortzusetzen" + IDS_CREATE_SUCCESS "Der Dienst wurde erfolgreich erstellt" + IDS_DELETE_SUCCESS "Der Dienst wurde erfolgreich gelöscht" IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich" IDS_DELETE_STOP "Sie müssen den Dienst manuell beenden, bevor er gelöscht werden kann!" END

1 0

[hpoussin] 28693: Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 13:49:48 2007 New Revision: 28693 URL: http://svn.reactos.org/svn/reactos?rev=28693&view=rev Log: Implement IsUserAnAdmin(), by copying implementation of IsUserAdmin() in setupapi (was implemented by Eric Kohl) Redirect setupapi.IsUserAdmin to shell32.IsUserAnAdmin Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Fri Aug 31 13:49:48 2007 @@ -135,7 +135,7 @@ if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; - bAdmin = IsUserAdmin(); + bAdmin = IsUserAnAdmin(); for (i = 0; i < 30; i++) { @@ -182,7 +182,7 @@ FIXME("%p %p %lu %lx %p\n", plcLogConf, dnDevInst, Priority, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (plcLogConf == NULL) @@ -298,7 +298,7 @@ TRACE("%p %s %lx %p\n", dnDevInst, debugstr_w(pszID), ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -490,7 +490,7 @@ FIXME("%p %s %p %lx %p\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (pdnDevInst == NULL) @@ -637,7 +637,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -725,7 +725,7 @@ FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) @@ -961,7 +961,7 @@ TRACE("%lx %lx %lx\n", lcLogConfToBeFreed, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; pLogConfInfo = (PLOG_CONF_INFO)lcLogConfToBeFreed; @@ -2707,7 +2707,7 @@ FIXME("%lx %lx %lx %lx\n", dnFromDevInst, dnToDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnFromDevInst == 0 || dnToDevInst == 0) @@ -3051,7 +3051,7 @@ TRACE("%lx %lx\n", ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (ulFlags & ~CM_DETECT_BITS) @@ -3525,7 +3525,7 @@ FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); - if (!IsUserAdmin()) + if (!IsUserAnAdmin()) return CR_ACCESS_DENIED; if (dnDevInst == 0) Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Fri Aug 31 13:49:48 2007 @@ -246,84 +246,6 @@ MyFree(*lpData); return lError; -} - - -/************************************************************************** - * IsUserAdmin [SETUPAPI.@] - * - * Checks whether the current user is a member of the Administrators group. - * - * PARAMS - * None - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI IsUserAdmin(VOID) -{ - SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - HANDLE hToken; - DWORD dwSize; - PTOKEN_GROUPS lpGroups; - PSID lpSid; - DWORD i; - BOOL bResult = FALSE; - - TRACE("\n"); - - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) - { - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) - { - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - CloseHandle(hToken); - return FALSE; - } - } - - lpGroups = MyMalloc(dwSize); - if (lpGroups == NULL) - { - CloseHandle(hToken); - return FALSE; - } - - if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) - { - MyFree(lpGroups); - CloseHandle(hToken); - return FALSE; - } - - CloseHandle(hToken); - - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &lpSid)) - { - MyFree(lpGroups); - return FALSE; - } - - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) - { - bResult = TRUE; - break; - } - } - - FreeSid(lpSid); - MyFree(lpGroups); - - return bResult; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Aug 31 13:49:48 2007 @@ -216,7 +216,7 @@ @ stdcall InstallHinfSectionW(long long wstr long) @ stub InstallStop @ stub InstallStopEx -@ stdcall IsUserAdmin() +@ stdcall IsUserAdmin=shell32.IsUserAnAdmin() @ stub LookUpStringInTable @ stub MemoryInitialize @ stdcall MultiByteToUnicode(str long) Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Fri Aug 31 13:49:48 2007 @@ -1227,10 +1227,78 @@ /************************************************************************* * IsUserAnAdmin [SHELL32.680] NT 4.0 * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE */ BOOL WINAPI IsUserAnAdmin(VOID) -{ FIXME("stub\n"); - return TRUE; +{ + SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; + HANDLE hToken; + DWORD dwSize; + PTOKEN_GROUPS lpGroups; + PSID lpSid; + DWORD i; + BOOL bResult = FALSE; + + TRACE("\n"); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + { + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + CloseHandle(hToken); + return FALSE; + } + } + + lpGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (lpGroups == NULL) + { + CloseHandle(hToken); + return FALSE; + } + + if (!GetTokenInformation(hToken, TokenGroups, lpGroups, dwSize, &dwSize)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + + if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, + &lpSid)) + { + HeapFree(GetProcessHeap(), 0, lpGroups); + return FALSE; + } + + for (i = 0; i < lpGroups->GroupCount; i++) + { + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) + { + bResult = TRUE; + break; + } + } + + FreeSid(lpSid); + HeapFree(GetProcessHeap(), 0, lpGroups); + + return bResult; } /*************************************************************************

1 0

[gedmurphy] 28692: only enable the delete and create service buttons for administrators
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 13:27:11 2007 New Revision: 28692 URL: http://svn.reactos.org/svn/reactos?rev=28692&view=rev Log: only enable the delete and create service buttons for administrators Modified: trunk/reactos/base/applications/mscutils/servman/about.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/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/about.c (original) +++ trunk/reactos/base/applications/mscutils/servman/about.c Fri Aug 31 13:27:11 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/about.c + * FILE: base/applications/mscutils/servman/about.c * PURPOSE: About dialog box message handler - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2005-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -20,28 +20,33 @@ { case WM_INITDIALOG: - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + if (hLicenseEditWnd) + { + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); - LoadString(hInstance, - IDS_LICENSE, - strLicense, - sizeof(strLicense) / sizeof(TCHAR)); - - SetWindowText(hLicenseEditWnd, - strLicense); + SetWindowText(hLicenseEditWnd, + strLicense); + } return TRUE; @@ -49,7 +54,6 @@ if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; 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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Îïðåñíÿâàíå", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Îáðàáîòêà...", ID_EDIT, GRAYED - MENUITEM "Ñúçäàâàíå...", ID_CREATE + MENUITEM "Ñúçäàâàíå...", ID_CREATE, GRAYED MENUITEM "Èçòðèâàíå...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Aktualisieren", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Bearbeiten...", ID_EDIT, GRAYED - MENUITEM "Erstellen...", ID_CREATE + MENUITEM "Erstellen...", ID_CREATE, GRAYED MENUITEM "Löschen...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Eigenschaften...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Dienst-Manager v0.8\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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE + MENUITEM "Create...", ID_CREATE, GRAYED MENUITEM "Delete...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Properties...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\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 Fri Aug 31 13:27:11 2007 @@ -22,7 +22,7 @@ MENUITEM "Rafraîchir", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Éditer...", ID_EDIT, GRAYED - MENUITEM "Créer...", ID_CREATE + MENUITEM "Créer...", ID_CREATE, GRAYED MENUITEM "Supprimer...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Propriétés...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de services v0.8\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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Segarkan", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Buat...", ID_CREATE + MENUITEM "Buat...", ID_CREATE, GRAYED MENUITEM "Hapus...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Properti...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Layanan v0.8\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/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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Aggiorna", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Modifica...", ID_EDIT, GRAYED - MENUITEM "Crea...", ID_CREATE + MENUITEM "Crea...", ID_CREATE, GRAYED MENUITEM "Cancella...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Proprietà...", ID_PROP, GRAYED @@ -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-2007\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestione Servizi v0.8\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 Fri Aug 31 13:27:11 2007 @@ -28,7 +28,7 @@ MENUITEM "Odwie¿", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Edycja...", ID_EDIT, GRAYED - MENUITEM "Utwórz...", ID_CREATE + MENUITEM "Utwórz...", ID_CREATE, GRAYED MENUITEM "Usuñ...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "W³aciwoci...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.8\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 Fri Aug 31 13:27:11 2007 @@ -21,7 +21,7 @@ MENUITEM "Îáíîâèòü", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Èçìåíèòü...", ID_EDIT, GRAYED - MENUITEM "Ñîçäàòü...", ID_CREATE + MENUITEM "Ñîçäàòü...", ID_CREATE, GRAYED MENUITEM "Óäàëèòü...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Ìåíåäæåð ñëóæá v0.8\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 Fri Aug 31 13:27:11 2007 @@ -30,7 +30,7 @@ MENUITEM "¿×é¹¿Ù", ID_REFRESH MENUITEM SEPARATOR MENUITEM "á¡éä¢...", ID_EDIT, GRAYED - MENUITEM "ÊÃéÒ§...", ID_CREATE + MENUITEM "ÊÃéÒ§...", ID_CREATE, GRAYED MENUITEM "Åº...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "¤Ø³ÊÁºÑµÔ...", ID_PROP, GRAYED @@ -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)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "â»Ãá¡ÃÁ¡ÒÃºÃÔ¡ÒÃ¨Ñ´¡ÒÃ ÃØè¹ 0.8\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 Fri Aug 31 13:27:11 2007 @@ -24,7 +24,7 @@ /* Note: First item for a seperator is its width in pixels */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {TBICON_CREATE, ID_CREATE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* create */ + {TBICON_CREATE, ID_CREATE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* create */ {TBICON_DELETE, ID_DELETE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* delete */ {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ @@ -172,10 +172,13 @@ if (Info->SelectedItem != NO_ITEM_SELECTED) { /* allow user to delete service */ - SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); - EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); - EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); + if (Info->bIsUserAnAdmin) + { + SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); + } Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; @@ -350,6 +353,24 @@ 0); Info->bIsUserAnAdmin = IsUserAnAdmin(); + if (Info->bIsUserAnAdmin) + { + HMENU hMainMenu = GetMenu(Info->hMainWnd); + + SendMessage(Info->hTool, + TB_SETSTATE, + ID_CREATE, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + if (hMainMenu) + { + EnableMenuItem(hMainMenu, + ID_CREATE, + MF_ENABLED); + } + EnableMenuItem(Info->hShortcutMenu, + ID_CREATE, + MF_ENABLED); + } return TRUE; }

1 0

[gedmurphy] 28691: - report successful deletion - refresh service list upon creation
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 12:21:47 2007 New Revision: 28691 URL: http://svn.reactos.org/svn/reactos?rev=28691&view=rev Log: - report successful deletion - refresh service list upon creation Modified: trunk/reactos/base/applications/mscutils/servman/delete.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 trunk/reactos/base/applications/mscutils/servman/resource.h Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Fri Aug 31 12:21:47 2007 @@ -29,6 +29,20 @@ { if (DeleteService(hSc)) { + LPTSTR lpSuccess; + + /* report success to user */ + if (AllocAndLoadString(&lpSuccess, + hInstance, + IDS_DELETE_SUCCESS)) + { + DisplayString(lpSuccess); + + HeapFree(ProcessHeap, + 0, + lpSuccess); + } + bRet = TRUE; } 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 Fri Aug 31 12:21:47 2007 @@ -218,6 +218,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Óñëóãàòà å óñïåøíî ñúçäàäåíà" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Ïîëåòàòà, îòáåëÿçàíè ñúñ \nçâåçäè÷êà ñà íåàçàäúëæèòåëíè" IDS_DELETE_STOP "Òðÿáâà ðú÷íî äà ñïðåòå óñëóãàòà, ïðåäè äà ÿ èçòðèåòå!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich" IDS_DELETE_STOP "Sie müssen den Dienst manuell beenden, bevor er gelöscht werden kann!" END 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 Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc Fri Aug 31 12:21:47 2007 @@ -218,6 +218,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS essaye de suspendre le service suivant" IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivant" IDS_CREATE_SUCCESS "Service créé" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Les champs marqués d'une astérisque\nasont obligatoires" IDS_DELETE_STOP "Vous devez arrêter le service avant de le supprimer!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Layanan Dibuat Dengan Sukses" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Field yang ditandai dengan\nbintang adalah mandatori" IDS_DELETE_STOP "Anda harus menghentikan layanan sebelum menghapus!" END 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 Fri Aug 31 12:21:47 2007 @@ -214,6 +214,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Servizio creato regolarmente" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori" IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc Fri Aug 31 12:21:47 2007 @@ -221,6 +221,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Us³uga utworzona pomylnie" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Pole zaznaczone wraz z \ nasterix jest obowi¹zkowy" IDS_DELETE_STOP "Musisz rêcznie zatrzymaæ us³ugê przed usuwaniem!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Aug 31 12:21:47 2007 @@ -213,6 +213,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Ñîçäàíèå ñëóæáû óñïåøíî çàâåðøåíî" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "* = îáÿçàòåëüíûå ïîëÿ" IDS_DELETE_STOP "Âû äîëæíû âðó÷íóþ îñòàíîâèòü ñëóæáó ïåðåä óäàëåíèåì!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc Fri Aug 31 12:21:47 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/lang/th-TH.rc * PURPOSE: Thai resources - * COPYRIGHT: Copyright 2007 Sumath Aowsakulsutthi + * TRANSLATOR: Sumath Aowsakulsutthi * */ @@ -223,6 +223,7 @@ IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_DELETE_SUCCESS "Service Deleted Succesfully" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" 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 (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Fri Aug 31 12:21:47 2007 @@ -400,11 +400,15 @@ case ID_CREATE: { - DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_CREATE), - Info->hMainWnd, - (DLGPROC)CreateDialogProc, - (LPARAM)Info); + INT ret; + + ret = DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_CREATE), + Info->hMainWnd, + (DLGPROC)CreateDialogProc, + (LPARAM)Info); + if (ret == IDOK) + RefreshServiceList(Info); SetFocus(Info->hListView); } Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h Fri Aug 31 12:21:47 2007 @@ -162,6 +162,7 @@ #define IDC_DEL_NAME 9002 #define IDC_DEL_DESC 9003 #define IDS_DELETE_STOP 9010 +#define IDS_DELETE_SUCCESS 9011 /* progress bar */

1 0

[gedmurphy] 28690: make the create service code a little more readable and reliable.
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Fri Aug 31 03:06:12 2007 New Revision: 28690 URL: http://svn.reactos.org/svn/reactos?rev=28690&view=rev Log: make the create service code a little more readable and reliable. Modified: trunk/reactos/base/applications/mscutils/servman/create.c Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Fri Aug 31 03:06:12 2007 @@ -27,196 +27,111 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; - TCHAR Buf[32]; + BOOL bRet = FALSE; /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) - { - GetError(); - return FALSE; - } - - hSc = CreateService(hSCManager, - Data->ServiceName, - Data->DisplayName, - SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, - Data->BinPath, - NULL, - NULL, - NULL, - NULL, - NULL); - - if (hSc == NULL) - { - GetError(); + if (hSCManager) + { + hSc = CreateService(hSCManager, + Data->ServiceName, + Data->DisplayName, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + Data->BinPath, + NULL, + NULL, + NULL, + NULL, + NULL); + + if (hSc) + { + LPTSTR lpSuccess; + + /* Set the service description as CreateService + does not do this for us */ + SetServiceDescription(Data->ServiceName, + Data->Description); + + /* report success to user */ + if (AllocAndLoadString(&lpSuccess, + hInstance, + IDS_CREATE_SUCCESS)) + { + DisplayString(lpSuccess); + + HeapFree(ProcessHeap, + 0, + lpSuccess); + } + + CloseServiceHandle(hSc); + bRet = TRUE; + } + CloseServiceHandle(hSCManager); - return FALSE; - } - - /* Set the service description as CreateService - does not do this for us */ - SetServiceDescription(Data->ServiceName, - Data->Description); - - /* report success to user */ - LoadString(hInstance, - IDS_CREATE_SUCCESS, - Buf, - sizeof(Buf) / sizeof(TCHAR)); - DisplayString(Buf); - - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - - return TRUE; + } + + return bRet; +} + + +static LPTSTR +GetStringFromDialog(PCREATE_DATA Data, + UINT id) +{ + HWND hwnd; + LPTSTR lpString = NULL; + INT iLen = 0; + + hwnd = GetDlgItem(Data->hSelf, + id); + if (hwnd) + { + iLen = GetWindowTextLength(hwnd); + if (iLen) + { + lpString = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + (iLen + 1) * sizeof(TCHAR)); + if (lpString) + { + GetWindowText(hwnd, + lpString, + iLen + 1); + } + } + } + + return lpString; } static BOOL GetDataFromDialog(PCREATE_DATA Data) { - HWND hwnd; - TCHAR Buf[64]; - INT iLen = 0; - - /* get service name */ - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_SERVNAME); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->ServiceName = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->ServiceName != NULL) - { - GetWindowText(hwnd, - Data->ServiceName, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get display name */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_DISPNAME); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->DisplayName = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->DisplayName != NULL) - { - GetWindowText(hwnd, - Data->DisplayName, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get binary path */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_PATH); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->BinPath = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->BinPath != NULL) - { - GetWindowText(hwnd, - Data->BinPath, - iLen+1); - } - else - return FALSE; - } - else - { - LoadString(hInstance, - IDS_CREATE_REQ, - Buf, - sizeof(Buf)); - DisplayString(Buf); - SetFocus(hwnd); - return FALSE; - } - - /* get description */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_DESC); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->Description = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->Description != NULL) - { - GetWindowText(hwnd, - Data->Description, - iLen+1); - } - else - return FALSE; - } - - - /* get options */ - iLen = 0; - hwnd = GetDlgItem(Data->hSelf, - IDC_CREATE_PATH); - iLen = GetWindowTextLength(hwnd); - if (iLen != 0) - { - Data->Options = (TCHAR*) HeapAlloc(ProcessHeap, - 0, - (iLen+1) * sizeof(TCHAR)); - if (Data->Options != NULL) - { - GetWindowText(hwnd, - Data->Options, - iLen+1); - } - else - return FALSE; - } - - return TRUE; + BOOL bRet = FALSE; + + if ((Data->ServiceName = GetStringFromDialog(Data, IDC_CREATE_SERVNAME))) + { + if ((Data->DisplayName = GetStringFromDialog(Data, IDC_CREATE_DISPNAME))) + { + if ((Data->BinPath = GetStringFromDialog(Data, IDC_CREATE_PATH))) + { + Data->Description = GetStringFromDialog(Data, IDC_CREATE_DESC); + Data->Options = GetStringFromDialog(Data, IDC_CREATE_OPTIONS); + + bRet = TRUE; + } + } + } + + return bRet; } static VOID

1 0

← Newer
1
2
3
4
5
6
7
...
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