Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 28662: - missed that
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

Author: janderwald Date: Thu Aug 30 02:28:30 2007 New Revision: 28662 URL: http://svn.reactos.org/svn/reactos?rev=28662&view=rev Log: - missed that 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:28:30 2007 @@ -167,7 +167,7 @@ options[2] = (TCHAR*)output.c_str(); cerr << "Creating HDD Image ..." << output << endl; - if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true)) + if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) { m_HDDImage = output; return true;

1 0

[janderwald] 28661: - in theory arguments start at argv[1] - so this needs to be passed to qemu-img
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

Author: janderwald Date: Thu Aug 30 02:27:30 2007 New Revision: 28661 URL: http://svn.reactos.org/svn/reactos?rev=28661&view=rev Log: - in theory arguments start at argv[1] - so this needs to be passed to qemu-img Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Thu Aug 30 02:27:30 2007 @@ -42,7 +42,7 @@ if (procargsnum) { - for (int i = 0; i < procargsnum; i++) + for (int i = 1; i < procargsnum; i++) { length += _tcslen(procargs[i]); } @@ -50,7 +50,7 @@ length += procargsnum; szBuffer = (TCHAR*)malloc(length * sizeof(TCHAR)); length = 0; - for (int i = 0; i < procargsnum; i++) + for (int i = 1; i < procargsnum; i++) { _tcscpy(&szBuffer[length], procargs[i]); length += _tcslen(procargs[i]); 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:27:30 2007 @@ -148,22 +148,23 @@ qemuimgdir += _T("\\qemu-img.exe"); #endif - TCHAR * options[] = { + if (!isFileExisting(qemuimgdir)) + { + cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img" << endl; + return false; + } + + TCHAR * options[] = { NULL, _T("create"), NULL, _T("100M"), 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(); + options[0] = (TCHAR*)qemuimgdir.c_str(); + options[2] = (TCHAR*)output.c_str(); cerr << "Creating HDD Image ..." << output << endl; if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true))

1 0

[janderwald] 28660: - silence debug messages
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

Author: janderwald Date: Thu Aug 30 02:14:47 2007 New Revision: 28660 URL: http://svn.reactos.org/svn/reactos?rev=28660&view=rev Log: - silence debug messages Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/pipe_reader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/pipe_reader.c… ============================================================================== --- trunk/reactos/tools/sysreg/pipe_reader.cpp (original) +++ trunk/reactos/tools/sysreg/pipe_reader.cpp Thu Aug 30 02:14:47 2007 @@ -91,7 +91,7 @@ TCHAR * res = _fgetts(buf, 100, m_File); if (!res) { - cerr << "Error: PipeReader::readPipe failed" << endl; + //cerr << "Error: PipeReader::readPipe failed" << endl; free(buf); return false; } 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:14:47 2007 @@ -824,11 +824,6 @@ if (!m_DataSource->readSource (vect)) { -#ifndef __LINUX__ - cerr << "No data read" << GetLastError() << endl; -#else - cerr << "No data read" << endl; -#endif continue; } if (write_log)

1 0

[janderwald] 28659: - check if qemu-img exists for attempting to create hdd image
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

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();

1 0

[janderwald] 28658: - add options required for sysreg
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

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

1 0

[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 29 Aug '07

29 Aug '07

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,

1 0

[gedmurphy] 28656: add the remaining code for changing the list view text
by gedmurphy＠svn.reactos.org 29 Aug '07

29 Aug '07

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 */

1 0

[janderwald] 28655: - add description for LocalID setting
by janderwald＠svn.reactos.org 29 Aug '07

29 Aug '07

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 ;

1 0

[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 29 Aug '07

29 Aug '07

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

1 0

[gedmurphy] 28653: use the provided apis instead of reading directly from the registry
by gedmurphy＠svn.reactos.org 29 Aug '07

29 Aug '07

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;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs