Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28631: Include "windef.h" in "mkstemps.c" for our wchar_t check. This is just a temporary solution for fixing the compilation on Mac OS X hosts until host and target headers are fully separated.
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Wed Aug 29 00:03:15 2007 New Revision: 28631 URL: http://svn.reactos.org/svn/reactos?rev=28631&view=rev Log: Include "windef.h" in "mkstemps.c" for our wchar_t check. This is just a temporary solution for fixing the compilation on Mac OS X hosts until host and target headers are fully separated. Modified: trunk/reactos/tools/wrc/port/mkstemps.c Modified: trunk/reactos/tools/wrc/port/mkstemps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/port/mkstemps.c?… ============================================================================== --- trunk/reactos/tools/wrc/port/mkstemps.c (original) +++ trunk/reactos/tools/wrc/port/mkstemps.c Wed Aug 29 00:03:15 2007 @@ -19,6 +19,7 @@ #include "config.h" #include <sys/types.h> +#include "windef.h" #include <stdlib.h> #include <string.h> #include <errno.h>

1 0

[gedmurphy] 28630: - improve the start code - add an edit button on the properties dialog to give admins the option to modify the service config
by gedmurphy＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: gedmurphy Date: Tue Aug 28 23:54:25 2007 New Revision: 28630 URL: http://svn.reactos.org/svn/reactos?rev=28630&view=rev Log: - improve the start code - add an edit button on the properties dialog to give admins the option to modify the service config Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/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/resource.h trunk/reactos/base/applications/mscutils/servman/start.c Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc Tue Aug 28 23:54:25 2007 @@ -74,7 +74,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Îáùî" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -100,6 +100,7 @@ LTEXT "Ìîæåòå äà çàäàäåòå ïóñêîâè óêàçàíèÿ, êîèòî äà ñå ïðèëîæàò ïðè ïóñêàíå íà óñëóãàòà îò òóê.",IDC_STATIC, 6,177,240,15 LTEXT "Ïóñêîâè óêàçàòåëè:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -74,7 +74,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Allgemein" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -98,6 +98,7 @@ LTEXT "Sie können die Startparameter angeben, die übernommen werden sollen, wenn der Dienst von hier aus gestartet wird.",IDC_STATIC, 6,177,240,20 LTEXT "Startparameter:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -74,7 +74,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "General" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -98,6 +98,7 @@ LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 LTEXT "Start parameters:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -75,7 +75,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Général" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -99,6 +99,7 @@ LTEXT "Vous pouvez définir les paramètres passés au service lorsque vous le démarrez.",IDC_STATIC, 6,177,240,15 LTEXT "Paramètres:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -74,7 +74,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Umum" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -98,6 +98,7 @@ LTEXT "Anda menetapkan parameter mulai yang diterapkan ketika anda memulai layanan dari sini.",IDC_STATIC, 6,177,240,15 LTEXT "Parameter Mulai:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -74,7 +74,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "General" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -98,6 +98,7 @@ LTEXT "Puoi indicarei parametri in uso quando il servizio è avviato da qui.",IDC_STATIC, 6,177,240,15 LTEXT "Parametri di avvio:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -81,7 +81,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Ogólny" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -105,6 +105,7 @@ LTEXT "Mo¿esz okreli parametry pocz¹tkowe, które bêd¹ u¿yte przy uruchomieniu us³ugi z tego miejsca.",IDC_STATIC, 6,177,240,15 LTEXT "Parametry uruchomienia:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -73,7 +73,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "Îáùèå" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -97,6 +97,7 @@ LTEXT "Ìîæíî óêàçàòü ïàðàìåòðû çàïóñêà, ïðèìåíÿåìûå ïðè çàïóñêå ñëóæáû èç ýòîãî êàòàëîãà.",IDC_STATIC, 6,177,240,15 LTEXT "Ïàðàìåòðû çàïóñêà:", IDC_STATIC, 6, 200, 73, 11 EDITTEXT IDC_START_PARAM, 78, 199, 168, 11, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 Tue Aug 28 23:54:25 2007 @@ -83,7 +83,7 @@ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END -IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +IDD_DLG_GENERAL DIALOGEX 6,6,253,232 CAPTION "·ÑèÇä»" FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP @@ -107,6 +107,7 @@ LTEXT "¤Ø³ÊÒÁÒÃ¶¡ÓË¹´¤èÒµÑÇá»ÃµèÒ§æã¹µÍ¹àÃÔèÁµé¹¡ÒÃãªé§Ò¹ àÁ×èÍ¤Ø³àÃÔèÁãËéºÃÔ¡ÒÃ·ÕèµÃ§¹Õé.",IDC_STATIC, 6,177,240,15 LTEXT "àÃÔèÁµé¹¤èÒµÑÇá»ÃµèÒ§æ:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 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 23:54:25 2007 @@ -122,7 +122,7 @@ { SendMessage(Info->hStatus, SB_SIMPLE, - (WPARAM)Info->InMenuLoop, + (WPARAM)Info->bInMenuLoop, 0); } } @@ -623,6 +623,8 @@ MAKEINTRESOURCE(IDR_POPUP)); Info->hShortcutMenu = GetSubMenu(Info->hShortcutMenu, 0); + + Info->bIsUserAnAdmin = IsUserAnAdmin(); return TRUE; } @@ -1055,14 +1057,14 @@ case WM_ENTERMENULOOP: { - Info->InMenuLoop = TRUE; + Info->bInMenuLoop = TRUE; UpdateMainStatusBar(Info); break; } case WM_EXITMENULOOP: { - Info->InMenuLoop = FALSE; + Info->bInMenuLoop = FALSE; UpdateMainStatusBar(Info); break; } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Tue Aug 28 23:54:25 2007 @@ -7,6 +7,7 @@ #include <stdio.h> #include <tchar.h> #include <commctrl.h> +#include <shlobj.h> #include "resource.h" #ifdef _MSC_VER @@ -30,7 +31,8 @@ INT SelectedItem;/* selection number in the list view */ BOOL bDlgOpen; - BOOL InMenuLoop; + BOOL bInMenuLoop; + BOOL bIsUserAnAdmin; } MAIN_WND_INFO, *PMAIN_WND_INFO; @@ -72,6 +74,7 @@ /* query.c */ ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info); LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); +VOID SetServiceConfig(LPQUERY_SERVICE_CONFIG); LPTSTR GetServiceDescription(LPTSTR lpServiceName); LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(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 23:54:25 2007 @@ -190,7 +190,39 @@ 0, (LPARAM)szServiceStatus); } -} + + if (dlgInfo->Info->bIsUserAnAdmin) + { + HWND hEdit = GetDlgItem(hwndDlg, + IDC_EDIT); + EnableWindow(hEdit, + TRUE); + } +} + + +SaveDlgInfo(PSERVICEPROPSHEET dlgInfo, + HWND hwndDlg) +{ + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; + HWND hList; + DWORD StartUp; + + hList = GetDlgItem(hwndDlg, IDC_START_TYPE); + + StartUp = SendMessage(hList, + CB_GETCURSEL, + 0, + 0); + + switch (StartUp) + { + case 0: pServiceConfig->dwStartType = SERVICE_AUTO_START; break; + case 1: pServiceConfig->dwStartType = SERVICE_DEMAND_START; break; + case 2: pServiceConfig->dwStartType = SERVICE_DISABLED; break; + } +} + /* @@ -258,14 +290,25 @@ //SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0); break; + case IDC_EDIT: + { + HWND hName, hDesc, hExePath; + + hName = GetDlgItem(hwndDlg, IDC_DISP_NAME); + hDesc = GetDlgItem(hwndDlg, IDC_DESCRIPTION); + hExePath = GetDlgItem(hwndDlg, IDC_EXEPATH); + + SendMessage(hName, EM_SETREADONLY, FALSE, 0); + SendMessage(hDesc, EM_SETREADONLY, FALSE, 0); + SendMessage(hExePath, EM_SETREADONLY, FALSE, 0); + } + break; + case IDC_START_PARAM: PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; } break; - - case WM_DESTROY: - break; case WM_NOTIFY: { @@ -296,13 +339,13 @@ 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; } @@ -311,12 +354,12 @@ { 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); + (LONG_PTR)dlgInfo); } } break; @@ -324,21 +367,6 @@ case WM_COMMAND: switch(LOWORD(wParam)) { - - } - break; - - case WM_DESTROY: - break; - - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - - switch (lpnm->code) - { - - } } break; @@ -404,7 +432,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USECALLBACK; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USECALLBACK;// | PSH_MODELESS; psh.hwndParent = Info->hMainWnd; psh.hInstance = hInstance; psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); 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 23:54:25 2007 @@ -87,6 +87,13 @@ CloseServiceHandle(hSc); return pServiceConfig; +} + + +VOID +SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig) +{ + } @@ -159,7 +166,6 @@ 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 Tue Aug 28 23:54:25 2007 @@ -132,6 +132,7 @@ #define IDC_PAUSE 10151 #define IDC_RESUME 10161 #define IDC_START_PARAM 10191 +#define IDC_EDIT 10192 /* dependancies dialog */ #define IDD_DLG_DEPEND 20001 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 Tue Aug 28 23:54:25 2007 @@ -19,107 +19,90 @@ DWORD BytesNeeded = 0; INT ArgCount = 0; DWORD dwStartTickCount, dwOldCheckPoint; + BOOL bRet = FALSE; - /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) { - GetError(); - return FALSE; - } + hSc = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + SERVICE_ALL_ACCESS); + if (hSc != NULL) + { + if (StartService(hSc, + ArgCount, + NULL)) + { + if (QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; - /* get a handle to the service requested for starting */ - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - SERVICE_ALL_ACCESS); - if (hSc == NULL) - { - GetError(); - return FALSE; - } + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) + { + DWORD dwWaitTime; - /* start the service opened */ - if (! StartService(hSc, - ArgCount, - NULL)) - { - GetError(); - return FALSE; - } + dwWaitTime = ServiceStatus.dwWaitHint / 10; - /* query the state of the service */ - if (! QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - GetError(); - return FALSE; - } + if(dwWaitTime < 1000) + dwWaitTime = 500; + else if (dwWaitTime > 10000) + dwWaitTime = 10000; - /* Save the tick count and initial checkpoint. */ - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; + IncrementProgressBar(hProgDlg); + Sleep(dwWaitTime ); + IncrementProgressBar(hProgDlg); - /* loop whilst service is not running */ - /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState != SERVICE_RUNNING) - { - DWORD dwWaitTime; + if (!QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + break; + } - dwWaitTime = ServiceStatus.dwWaitHint / 10; - - if( dwWaitTime < 500 ) - dwWaitTime = 500; - else if ( dwWaitTime > 5000 ) - dwWaitTime = 5000; - - IncrementProgressBar(hProgDlg); - - /* wait before checking status */ - Sleep(ServiceStatus.dwWaitHint / 8); - - /* check status again */ - if (! QueryServiceStatusEx(hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) - { - GetError(); - return FALSE; + if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) + { + /* The service is making progress, increment the progress bar */ + IncrementProgressBar(hProgDlg); + dwStartTickCount = GetTickCount(); + dwOldCheckPoint = ServiceStatus.dwCheckPoint; + } + else + { + if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) + { + /* No progress made within the wait hint */ + break; + } + } + } + } + } + + CloseServiceHandle(hSc); } - if (ServiceStatus.dwCheckPoint > dwOldCheckPoint) - { - /* The service is making progress. increment the progress bar */ - IncrementProgressBar(hProgDlg); - dwStartTickCount = GetTickCount(); - dwOldCheckPoint = ServiceStatus.dwCheckPoint; - } - else - { - if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint) - { - /* No progress made within the wait hint */ - break; - } - } + CloseServiceHandle(hSCManager); } - - CloseServiceHandle(hSc); if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) { CompleteProgressBar(hProgDlg); Sleep(1000); - return TRUE; + bRet = TRUE; } else - return FALSE; + GetError(); + + return bRet; }

1 0

[cfinck] 28629: Merge 28572:28574 ("make depends" fixes)
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:50:18 2007 New Revision: 28629 URL: http://svn.reactos.org/svn/reactos?rev=28629&view=rev Log: Merge 28572:28574 ("make depends" fixes) Modified: branches/ros-branch-0_3_3-new/reactos/Makefile branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-branch-0_3_3-new/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/Ma… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/Makefile (original) +++ branches/ros-branch-0_3_3-new/reactos/Makefile Tue Aug 28 23:50:18 2007 @@ -420,7 +420,6 @@ ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw - @$(MAKE) psdk world: all bootcd livecd @@ -625,6 +624,6 @@ clean: makefile_auto_clean .PHONY: depends -depends: - @-$(rm) makefile.auto - @$(MAKE) $(filter-out depends, $(MAKECMDGOALS)) +depends: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw Modified: branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/ros-branch-0_3_3-new/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 28 23:50:18 2007 @@ -615,7 +615,7 @@ fprintf ( fMakefile, "\t$(ECHO_RBUILD)\n" ); fprintf ( fMakefile, - "\t$(Q)$(RBUILD_TARGET) -dm%s mingw\n", + "\t$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) -dm%s mingw\n", module.name.c_str () ); } @@ -2193,6 +2193,11 @@ && module.name != "hostzlib" ) dependencies.push_back ( "$(INIT)" ); + + if ( module.type != BuildTool + && module.name != "psdk" ) + + dependencies.push_back ( "$(PSDK_TARGET)" ); } void

1 0

[cfinck] 28628: Ok, we don't disable the creation of the regedit shortcut, but move it to the system32 directory. This way it can be started.
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:47:00 2007 New Revision: 28628 URL: http://svn.reactos.org/svn/reactos?rev=28628&view=rev Log: Ok, we don't disable the creation of the regedit shortcut, but move it to the system32 directory. This way it can be started. Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff (original) +++ branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff Tue Aug 28 23:47:00 2007 @@ -54,7 +54,7 @@ base\applications\network\tracert\tracert.exe 1 base\applications\network\whois\whois.exe 1 base\applications\notepad\notepad.exe 1 -base\applications\regedit\regedit.exe 4 +base\applications\regedit\regedit.exe 1 base\applications\regedit\clb\clb.dll 1 base\applications\sc\sc.exe 1 base\applications\screensavers\cylfrac\cylfrac.scr 1 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Tue Aug 28 23:47:00 2007 @@ -606,7 +606,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - //CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\system32\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); }

1 0

[cfinck] 28627: Don't create the "ReactOS Explorer" and "Regedit" shortcuts. In my opinion, this is better than trying to fix the Regedit shortcut by moving the file to the "system32" directory.
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:08:09 2007 New Revision: 28627 URL: http://svn.reactos.org/svn/reactos?rev=28627&view=rev Log: Don't create the "ReactOS Explorer" and "Regedit" shortcuts. In my opinion, this is better than trying to fix the Regedit shortcut by moving the file to the "system32" directory. Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/syssetup/install.c Tue Aug 28 23:08:09 2007 @@ -593,7 +593,7 @@ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); + //CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE); CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create administrative tools startmenu shortcuts */ @@ -606,7 +606,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, FALSE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); + //CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, FALSE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); }

1 0

[janderwald] 28626: - update documentation - implement wait for linux
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 23:06:02 2007 New Revision: 28626 URL: http://svn.reactos.org/svn/reactos?rev=28626&view=rev Log: - update documentation - implement wait for linux Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/txtmode.cfg 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 Tue Aug 28 23:06:02 2007 @@ -93,7 +93,7 @@ } #else /********************************************************************************************************************/ - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) { ProcessID pid; @@ -107,7 +107,14 @@ execv(procname, procargs); return 0; } - + else + { + /* parent process */ + if (wait) + { + waitpid(pid, NULL, WNOHANG); + } + } return pid; } Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Aug 28 23:06:02 2007 @@ -16,6 +16,7 @@ #include <unistd.h> #include <sys/types.h> #include <signal.h> +#include <sys/wait.h> #endif #include "user_types.h" Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Aug 28 23:06:02 2007 @@ -17,7 +17,8 @@ ; ROS_HDD_IMAGE ; ; The hdd image to use for running the emulator. If this variable is not -; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search +; set, SysReg will create a HDD with name "ros.hd" in the ROS_OUTPUT +; directory using the qemu-img tool. It will search ; this tool in the directory of emulator and abort if the tool cannot be found ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd ;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd

1 0

[cfinck] 28625: Merge 28537 and 28575 (fireball's freeldr changes)
by cfinck＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: cfinck Date: Tue Aug 28 23:01:54 2007 New Revision: 28625 URL: http://svn.reactos.org/svn/reactos?rev=28625&view=rev Log: Merge 28537 and 28575 (fireball's freeldr changes) Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/ros-branch-0_3_3-new/reactos/boot/freeldr/freeldr/reactos/reactos.c Tue Aug 28 23:01:54 2007 @@ -599,7 +599,7 @@ if (LoaderBlock.MmapLength) { ULONG i; - + LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO; LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map; reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24 for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++) Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/cm/registry.c Tue Aug 28 23:01:54 2007 @@ -142,7 +142,7 @@ { /* Check if it's not the SYSTEM hive that we already initialized */ if ((MdBlock->BasePage) != - ((ULONG_PTR)KeLoaderBlock->RegistryBase >> PAGE_SHIFT)) + (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) { /* Hardware hive break out */ break; @@ -156,7 +156,7 @@ /* We need a hardware hive */ ASSERT(MdBlock); *Length = MdBlock->PageCount << PAGE_SHIFT; - return (PVOID)(MdBlock->BasePage << PAGE_SHIFT); + return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); } VOID Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/freeldr.c Tue Aug 28 23:01:54 2007 @@ -23,6 +23,12 @@ /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; BOOLEAN AcpiTableDetected; +ADDRESS_RANGE KeMemoryMap[64]; +ULONG KeMemoryMapRangeCount; + +/* NT Loader Module/Descriptor Count */ +ULONG BldrCurrentMd; +ULONG BldrCurrentMod; /* NT Loader Data. Eats up about 80KB! */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; // 0x0000 @@ -44,6 +50,15 @@ // 0x1443C /* FUNCTIONS *****************************************************************/ + +PMEMORY_ALLOCATION_DESCRIPTOR +NTAPI +KiRosGetMdFromArray(VOID) +{ + /* Return the next MD from the list, but make sure we don't overflow */ + if (BldrCurrentMd > 64) KEBUGCHECK(0); + return &BldrMemoryDescriptors[BldrCurrentMd++]; +} VOID NTAPI @@ -69,6 +84,7 @@ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; MmFreeLdrMemHigher = RosLoaderBlock->MemHigher; MmFreeLdrPageDirectoryEnd = RosLoaderBlock->PageDirectoryEnd; + if (!MmFreeLdrPageDirectoryEnd) MmFreeLdrPageDirectoryEnd = 0x40000; /* Set the NT Loader block and initialize it */ *NtLoaderBlock = LoaderBlock = &BldrLoaderBlock; @@ -88,6 +104,64 @@ InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); + + /* Create one large blob of free memory */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFree; + MdEntry->BasePage = 0; + MdEntry->PageCount = MmFreeLdrMemHigher / 4; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* + * FIXME: Instead of just "inserting" MDs into the list, + * we need to make then be "consumed" from the Free Descriptor. + * This will happen soon (and also ensure a sorted list). + */ + + /* Loop the BIOS Memory Map */ + for (j = 0; j < KeMemoryMapRangeCount; j++) + { + /* Check if this is a reserved entry */ + if (KeMemoryMap[j].Type == 2) + { + /* It is, build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderSpecialMemory; + MdEntry->BasePage = KeMemoryMap[j].BaseAddrLow >> PAGE_SHIFT; + MdEntry->PageCount = (KeMemoryMap[j].LengthLow + PAGE_SIZE - 1) >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + } + + /* Page 0 is reserved: build an entry for it */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the KPCR (which we put in page 1) */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = 1; + MdEntry->PageCount = 1; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Build an entry for the PDE */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderMemoryData; + MdEntry->BasePage = (ULONG_PTR)MmGetPageDirectory() >> PAGE_SHIFT; + MdEntry->PageCount = (MmFreeLdrPageDirectoryEnd - + (ULONG_PTR)MmGetPageDirectory()) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); + + /* Mark Video ROM as reserved */ + MdEntry = KiRosGetMdFromArray(); + MdEntry->MemoryType = LoaderFirmwarePermanent; + MdEntry->BasePage = 0xA0000 >> PAGE_SHIFT; + MdEntry->PageCount = (0xE8000 - 0xA0000) / PAGE_SIZE; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); /* Loop boot driver list */ for (i = 0; i < RosLoaderBlock->ModsCount; i++) @@ -106,9 +180,9 @@ LoaderBlock->NlsData->AnsiCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1)>> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -121,9 +195,9 @@ LoaderBlock->NlsData->OemCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -136,9 +210,9 @@ LoaderBlock->NlsData->UnicodeCodePageData = ModStart; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderNlsData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -158,9 +232,9 @@ LoaderBlock->SetupLdrBlock = NULL; /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -173,9 +247,9 @@ { /* Create an MD for it */ ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderRegistryData; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -186,9 +260,9 @@ if (!(_stricmp(DriverName, "ntoskrnl.exe"))) { /* Create an MD for it */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderSystemCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -196,9 +270,9 @@ else if (!(_stricmp(DriverName, "hal.dll"))) { /* Create an MD for the HAL */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderHalCode; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -206,9 +280,9 @@ else { /* Create an MD for any driver */ - MdEntry = &BldrMemoryDescriptors[i]; + MdEntry = KiRosGetMdFromArray(); MdEntry->MemoryType = LoaderBootDriver; - MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->BasePage = ((ULONG_PTR)ModStart &~ KSEG0_BASE) >> PAGE_SHIFT; MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); @@ -351,6 +425,7 @@ IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; + ULONG size, i; #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; @@ -383,6 +458,39 @@ MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE + 0x200000; + KeMemoryMapRangeCount = 0; + if (LoaderBlock->Flags & MB_FLAGS_MMAP_INFO) + { + /* We have a memory map from the nice BIOS */ + size = *((PULONG)(LoaderBlock->MmapAddr - sizeof(ULONG))); + i = 0; + + /* Map it until we run out of size */ + while (i < LoaderBlock->MmapLength) + { + /* Copy into the Kernel Memory Map */ + memcpy (&KeMemoryMap[KeMemoryMapRangeCount], + (PVOID)(LoaderBlock->MmapAddr + i), + sizeof(ADDRESS_RANGE)); + + /* Increase Memory Map Count */ + KeMemoryMapRangeCount++; + + /* Increase Size */ + i += size; + } + + /* Save data */ + LoaderBlock->MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + else + { + /* Nothing from BIOS */ + LoaderBlock->MmapLength = 0; + LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + } + #if defined(_M_IX86) /* Set up the VDM Data */ NtEarlyInitVdm(); Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ke/i386/kiinit.c Tue Aug 28 23:01:54 2007 @@ -17,6 +17,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* BIOS Memory Map. Not NTLDR-compliant yet */ +extern ULONG KeMemoryMapRangeCount; +extern ADDRESS_RANGE KeMemoryMap[64]; /* FUNCTIONS *****************************************************************/ @@ -536,8 +540,8 @@ MmInit1(MmFreeLdrFirstKrnlPhysAddr, MmFreeLdrLastKrnlPhysAddr, MmFreeLdrLastKernelAddress, - NULL, - 0, + KeMemoryMap, + KeMemoryMapRangeCount, 4096); /* Set basic CPU Features that user mode can read */ Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c (original) +++ branches/ros-branch-0_3_3-new/reactos/ntoskrnl/mm/mminit.c Tue Aug 28 23:01:54 2007 @@ -296,6 +296,34 @@ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } +PCHAR +MemType[] = { + "ExceptionBlock ", // ? + "SystemBlock ", // ? + "Free ", + "Bad ", // used + "LoadedProgram ", // == Free + "FirmwareTemporary ", // == Free + "FirmwarePermanent ", // == Bad + "OsloaderHeap ", // used + "OsloaderStack ", // == Free + "SystemCode ", + "HalCode ", + "BootDriver ", // not used + "ConsoleInDriver ", // ? + "ConsoleOutDriver ", // ? + "StartupDpcStack ", // ? + "StartupKernelStack", // ? + "StartupPanicStack ", // ? + "StartupPcrPage ", // ? + "StartupPdrPage ", // ? + "RegistryData ", // used + "MemoryData ", // not used + "NlsData ", // used + "SpecialMemory ", // == Bad + "BBTMemory " // == Bad +}; + VOID INIT_FUNCTION NTAPI @@ -319,6 +347,25 @@ LastKrnlPhysAddr, LastKernelAddress); + /* Dump memory descriptors */ + { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Md; + ULONG TotalPages = 0; + + DPRINT1("Base\t\tLength\t\tType\n"); + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + DPRINT1("%08lX\t%08lX\t%s\n", Md->BasePage, Md->PageCount, MemType[Md->MemoryType]); + TotalPages += Md->PageCount; + } + + DPRINT1("Total: %08lX (%d MB)\n", TotalPages, (TotalPages * PAGE_SIZE) / 1024 / 1024); + } + /* Set the page directory */ PsGetCurrentProcess()->Pcb.DirectoryTableBase.LowPart = (ULONG)MmGetPageDirectory();

1 0

[janderwald] 28624: - silence a few debug messages - implement creating of disk images with qemu-img for windows
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 22:41:08 2007 New Revision: 28624 URL: http://svn.reactos.org/svn/reactos?rev=28624&view=rev Log: - silence a few debug messages - implement creating of disk images with qemu-img for windows Modified: trunk/reactos/tools/sysreg/conf_parser.cpp trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/conf_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/conf_parser.c… ============================================================================== --- trunk/reactos/tools/sysreg/conf_parser.cpp (original) +++ trunk/reactos/tools/sysreg/conf_parser.cpp Tue Aug 28 22:41:08 2007 @@ -84,7 +84,7 @@ ConfigMap::iterator it = m_Map.find (ConfVariable); if (it == m_Map.end ()) { - cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; + //cerr << "ConfigParser::getValue failed to find " << ConfVariable << endl; return false; } 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 Tue Aug 28 22:41:08 2007 @@ -25,36 +25,66 @@ return ret; } - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) { STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; OsSupport::ProcessID pid; - - UNREFERENCED_PARAMETER(procargsnum); - UNREFERENCED_PARAMETER(procargs); - + DWORD length = 0; + TCHAR * szBuffer; + TCHAR * cmd; ZeroMemory(&siStartInfo, sizeof(STARTUPINFO)); ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION)); siStartInfo.cb = sizeof(STARTUPINFO); siStartInfo.wShowWindow = SW_SHOWNORMAL; siStartInfo.dwFlags = STARTF_USESHOWWINDOW; + + if (procargsnum) + { + for (int i = 0; i < procargsnum; i++) + { + length += _tcslen(procargs[i]); + } - LPTSTR command = _tcsdup(procname); + length += procargsnum; + szBuffer = (TCHAR*)malloc(length * sizeof(TCHAR)); + length = 0; + for (int i = 0; i < procargsnum; i++) + { + _tcscpy(&szBuffer[length], procargs[i]); + length += _tcslen(procargs[i]); + szBuffer[length] = _T(' '); + length++; + } + length = _tcslen(procname) + _tcslen(szBuffer) + 2; + cmd = (TCHAR*)malloc(length * sizeof(TCHAR)); + _tcscpy(cmd, procname); + _tcscat(cmd, _T(" ")); + _tcscat(cmd, szBuffer); + free(szBuffer); + } + else + { + cmd = _tcsdup(procname); - if (!CreateProcess(NULL, procname, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) + } + if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &siStartInfo, &piProcInfo)) { - cerr << "Error: CreateProcess failed " << command <<endl; + cerr << "Error: CreateProcess failed " << cmd << endl; pid = 0; } else { pid = piProcInfo.dwProcessId; + if (wait) + { + WaitForSingleObject(piProcInfo.hThread, INFINITE); + } CloseHandle(piProcInfo.hProcess); CloseHandle(piProcInfo.hThread); } - free(command); + free(cmd); return pid; } void OsSupport::sleep(long value) Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Aug 28 22:41:08 2007 @@ -62,7 +62,7 @@ /// /// - static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs); + static ProcessID createProcess(TCHAR * procname, int procargsnum, TCHAR ** procargs, bool wait); //--------------------------------------------------------------------------------------- /// 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 Tue Aug 28 22:41:08 2007 @@ -15,6 +15,7 @@ //#include "sym_file.h" #include "file_reader.h" #include "os_support.h" +#include "env_var.h" #include <iostream> #include <vector> @@ -36,6 +37,7 @@ /* using System_::SymbolFile; */ using System_::FileReader; using System_::OsSupport; + using System_::EnvironmentVariable; #ifdef UNICODE using std::wofstream; @@ -74,7 +76,7 @@ //--------------------------------------------------------------------------------------- bool RosBootTest::executeBootCmd() { - m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL); + m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL, false); if (!m_Pid) { cerr << "Error: failed to launch boot cmd" << m_BootCmd << endl; @@ -140,15 +142,34 @@ string qemuimgdir = qemupath; m_HDDImage = _T("ros.img"); #ifdef __LINUX___ - qemuimgdir += _T("qemu-img"); + qemuimgdir += _T("\\qemu-img"); #else - qemuimgdir += _T("qemu-img.exe"); + qemuimgdir += _T("\\qemu-img.exe"); #endif /// /// FIXME /// call qemu-img to create the tool /// - cerr << "Creating HDD Image ..." << qemuimgdir << endl; + TCHAR * options[] = { + _T("create"), + NULL, + _T("100M"), + NULL + }; + string output = "output-i386"; + EnvironmentVariable::getValue(_T("ROS_OUTPUT"), output); + output += _T("\\ros.hd"); + options[1] = (TCHAR*)output.c_str(); + + cerr << "Creating HDD Image ..." << output << endl; + if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 3, options, true)) + { + m_HDDImage = output; + } + else + { + return false; + } } if (!bootcmdprovided) @@ -170,11 +191,11 @@ if (bootfromcd) { - m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage; + m_BootCmd = m_EmuPath + _T(" -serial ") + pipe + _T(" -m ") + m_MaxMem + _T(" -hda ") + m_HDDImage + _T(" -boot d -cdrom ") + m_CDImage + _T(" -L ") + qemupath; } else { - m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe; + m_BootCmd = m_EmuPath + _T(" -L ") + qemupath + _T(" -m ") + m_MaxMem + _T(" -boot c -serial ") + pipe + _T(" -hda ") + m_HDDImage; } if (m_KillEmulator == _T("yes"))

1 0

[janderwald] 28623: - include unattend.inf from boot/bootdata/bootcdregtest
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 21:32:30 2007 New Revision: 28623 URL: http://svn.reactos.org/svn/reactos?rev=28623&view=rev Log: - include unattend.inf from boot/bootdata/bootcdregtest Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Aug 28 21:32:30 2007 @@ -3306,6 +3306,10 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; + string srcunattend = NormalizeFilename("boot/bootdata/bootcdregtest/unattend.inf"); + string tarunattend = NormalizeFilename("$(OUTPUT)/cd/reactos/unattend.inf"); + + vector<string> vCdFiles; string bootcd = PassThruCacheDirectory ( NormalizeFilename ( bootcdDirectory + sSep ), backend->outputDirectory ); @@ -3313,8 +3317,9 @@ string bootloader; string IsoName; - if (module.name == "bootcdregtest") - { + if (module.type == IsoRegTest) + { + vCdFiles.push_back (srcunattend.c_str ()); bootloader = "isobtrt.o"; IsoName = "ReactOS-RegTest.iso"; } @@ -3338,7 +3343,6 @@ backend->outputDirectory ); string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); - vector<string> vCdFiles; GetCdFiles ( vCdFiles ); string cdFiles = v2s ( vCdFiles, 5 ); @@ -3366,6 +3370,16 @@ reactosInf.c_str () ); OutputBootstrapfileCopyCommands ( bootcdDirectory ); OutputCdfileCopyCommands ( bootcdDirectory ); + if (module.type == IsoRegTest) + { + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + srcunattend.c_str (), + tarunattend.c_str () ); + } + fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n",

1 0

[janderwald] 28622: - add unattend.inf for bootcdregtest
by janderwald＠svn.reactos.org 28 Aug '07

28 Aug '07

Author: janderwald Date: Tue Aug 28 21:32:05 2007 New Revision: 28622 URL: http://svn.reactos.org/svn/reactos?rev=28622&view=rev Log: - add unattend.inf for bootcdregtest Added: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf (with props) Added: 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 (added) +++ trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf Tue Aug 28 21:32:05 2007 @@ -1,0 +1,54 @@ +; In order to get unattended setup working: +; 1. Copy unattend.inf.sample to unattend.inf, adjust as needed +; 2. Uncomment the line in bootdata.rbuild to include it into bootcd + +[Unattend] +Signature = "$ReactOS$" + +; yes - unattend setup enabled +; no - unattend setup disabled +UnattendSetupEnabled = yes + +; Install to \Device\Harddisk0\Partition1\ReactOS +DestinationDiskNumber = 0 +DestinationPartitionNumber = 1 +InstallationDirectory=ReactOS + +; MBRInstallType=0 skips MBR installation +; MBRInstallType=1 install MBR on floppy +; MBRInstallType=2 install MBR on hdd +MBRInstallType=2 + +FullName="MyName" +;OrgName="MyOrg" +ComputerName="MYCOMPUTERNAME"; +AdminPassword="MyPassword" + +; TimeZone is set GMT as default +TimeZoneIndex=85 + +; enable this setting to disable daylight saving changes +; DisableAutoDaylightTimeSet = 1 + +; enable this setting to format the selected partition +; 1 - format enabled +; 0 - format disabled +FormatPartition=1 + +; enable this setting to automatically create a partition +; during installation +; 1 - enabled +; 0 - disabled +AutoPartition = 1 + +; enable this setting to disable vmware driver install +; yes - disabled +; no - enabled +DisableVmwInst = yes + +; enable this section to automatically launch programs +; after 3rd boot +; +; [GuiRunOnce] +; %SystemRoot%\system32\cmd.exe + Propchange: trunk/reactos/boot/bootdata/bootcdregtest/unattend.inf ------------------------------------------------------------------------------ svn:eol-style = native

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