Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[gedmurphy] 28618: - don't read the description directly from the registry - give each property dialog it's own service data instead of relying on the the global current. This will eventually allow us to have multiple property dialogs open.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Aug 28 18:49:47 2007 New Revision: 28618 URL: http://svn.reactos.org/svn/reactos?rev=28618&view=rev Log: - don't read the description directly from the registry - give each property dialog it's own service data instead of relying on the the global current. This will eventually allow us to have multiple property dialogs open. 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/reg.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 Tue Aug 28 18:49:47 2007 @@ -161,7 +161,7 @@ { LPTSTR lpDescription; - lpDescription = GetDescription(Info->pCurrentService->lpServiceName); + lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); item.pszText = lpDescription; SendMessage(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 Tue Aug 28 18:49:47 2007 @@ -71,13 +71,14 @@ /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); -LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); +LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); +LPTSTR GetServiceDescription(LPTSTR lpServiceName); +LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); /* reg */ BOOL SetDescription(LPTSTR, LPTSTR); -LPTSTR GetDescription(LPTSTR); /* propsheet.c */ LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); 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 Tue Aug 28 18:49:47 2007 @@ -9,15 +9,22 @@ #include "precomp.h" +typedef struct _SERVICEPROPSHEET +{ + PMAIN_WND_INFO Info; + ENUM_SERVICE_STATUS_PROCESS *pService; +} SERVICEPROPSHEET, *PSERVICEPROPSHEET; + + static VOID -SetButtonStates(PMAIN_WND_INFO Info, +SetButtonStates(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) { HWND hButton; DWORD Flags, State; - Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; + Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted; + State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -49,56 +56,53 @@ * values and sets it to value of the selected item */ static VOID -SetStartupType(PMAIN_WND_INFO Info, +SetStartupType(LPTSTR lpServiceName, HWND hwndDlg) { HWND hList; - HKEY hKey; - TCHAR buf[25]; - DWORD dwValueSize = 0; + LPQUERY_SERVICE_CONFIG pServiceConfig; + LPTSTR lpBuf; DWORD StartUp = 0; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR KeyBuf[300]; - - /* open the registry key for the service */ - _sntprintf(KeyBuf, - sizeof(KeyBuf) / sizeof(TCHAR), - Path, - Info->pCurrentService->lpServiceName); - - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - KeyBuf, + UINT i; + + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); + + for (i = IDS_SERVICES_AUTO; i <= IDS_SERVICES_DIS; i++) + { + if (AllocAndLoadString(&lpBuf, + hInstance, + i)) + { + SendMessage(hList, + CB_ADDSTRING, + 0, + (LPARAM)lpBuf); + HeapFree(ProcessHeap, + 0, + lpBuf); + } + } + + pServiceConfig = GetServiceConfig(lpServiceName); + + if (pServiceConfig) + { + switch (pServiceConfig->dwStartType) + { + case SERVICE_AUTO_START: StartUp = 0; break; + case SERVICE_DEMAND_START: StartUp = 1; break; + case SERVICE_DISABLED: StartUp = 2; break; + } + + SendMessage(hList, + CB_SETCURSEL, + StartUp, + 0); + + HeapFree(ProcessHeap, 0, - KEY_READ, - &hKey); - - hList = GetDlgItem(hwndDlg, IDC_START_TYPE); - - LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_SERVICES_MAN, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - LoadString(hInstance, IDS_SERVICES_DIS, buf, sizeof(buf) / sizeof(TCHAR)); - SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf); - - dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hKey, - _T("Start"), - NULL, - NULL, - (LPBYTE)&StartUp, - &dwValueSize)) - { - RegCloseKey(hKey); - return; - } - - if (StartUp == 0x02) - SendMessage(hList, CB_SETCURSEL, 0, 0); - else if (StartUp == 0x03) - SendMessage(hList, CB_SETCURSEL, 1, 0); - else if (StartUp == 0x04) - SendMessage(hList, CB_SETCURSEL, 2, 0); + pServiceConfig); + } } @@ -107,28 +111,28 @@ * the relevant service information */ static VOID -GetDlgInfo(PMAIN_WND_INFO Info, +GetDlgInfo(PSERVICEPROPSHEET dlgInfo, HWND hwndDlg) { + LPQUERY_SERVICE_CONFIG pServiceConfig; LPTSTR lpDescription; - LPTSTR lpPathToExe; /* set the service name */ SendDlgItemMessage(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, - (LPARAM)Info->pCurrentService->lpServiceName); + (LPARAM)dlgInfo->pService->lpServiceName); /* set the display name */ SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, - (LPARAM)Info->pCurrentService->lpDisplayName); + (LPARAM)dlgInfo->pService->lpDisplayName); /* set the description */ - if ((lpDescription = GetDescription(Info->pCurrentService->lpServiceName))) + if ((lpDescription = GetServiceDescription(dlgInfo->pService->lpServiceName))) { SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, @@ -139,29 +143,24 @@ HeapFree(ProcessHeap, 0, lpDescription); - - - } - - /* set the executable path */ - if ((lpPathToExe = GetExecutablePath(Info))) + } + + pServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName); + if (pServiceConfig) { SendDlgItemMessage(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, - (LPARAM)lpPathToExe); - - HeapFree(ProcessHeap, - 0, - lpPathToExe); - } + (LPARAM)pServiceConfig->lpBinaryPathName); + } + /* set startup type */ - SetStartupType(Info, hwndDlg); + SetStartupType(dlgInfo->pService->lpServiceName, hwndDlg); /* set service status */ - if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { TCHAR szServiceStatus[32]; @@ -192,7 +191,6 @@ (LPARAM)szServiceStatus); } } - /* @@ -205,13 +203,12 @@ WPARAM wParam, LPARAM lParam) { - PMAIN_WND_INFO Info; + PSERVICEPROPSHEET dlgInfo; /* Get the window context */ - Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg, - GWLP_USERDATA); - - if (Info == NULL && uMsg != WM_INITDIALOG) + dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, + GWLP_USERDATA); + if (dlgInfo == NULL && uMsg != WM_INITDIALOG) { return FALSE; } @@ -220,14 +217,14 @@ { case WM_INITDIALOG: { - Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam); - if (Info != NULL) + dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); + if (dlgInfo != NULL) { SetWindowLongPtr(hwndDlg, GWLP_USERDATA, - (LONG_PTR)Info); - GetDlgInfo(Info, hwndDlg); - SetButtonStates(Info, hwndDlg); + (LONG_PTR)dlgInfo); + GetDlgInfo(dlgInfo, hwndDlg); + SetButtonStates(dlgInfo, hwndDlg); } } break; @@ -236,31 +233,34 @@ switch(LOWORD(wParam)) { case IDC_START_TYPE: - /* Enable the 'Apply' button */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if (HIWORD(wParam) == CBN_SELCHANGE) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_START: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_START, 0); + if (DoStart(dlgInfo->Info)) + { + //UpdateServiceStatus(dlgInfo->pService); + //ChangeListViewText(dlgInfo, LVSTATUS); + //SetMenuAndButtonStates(Info); + } break; case IDC_STOP: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0); break; case IDC_PAUSE: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0); break; case IDC_RESUME: - SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); + //SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); break; case IDC_START_PARAM: - /* Enable the 'Apply' button */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; - + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; } break; @@ -273,9 +273,8 @@ switch (lpnm->code) { - case MCN_SELECT: - /* Enable the 'Apply' button */ - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case PSN_APPLY: + MessageBox(NULL, _T("apply"), NULL, 0); break; } } @@ -381,7 +380,7 @@ static VOID InitPropSheetPage(PROPSHEETPAGE *psp, - PMAIN_WND_INFO Info, + PSERVICEPROPSHEET dlgInfo, WORD idDlg, DLGPROC DlgProc) { @@ -391,7 +390,7 @@ psp->hInstance = hInstance; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; - psp->lParam = (LPARAM)Info; + psp->lParam = (LPARAM)dlgInfo; } @@ -400,6 +399,8 @@ { PROPSHEETHEADER psh; PROPSHEETPAGE psp[2]; + PSERVICEPROPSHEET pServicePropSheet; + LONG Ret = 0; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -414,11 +415,27 @@ psh.ppsp = psp; - InitPropSheetPage(&psp[0], Info, IDD_DLG_GENERAL, GeneralPageProc); - //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc); - //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc); - InitPropSheetPage(&psp[1], Info, IDD_DLG_DEPEND, DependanciesPageProc); - - return (LONG)(PropertySheet(&psh) != -1); -} - + pServicePropSheet = HeapAlloc(ProcessHeap, + 0, + sizeof(*pServicePropSheet)); + if (pServicePropSheet) + { + /* save current service, as it could change while the dialog is open */ + pServicePropSheet->pService = Info->pCurrentService; + pServicePropSheet->Info = Info; + + InitPropSheetPage(&psp[0], pServicePropSheet, IDD_DLG_GENERAL, GeneralPageProc); + //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc); + //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc); + InitPropSheetPage(&psp[1], pServicePropSheet, IDD_DLG_DEPEND, DependanciesPageProc); + + Ret = (LONG)(PropertySheet(&psh) != -1); + + HeapFree(ProcessHeap, + 0, + pServicePropSheet); + } + + return Ret; +} + 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 Tue Aug 28 18:49:47 2007 @@ -27,29 +27,25 @@ } -/* get vendor of service binary */ -LPTSTR -GetExecutablePath(PMAIN_WND_INFO Info) +LPQUERY_SERVICE_CONFIG +GetServiceConfig(LPTSTR lpServiceName) { SC_HANDLE hSCManager = NULL; SC_HANDLE hSc = NULL; LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; DWORD BytesNeeded = 0; - LPTSTR lpExePath = NULL; - - /* open handle to the SCM */ + hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE); if (hSCManager == NULL) { GetError(); - return FALSE; - } - - /* get a handle to the service requested for starting */ + return NULL; + } + hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, + lpServiceName, SERVICE_QUERY_CONFIG); if (hSc == NULL) { @@ -70,32 +66,101 @@ if (pServiceConfig == NULL) goto cleanup; - if (QueryServiceConfig(hSc, - pServiceConfig, - BytesNeeded, - &BytesNeeded)) - { - lpExePath = HeapAlloc(ProcessHeap, - 0, - (_tcslen(pServiceConfig->lpBinaryPathName) +1 ) * sizeof(TCHAR)); - - _tcscpy(lpExePath, pServiceConfig->lpBinaryPathName); + if (!QueryServiceConfig(hSc, + pServiceConfig, + BytesNeeded, + &BytesNeeded)) + { + HeapFree(ProcessHeap, + 0, + pServiceConfig); + + pServiceConfig = NULL; } } } cleanup: - if (pServiceConfig) - HeapFree(ProcessHeap, - 0, - pServiceConfig); if (hSCManager != NULL) CloseServiceHandle(hSCManager); if (hSc != NULL) CloseServiceHandle(hSc); - return lpExePath; -} + return pServiceConfig; +} + + +LPTSTR +GetServiceDescription(LPTSTR lpServiceName) +{ + SC_HANDLE hSCManager = NULL; + SC_HANDLE hSc = NULL; + SERVICE_DESCRIPTION *pServiceDescription = NULL; + LPTSTR lpDescription = NULL; + DWORD BytesNeeded = 0; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hSCManager == NULL) + { + GetError(); + return NULL; + } + + hSc = OpenService(hSCManager, + lpServiceName, + SERVICE_QUERY_CONFIG); + if (hSc) + { + if (!QueryServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + NULL, + 0, + &BytesNeeded)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + pServiceDescription = (SERVICE_DESCRIPTION *) HeapAlloc(ProcessHeap, + 0, + BytesNeeded); + if (pServiceDescription == NULL) + goto cleanup; + + if (QueryServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)pServiceDescription, + BytesNeeded, + &BytesNeeded)) + { + if (pServiceDescription->lpDescription) + { + lpDescription = HeapAlloc(ProcessHeap, + 0, + (_tcslen(pServiceDescription->lpDescription) + 1) * sizeof(TCHAR)); + if (lpDescription) + _tcscpy(lpDescription, + pServiceDescription->lpDescription); + } + } + } + } + } + +cleanup: + if (pServiceDescription) + HeapFree(ProcessHeap, + 0, + pServiceDescription); + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hSc != NULL) + CloseServiceHandle(hSc); + + return lpDescription; +} + + static BOOL @@ -206,6 +271,7 @@ RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; + LPTSTR lpDescription; LVITEM lvItem; TCHAR szNumServices[32]; TCHAR szStatus[64]; @@ -223,7 +289,6 @@ for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; - LPTSTR lpDescription = NULL; LPTSTR lpLogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; @@ -260,7 +325,7 @@ lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem); /* set the description */ - if ((lpDescription = GetDescription(pService->lpServiceName))) + if ((lpDescription = GetServiceDescription(pService->lpServiceName))) { lvItem.pszText = lpDescription; lvItem.iSubItem = 1; Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Tue Aug 28 18:49:47 2007 @@ -57,46 +57,3 @@ return bRet; } - - -LPTSTR -GetDescription(LPTSTR lpServiceName) -{ - HKEY hKey; - LPTSTR lpDescription = NULL; - DWORD dwValueSize = 0; - - hKey = OpenServiceKey(lpServiceName); - if (hKey) - { - if (RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize) == ERROR_SUCCESS) - { - lpDescription = HeapAlloc(ProcessHeap, - 0, - dwValueSize); - if (lpDescription) - { - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)lpDescription, - &dwValueSize) != ERROR_SUCCESS) - { - HeapFree(ProcessHeap, - 0, - lpDescription); - } - } - } - - RegCloseKey(hKey); - } - - return lpDescription; -}

17 years, 3 months

[hpoussin] 28617: Install VBE and VGA drivers when a compatible graphic adapter is detected See issue #2589 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 28 18:27:23 2007 New Revision: 28617 URL: http://svn.reactos.org/svn/reactos?rev=28617&view=rev Log: Install VBE and VGA drivers when a compatible graphic adapter is detected See issue #2589 for more details. Modified: trunk/reactos/media/inf/display.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf (original) +++ trunk/reactos/media/inf/display.inf Tue Aug 28 18:27:23 2007 @@ -1,16 +1,19 @@ ; Display.INF ; -; Installation file for the Display class +; Installation file for the display adapters and display class ; [Version] Signature = "$Windows NT$" ;Signature = "$ReactOS$" LayoutFile = layout.inf +Class = Display +ClassGUID = {4D36E968-E325-11CE-BFC1-08002BE10318} +Provider = %ReactOS% +DriverVer = 08/25/2007,1.10 -Class = Display -ClassGUID = {4d36e968-e325-11ce-bfc1-08002be10318} -Provider = %ReactOS% -DriverVer = 10/18/2005,1.00 +[DestinationDirs] +DefaultDestDir = 12 +VGA.Display_CopyFiles.NT = 11 [ClassInstall32.NT] AddReg = DisplayClass.NT.AddReg @@ -20,6 +23,50 @@ HKR, , Icon, 0, "-1" HKR, , Installer32, 0, "desk.cpl,DisplayClassInstaller" +[Manufacturer] +%StdMfg% = StdMfg + +[StdMfg] +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0001 +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0300 +%VGA.DeviceDesc% = VGA_Inst,PCI\CC_0301 + +;---------------------------- VGA/VBE DRIVER ---------------------------- + +[VGA_Inst.NT] +CopyFiles = VGA.Miniport_CopyFiles.NT, VGA.Display_CopyFiles.NT + +[VGA.Miniport_CopyFiles.NT] +vgamp.sys +vbemp.sys + +[VGA.Display_CopyFiles.NT] +vgaddi.dll +framebuf.dll + +[VGA_Inst.NT.Services] +AddService = VGA, , VGA_Service_Inst +AddService = VBE, 0x00000002, VBE_Service_Inst + +[VGA_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\vgamp.sys +LoadOrderGroup = Video Save + +[VBE_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 0 +ServiceBinary = %12%\vbemp.sys +LoadOrderGroup = Video SVGA Save + +;-------------------------------- STRINGS ------------------------------- + [Strings] ReactOS = "ReactOS Team" DisplayClassName = "Display Adapters" + +StdMfg = "(Standard display adapters)" +VGA.DeviceDesc = "VGA-compatible graphic card"

17 years, 3 months

[janderwald] 28616: - search for ReactOS installation cd and try locate directly the unattend.inf. This allows us to use the _same_ unattend.inf which is used in usetup. As a result we no longer need to put a second unattend.inf in the reactos.cab which revives the bootcdregtest

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 28 18:00:24 2007 New Revision: 28616 URL: http://svn.reactos.org/svn/reactos?rev=28616&view=rev Log: - search for ReactOS installation cd and try locate directly the unattend.inf. This allows us to use the _same_ unattend.inf which is used in usetup. As a result we no longer need to put a second unattend.inf in the reactos.cab which revives the bootcdregtest 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 Tue Aug 28 18:00:24 2007 @@ -60,6 +60,8 @@ /* FUNCTIONS ****************************************************************/ +BOOL +GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength); #ifdef VMWINST static BOOL @@ -779,7 +781,7 @@ static BOOL -RunControlPanelApplet(HWND hwnd, TCHAR *lpCommandLine) +RunControlPanelApplet(HWND hwnd, WCHAR *lpCommandLine) { STARTUPINFO StartupInfo; PROCESS_INFORMATION ProcessInformation; @@ -787,7 +789,7 @@ ZeroMemory(&StartupInfo, sizeof(STARTUPINFO)); StartupInfo.cb = sizeof(STARTUPINFO); - if (!CreateProcess(NULL, + if (!CreateProcessW(NULL, lpCommandLine, NULL, NULL, @@ -815,7 +817,7 @@ LPARAM lParam) { PSETUPDATA SetupData; - TCHAR szBuffer[MAX_PATH]; + WCHAR szBuffer[1024]; /* Retrieve pointer to the global setup data */ SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -841,7 +843,7 @@ { case IDC_CUSTOMLOCALE: { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); + wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,5")); RunControlPanelApplet(hwndDlg, szBuffer); /* FIXME: Update input locale name */ } @@ -849,7 +851,7 @@ case IDC_CUSTOMLAYOUT: { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); + wcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL main.cpl,@1")); RunControlPanelApplet(hwndDlg, szBuffer); } break; @@ -868,7 +870,16 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (SetupData->UnattendSetup) { - _tcscpy(szBuffer, _T("rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\"")); + WCHAR szPath[MAX_PATH]; + if (GetRosInstallCD(szPath, MAX_PATH)) + { + wsprintf(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"%s\\reactos\\unattend.inf\"", szPath); + } + else + { + wcscpy(szBuffer, L"rundll32.exe shell32.dll,Control_RunDLL intl.cpl,,/f:\"unattend.inf\""); + } + RunControlPanelApplet(hwndDlg, szBuffer); SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; @@ -2144,29 +2155,103 @@ return TRUE; } +/* + * GetRosInstallCD should find the path to ros installation medium + * BUG 1 + * If there are more than one CDDrive in it containing a ReactOS + * installation cd, then it will pick the first one regardless if + * it is really the installation cd + * + * The best way to implement this is to set the key + * HKLM\Software\Microsoft\Windows NT\CurrentVersion\SourcePath (REG_SZ) + */ + +BOOL +GetRosInstallCD(WCHAR * szPath, DWORD dwPathLength) +{ + WCHAR szDrives[512]; + WCHAR szDrive[] = L"D:\\"; + DWORD dwLength, dwIndex; + WCHAR * pDrive; + dwLength = GetLogicalDriveStringsW(sizeof(szDrives) / sizeof(WCHAR), szDrives); + + if (dwLength > (sizeof(szDrives) / sizeof(WCHAR)) || dwLength == 0) + { + /* buffer too small or failure */ + LogItem(SYSSETUP_SEVERITY_INFORMATION, L"GetLogicalDriveStringsW failed"); + return FALSE; + } + + pDrive = szDrives; + for (dwIndex = 0; dwIndex < dwLength; dwIndex++) + { + szDrive[0] = pDrive[dwIndex]; + if (GetDriveType(szDrive) == DRIVE_CDROM) + { + WCHAR szBuffer[MAX_PATH]; + wcscpy(szBuffer, szDrive); + wcscat(szBuffer, L"reactos\\ntoskrnl.exe"); + LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer); + if (FileExists(szBuffer, NULL)) + { + wcsncpy(szPath, szDrive, dwPathLength); + return TRUE; + } + } + } + return FALSE; +} VOID -InstallWizard(VOID) -{ - PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[8]; - PROPSHEETPAGE psp = {0}; - UINT nPages = 0; +ProcessUnattendSetup() +{ + WCHAR szPath[MAX_PATH]; HINF hUnattendedInf; - - /* Clear setup data */ - ZeroMemory(&SetupData, sizeof(SETUPDATA)); - - hUnattendedInf = SetupOpenInfFileW(L"unattend.inf", + DWORD dwLength; + + if (!GetRosInstallCD(szPath, MAX_PATH)) + { + /* no cd drive found */ + return; + } + + dwLength = wcslen(szPath); + if (dwLength + 21 > MAX_PATH) + { + /* FIXME + * allocate bigger buffer + */ + return; + } + + wcscat(szPath, L"reactos\\unattend.inf"); + + hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); - + if (hUnattendedInf != INVALID_HANDLE_VALUE) { SetupData.UnattendSetup = ProcessUnattendInf(hUnattendedInf); SetupCloseInfFile(hUnattendedInf); } +} + + +VOID +InstallWizard(VOID) +{ + PROPSHEETHEADER psh; + HPROPSHEETPAGE ahpsp[8]; + PROPSHEETPAGE psp = {0}; + UINT nPages = 0; + + /* Clear setup data */ + ZeroMemory(&SetupData, sizeof(SETUPDATA)); + + ProcessUnattendSetup(); + /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE);

17 years, 3 months

[hpoussin] 28615: Revert r28603 and add the correct fix

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 28 17:40:56 2007 New Revision: 28615 URL: http://svn.reactos.org/svn/reactos?rev=28615&view=rev Log: Revert r28603 and add the correct fix Modified: trunk/reactos/include/reactos/typedefs_host.h trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Tue Aug 28 17:40:56 2007 @@ -11,6 +11,16 @@ #include <stdlib.h> #include <limits.h> + +#ifndef __fastcall +#define __fastcall __attribute__((fastcall)) +#endif +#ifndef __cdecl +#define __cdecl __attribute__((cdecl)) +#endif +#ifndef __stdcall +#define __stdcall __attribute__((stdcall)) +#endif #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } #define ASSERT(x) { if (!(x)) { printf("Assertion " #x " at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=28615… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c (original) +++ trunk/reactos/lib/rtl/bitmap.c Tue Aug 28 17:40:56 2007 @@ -36,6 +36,7 @@ static int +__cdecl NTDLL_RunSortFn(const void *lhs, const void *rhs) {

17 years, 3 months

[hpoussin] 28614: Forgot one file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 28 10:35:54 2007 New Revision: 28614 URL: http://svn.reactos.org/svn/reactos?rev=28614&view=rev Log: Forgot one file Modified: trunk/rostests/winetests/shell32/shellpath.c Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… ============================================================================== --- trunk/rostests/winetests/shell32/shellpath.c (original) +++ trunk/rostests/winetests/shell32/shellpath.c Tue Aug 28 10:35:54 2007 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * This is a test program for the SHGet{Special}Folder{Path|Location} functions * of shell32, that get either a filesytem path or a LPITEMIDLIST (shell * namespace) path for a given folder (CSIDL value). @@ -30,7 +30,6 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" @@ -74,7 +73,7 @@ BYTE pidlType; }; -static HMODULE hShell32; +static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND, int, HANDLE, DWORD, LPITEMIDLIST *); @@ -153,55 +152,57 @@ static void loadShell32(void) { - hShell32 = LoadLibraryA("shell32"); - if (hShell32) - { - HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); - - pSHGetFolderPathA = (void *)GetProcAddress(hShell32, - "SHGetFolderPathA"); - pSHGetFolderLocation = (void *)GetProcAddress(hShell32, - "SHGetFolderLocation"); - pSHGetSpecialFolderPathA = (void *)GetProcAddress(hShell32, - "SHGetSpecialFolderPathA"); - pSHGetSpecialFolderLocation = (void *)GetProcAddress(hShell32, - "SHGetSpecialFolderLocation"); - pDllGetVersion = (void *)GetProcAddress(hShell32, "DllGetVersion"); - pILFindLastID = (void *)GetProcAddress(hShell32, "ILFindLastID"); - if (!pILFindLastID) - pILFindLastID = (void *)GetProcAddress(hShell32, (LPCSTR)16); - pSHFileOperationA = (void *)GetProcAddress(hShell32, - "SHFileOperationA"); - pSHGetMalloc = (void *)GetProcAddress(hShell32, "SHGetMalloc"); - - ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); - if (pSHGetMalloc) - { - HRESULT hr = pSHGetMalloc(&pMalloc); - - ok(SUCCEEDED(hr), "SHGetMalloc failed: 0x%08lx\n", hr); - ok(pMalloc != NULL, "SHGetMalloc returned a NULL IMalloc\n"); - } - - if (pDllGetVersion) - { - shellVersion.cbSize = sizeof(shellVersion); - pDllGetVersion(&shellVersion); - if (winetest_interactive) - printf("shell32 version is %ld.%ld\n", - shellVersion.dwMajorVersion, shellVersion.dwMinorVersion); - } - } + HMODULE hShell32 = GetModuleHandleA("shell32"); + +#define GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hShell32, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + GET_PROC(DllGetVersion) + GET_PROC(SHGetFolderPathA) + GET_PROC(SHGetFolderLocation) + GET_PROC(SHGetSpecialFolderPathA) + GET_PROC(SHGetSpecialFolderLocation) + GET_PROC(ILFindLastID) + if (!pILFindLastID) + pILFindLastID = (void *)GetProcAddress(hShell32, (LPCSTR)16); + GET_PROC(SHFileOperationA) + GET_PROC(SHGetMalloc) + + ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); + if (pSHGetMalloc) + { + HRESULT hr = pSHGetMalloc(&pMalloc); + + ok(SUCCEEDED(hr), "SHGetMalloc failed: 0x%08x\n", hr); + ok(pMalloc != NULL, "SHGetMalloc returned a NULL IMalloc\n"); + } + + if (pDllGetVersion) + { + shellVersion.cbSize = sizeof(shellVersion); + pDllGetVersion(&shellVersion); + if (winetest_interactive) + printf("shell32 version is %d.%d\n", + shellVersion.dwMajorVersion, shellVersion.dwMinorVersion); + } +#undef GET_PROC } #ifndef CSIDL_PROFILES #define CSIDL_PROFILES 0x003e #endif +/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want + * here is its original value. + */ +#define OLD_CSIDL_MYDOCUMENTS 0x000c + /* A couple utility printing functions */ static const char *getFolderName(int folder) { - static char unknown[17]; + static char unknown[32]; #define CSIDL_TO_STR(x) case x: return#x; switch (folder) @@ -218,7 +219,7 @@ CSIDL_TO_STR(CSIDL_SENDTO); CSIDL_TO_STR(CSIDL_BITBUCKET); CSIDL_TO_STR(CSIDL_STARTMENU); - CSIDL_TO_STR(CSIDL_MYDOCUMENTS); + CSIDL_TO_STR(OLD_CSIDL_MYDOCUMENTS); CSIDL_TO_STR(CSIDL_MYMUSIC); CSIDL_TO_STR(CSIDL_MYVIDEO); CSIDL_TO_STR(CSIDL_DESKTOPDIRECTORY); @@ -266,7 +267,7 @@ CSIDL_TO_STR(CSIDL_COMPUTERSNEARME); #undef CSIDL_TO_STR default: - wnsprintfA(unknown, sizeof(unknown), "unknown (0x%04x)", folder); + sprintf(unknown, "unknown (0x%04x)", folder); return unknown; } } @@ -277,8 +278,7 @@ if (!guid) return NULL; - wnsprintfA(guidSTR, sizeof(guidSTR), - "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); @@ -297,7 +297,7 @@ hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); ok(hr == E_INVALIDARG, "SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check a bogus user token: */ @@ -305,7 +305,7 @@ hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); ok(hr == E_FAIL, "SHGetFolderLocation(NULL, CSIDL_FAVORITES, 2, 0, &pidl)\n" - "returned 0x%08lx, expected E_FAIL\n", hr); + "returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* check reserved is not zero: */ @@ -313,7 +313,7 @@ hr = pSHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl); ok(hr == E_INVALIDARG, "SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 1, &pidl)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); if (SUCCEEDED(hr)) IMalloc_Free(pMalloc, pidl); /* a NULL pidl pointer crashes, so don't test it */ @@ -329,7 +329,7 @@ /* SHGetSpecialFolderLocation(NULL, 0, NULL) crashes */ hr = pSHGetSpecialFolderLocation(NULL, 0xeeee, &pidl); ok(hr == E_INVALIDARG, - "SHGetSpecialFolderLocation(NULL, 0xeeee, &pidl) returned 0x%08lx, " + "SHGetSpecialFolderLocation(NULL, 0xeeee, &pidl) returned 0x%08x, " "expected E_INVALIDARG\n", hr); } @@ -345,11 +345,11 @@ SHGFP_TYPE_DEFAULT, path); ok(hr == E_FAIL, "SHGetFolderPathA(NULL, CSIDL_DESKTOP, 2, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08lx, expected E_FAIL\n", hr); + "returned 0x%08x, expected E_FAIL\n", hr); hr = pSHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path); ok(hr == E_INVALIDARG, "SHGetFolderPathA(NULL, 0xeeee, NULL, SHGFP_TYPE_DEFAULT, path)\n" - "returned 0x%08lx, expected E_INVALIDARG\n", hr); + "returned 0x%08x, expected E_INVALIDARG\n", hr); } static void testSHGetSpecialFolderPathInvalidArgs(void) @@ -359,16 +359,18 @@ if (!pSHGetSpecialFolderPathA) return; +#if 0 ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE); ok(!ret, "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_BITBUCKET, FALSE)\n" "returned TRUE, expected FALSE\n"); +#endif /* odd but true: calling with a NULL path still succeeds if it's a real - * dir + * dir (on some windows platform). on winME it generates exception. */ - ret = pSHGetSpecialFolderPathA(NULL, NULL, CSIDL_PROGRAMS, FALSE); + ret = pSHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE); ok(ret, - "SHGetSpecialFolderPathA(NULL, NULL, CSIDL_PROGRAMS, FALSE)\n" + "SHGetSpecialFolderPathA(NULL, path, CSIDL_PROGRAMS, FALSE)\n" "returned FALSE, expected TRUE\n"); ret = pSHGetSpecialFolderPathA(NULL, path, 0xeeee, FALSE); ok(!ret, @@ -398,7 +400,7 @@ hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); ok(SUCCEEDED(hr) || optional, "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, @@ -432,7 +434,7 @@ hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); ok(SUCCEEDED(hr) || optional, "SHGetSpecialFolderLocation(NULL, %s, &pidl)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { ok(pidl != NULL, @@ -462,7 +464,7 @@ hr = pSHGetFolderPathA(NULL, folder, NULL, SHGFP_TYPE_CURRENT, path); ok(SUCCEEDED(hr) || optional, "SHGetFolderPathA(NULL, %s, NULL, SHGFP_TYPE_CURRENT, path)\n" - "failed: 0x%08lx\n", getFolderName(folder), hr); + "failed: 0x%08x\n", getFolderName(folder), hr); } static void testSHGetSpecialFolderPath(BOOL optional, int folder) @@ -720,21 +722,21 @@ /* test some failure cases first: */ hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES, NULL, - SHGFP_TYPE_CURRENT, NULL); + SHGFP_TYPE_CURRENT, path); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "SHGetFolderPath returned 0x%08lx, expected 0x80070002\n", hr); + "SHGetFolderPath returned 0x%08x, expected 0x80070002\n", hr); pidl = NULL; hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); ok(hr == E_FAIL, - "SHGetFolderLocation returned 0x%08lx, expected E_FAIL\n", hr); + "SHGetFolderLocation returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr) && pidl) IMalloc_Free(pMalloc, pidl); ok(!pSHGetSpecialFolderPathA(NULL, path, CSIDL_FAVORITES, FALSE), "SHGetSpecialFolderPath succeeded, expected failure\n"); pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidl); - ok(hr == E_FAIL, "SHGetFolderLocation returned 0x%08lx, expected E_FAIL\n", + ok(hr == E_FAIL, "SHGetFolderLocation returned 0x%08x, expected E_FAIL\n", hr); if (SUCCEEDED(hr) && pidl) IMalloc_Free(pMalloc, pidl); @@ -753,13 +755,13 @@ "with ERROR_ALREADY_EXISTS\n"); if (!ret) ok(GetLastError() == ERROR_ALREADY_EXISTS, - "CreateDirectoryA failed with %ld, " + "CreateDirectoryA failed with %d, " "expected ERROR_ALREADY_EXISTS\n", GetLastError()); } ok(SUCCEEDED(hr), "SHGetFolderPath(NULL, CSIDL_FAVORITES | CSIDL_FLAG_CREATE, " - "NULL, SHGFP_TYPE_CURRENT, path)\nfailed: 0x%08lx\n", hr); + "NULL, SHGFP_TYPE_CURRENT, path)\nfailed: 0x%08x\n", hr); } /* Subprocess helper 2: make sure SHGetFolderPath still succeeds when the @@ -768,10 +770,11 @@ static void testNonExistentPath2(void) { HRESULT hr; + char path[MAX_PATH]; hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES | CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_CURRENT, NULL); - ok(SUCCEEDED(hr), "SHGetFolderPath failed: 0x%08lx\n", hr); + SHGFP_TYPE_CURRENT, path); + ok(SUCCEEDED(hr), "SHGetFolderPath failed: 0x%08x\n", hr); } static void doChild(const char *arg) @@ -825,16 +828,15 @@ modifiedPath[len++] = '\0'; if (winetest_interactive) printf("Changing CSIDL_FAVORITES to %s\n", modifiedPath); - if (!RegSetValueExA(key, "Favorites", 0, type, (LPBYTE) modifiedPath, len)) + if (!RegSetValueExA(key, "Favorites", 0, type, + (LPBYTE)modifiedPath, len)) { - char buffer[MAX_PATH]; + char buffer[MAX_PATH+20]; STARTUPINFOA startup; PROCESS_INFORMATION info; HRESULT hr; - BOOL ret; - - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 1", - selfname); + + sprintf(buffer, "%s tests/shellpath.c 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -847,7 +849,7 @@ /* Query the path to be able to delete it below */ hr = pSHGetFolderPathA(NULL, CSIDL_FAVORITES, NULL, SHGFP_TYPE_CURRENT, modifiedPath); - ok(SUCCEEDED(hr), "SHGetFolderPathA failed: 0x%08lx\n", hr); + ok(SUCCEEDED(hr), "SHGetFolderPathA failed: 0x%08x\n", hr); /* restore original values: */ if (winetest_interactive) @@ -856,8 +858,7 @@ strlen(originalPath) + 1); RegFlushKey(key); - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 2", - selfname); + sprintf(buffer, "%s tests/shellpath.c 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -867,8 +868,10 @@ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "child process termination\n"); - ret = RemoveDirectoryA(modifiedPath); - ok( ret, "RemoveDirectoryA failed: %ld\n", GetLastError()); + strcpy(buffer, modifiedPath); + strcat(buffer, "\\desktop.ini"); + DeleteFileA(buffer); + RemoveDirectoryA(modifiedPath); } } else if (winetest_interactive) @@ -886,7 +889,6 @@ if (!init()) return; loadShell32(); - if (!hShell32) return; if (myARGC >= 3) doChild(myARGV[2]);

17 years, 4 months

[janderwald] 28613: - implement AutoPartioning - set AutoPartition = 1 if you want unattended setup to create one partition with maximum size of disk

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Aug 28 00:03:06 2007 New Revision: 28613 URL: http://svn.reactos.org/svn/reactos?rev=28613&view=rev Log: - implement AutoPartioning - set AutoPartition = 1 if you want unattended setup to create one partition with maximum size of disk Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Aug 28 00:03:06 2007 @@ -1394,13 +1394,21 @@ if (IsUnattendedSetup) { - if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) + if (!SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber)) { - return(SELECT_FILE_SYSTEM_PAGE); + if (AutoPartition) + { + PPARTENTRY PartEntry = PartEntry = PartitionList->CurrentPartition; + ULONG MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ + CreateNewPartition (PartitionList, + MaxSize, + TRUE); + return (SELECT_FILE_SYSTEM_PAGE); + } } else { - return (CREATE_PARTITION_PAGE); + return(SELECT_FILE_SYSTEM_PAGE); } } @@ -1706,17 +1714,9 @@ while (TRUE) { MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (!IsUnattendedSetup || !AutoPartition) - { - ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + ShowPartitionSizeInputBox (12, 14, xScreen - 12, 17, /* left, top, right, bottom */ MaxSize, InputBuffer, &Quit, &Cancel); - } - else - { - Quit = FALSE; - Cancel = FALSE; - } - if (Quit == TRUE) + if (Quit == TRUE) { if (ConfirmQuit (Ir) == TRUE) { @@ -1729,7 +1729,7 @@ } else { - PartSize = atoi (InputBuffer); + PartSize = atoi (InputBuffer); if (PartSize < 1) { /* Too small */

17 years, 4 months

[gedmurphy] 28612: - update the stored service status after attempting to change it - add functionality for changing the list view text and use it to change the status text - various other bits and bobs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Aug 27 23:31:09 2007 New Revision: 28612 URL: http://svn.reactos.org/svn/reactos?rev=28612&view=rev Log: - update the stored service status after attempting to change it - add functionality for changing the list view text and use it to change the status text - various other bits and bobs Modified: trunk/reactos/base/applications/mscutils/servman/control.c 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/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet.c trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/reg.c trunk/reactos/base/applications/mscutils/servman/resource.h trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/control.c (original) +++ trunk/reactos/base/applications/mscutils/servman/control.c Mon Aug 27 23:31:09 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/mscutils/servman/control + * FILE: base/applications/mscutils/servman/control.c * PURPOSE: Stops, pauses and resumes a service - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -41,7 +41,7 @@ /* open handle to the service */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SC_MANAGER_ALL_ACCESS); if (hSc == NULL) { @@ -138,7 +138,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_STOP); if (hProgDlg) { @@ -158,7 +158,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_PAUSE); if (hProgDlg) { @@ -178,7 +178,7 @@ HWND hProgDlg; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_RESUME); if (hProgDlg) { 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 Mon Aug 27 23:31:09 2007 @@ -28,7 +28,7 @@ /* get a handle to the service requested for deleting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, DELETE); if (hSc == NULL) { @@ -87,7 +87,7 @@ IDC_DEL_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); item.mask = LVIF_TEXT; 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 Mon Aug 27 23:31:09 2007 @@ -146,7 +146,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Íå", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Ja", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Yes", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -144,7 +144,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Oui", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Ya", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -143,7 +143,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Si", IDOK, 26, 129, 54, 13 - PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -150,7 +150,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Tak", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Nie", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Nie", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -142,7 +142,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Äà", IDOK, 26, 129, 54, 13 - PUSHBUTTON "Íåò", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "Íåò", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -152,7 +152,7 @@ LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "ãªè", IDOK, 26, 129, 54, 13 - PUSHBUTTON "äÁèãªè", IDCANCEL, 102, 129, 54, 13 + DEFPUSHBUTTON "äÁèãªè", IDCANCEL, 102, 129, 54, 13 END IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 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 Mon Aug 27 23:31:09 2007 @@ -8,6 +8,12 @@ */ #include "precomp.h" + +#define LVNAME 0 +#define LVDESC 1 +#define LVSTATUS 2 +#define LVSTARTUP 3 +#define LVLOGONAS 4 static const TCHAR szMainWndClass[] = TEXT("ServManWndClass"); @@ -136,6 +142,73 @@ } } +static VOID +ChangeListViewText(PMAIN_WND_INFO Info, + UINT Column) +{ + LVITEM item; + + item.iItem = Info->SelectedItem; + item.iSubItem = Column; + + switch (Column) + { + case LVNAME: + + break; + + case LVDESC: + { + LPTSTR lpDescription; + + lpDescription = GetDescription(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) + { + LoadString(hInstance, + IDS_SERVICES_STARTED, + szStatus, + sizeof(szStatus) / sizeof(TCHAR)); + } + else + { + szStatus[0] = 0; + } + + item.pszText = szStatus; + SendMessage(Info->hListView, + LVM_SETITEMTEXT, + item.iItem, + (LPARAM) &item); + } + break; + + case LVSTARTUP: + + break; + + case LVLOGONAS: + + break; + } +} + VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info) { @@ -163,8 +236,8 @@ EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED); EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED); - Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->CurrentService->ServiceStatusProcess.dwCurrentState; + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -369,9 +442,8 @@ lvc.fmt = LVCFMT_LEFT; /* Add columns to the list-view */ - /* name */ - lvc.iSubItem = 0; + lvc.iSubItem = LVNAME; lvc.cx = 150; LoadString(hInstance, IDS_FIRSTCOLUMN, @@ -383,7 +455,7 @@ &lvc); /* description */ - lvc.iSubItem = 1; + lvc.iSubItem = LVDESC; lvc.cx = 240; LoadString(hInstance, IDS_SECONDCOLUMN, @@ -395,7 +467,7 @@ &lvc); /* status */ - lvc.iSubItem = 2; + lvc.iSubItem = LVSTATUS; lvc.cx = 55; LoadString(hInstance, IDS_THIRDCOLUMN, @@ -407,7 +479,7 @@ &lvc); /* startup type */ - lvc.iSubItem = 3; + lvc.iSubItem = LVSTARTUP; lvc.cx = 80; LoadString(hInstance, IDS_FOURTHCOLUMN, @@ -419,7 +491,7 @@ &lvc); /* logon as */ - lvc.iSubItem = 4; + lvc.iSubItem = LVLOGONAS; lvc.cx = 100; LoadString(hInstance, IDS_FITHCOLUMN, @@ -509,7 +581,7 @@ Info->SelectedItem = pnmv->iItem; /* get pointer to selected service */ - Info->CurrentService = GetSelectedService(Info); + Info->pCurrentService = GetSelectedService(Info); /* alter options for the service */ SetMenuAndButtonStates(Info); @@ -518,7 +590,7 @@ SendMessage(Info->hStatus, SB_SETTEXT, 1, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); /* show the properties button */ SendMessage(Info->hTool, @@ -613,7 +685,7 @@ case ID_DELETE: { - if (Info->CurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING) + if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING) { DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), @@ -640,22 +712,8 @@ { if (DoStart(Info)) { - LVITEM item; - TCHAR szStatus[64]; - - LoadString(hInstance, - IDS_SERVICES_STARTED, - szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - item.pszText = szStatus; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_RUNNING; + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -665,17 +723,8 @@ case ID_STOP: if (DoStop(Info)) { - LVITEM item; - - item.pszText = 0; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED; + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); SetMenuAndButtonStates(Info); SetFocus(Info->hListView); } @@ -692,22 +741,11 @@ case ID_RESTART: if (DoStop(Info)) { - if(!DoStart(Info)) - { - LVITEM item; - - item.pszText = 0; - item.iItem = Info->SelectedItem; - item.iSubItem = 2; - SendMessage(Info->hListView, - LVM_SETITEMTEXT, - item.iItem, - (LPARAM) &item); - - Info->CurrentService->ServiceStatusProcess.dwCurrentState = SERVICE_STOPPED; - SetMenuAndButtonStates(Info); - SetFocus(Info->hListView); - } + DoStart(Info); + UpdateServiceStatus(Info->pCurrentService); + ChangeListViewText(Info, LVSTATUS); + SetMenuAndButtonStates(Info); + SetFocus(Info->hListView); } 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 Mon Aug 27 23:31:09 2007 @@ -26,7 +26,7 @@ int nCmdShow; ENUM_SERVICE_STATUS_PROCESS *pAllServices; - ENUM_SERVICE_STATUS_PROCESS *CurrentService; /* Stores the current selected service */ + ENUM_SERVICE_STATUS_PROCESS *pCurrentService; INT SelectedItem;/* selection number in the list view */ BOOL bDlgOpen; @@ -59,9 +59,6 @@ /* start */ BOOL DoStart(PMAIN_WND_INFO Info); -/* stop */ - - /* control */ BOOL DoStop(PMAIN_WND_INFO Info); BOOL DoPause(PMAIN_WND_INFO Info); @@ -76,6 +73,7 @@ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); LPTSTR GetExecutablePath(PMAIN_WND_INFO Info); BOOL RefreshServiceList(PMAIN_WND_INFO Info); +BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); /* reg */ BOOL SetDescription(LPTSTR, LPTSTR); 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 Mon Aug 27 23:31:09 2007 @@ -16,8 +16,8 @@ HWND hButton; DWORD Flags, State; - Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted; - State = Info->CurrentService->ServiceStatusProcess.dwCurrentState; + Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted; + State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState; if (State == SERVICE_STOPPED) { @@ -64,7 +64,7 @@ _sntprintf(KeyBuf, sizeof(KeyBuf) / sizeof(TCHAR), Path, - Info->CurrentService->lpServiceName); + Info->pCurrentService->lpServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, KeyBuf, @@ -118,17 +118,17 @@ IDC_SERV_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpServiceName); + (LPARAM)Info->pCurrentService->lpServiceName); /* set the display name */ SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, - (LPARAM)Info->CurrentService->lpDisplayName); + (LPARAM)Info->pCurrentService->lpDisplayName); /* set the description */ - if ((lpDescription = GetDescription(Info->CurrentService->lpServiceName))) + if ((lpDescription = GetDescription(Info->pCurrentService->lpServiceName))) { SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, @@ -161,7 +161,7 @@ SetStartupType(Info, hwndDlg); /* set service status */ - if (Info->CurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) + if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) { TCHAR szServiceStatus[32]; @@ -407,7 +407,7 @@ psh.hwndParent = Info->hMainWnd; psh.hInstance = hInstance; psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); - psh.pszCaption = Info->CurrentService->lpDisplayName; + psh.pszCaption = Info->pCurrentService->lpDisplayName; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.pfnCallback = AddEditButton; 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 Mon Aug 27 23:31:09 2007 @@ -49,7 +49,7 @@ /* get a handle to the service requested for starting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SERVICE_QUERY_CONFIG); if (hSc == NULL) { @@ -169,6 +169,40 @@ BOOL +UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService) +{ + SC_HANDLE hScm; + BOOL bRet = FALSE; + + hScm = OpenSCManager(NULL, + NULL, + SC_MANAGER_ENUMERATE_SERVICE); + if (hScm != INVALID_HANDLE_VALUE) + { + SC_HANDLE hService; + + hService = OpenService(hScm, + pService->lpServiceName, + SERVICE_QUERY_STATUS); + if (hService) + { + DWORD size; + + QueryServiceStatusEx(hService, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&pService->ServiceStatusProcess, + sizeof(*pService), + &size); + + bRet = TRUE; + } + } + + return bRet; +} + + +BOOL RefreshServiceList(PMAIN_WND_INFO Info) { ENUM_SERVICE_STATUS_PROCESS *pService; Modified: trunk/reactos/base/applications/mscutils/servman/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/reg.c (original) +++ trunk/reactos/base/applications/mscutils/servman/reg.c Mon Aug 27 23:31:09 2007 @@ -2,104 +2,100 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/reg.c - * PURPOSE: Query service information - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * PURPOSE: functions for querying a services registry key + * COPYRIGHT: Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * */ #include "precomp.h" -/* Sets the service description in the registry */ -BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description) +static HKEY +OpenServiceKey(LPTSTR lpServiceName) +{ + HKEY hKey = NULL; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + return hKey; + } + else + { + return NULL; + } +} + +BOOL +SetDescription(LPTSTR lpServiceName, + LPTSTR lpDescription) { HKEY hKey; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; TCHAR szBuf[MAX_PATH]; - LONG val; + BOOL bRet = FALSE; + hKey = OpenServiceKey(lpServiceName); + if (hKey) + { + if (RegSetValueEx(hKey, + _T("Description"), + 0, + REG_SZ, + (LPBYTE)lpDescription, + (DWORD)(_tcslen(szBuf) + 1 ) * sizeof(TCHAR)) == ERROR_SUCCESS) + { + bRet = TRUE; + } - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_WRITE, - &hKey); + RegCloseKey(hKey); + } - - if ((val = RegSetValueEx(hKey, - _T("Description"), - 0, - REG_SZ, - (LPBYTE)Description, - (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS) - { - //GetError(val); - return FALSE; - } - - - RegCloseKey(hKey); - return TRUE; + return bRet; } - -/* Retrives the service description from the registry */ LPTSTR GetDescription(LPTSTR lpServiceName) { HKEY hKey; LPTSTR lpDescription = NULL; DWORD dwValueSize = 0; - LONG ret; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; - /* open the registry key for the service */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey); - - ret = RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize); - if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) + hKey = OpenServiceKey(lpServiceName); + if (hKey) { - RegCloseKey(hKey); - return FALSE; - } - - if (ret != ERROR_FILE_NOT_FOUND) - { - lpDescription = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - dwValueSize); - if (lpDescription == NULL) + if (RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize) == ERROR_SUCCESS) { - RegCloseKey(hKey); - return FALSE; + lpDescription = HeapAlloc(ProcessHeap, + 0, + dwValueSize); + if (lpDescription) + { + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)lpDescription, + &dwValueSize) != ERROR_SUCCESS) + { + HeapFree(ProcessHeap, + 0, + lpDescription); + } + } } - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)lpDescription, - &dwValueSize)) - { - HeapFree(ProcessHeap, - 0, - lpDescription); - RegCloseKey(hKey); - } + RegCloseKey(hKey); } return lpDescription; 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 Mon Aug 27 23:31:09 2007 @@ -172,5 +172,3 @@ #define IDS_PROGRESS_INFO_STOP 7005 #define IDS_PROGRESS_INFO_PAUSE 7006 #define IDS_PROGRESS_INFO_RESUME 7007 - - 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 Mon Aug 27 23:31:09 2007 @@ -32,7 +32,7 @@ /* get a handle to the service requested for starting */ hSc = OpenService(hSCManager, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, SERVICE_ALL_ACCESS); if (hSc == NULL) { @@ -130,7 +130,7 @@ BOOL bRet = FALSE; hProgDlg = CreateProgressDialog(Info->hMainWnd, - Info->CurrentService->lpServiceName, + Info->pCurrentService->lpServiceName, IDS_PROGRESS_INFO_START); if (hProgDlg)

17 years, 4 months

[cfinck] 28611: Make the cpucount utility working on Mac OS X hosts, thanks to Alex for the fix

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Aug 27 23:00:36 2007 New Revision: 28611 URL: http://svn.reactos.org/svn/reactos?rev=28611&view=rev Log: Make the cpucount utility working on Mac OS X hosts, thanks to Alex for the fix Modified: trunk/tools/RosBE-Unix/tools/cpucount.c Modified: trunk/tools/RosBE-Unix/tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Unix/tools/cpucount.c?… ============================================================================== --- trunk/tools/RosBE-Unix/tools/cpucount.c (original) +++ trunk/tools/RosBE-Unix/tools/cpucount.c Mon Aug 27 23:00:36 2007 @@ -5,16 +5,27 @@ Released under GNU GPL v2 or any later version. */ -#include <stdio.h> -#include <unistd.h> - -int -main(int argc, - char *argv[]) +#include <stdio.h> +#include <unistd.h> +#ifdef __APPLE__ +#include <sys/sysctl.h> +#endif + +int +main(int argc, + char *argv[]) { - printf( "%u\n", - sysconf(_SC_NPROCESSORS_ONLN) ); - - return 0; + int cpuCount = 0; + +#ifdef __APPLE__ + size_t countSize = sizeof(cpuCount); + + sysctlbyname("hw.logicalcpu", &cpuCount, &countSize, NULL, 0); +#else + cpuCount = sysconf(_SC_NPROCESSORS_ONLN); +#endif + + printf( "%u\n", cpuCount); + + return 0; } -

17 years, 4 months

[janderwald] 28610: - fix typo and compilation under windows

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Aug 27 22:53:31 2007 New Revision: 28610 URL: http://svn.reactos.org/svn/reactos?rev=28610&view=rev Log: - fix typo and compilation under windows 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 Mon Aug 27 22:53:31 2007 @@ -209,7 +209,7 @@ } else { - m_Src = _T("\\\\.\\pipe\\" + pipe; + m_Src = _T("\\\\.\\pipe\\") + pipe; } #endif } @@ -221,7 +221,7 @@ #ifdef __LINUX__ m_Src = m_BootCmd; #else - cerr << "Error: sysreg doesnot support reading stdio" << endl; + cerr << "Error: sysreg does not support reading stdio" << endl; return false; #endif

17 years, 4 months

[cfinck] 28609: Also add mIRC 6.21 to the "downloader.xml" in Trunk

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Aug 27 22:50:30 2007 New Revision: 28609 URL: http://svn.reactos.org/svn/reactos?rev=28609&view=rev Log: Also add mIRC 6.21 to the "downloader.xml" in Trunk Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Mon Aug 27 22:50:30 2007 @@ -44,6 +44,13 @@ <regname>The Off By One Web Browser</regname> <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> + </application> + <application name="mIRC"> + <regname>mIRC</regname> + <licence>Shareware</licence> + <version>6.21</version> + <description>The most popular client for the Internet Relay Chat (IRC).</description> + <location>http://www.efnet.org/clients/win32/mirc/mirc621.exe</location> </application> <application name="Samba TNG"> <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>

17 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
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