Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[janderwald] 28659: - check if qemu-img exists for attempting to create hdd image

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 30 02:09:07 2007 New Revision: 28659 URL: http://svn.reactos.org/svn/reactos?rev=28659&view=rev Log: - check if qemu-img exists for attempting to create hdd image Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Aug 30 02:09:07 2007 @@ -155,6 +155,13 @@ NULL }; + if (!isFileExisting(qemuimgdir)) + { + cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img" << endl; + return false; + } + + getDefaultHDDImage(output); options[1] = (TCHAR*)output.c_str();

17 years, 3 months

[janderwald] 28658: - add options required for sysreg

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 30 01:10:42 2007 New Revision: 28658 URL: http://svn.reactos.org/svn/reactos?rev=28658&view=rev Log: - add options required for sysreg Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Thu Aug 30 01:10:42 2007 @@ -45,6 +45,8 @@ ; yes - disabled ; no - enabled DisableVmwInst = yes +LocaleID = 407 +BootCDRegTestActive = 1 ; enable this section to automatically launch programs ; after 3rd boot

17 years, 3 months

[janderwald] 28657: - fix 2 bugs in unattend setup - add option to start dbgprint.exe on 3rd boot when unattend key BootCDRegtestActive key is found (this makes sysreg detect that the 3rd boot has completed successfully)

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 30 01:10:05 2007 New Revision: 28657 URL: http://svn.reactos.org/svn/reactos?rev=28657&view=rev Log: - fix 2 bugs in unattend setup - add option to start dbgprint.exe on 3rd boot when unattend key BootCDRegtestActive key is found (this makes sysreg detect that the 3rd boot has completed successfully) Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Thu Aug 30 01:10:05 2007 @@ -1999,6 +1999,8 @@ TCHAR szName[256]; TCHAR szValue[MAX_PATH]; DWORD LineLength; + HKEY hKey; + DWORD BootCDRegtestActive = 0; if (!SetupFindFirstLine(hUnattendedInf, _T("Unattend"), @@ -2089,17 +2091,46 @@ { SetupData.TimeZoneIndex = _ttoi(szValue); } - else if (_tcscmp(szName, _T("DisableAutoDaylightTimeSet"))) + else if (!_tcscmp(szName, _T("DisableAutoDaylightTimeSet"))) { SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue); } - else if (_tcscmp(szName, _T("DisableVmwInst"))) + else if (!_tcscmp(szName, _T("DisableVmwInst"))) { - if(_tcscmp(szValue, _T("yes"))) SetupData.DisableVmwInst = 1; - else SetupData.DisableVmwInst = 0; + if(!_tcscmp(szValue, _T("yes"))) + SetupData.DisableVmwInst = 1; + else + SetupData.DisableVmwInst = 0; } + else if (!_tcscmp(szName, _T("BootCDRegTestActive"))) + { + BootCDRegtestActive = _ttoi(szValue); + } + } while (SetupFindNextLine(&InfContext, &InfContext)); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce"), + 0, + KEY_SET_VALUE, + &hKey) != ERROR_SUCCESS) + { + DPRINT1("Error: failed to open HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n"); + return TRUE; + } + + if (BootCDRegtestActive) + { + _tcscpy(szValue, _T("C:\\ReactOS\\bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE")); + RegSetValueEx(hKey, + _T("BootCDRegtestActive"), + 0, + REG_SZ, + (const BYTE*)szValue, + _tcslen(szValue) * sizeof(TCHAR)); + } + if (SetupFindFirstLine(hUnattendedInf, @@ -2107,21 +2138,8 @@ NULL, &InfContext)) { - HKEY hKey; - int i; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce"), - 0, - KEY_SET_VALUE, - &hKey) != ERROR_SUCCESS) - { - DPRINT1("Error: failed to open HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n"); - return TRUE; - } - - i = 0; - + + int i = 0; do { if(SetupGetStringField(&InfContext,

17 years, 3 months

[gedmurphy] 28656: add the remaining code for changing the list view text

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Aug 30 00:20:23 2007 New Revision: 28656 URL: http://svn.reactos.org/svn/reactos?rev=28656&view=rev Log: add the remaining code for changing the list view text Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Aug 30 00:20:23 2007 @@ -105,6 +105,23 @@ switch (Column) { case LVNAME: + { + LPQUERY_SERVICE_CONFIG lpServiceConfig; + + lpServiceConfig = GetServiceConfig(pService->lpServiceName); + if (lpServiceConfig) + { + lvItem.pszText = lpServiceConfig->lpDisplayName; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + } + } break; @@ -186,7 +203,23 @@ break; case LVLOGONAS: - + { + LPQUERY_SERVICE_CONFIG lpServiceConfig; + + lpServiceConfig = GetServiceConfig(pService->lpServiceName); + if (lpServiceConfig) + { + lvItem.pszText = lpServiceConfig->lpServiceStartName; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + } + } break; } } @@ -309,7 +342,7 @@ NumListedServ = ListView_GetItemCount(Info->hListView); _sntprintf(szNumServices, - 300, + 31, lpNumServices, NumListedServ); @@ -322,7 +355,6 @@ 0, lpNumServices); } - } /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */

17 years, 3 months

[janderwald] 28655: - add description for LocalID setting

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 30 00:18:16 2007 New Revision: 28655 URL: http://svn.reactos.org/svn/reactos?rev=28655&view=rev Log: - add description for LocalID setting Modified: trunk/reactos/boot/bootdata/unattend.inf.sample Modified: trunk/reactos/boot/bootdata/unattend.inf.sample URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/unattend.inf… ============================================================================== --- trunk/reactos/boot/bootdata/unattend.inf.sample (original) +++ trunk/reactos/boot/bootdata/unattend.inf.sample Thu Aug 30 00:18:16 2007 @@ -46,6 +46,12 @@ ; no - enabled DisableVmwInst = yes +; set this option to automatically +; specify language in 2nd mode setup +; see hivesys.inf for available languages +; LocaleID = 407 + + ; enable this section to automatically launch programs ; after 3rd boot ;

17 years, 3 months

[janderwald] 28654: - close unattend inf in case of errors - correctly convert provided LCID (with base 16) - verify provided LCID with installed languages - thanks to Colin_Fink

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Aug 30 00:13:27 2007 New Revision: 28654 URL: http://svn.reactos.org/svn/reactos?rev=28654&view=rev Log: - close unattend inf in case of errors - correctly convert provided LCID (with base 16) - verify provided LCID with installed languages - thanks to Colin_Fink Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Thu Aug 30 00:13:27 2007 @@ -173,6 +173,34 @@ RegCloseKey(langKey); } +DWORD +VerifyUnattendLCID(HWND hwndDlg) +{ + LRESULT lCount, lIndex, lResult; + lCount = SendMessage(hList, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount == CB_ERR) + { + return 0; + } + + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendMessage(hList, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR) + { + continue; + } + + if (lResult == (LCID)UnattendLCID) + { + SendMessage(hList, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + return 1; + } + } + return 0; +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -185,6 +213,15 @@ { case WM_INITDIALOG: CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); + if (IsUnattendedSetupEnabled) + { + if (VerifyUnattendLCID(hwndDlg)) + { + SetNewLocale(UnattendLCID); + PostQuitMessage(0); + } + return TRUE; + } break; case WM_COMMAND: switch (LOWORD(wParam)) Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Thu Aug 30 00:13:27 2007 @@ -41,6 +41,9 @@ HINSTANCE hApplet = 0; HINF hSetupInf = INVALID_HANDLE_VALUE; +DWORD IsUnattendedSetupEnabled = 0; +DWORD UnattendLCID = 0; + /* Applets */ APPLET Applets[NUM_APPLETS] = @@ -97,10 +100,10 @@ return (hSetupInf != INVALID_HANDLE_VALUE); } -LONG ParseSetupInf() +VOID +ParseSetupInf() { INFCONTEXT InfContext; - INT LocaleID; TCHAR szBuffer[30]; if (!SetupFindFirstLine(hSetupInf, @@ -108,7 +111,8 @@ _T("LocaleID"), &InfContext)) { - return -1; + SetupCloseInfFile(hSetupInf); + return; } if (!SetupGetStringField(&InfContext, @@ -117,13 +121,13 @@ sizeof(szBuffer) / sizeof(TCHAR), NULL)) { - return -1; - } - LocaleID = _ttoi(szBuffer); - SetNewLocale((LCID)LocaleID); + SetupCloseInfFile(hSetupInf); + return; + } + + UnattendLCID = _tcstoul(szBuffer, NULL, 16); + IsUnattendedSetupEnabled = 1; SetupCloseInfFile(hSetupInf); - - return 0; } static LONG APIENTRY @@ -135,7 +139,7 @@ if (OpenSetupInf()) { - return ParseSetupInf(); + ParseSetupInf(); } LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Thu Aug 30 00:13:27 2007 @@ -11,7 +11,8 @@ } APPLET, *PAPPLET; extern HINSTANCE hApplet; - +extern DWORD IsUnattendedSetupEnabled; +extern DWORD UnattendLCID; /* currency.c */ INT_PTR CALLBACK

17 years, 3 months

[gedmurphy] 28653: use the provided apis instead of reading directly from the registry

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Aug 29 23:36:58 2007 New Revision: 28653 URL: http://svn.reactos.org/svn/reactos?rev=28653&view=rev Log: use the provided apis instead of reading directly from the registry Modified: trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Wed Aug 29 23:36:58 2007 @@ -199,45 +199,23 @@ ENUM_SERVICE_STATUS_PROCESS *pService; LPTSTR lpDescription; LVITEM lvItem; + LPTSTR lpNumServices; TCHAR szNumServices[32]; TCHAR szStatus[64]; DWORD NumServices; DWORD Index; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); (void)ListView_DeleteAllItems(Info->hListView); if (GetServiceList(Info, &NumServices)) { - TCHAR buf[300]; /* buffer to hold key path */ - INT NumListedServ = 0; /* how many services were listed */ + INT NumListedServ = 0; for (Index = 0; Index < NumServices; Index++) { - HKEY hKey = NULL; - LPTSTR lpLogOnAs = NULL; - DWORD StartUp = 0; - DWORD dwValueSize; - - /* copy the service info over */ + LPQUERY_SERVICE_CONFIG pServiceConfig; + pService = &Info->pAllServices[Index]; - - /* open the registry key for the service */ - _sntprintf(buf, - 300, - Path, - pService->lpServiceName); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) - { - HeapFree(ProcessHeap, - 0, - pService); - continue; - } /* set the display name */ ZeroMemory(&lvItem, sizeof(LVITEM)); @@ -254,7 +232,7 @@ if ((lpDescription = GetServiceDescription(pService->lpServiceName))) { lvItem.pszText = lpDescription; - lvItem.iSubItem = 1; + lvItem.iSubItem = LVDESC; SendMessage(Info->hListView, LVM_SETITEMTEXT, lvItem.iItem, @@ -273,110 +251,78 @@ szStatus, sizeof(szStatus) / sizeof(TCHAR)); lvItem.pszText = szStatus; - lvItem.iSubItem = 2; + lvItem.iSubItem = LVSTATUS; SendMessage(Info->hListView, LVM_SETITEMTEXT, lvItem.iItem, (LPARAM)&lvItem); } - /* set the startup type */ - dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hKey, - _T("Start"), - NULL, - NULL, - (LPBYTE)&StartUp, - &dwValueSize) == ERROR_SUCCESS) - { - switch (StartUp) + pServiceConfig = GetServiceConfig(pService->lpServiceName); + if (pServiceConfig) + { + DWORD StringId = 0; + LPTSTR lpStartup; + + /* set the startup type */ + switch (pServiceConfig->dwStartType) { - case 2: - LoadStringW(hInstance, - IDS_SERVICES_AUTO, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - case 3: - LoadStringW(hInstance, - IDS_SERVICES_MAN, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - - case 4: - LoadStringW(hInstance, - IDS_SERVICES_DIS, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - default: - szStatus[0] = 0; - break; + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; } - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; + if (StringId) + AllocAndLoadString(&lpStartup, + hInstance, + StringId); + + lvItem.pszText = lpStartup; + lvItem.iSubItem = LVSTARTUP; SendMessage(Info->hListView, LVM_SETITEMTEXT, lvItem.iItem, (LPARAM)&lvItem); - } - - /* set Log On As */ - dwValueSize = 0; - if (RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - NULL, - &dwValueSize) == ERROR_SUCCESS) - { - lpLogOnAs = HeapAlloc(ProcessHeap, - 0, - dwValueSize); - if (lpLogOnAs != NULL) - { - if(RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - (LPBYTE)lpLogOnAs, - &dwValueSize) == ERROR_SUCCESS) - { - lvItem.pszText = lpLogOnAs; - lvItem.iSubItem = 4; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - HeapFree(ProcessHeap, - 0, - lpLogOnAs); - } - - RegCloseKey(hKey); + + HeapFree(ProcessHeap, + 0, + lpStartup); + + /* set Log On As */ + lvItem.pszText = pServiceConfig->lpServiceStartName; + lvItem.iSubItem = LVLOGONAS; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + pServiceConfig); } } - /* set the number of listed services in the status bar */ - NumListedServ = ListView_GetItemCount(Info->hListView); - LoadString(hInstance, - IDS_NUM_SERVICES, - szNumServices, - sizeof(szNumServices) / sizeof(TCHAR)); - - _sntprintf(buf, - 300, - szNumServices, - NumListedServ); - - SendMessage(Info->hStatus, - SB_SETTEXT, - 0, - (LPARAM)buf); + if (AllocAndLoadString(&lpNumServices, + hInstance, + IDS_NUM_SERVICES)) + { + NumListedServ = ListView_GetItemCount(Info->hListView); + + _sntprintf(szNumServices, + 300, + lpNumServices, + NumListedServ); + + SendMessage(Info->hStatus, + SB_SETTEXT, + 0, + (LPARAM)szNumServices); + + HeapFree(ProcessHeap, + 0, + lpNumServices); + } + } /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c Wed Aug 29 23:36:58 2007 @@ -17,8 +17,6 @@ SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; DWORD BytesNeeded = 0; - INT ArgCount = 0; - DWORD dwStartTickCount, dwOldCheckPoint; BOOL bRet = FALSE; hSCManager = OpenSCManager(NULL, @@ -32,7 +30,7 @@ if (hSc != NULL) { if (StartService(hSc, - ArgCount, + 0, NULL)) { if (QueryServiceStatusEx(hSc, @@ -41,14 +39,12 @@ sizeof(SERVICE_STATUS_PROCESS), &BytesNeeded)) { - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; + DWORD dwStartTickCount = GetTickCount(); + DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint; while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) { - DWORD dwWaitTime; - - dwWaitTime = ServiceStatus.dwWaitHint / 10; + DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10; if(dwWaitTime < 1000) dwWaitTime = 500;

17 years, 3 months

[gedmurphy] 28652: split the code, some files were getting too long

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Aug 29 22:10:58 2007 New Revision: 28652 URL: http://svn.reactos.org/svn/reactos?rev=28652&view=rev Log: split the code, some files were getting too long Added: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.rbuild Added: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (added) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Wed Aug 29 22:10:58 2007 @@ -1,0 +1,545 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/servman/listview.c + * PURPOSE: service listview manipulation functions + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "precomp.h" + + +VOID +SetListViewStyle(HWND hListView, + DWORD View) +{ + DWORD Style = GetWindowLong(hListView, GWL_STYLE); + + if ((Style & LVS_TYPEMASK) != View) + { + SetWindowLong(hListView, + GWL_STYLE, + (Style & ~LVS_TYPEMASK) | View); + } +} + + +VOID +ListViewSelectionChanged(PMAIN_WND_INFO Info, + LPNMLISTVIEW pnmv) +{ + HMENU hMainMenu; + + /* get handle to menu */ + hMainMenu = GetMenu(Info->hMainWnd); + + /* activate properties menu item, if not already */ + if (GetMenuState(hMainMenu, + ID_PROP, + MF_BYCOMMAND) != MF_ENABLED) + { + EnableMenuItem(hMainMenu, + ID_PROP, + MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, + ID_PROP, + MF_ENABLED); + SetMenuDefaultItem(Info->hShortcutMenu, + ID_PROP, + MF_BYCOMMAND); + } + + /* activate delete menu item, if not already */ + if (GetMenuState(hMainMenu, + ID_DELETE, + MF_BYCOMMAND) != MF_ENABLED) + { + EnableMenuItem(hMainMenu, + ID_DELETE, + MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, + ID_DELETE, + MF_ENABLED); + } + + /* set selected service */ + Info->SelectedItem = pnmv->iItem; + + /* get pointer to selected service */ + Info->pCurrentService = GetSelectedService(Info); + + /* set current selected service in the status bar */ + SendMessage(Info->hStatus, + SB_SETTEXT, + 1, + (LPARAM)Info->pCurrentService->lpDisplayName); + + /* show the properties button */ + SendMessage(Info->hTool, + TB_SETSTATE, + ID_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); +} + + +VOID +ChangeListViewText(PMAIN_WND_INFO Info, + ENUM_SERVICE_STATUS_PROCESS* pService, + UINT Column) +{ + LVFINDINFO lvfi; + LVITEM lvItem; + INT index; + + lvfi.flags = LVFI_PARAM; + lvfi.lParam = (LPARAM)pService; + index = ListView_FindItem(Info->hListView, + -1, + &lvfi); + if (index != -1) + { + lvItem.iItem = index; + lvItem.iSubItem = Column; + + switch (Column) + { + case LVNAME: + + break; + + case LVDESC: + { + LPTSTR lpDescription; + + lpDescription = GetServiceDescription(pService->lpServiceName); + + lvItem.pszText = lpDescription; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM) &lvItem); + + HeapFree(ProcessHeap, + 0, + lpDescription); + } + break; + + case LVSTATUS: + { + TCHAR szStatus[64]; + + if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + LoadString(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + } + else + { + szStatus[0] = 0; + } + + lvItem.pszText = szStatus; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM) &lvItem); + } + break; + + case LVSTARTUP: + { + LPQUERY_SERVICE_CONFIG lpServiceConfig; + LPTSTR lpStartup = NULL; + DWORD StringId = 0; + + lpServiceConfig = GetServiceConfig(pService->lpServiceName); + + switch (lpServiceConfig->dwStartType) + { + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; + } + + if (StringId) + AllocAndLoadString(&lpStartup, + hInstance, + StringId); + + lvItem.pszText = lpStartup; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + lpStartup); + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + } + break; + + case LVLOGONAS: + + break; + } + } +} + + +BOOL +RefreshServiceList(PMAIN_WND_INFO Info) +{ + ENUM_SERVICE_STATUS_PROCESS *pService; + LPTSTR lpDescription; + LVITEM lvItem; + TCHAR szNumServices[32]; + TCHAR szStatus[64]; + DWORD NumServices; + DWORD Index; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + + (void)ListView_DeleteAllItems(Info->hListView); + + if (GetServiceList(Info, &NumServices)) + { + TCHAR buf[300]; /* buffer to hold key path */ + INT NumListedServ = 0; /* how many services were listed */ + + for (Index = 0; Index < NumServices; Index++) + { + HKEY hKey = NULL; + LPTSTR lpLogOnAs = NULL; + DWORD StartUp = 0; + DWORD dwValueSize; + + /* copy the service info over */ + pService = &Info->pAllServices[Index]; + + /* open the registry key for the service */ + _sntprintf(buf, + 300, + Path, + pService->lpServiceName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, + 0, + pService); + continue; + } + + /* set the display name */ + ZeroMemory(&lvItem, sizeof(LVITEM)); + lvItem.mask = LVIF_TEXT | LVIF_PARAM; + lvItem.pszText = pService->lpDisplayName; + + /* Add the service pointer */ + lvItem.lParam = (LPARAM)pService; + + /* add it to the listview */ + lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); + + /* set the description */ + if ((lpDescription = GetServiceDescription(pService->lpServiceName))) + { + lvItem.pszText = lpDescription; + lvItem.iSubItem = 1; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + lpDescription); + } + + /* set the status */ + if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + LoadString(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + lvItem.pszText = szStatus; + lvItem.iSubItem = 2; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + } + + /* set the startup type */ + dwValueSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + _T("Start"), + NULL, + NULL, + (LPBYTE)&StartUp, + &dwValueSize) == ERROR_SUCCESS) + { + switch (StartUp) + { + case 2: + LoadStringW(hInstance, + IDS_SERVICES_AUTO, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + case 3: + LoadStringW(hInstance, + IDS_SERVICES_MAN, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + + case 4: + LoadStringW(hInstance, + IDS_SERVICES_DIS, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + break; + default: + szStatus[0] = 0; + break; + } + + lvItem.pszText = szStatus; + lvItem.iSubItem = 3; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + } + + /* set Log On As */ + dwValueSize = 0; + if (RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + NULL, + &dwValueSize) == ERROR_SUCCESS) + { + lpLogOnAs = HeapAlloc(ProcessHeap, + 0, + dwValueSize); + if (lpLogOnAs != NULL) + { + if(RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + (LPBYTE)lpLogOnAs, + &dwValueSize) == ERROR_SUCCESS) + { + lvItem.pszText = lpLogOnAs; + lvItem.iSubItem = 4; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + } + + HeapFree(ProcessHeap, + 0, + lpLogOnAs); + } + + RegCloseKey(hKey); + } + } + + /* set the number of listed services in the status bar */ + NumListedServ = ListView_GetItemCount(Info->hListView); + LoadString(hInstance, + IDS_NUM_SERVICES, + szNumServices, + sizeof(szNumServices) / sizeof(TCHAR)); + + _sntprintf(buf, + 300, + szNumServices, + NumListedServ); + + SendMessage(Info->hStatus, + SB_SETTEXT, + 0, + (LPARAM)buf); + } + + /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ + SendMessage (Info->hListView, + WM_SETREDRAW, + TRUE, + 0); + + return TRUE; +} + + +static VOID +InitListViewImage(PMAIN_WND_INFO Info) +{ + HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ + HIMAGELIST hSmall, hLarge; /* image list for other views */ + + + /* Create the icon image lists */ + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_MASK | ILC_COLOR32, + 1, + 1); + + hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + ILC_MASK | ILC_COLOR32, + 1, + 1); + + /* Add an icon to each image list */ + hSmIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + + ImageList_AddIcon(hSmall, + hSmIconItem); + + hLgIconItem = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 32, + 32, + 0); + + ImageList_AddIcon(hLarge, + hLgIconItem); + + /* assign the image to the list view */ + (void)ListView_SetImageList(Info->hListView, + hSmall, + LVSIL_SMALL); + (void)ListView_SetImageList(Info->hListView, + hLarge, + LVSIL_NORMAL); +} + + +BOOL +CreateListView(PMAIN_WND_INFO Info) +{ + LVCOLUMN lvc = { 0 }; + TCHAR szTemp[256]; + + Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE, + WC_LISTVIEW, + NULL, + WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | + LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW, + 0, 0, 0, 0, + Info->hMainWnd, + (HMENU) IDC_SERVLIST, + hInstance, + NULL); + if (Info->hListView == NULL) + { + MessageBox(Info->hMainWnd, + _T("Could not create List View."), + _T("Error"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + (void)ListView_SetExtendedListViewStyle(Info->hListView, + LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/ + + lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; + lvc.fmt = LVCFMT_LEFT; + + /* Add columns to the list-view */ + /* name */ + lvc.iSubItem = LVNAME; + lvc.cx = 150; + LoadString(hInstance, + IDS_FIRSTCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(TCHAR)); + lvc.pszText = szTemp; + (void)ListView_InsertColumn(Info->hListView, + 0, + &lvc); + + /* description */ + lvc.iSubItem = LVDESC; + lvc.cx = 240; + LoadString(hInstance, + IDS_SECONDCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(TCHAR)); + lvc.pszText = szTemp; + (void)ListView_InsertColumn(Info->hListView, + 1, + &lvc); + + /* status */ + lvc.iSubItem = LVSTATUS; + lvc.cx = 55; + LoadString(hInstance, + IDS_THIRDCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(TCHAR)); + lvc.pszText = szTemp; + (void)ListView_InsertColumn(Info->hListView, + 2, + &lvc); + + /* startup type */ + lvc.iSubItem = LVSTARTUP; + lvc.cx = 80; + LoadString(hInstance, + IDS_FOURTHCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(TCHAR)); + lvc.pszText = szTemp; + (void)ListView_InsertColumn(Info->hListView, + 3, + &lvc); + + /* logon as */ + lvc.iSubItem = LVLOGONAS; + lvc.cx = 100; + LoadString(hInstance, + IDS_FITHCOLUMN, + szTemp, + sizeof(szTemp) / sizeof(TCHAR)); + lvc.pszText = szTemp; + (void)ListView_InsertColumn(Info->hListView, + 4, + &lvc); + + InitListViewImage(Info); + + /* check the details view menu item */ + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_DETAILS, + MF_BYCOMMAND); + + return TRUE; +} 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 Wed Aug 29 22:10:58 2007 @@ -122,130 +122,6 @@ } -static VOID -SetListViewStyle(HWND hListView, - DWORD View) -{ - DWORD Style = GetWindowLong(hListView, GWL_STYLE); - - if ((Style & LVS_TYPEMASK) != View) - { - SetWindowLong(hListView, - GWL_STYLE, - (Style & ~LVS_TYPEMASK) | View); - } -} - -VOID -ChangeListViewText(PMAIN_WND_INFO Info, - ENUM_SERVICE_STATUS_PROCESS* pService, - UINT Column) -{ - LVFINDINFO lvfi; - LVITEM lvItem; - INT index; - - lvfi.flags = LVFI_PARAM; - lvfi.lParam = (LPARAM)pService; - index = ListView_FindItem(Info->hListView, - -1, - &lvfi); - if (index != -1) - { - lvItem.iItem = index; - lvItem.iSubItem = Column; - - switch (Column) - { - case LVNAME: - - break; - - case LVDESC: - { - LPTSTR lpDescription; - - lpDescription = GetServiceDescription(pService->lpServiceName); - - lvItem.pszText = lpDescription; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM) &lvItem); - - HeapFree(ProcessHeap, - 0, - lpDescription); - } - break; - - case LVSTATUS: - { - TCHAR szStatus[64]; - - if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - } - else - { - szStatus[0] = 0; - } - - lvItem.pszText = szStatus; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM) &lvItem); - } - break; - - case LVSTARTUP: - { - LPQUERY_SERVICE_CONFIG lpServiceConfig; - LPTSTR lpStartup = NULL; - DWORD StringId = 0; - - lpServiceConfig = GetServiceConfig(pService->lpServiceName); - - switch (lpServiceConfig->dwStartType) - { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; - } - - if (StringId) - AllocAndLoadString(&lpStartup, - hInstance, - StringId); - - lvItem.pszText = lpStartup; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - lpStartup); - HeapFree(ProcessHeap, - 0, - lpServiceConfig); - } - break; - - case LVLOGONAS: - - break; - } - } -} - - VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { HMENU hMainMenu; @@ -392,162 +268,6 @@ } return FALSE; -} - - -static VOID -InitListViewImage(PMAIN_WND_INFO Info) -{ - HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ - HIMAGELIST hSmall, hLarge; /* image list for other views */ - - - /* Create the icon image lists */ - hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - ILC_MASK | ILC_COLOR32, - 1, - 1); - - hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), - ILC_MASK | ILC_COLOR32, - 1, - 1); - - /* Add an icon to each image list */ - hSmIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - ImageList_AddIcon(hSmall, - hSmIconItem); - - hLgIconItem = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 32, - 32, - 0); - - ImageList_AddIcon(hLarge, - hLgIconItem); - - /* assign the image to the list view */ - (void)ListView_SetImageList(Info->hListView, - hSmall, - LVSIL_SMALL); - (void)ListView_SetImageList(Info->hListView, - hLarge, - LVSIL_NORMAL); -} - - -static BOOL -CreateListView(PMAIN_WND_INFO Info) -{ - LVCOLUMN lvc = { 0 }; - TCHAR szTemp[256]; - - Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE, - WC_LISTVIEW, - NULL, - WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | - LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW, - 0, 0, 0, 0, - Info->hMainWnd, - (HMENU) IDC_SERVLIST, - hInstance, - NULL); - if (Info->hListView == NULL) - { - MessageBox(Info->hMainWnd, - _T("Could not create List View."), - _T("Error"), - MB_OK | MB_ICONERROR); - return FALSE; - } - - (void)ListView_SetExtendedListViewStyle(Info->hListView, - LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/ - - lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; - lvc.fmt = LVCFMT_LEFT; - - /* Add columns to the list-view */ - /* name */ - lvc.iSubItem = LVNAME; - lvc.cx = 150; - LoadString(hInstance, - IDS_FIRSTCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 0, - &lvc); - - /* description */ - lvc.iSubItem = LVDESC; - lvc.cx = 240; - LoadString(hInstance, - IDS_SECONDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 1, - &lvc); - - /* status */ - lvc.iSubItem = LVSTATUS; - lvc.cx = 55; - LoadString(hInstance, - IDS_THIRDCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 2, - &lvc); - - /* startup type */ - lvc.iSubItem = LVSTARTUP; - lvc.cx = 80; - LoadString(hInstance, - IDS_FOURTHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 3, - &lvc); - - /* logon as */ - lvc.iSubItem = LVLOGONAS; - lvc.cx = 100; - LoadString(hInstance, - IDS_FITHCOLUMN, - szTemp, - sizeof(szTemp) / sizeof(TCHAR)); - lvc.pszText = szTemp; - (void)ListView_InsertColumn(Info->hListView, - 4, - &lvc); - - InitListViewImage(Info); - - /* check the details view menu item */ - CheckMenuRadioItem(GetMenu(Info->hMainWnd), - ID_VIEW_LARGE, - ID_VIEW_DETAILS, - ID_VIEW_DETAILS, - MF_BYCOMMAND); - - return TRUE; } static BOOL @@ -573,66 +293,6 @@ (LPARAM)StatWidths); return TRUE; -} - -static VOID -ListViewSelectionChanged(PMAIN_WND_INFO Info, - LPNMLISTVIEW pnmv) -{ - HMENU hMainMenu; - - /* get handle to menu */ - hMainMenu = GetMenu(Info->hMainWnd); - - /* activate properties menu item, if not already */ - if (GetMenuState(hMainMenu, - ID_PROP, - MF_BYCOMMAND) != MF_ENABLED) - { - EnableMenuItem(hMainMenu, - ID_PROP, - MF_ENABLED); - EnableMenuItem(Info->hShortcutMenu, - ID_PROP, - MF_ENABLED); - SetMenuDefaultItem(Info->hShortcutMenu, - ID_PROP, - MF_BYCOMMAND); - } - - /* activate delete menu item, if not already */ - if (GetMenuState(hMainMenu, - ID_DELETE, - MF_BYCOMMAND) != MF_ENABLED) - { - EnableMenuItem(hMainMenu, - ID_DELETE, - MF_ENABLED); - EnableMenuItem(Info->hShortcutMenu, - ID_DELETE, - MF_ENABLED); - } - - /* set selected service */ - Info->SelectedItem = pnmv->iItem; - - /* get pointer to selected service */ - Info->pCurrentService = GetSelectedService(Info); - - /* alter options for the service */ - SetMenuAndButtonStates(Info); - - /* set current selected service in the status bar */ - SendMessage(Info->hStatus, - SB_SETTEXT, - 1, - (LPARAM)Info->pCurrentService->lpDisplayName); - - /* show the properties button */ - SendMessage(Info->hTool, - TB_SETSTATE, - ID_PROP, - (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); } @@ -981,6 +641,7 @@ LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; ListViewSelectionChanged(Info, pnmv); + SetMenuAndButtonStates(Info); } break; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Wed Aug 29 22:10:58 2007 @@ -65,6 +65,11 @@ VOID UninitMainWindowImpl(VOID); HWND CreateMainWindow(LPCTSTR lpCaption, int nCmdShow); +/* listview.c */ +VOID SetListViewStyle(HWND hListView, DWORD View); +VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv); +BOOL CreateListView(PMAIN_WND_INFO Info); + /* start */ BOOL DoStart(PMAIN_WND_INFO Info); @@ -86,6 +91,7 @@ LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); +BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices); /* reg */ BOOL SetDescription(LPTSTR, LPTSTR); Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Wed Aug 29 22:10:58 2007 @@ -212,7 +212,7 @@ -static BOOL +BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices) { @@ -314,199 +314,3 @@ return bRet; } - - -BOOL -RefreshServiceList(PMAIN_WND_INFO Info) -{ - ENUM_SERVICE_STATUS_PROCESS *pService; - LPTSTR lpDescription; - LVITEM lvItem; - TCHAR szNumServices[32]; - TCHAR szStatus[64]; - DWORD NumServices; - DWORD Index; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - - (void)ListView_DeleteAllItems(Info->hListView); - - if (GetServiceList(Info, &NumServices)) - { - TCHAR buf[300]; /* buffer to hold key path */ - INT NumListedServ = 0; /* how many services were listed */ - - for (Index = 0; Index < NumServices; Index++) - { - HKEY hKey = NULL; - LPTSTR lpLogOnAs = NULL; - DWORD StartUp = 0; - DWORD dwValueSize; - - /* copy the service info over */ - pService = &Info->pAllServices[Index]; - - /* open the registry key for the service */ - _sntprintf(buf, - 300, - Path, - pService->lpServiceName); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) - { - HeapFree(ProcessHeap, - 0, - pService); - continue; - } - - /* set the display name */ - ZeroMemory(&lvItem, sizeof(LVITEM)); - lvItem.mask = LVIF_TEXT | LVIF_PARAM; - lvItem.pszText = pService->lpDisplayName; - - /* Add the service pointer */ - lvItem.lParam = (LPARAM)pService; - - /* add it to the listview */ - lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); - - /* set the description */ - if ((lpDescription = GetServiceDescription(pService->lpServiceName))) - { - lvItem.pszText = lpDescription; - lvItem.iSubItem = 1; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - - HeapFree(ProcessHeap, - 0, - lpDescription); - } - - /* set the status */ - if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) - { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - lvItem.pszText = szStatus; - lvItem.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - /* set the startup type */ - dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hKey, - _T("Start"), - NULL, - NULL, - (LPBYTE)&StartUp, - &dwValueSize) == ERROR_SUCCESS) - { - switch (StartUp) - { - case 2: - LoadStringW(hInstance, - IDS_SERVICES_AUTO, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - case 3: - LoadStringW(hInstance, - IDS_SERVICES_MAN, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - - case 4: - LoadStringW(hInstance, - IDS_SERVICES_DIS, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - break; - default: - szStatus[0] = 0; - break; - } - - lvItem.pszText = szStatus; - lvItem.iSubItem = 3; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - /* set Log On As */ - dwValueSize = 0; - if (RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - NULL, - &dwValueSize) == ERROR_SUCCESS) - { - lpLogOnAs = HeapAlloc(ProcessHeap, - 0, - dwValueSize); - if (lpLogOnAs != NULL) - { - if(RegQueryValueEx(hKey, - _T("ObjectName"), - NULL, - NULL, - (LPBYTE)lpLogOnAs, - &dwValueSize) == ERROR_SUCCESS) - { - lvItem.pszText = lpLogOnAs; - lvItem.iSubItem = 4; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - lvItem.iItem, - (LPARAM)&lvItem); - } - - HeapFree(ProcessHeap, - 0, - lpLogOnAs); - } - - RegCloseKey(hKey); - } - } - - /* set the number of listed services in the status bar */ - NumListedServ = ListView_GetItemCount(Info->hListView); - LoadString(hInstance, - IDS_NUM_SERVICES, - szNumServices, - sizeof(szNumServices) / sizeof(TCHAR)); - - _sntprintf(buf, - 300, - szNumServices, - NumListedServ); - - SendMessage(Info->hStatus, - SB_SETTEXT, - 0, - (LPARAM)buf); - } - - /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ - SendMessage (Info->hListView, - WM_SETREDRAW, - TRUE, - 0); - - return TRUE; -} Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.rbuild (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.rbuild Wed Aug 29 22:10:58 2007 @@ -20,6 +20,7 @@ <file>create.c</file> <file>delete.c</file> <file>export.c</file> + <file>listview.c</file> <file>mainwnd.c</file> <file>misc.c</file> <file>progress.c</file>

17 years, 3 months

[gedmurphy] 28651: - implement changing of the startup type from the properties dialog - add functionality for changing the startup type listview text - fix a couple of bugs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Aug 29 19:46:52 2007 New Revision: 28651 URL: http://svn.reactos.org/svn/reactos?rev=28651&view=rev Log: - implement changing of the startup type from the properties dialog - add functionality for changing the startup type listview text - fix a couple of bugs Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/start.c 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 Wed Aug 29 19:46:52 2007 @@ -8,12 +8,6 @@ */ #include "precomp.h" - -#define LVNAME 0 -#define LVDESC 1 -#define LVSTATUS 2 -#define LVSTARTUP 3 -#define LVLOGONAS 4 static const TCHAR szMainWndClass[] = TEXT("ServManWndClass"); @@ -142,70 +136,112 @@ } } -static VOID +VOID ChangeListViewText(PMAIN_WND_INFO Info, + ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column) { - LVITEM item; - - item.iItem = Info->SelectedItem; - item.iSubItem = Column; - - switch (Column) - { - case LVNAME: - - break; - - case LVDESC: - { - LPTSTR lpDescription; - - lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); - - item.pszText = lpDescription; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - HeapFree(ProcessHeap, - 0, - lpDescription); - } - break; - - case LVSTATUS: - { - TCHAR szStatus[64]; - - if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + LVFINDINFO lvfi; + LVITEM lvItem; + INT index; + + lvfi.flags = LVFI_PARAM; + lvfi.lParam = (LPARAM)pService; + index = ListView_FindItem(Info->hListView, + -1, + &lvfi); + if (index != -1) + { + lvItem.iItem = index; + lvItem.iSubItem = Column; + + switch (Column) + { + case LVNAME: + + break; + + case LVDESC: { - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); + LPTSTR lpDescription; + + lpDescription = GetServiceDescription(pService->lpServiceName); + + lvItem.pszText = lpDescription; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM) &lvItem); + + HeapFree(ProcessHeap, + 0, + lpDescription); } - else + break; + + case LVSTATUS: { - szStatus[0] = 0; + TCHAR szStatus[64]; + + if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + { + LoadString(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + } + else + { + szStatus[0] = 0; + } + + lvItem.pszText = szStatus; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM) &lvItem); } - - item.pszText = szStatus; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - } - break; - - case LVSTARTUP: - - break; - - case LVLOGONAS: - - break; + break; + + case LVSTARTUP: + { + LPQUERY_SERVICE_CONFIG lpServiceConfig; + LPTSTR lpStartup = NULL; + DWORD StringId = 0; + + lpServiceConfig = GetServiceConfig(pService->lpServiceName); + + switch (lpServiceConfig->dwStartType) + { + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; + } + + if (StringId) + AllocAndLoadString(&lpStartup, + hInstance, + StringId); + + lvItem.pszText = lpStartup; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + lvItem.iItem, + (LPARAM)&lvItem); + + HeapFree(ProcessHeap, + 0, + lpStartup); + HeapFree(ProcessHeap, + 0, + lpServiceConfig); + } + break; + + case LVLOGONAS: + + break; + } } } @@ -715,7 +751,7 @@ if (DoStart(Info)) { UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, LVSTATUS); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -726,7 +762,7 @@ if (DoStop(Info)) { UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, LVSTATUS); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -745,7 +781,7 @@ { DoStart(Info); UpdateServiceStatus(Info->pCurrentService); - ChangeListViewText(Info, LVSTATUS); + ChangeListViewText(Info, Info->pCurrentService, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Wed Aug 29 19:46:52 2007 @@ -16,6 +16,12 @@ #define NO_ITEM_SELECTED -1 #define MAX_KEY_LENGTH 256 + +#define LVNAME 0 +#define LVDESC 1 +#define LVSTATUS 2 +#define LVSTARTUP 3 +#define LVLOGONAS 4 typedef struct _MAIN_WND_INFO { @@ -54,6 +60,7 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; +VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column); BOOL InitMainWindowImpl(VOID); VOID UninitMainWindowImpl(VOID); HWND CreateMainWindow(LPCTSTR lpCaption, int nCmdShow); 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 Wed Aug 29 19:46:52 2007 @@ -200,6 +200,7 @@ } } + VOID SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) @@ -208,21 +209,40 @@ HWND hList; DWORD StartUp; - hList = GetDlgItem(hwndDlg, IDC_START_TYPE); - - StartUp = SendMessage(hList, - CB_GETCURSEL, - 0, - 0); - - switch (StartUp) - { - case 0: pServiceConfig->dwStartType = SERVICE_AUTO_START; break; - case 1: pServiceConfig->dwStartType = SERVICE_DEMAND_START; break; - case 2: pServiceConfig->dwStartType = SERVICE_DISABLED; break; - } -} - + pServiceConfig = HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(*pServiceConfig)); + if (pServiceConfig) + { + pServiceConfig->dwServiceType = SERVICE_NO_CHANGE; + pServiceConfig->dwErrorControl = SERVICE_NO_CHANGE; + + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); + StartUp = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + switch (StartUp) + { + case 0: pServiceConfig->dwStartType = SERVICE_AUTO_START; break; + case 1: pServiceConfig->dwStartType = SERVICE_DEMAND_START; break; + case 2: pServiceConfig->dwStartType = SERVICE_DISABLED; break; + } + + if (SetServiceConfig(pServiceConfig, + dlgInfo->pService->lpServiceName, + NULL)) + { + ChangeListViewText(dlgInfo->Info, + dlgInfo->pService, + LVSTARTUP); + } + + HeapFree(ProcessHeap, + 0, + pServiceConfig); + } +} /* @@ -317,7 +337,7 @@ switch (lpnm->code) { case PSN_APPLY: - MessageBox(NULL, _T("apply"), NULL, 0); + SaveDlgInfo(dlgInfo, hwndDlg); break; } } Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Wed Aug 29 19:46:52 2007 @@ -110,7 +110,7 @@ { hSc = OpenService(hSCManager, lpServiceName, - SERVICE_QUERY_CONFIG); + SERVICE_CHANGE_CONFIG); if (hSc) { if (ChangeServiceConfig(hSc, @@ -119,7 +119,7 @@ pServiceConfig->dwErrorControl, pServiceConfig->lpBinaryPathName, pServiceConfig->lpLoadOrderGroup, - &pServiceConfig->dwTagId, + pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL, pServiceConfig->lpDependencies, pServiceConfig->lpServiceStartName, lpPassword, Modified: trunk/reactos/base/applications/mscutils/servman/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/start.c (original) +++ trunk/reactos/base/applications/mscutils/servman/start.c Wed Aug 29 19:46:52 2007 @@ -24,7 +24,7 @@ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) + if (hSCManager != NULL) { hSc = OpenService(hSCManager, Info->pCurrentService->lpServiceName,

17 years, 3 months

[peterw] 28650: _really fix it this time. (and on with the language saga)

by peterw＠svn.reactos.org

Author: peterw Date: Wed Aug 29 17:31:04 2007 New Revision: 28650 URL: http://svn.reactos.org/svn/reactos?rev=28650&view=rev Log: _really fix it this time. (and on with the language saga) Modified: trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc Modified: trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc Wed Aug 29 17:31:04 2007 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { @@ -13,18 +13,3 @@ IDS_CONTINUE, " -- Continuer (100%) -- " IDS_FILE_ACCESS, "Impossible d'accèder au fichier %s." } -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ - IDS_USAGE, "Affiche les données page par page à l'écran.\n\n\ - MORE < [Lecteur:][Chemin]Nom du fichier\n\ - Commande | MORE \n\ - MORE [Lecteur:][Chemin]Nom du fichier\n\n\ - [Lecteur:][Chemin]Nom du fichier Un fichier, dont le contenu sera affiché.\n\ - Commande\t\t Une commande, dont la sortie sera affiché.\n\n\ - À l'invite ""-- Continuer --"" you pouvez appuyer sur n'importe quelle touche pour afficher la page suivante.\n" - - IDS_CONTINUE, " -- Continuer (100%) -- " - IDS_FILE_ACCESS, "Impossible d'accèder au fichier %s." -}

17 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
67
Older →

Jump to page:

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