Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 28440: - Some typos and fixes for greek resource file for newdev by Apostolos Alexiadis aka Apal (grad0621 at di dot uoa dot gr) See issue #2576 for more details.
by janderwald＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: janderwald Date: Tue Aug 21 02:29:40 2007 New Revision: 28440 URL: http://svn.reactos.org/svn/reactos?rev=28440&view=rev Log: - Some typos and fixes for greek resource file for newdev by Apostolos Alexiadis aka Apal (grad0621 at di dot uoa dot gr) See issue #2576 for more details. Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc Tue Aug 21 02:29:40 2007 @@ -11,11 +11,11 @@ IDC_STATIC,120,21,195,16 LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.",IDC_STATIC,120,169,195,17 LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,134,36,164,11 - LTEXT "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 - CONTROL "Áõôüáìôç åãêáôÜóôáóç ïäçãïý",IDC_RADIO_AUTO,"Button", + LTEXT "ÑÏÅÉÄÏÐÏÉÇÓÇ! Ç ÅÃÊÁÔ¢ÓÔÁÓÇ ÌÉÁÓ ÄÉÊÇÓ ÓÁÓ ÓÕÓÊÅÕÇÓ ÌÐÏÑÅÉ ÍÁ ÐÁÃÙÓÅÉ ÔÇ ËÅÉÔÏÕÑÃÉÁ ÔÏÕ ÕÐÏËÏÃÉÓÔÇ 'Ç ÍÁ ÔÏÍ ÊÁÍÅÉ ÌÇ ÅÐÁÍÅÊÊÉÍÇÓÉÌÏ!",IDC_STATIC,120,59,195,16 + CONTROL "Áõôüìáôç åãêáôÜóôáóç ïäçãïý",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "ÅãêáôÜóôáóç ïäçãïý áðü óõãêåêñéìÝíç ôïðïèåóßá",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,120,133,164,14 + "Button",BS_AUTORADIOBUTTON,120,133,184,14 END IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -27,7 +27,7 @@ LTEXT "Ç åãêáôÜóôáóç áðÝôõ÷å",IDC_FINISHTITLE,120,8,195,24 LTEXT "Ç óõóêåõÞ äåí Þôáí äõíáôüí íá åãêáôáóôáèåß åðåéäÞ ï ïäçãüò äå âñÝèçêå.", IDC_STATIC,120,40,195,19 - LTEXT "Click on Back if you have a driver disk or know the path to the driver.", + LTEXT "ÐáôÞóôå óôï Ðñïçãïýìåíï áí Ý÷åôå äéóêÝôá ïäçãïý Þ îÝñåôå ôïí êáôÜëïãü ôïõ.", IDC_STATIC,120,98,181,24 CONTROL "Íá ìçí åìöáíéóôåß áõôü ôï ðáñÜèõñï îáíÜ",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11

1 0

[janderwald] 28439: - set check when theres a timeout
by janderwald＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: janderwald Date: Tue Aug 21 02:10:55 2007 New Revision: 28439 URL: http://svn.reactos.org/svn/reactos?rev=28439&view=rev Log: - set check when theres a timeout Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Tue Aug 21 02:10:55 2007 @@ -246,6 +246,10 @@ SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } + if(TimeOut) + { + SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } SetTimeout(hwndDlg, TimeOut); return TRUE; } @@ -369,6 +373,10 @@ { /* set cur sel */ SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + if(TimeOut) + { + SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut);

1 0

[janderwald] 28438: - implement writing startup recovery options
by janderwald＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: janderwald Date: Tue Aug 21 02:01:54 2007 New Revision: 28438 URL: http://svn.reactos.org/svn/reactos?rev=28438&view=rev Log: - implement writing startup recovery options Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Tue Aug 21 02:01:54 2007 @@ -15,6 +15,7 @@ static TCHAR m_szDumpFile[MAX_PATH]; static TCHAR m_szMinidumpDir[MAX_PATH]; static DWORD m_dwCrashDumpEnabled = 0; + void SetTimeout(HWND hwndDlg, int Timeout) { if (Timeout == 0) @@ -473,6 +474,48 @@ SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)m_szDumpFile); } SendDlgItemMessage(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)m_dwCrashDumpEnabled, (LPARAM)0); +} + +void WriteStartupRecoveryOptions(HWND hwndDlg) +{ + HKEY hKey; + DWORD lResult; + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("System\\CurrentControlSet\\Control\\CrashControl"), + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + /* failed to open key */ + return; + } + + lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + RegSetValueEx(hKey, _T("LogEvent"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + + lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + RegSetValueEx(hKey, _T("SendAlert"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + + lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + RegSetValueEx(hKey, _T("AutoReboot"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + + lResult = (DWORD) SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + RegSetValueEx(hKey, _T("Overwrite"), 0, REG_DWORD, (LPBYTE)&lResult, sizeof(lResult)); + + + if (m_dwCrashDumpEnabled == 1 || m_dwCrashDumpEnabled == 2) + { + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(m_szDumpFile) / sizeof(TCHAR), (LPARAM)m_szDumpFile); + RegSetValueEx(hKey, _T("DumpFile"), 0, REG_EXPAND_SZ, (LPBYTE)&m_szDumpFile, (_tcslen(m_szDumpFile) + 1) * sizeof(TCHAR)); + } + else if (m_dwCrashDumpEnabled == 3) + { + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(m_szDumpFile) / sizeof(TCHAR), (LPARAM)m_szDumpFile); + RegSetValueEx(hKey, _T("MinidumpDir"), 0, REG_EXPAND_SZ, (LPBYTE)&m_szDumpFile, (_tcslen(m_szDumpFile) + 1) * sizeof(TCHAR)); + } + + RegSetValueEx(hKey, _T("CrashDumpEnabled"), 0, REG_DWORD, (LPBYTE)&m_dwCrashDumpEnabled, sizeof(m_dwCrashDumpEnabled)); + RegCloseKey(hKey); } void LoadRecoveryOptions(HWND hwndDlg) @@ -634,8 +677,6 @@ pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0); - - if ((INT)pRecord != CB_ERR) { if (m_FreeLdrIni == 1) // FreeLdrIni style @@ -667,11 +708,11 @@ } } + WriteStartupRecoveryOptions(hwndDlg); DeleteBootRecords(hwndDlg); EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; - break; } case IDCANCEL: {

1 0

[janderwald] 28437: - implement reading startup / recovery options
by janderwald＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: janderwald Date: Tue Aug 21 01:41:05 2007 New Revision: 28437 URL: http://svn.reactos.org/svn/reactos?rev=28437&view=rev Log: - implement reading startup / recovery options Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc Tue Aug 21 01:41:05 2007 @@ -121,4 +121,8 @@ IDS_CPLSYSTEMDESCRIPTION "Zobrazuje informace o Vaem poèítaèi, mìní rùzné systémové promìnné a hardwarové vlastnosti." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc Tue Aug 21 01:41:05 2007 @@ -119,4 +119,8 @@ IDS_CPLSYSTEMDESCRIPTION "Se mere information omkring din computer, og skift diverse system og hardware indstillinger." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc Tue Aug 21 01:41:05 2007 @@ -273,4 +273,8 @@ IDS_PETABYTE "PB RAM" IDS_VARIABLE "Variable" IDS_VALUE "Value" -END + IDS_NO_DUMP "(Keine)" + IDS_MINI_DUMP "Kleines Speicherabild(64KB)" + IDS_KERNEL_DUMP "Kernelspeicherabild" + IDS_FULL_DUMP "Vollständiges Speicherabild" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc Tue Aug 21 01:41:05 2007 @@ -265,4 +265,8 @@ IDS_PETABYTE "PB of RAM" IDS_VARIABLE "Variable" IDS_VALUE "Value" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc Tue Aug 21 01:41:05 2007 @@ -125,4 +125,8 @@ IDS_CPLSYSTEMDESCRIPTION "Ver información de su Computadora y cambiar varias opciones del systema." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Tue Aug 21 01:41:05 2007 @@ -268,4 +268,8 @@ IDS_PETABYTE "PB de RAM" IDS_VARIABLE "Variable" IDS_VALUE "Valeur" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc Tue Aug 21 01:41:05 2007 @@ -122,4 +122,8 @@ IDS_CPLSYSTEMDESCRIPTION "A számítógéppel kapcsolatos információk megjelenítése, különbözõ rendszer és hardver beállítások módosítása." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc Tue Aug 21 01:41:05 2007 @@ -264,4 +264,9 @@ IDS_PETABYTE "PB RAM" IDS_VARIABLE "Variabel" IDS_VALUE "Nilai" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + +END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Tue Aug 21 01:41:05 2007 @@ -265,4 +265,9 @@ IDS_PETABYTE "PB di RAM" IDS_VARIABLE "Variabile" IDS_VALUE "Valore" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc Tue Aug 21 01:41:05 2007 @@ -121,4 +121,9 @@ IDS_CPLSYSTEMDESCRIPTION "VXeÌî{îñð\\¦µAVXeân[hEFAÌlXÈÝèðÏXµÜ·B" IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc Tue Aug 21 01:41:05 2007 @@ -121,4 +121,9 @@ IDS_CPLSYSTEMDESCRIPTION "Systeeminformatie weergeven en omgevingsinstellingen wijzigen." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc Tue Aug 21 01:41:05 2007 @@ -270,4 +270,9 @@ IDS_PETABYTE "PB RAM" IDS_VARIABLE "Zmienna" IDS_VALUE "Wartoæ" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Tue Aug 21 01:41:05 2007 @@ -265,4 +265,9 @@ IDS_PETABYTE "Ïá ÎÇÓ" IDS_VARIABLE "Ïåðåìåííàÿ" IDS_VALUE "Çíà÷åíèå" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc Tue Aug 21 01:41:05 2007 @@ -123,4 +123,9 @@ IDS_CPLSYSTEMDESCRIPTION "Se information om din dator och ändra olika system- och hårdvaruinställningar." IDS_VARIABLE "Variable" IDS_VALUE "Value" + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc Tue Aug 21 01:41:05 2007 @@ -273,4 +273,9 @@ IDS_PETABYTE "PB of RAM" IDS_VARIABLE "Çì³ííà" IDS_VALUE "Çíà÷åííÿ" -END + IDS_NO_DUMP "(None)" + IDS_MINI_DUMP "Minidump(64KB)" + IDS_KERNEL_DUMP "Kernel dump" + IDS_FULL_DUMP "Complete dump" + +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Tue Aug 21 01:41:05 2007 @@ -20,6 +20,11 @@ #define IDS_VARIABLE 66 #define IDS_VALUE 67 +#define IDS_NO_DUMP 68 +#define IDS_MINI_DUMP 69 +#define IDS_KERNEL_DUMP 70 +#define IDS_FULL_DUMP 71 + /* propsheet - general */ #define IDD_PROPPAGEGENERAL 100 Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Tue Aug 21 01:41:05 2007 @@ -6,13 +6,15 @@ * PURPOSE: Computer settings for startup and recovery * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * Copyright 2006 Christoph von Wittich <Christoph(a)ApiViewer.de> - * + * Copyright 2007 Johannes Anderwald <johannes dot anderwald at student dot tugraz dot at> */ #include "precomp.h" static TCHAR m_szFreeldrIni[MAX_PATH + 15]; static int m_FreeLdrIni = 0; - +static TCHAR m_szDumpFile[MAX_PATH]; +static TCHAR m_szMinidumpDir[MAX_PATH]; +static DWORD m_dwCrashDumpEnabled = 0; void SetTimeout(HWND hwndDlg, int Timeout) { if (Timeout == 0) @@ -399,9 +401,7 @@ DWORD dwBufSize; TCHAR *szSystemDrive; HINF hInf; - - SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); - + dwBufSize = GetSystemDrive(&szSystemDrive); if (!dwBufSize) return FALSE; @@ -449,6 +449,134 @@ } return FALSE; } + +void SetCrashDlgItems(HWND hwnd) +{ + if (m_dwCrashDumpEnabled == 0) + { + /* no crash information required */ + EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); + } + else if (m_dwCrashDumpEnabled == 3) + { + /* minidump type */ + EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); + SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)m_szMinidumpDir); + } + else if (m_dwCrashDumpEnabled == 1 || m_dwCrashDumpEnabled == 2) + { + /* kernel or complete dump */ + EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE); + SendMessage(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)m_szDumpFile); + } + SendDlgItemMessage(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)m_dwCrashDumpEnabled, (LPARAM)0); +} + +void LoadRecoveryOptions(HWND hwndDlg) +{ + HKEY hKey; + DWORD dwValues; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD i, dwName, dwValue, dwValueLength, dwType; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("System\\CurrentControlSet\\Control\\CrashControl"), + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + /* failed to open key */ + return; + } + + if (RegQueryInfoKey(hKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + NULL, + NULL, + NULL, + NULL) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + for (i = 0; i < dwValues; i++) + { + dwName = sizeof(szName) / sizeof(TCHAR); + + RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, NULL, NULL); + if (dwType == REG_DWORD) + { + dwValueLength = sizeof(dwValue); + dwName = sizeof(szName) / sizeof(TCHAR); + if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&dwValue, &dwValueLength) != ERROR_SUCCESS) + continue; + } + else + { + dwValueLength = sizeof(szValue); + dwName = sizeof(szName) / sizeof(TCHAR); + if (RegEnumValue(hKey, i, szName, &dwName, NULL, &dwType, (LPBYTE)&szValue, &dwValueLength) != ERROR_SUCCESS) + continue; + } + + if (!_tcscmp(szName, _T("LogEvent"))) + { + if (dwValue) + SendDlgItemMessage(hwndDlg, IDC_STRRECWRITEEVENT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + else if (!_tcscmp(szName, _T("SendAlert"))) + { + if (dwValue) + SendDlgItemMessage(hwndDlg, IDC_STRRECSENDALERT, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + else if (!_tcscmp(szName, _T("AutoReboot"))) + { + if (dwValue) + SendDlgItemMessage(hwndDlg, IDC_STRRECRESTART, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + else if (!_tcscmp(szName, _T("Overwrite"))) + { + if (dwValue) + SendDlgItemMessage(hwndDlg, IDC_STRRECOVERWRITE, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + else if (!_tcscmp(szName, _T("DumpFile"))) + { + _tcscpy(m_szDumpFile, szValue); + } + else if (!_tcscmp(szName, _T("MinidumpDir"))) + { + _tcscpy(m_szMinidumpDir, szValue); + } + else if (!_tcscmp(szName, _T("CrashDumpEnabled"))) + { + m_dwCrashDumpEnabled = dwValue; + } + } + + if (LoadString(hApplet, IDS_NO_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) + SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_FULL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) + SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_KERNEL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) + SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_MINI_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) + SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + + SetCrashDlgItems(hwndDlg); + RegCloseKey(hKey); +} + /* Property page dialog callback */ @@ -469,6 +597,7 @@ { case WM_INITDIALOG: { + LoadRecoveryOptions(hwndDlg); return LoadOSList(hwndDlg); } break; @@ -558,6 +687,30 @@ else SetTimeout(hwndDlg, 0); } + case IDC_STRRECDEBUGCOMBO: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + LRESULT lResult; + + lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lResult != CB_ERR && lResult != m_dwCrashDumpEnabled) + { + if (m_dwCrashDumpEnabled == 1 || m_dwCrashDumpEnabled == 2) + { + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(m_szDumpFile) / sizeof(TCHAR), (LPARAM)m_szDumpFile); + } + else if (m_dwCrashDumpEnabled == 3) + { + SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(m_szMinidumpDir) / sizeof(TCHAR), (LPARAM)m_szMinidumpDir); + } + m_dwCrashDumpEnabled = lResult; + SetCrashDlgItems(hwndDlg); + } + } + break; + } + } } break;

1 0

[greatlrd] 28436: Fix NtUserGetClipboardViewer in w32ksvc a smaller typo
by greatlrd＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: greatlrd Date: Tue Aug 21 01:02:25 2007 New Revision: 28436 URL: http://svn.reactos.org/svn/reactos?rev=28436&view=rev Log: Fix NtUserGetClipboardViewer in w32ksvc a smaller typo Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Aug 21 01:02:25 2007 @@ -8,48 +8,48 @@ # NtGdiAbortDoc 1 NtGdiAbortPath 1 -# NtGdiAddFontResourceW 6 -# NtGdiAddRemoteFontToDC 4 -# NtGdiAddFontMemResourceEx 5 -# NtGdiRemoveMergeFont 2 -# NtGdiAddRemoteMMInstanceToDC 3 +# NtGdiAddFontResourceW 6 +# NtGdiAddRemoteFontToDC 4 +# NtGdiAddFontMemResourceEx 5 +# NtGdiRemoveMergeFont 2 +# NtGdiAddRemoteMMInstanceToDC 3 NtGdiAlphaBlend 12 NtGdiAngleArc 6 -# NtGdiAnyLinkedFonts 0 -# NtGdiFontIsLinked 1 +# NtGdiAnyLinkedFonts 0 +# NtGdiFontIsLinked 1 NtGdiArcInternal 10 NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -# NtGdiCheckBitmapBits 8 +# NtGdiCheckBitmapBits 8 NtGdiCloseFigure 1 -# NtGdiClearBitmapAttributes 2 -# NtGdiClearBrushAttributes 2 -# NtGdiColorCorrectPalette 6 +# NtGdiClearBitmapAttributes 2 +# NtGdiClearBrushAttributes 2 +# NtGdiColorCorrectPalette 6 NtGdiCombineRgn 4 NtGdiCombineTransform 3 -# NtGdiComputeXformCoefficients 1 -# NtGdiConsoleTextOut 4 -# NtGdiConvertMetafileRect 2 +# NtGdiComputeXformCoefficients 1 +# NtGdiConsoleTextOut 4 +# NtGdiConvertMetafileRect 2 NtGdiCreateBitmap 5 NtGdiCreateClientObj 1 NtGdiCreateColorSpace 1 -# NtGdiCreateColorTransform 8 +# NtGdiCreateColorTransform 8 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 NtGdiCreateDIBBrush 6 -#NtGdiCreateDIBitmapInternal 11 +#NtGdiCreateDIBitmapInternal 11 NtGdiCreateDIBSection 9 NtGdiCreateEllipticRgn 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -# NtGdiCreateMetafileDC 1 -# NtGdiCreatePaletteInternal 2 +# NtGdiCreateMetafileDC 1 +# NtGdiCreatePaletteInternal 2 NtGdiCreatePatternBrushInternal 3 NtGdiCreatePen 4 NtGdiCreateRectRgn 4 NtGdiCreateRoundRectRgn 6 -#NtGdiCreateServerMetaFile 6 +#NtGdiCreateServerMetaFile 6 NtGdiCreateSolidBrush 2 NtGdiD3dContextCreate 4 NtGdiD3dContextDestroy 1 @@ -107,44 +107,44 @@ NtGdiDdUnlockD3D 2 NtGdiDdUpdateOverlay 3 NtGdiDdWaitForVerticalBlank 2 -# NtGdiDvpCanCreateVideoPort 2 -# NtGdiDvpColorControl 2 -# NtGdiDvpCreateVideoPort 2 -# NtGdiDvpDestroyVideoPort 2 -# NtGdiDvpFlipVideoPort 4 -# NtGdiDvpGetVideoPortBandwidth 2 -# NtGdiDvpGetVideoPortField 2 -# NtGdiDvpGetVideoPortFlipStatus 2 -# NtGdiDvpGetVideoPortInputFormats 2 -# NtGdiDvpGetVideoPortLine 2 -# NtGdiDvpGetVideoPortOutputFormats 2 -# NtGdiDvpGetVideoPortConnectInfo 2 -# NtGdiDvpGetVideoSignalStatus 2 -# NtGdiDvpUpdateVideoPort 4 -# NtGdiDvpWaitForVideoPortSync 2 -# NtGdiDvpAcquireNotification 3 -# NtGdiDvpReleaseNotification 2 -# NtGdiDxgGenericThunk 6 +# NtGdiDvpCanCreateVideoPort 2 +# NtGdiDvpColorControl 2 +# NtGdiDvpCreateVideoPort 2 +# NtGdiDvpDestroyVideoPort 2 +# NtGdiDvpFlipVideoPort 4 +# NtGdiDvpGetVideoPortBandwidth 2 +# NtGdiDvpGetVideoPortField 2 +# NtGdiDvpGetVideoPortFlipStatus 2 +# NtGdiDvpGetVideoPortInputFormats 2 +# NtGdiDvpGetVideoPortLine 2 +# NtGdiDvpGetVideoPortOutputFormats 2 +# NtGdiDvpGetVideoPortConnectInfo 2 +# NtGdiDvpGetVideoSignalStatus 2 +# NtGdiDvpUpdateVideoPort 4 +# NtGdiDvpWaitForVideoPortSync 2 +# NtGdiDvpAcquireNotification 3 +# NtGdiDvpReleaseNotification 2 +# NtGdiDxgGenericThunk 6 NtGdiDeleteClientObj 1 NtGdiDeleteColorSpace 1 -# NtGdiDeleteColorTransform 2 +# NtGdiDeleteColorTransform 2 NtGdiDeleteObjectApp 1 NtGdiDescribePixelFormat 4 -# NtGdiGetPerBandInfo 2 -# NtGdiDoBanding 4 -# NtGdiDoPalette 6 +# NtGdiGetPerBandInfo 2 +# NtGdiDoBanding 4 +# NtGdiDoPalette 6 NtGdiDrawEscape 4 NtGdiEllipse 5 -# NtGdiEnableEudc 1 +# NtGdiEnableEudc 1 NtGdiEndDoc 1 NtGdiEndPage 1 NtGdiEndPath 1 -# NtGdiEnumFontChunk 5 -# NtGdiEnumFontClose 1 -# NtGdiEnumFontOpen 7 +# NtGdiEnumFontChunk 5 +# NtGdiEnumFontClose 1 +# NtGdiEnumFontOpen 7 NtGdiEnumObjects 4 NtGdiEqualRgn 2 -# NtGdiEudcLoadUnloadLink 7 +# NtGdiEudcLoadUnloadLink 7 NtGdiExcludeClipRect 5 NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 @@ -152,13 +152,13 @@ NtGdiExtFloodFill 5 NtGdiExtGetObjectW 3 NtGdiExtSelectClipRgn 3 -# NtGdiExtTextOutW 9 +# NtGdiExtTextOutW 9 NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -# NtGdiFlushUserBatch 0 +# NtGdiFlushUserBatch 0 NtGdiFlush 0 -# NtGdiForceUFIMapping 2 +# NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 # NtGdiFullscreenControl 5 NtGdiGetAndSetDCDword 4 @@ -246,10 +246,10 @@ NtGdiPlgBlt 11 NtGdiPolyDraw 4 NtGdiPolyPolyDraw 5 -# NtGdiPolyTextOutW 4 +# NtGdiPolyTextOutW 4 NtGdiPtInRegion 3 NtGdiPtVisible 3 -# NtGdiQueryFonts 3 +# NtGdiQueryFonts 3 # NtGdiQueryFontAssocInfo 1 NtGdiRectangle 5 NtGdiRectInRegion 2 @@ -312,12 +312,12 @@ NtGdiWidenPath 1 NtUserActivateKeyboardLayout 2 NtUserAlterWindowStyle 3 -# NtUserAssociateInputContext 3 +# NtUserAssociateInputContext 3 NtUserAttachThreadInput 3 NtUserBeginPaint 2 NtUserBitBltSysBmp 8 NtUserBlockInput 1 -# NtUserBuildHimcList 4 +# NtUserBuildHimcList 4 NtUserBuildHwndList 7 NtUserBuildNameList 4 NtUserBuildPropList 4 @@ -333,14 +333,14 @@ NtUserCallTwoParam 3 NtUserChangeClipboardChain 2 NtUserChangeDisplaySettings 5 -# NtUserCheckImeHotKey 2 +# NtUserCheckImeHotKey 2 NtUserCheckMenuItem 3 NtUserChildWindowFromPointEx 4 NtUserClipCursor 1 NtUserCloseClipboard 0 NtUserCloseDesktop 1 NtUserCloseWindowStation 1 -# NtUserConsoleControl 3 +# NtUserConsoleControl 3 NtUserConvertMemHandle 2 NtUserCopyAcceleratorTable 3 NtUserCountClipboardFormats 0 @@ -399,7 +399,7 @@ NtUserGetClipboardFormatName 3 NtUserGetClipboardOwner 0 NtUserGetClipboardSequenceNumber 0 -# NtUserGetClipboardViewer 1 Wrong number of param ? +NtUserGetClipboardViewer 0 NtUserGetClipCursor 1 NtUserGetComboBoxInfo 2 NtUserGetControlBrush 3 @@ -682,7 +682,6 @@ NtUserFindExistingCursorIcon 4 NtUserFindWindowEx 4 NtUserGetClassInfo 4 -NtUserGetClipboardViewer 0 NtUserInitTask 11 NtUserSetClassWord 3 NtUserSetCursorIconData 6

1 0

[cfinck] 28435: Merge 28433 for real now. In my last commit, I wrote 28402:28433, but only merged up to 28432.
by cfinck＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: cfinck Date: Tue Aug 21 00:30:37 2007 New Revision: 28435 URL: http://svn.reactos.org/svn/reactos?rev=28435&view=rev Log: Merge 28433 for real now. In my last commit, I wrote 28402:28433, but only merged up to 28432. Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/precomp.h branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/startrec.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/precomp.h 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/cpl/sysdm/precomp.h (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/precomp.h Tue Aug 21 00:30:37 2007 @@ -3,7 +3,6 @@ #include <ntstatus.h> #define WIN32_NO_STATUS -#include <windows.h> #include <windows.h> #include <commctrl.h> #include <powrprof.h> @@ -16,6 +15,7 @@ #include <shlobj.h> #include <cplext.h> #include <regstr.h> +#include <setupapi.h> #include "resource.h" #define NUM_APPLETS (1) @@ -66,5 +66,13 @@ PAGEFILE Pagefile[26]; } VIRTMEM, *PVIRTMEM; +typedef struct _BOOTRECORD +{ + DWORD BootType; + TCHAR szSectionName[128]; + TCHAR szBootPath[MAX_PATH]; + TCHAR szOptions[512]; + +}BOOTRECORD, *PBOOTRECORD; #endif /* __CPL_SYSDM_H */ Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/startrec.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/cpl/sysdm/startrec.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/startrec.c Tue Aug 21 00:30:37 2007 @@ -10,10 +10,8 @@ */ #include "precomp.h" - static TCHAR m_szFreeldrIni[MAX_PATH + 15]; -static TCHAR szBootLdrSection[12]; -static TCHAR szBootLdrDefault[10]; +static int m_FreeLdrIni = 0; void SetTimeout(HWND hwndDlg, int Timeout) { @@ -27,6 +25,431 @@ } SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } + +DWORD GetSystemDrive(TCHAR ** szSystemDrive) +{ + DWORD dwBufSize; + /* get Path to freeldr.ini or boot.ini */ + *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); + if (szSystemDrive != NULL) + { + dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, MAX_PATH); + if (dwBufSize > MAX_PATH) + { + TCHAR *szTmp; + DWORD dwBufSize2; + + szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(TCHAR)); + if (szTmp == NULL) + goto FailGetSysDrive; + + *szSystemDrive = szTmp; + + dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, dwBufSize); + if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) + goto FailGetSysDrive; + } + else if (dwBufSize == 0) + { +FailGetSysDrive: + HeapFree(GetProcessHeap(), 0, szSystemDrive); + *szSystemDrive = NULL; + return FALSE; + } + return dwBufSize; + } + return FALSE; +} + +PBOOTRECORD ReadFreeldrSection(HINF hInf, TCHAR * szSectionName) +{ + PBOOTRECORD pRecord; + INFCONTEXT InfContext; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + + if (!SetupFindFirstLine(hInf, + szSectionName, + NULL, + &InfContext)) + { + /* failed to find section */ + return NULL; + } + + pRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); + if (pRecord == NULL) + { + return NULL; + } + _tcscpy(pRecord->szSectionName, szSectionName); + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + break; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + break; + } + + + if (!_tcsnicmp(szName, _T("BootType"), 8)) + { + if (!_tcsnicmp(szValue, _T("ReactOS"), 7)) + { + //FIXME store as enum + pRecord->BootType = 1; + } + else + { + pRecord->BootType = 0; + } + } + else if (!_tcsnicmp(szName, _T("SystemPath"), 10)) + { + _tcscpy(pRecord->szBootPath, szValue); + } + else if (!_tcsnicmp(szName, _T("Options"), 7)) + { + //FIXME store flags as values + _tcscpy(pRecord->szOptions, szValue); + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + return pRecord; +} + + +int LoadFreeldrSettings(HINF hInf, HWND hwndDlg) +{ + INFCONTEXT InfContext; + PBOOTRECORD pRecord; + TCHAR szDefaultOs[MAX_PATH]; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + DWORD TimeOut; + LRESULT lResult; + + if (!SetupFindFirstLine(hInf, + _T("FREELOADER"), + _T("DefaultOS"), + &InfContext)) + { + /* failed to find default os */ + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szDefaultOs, + sizeof(szDefaultOs) / sizeof(TCHAR), + &LineLength)) + { + /* no key */ + return FALSE; + } + + if (!SetupFindFirstLine(hInf, + _T("FREELOADER"), + _T("TimeOut"), + &InfContext)) + { + /* expected to find timeout value */ + return FALSE; + } + + + if (!SetupGetIntField(&InfContext, + 1, + (PINT)&TimeOut)) + { + /* failed to retrieve timeout */ + return FALSE; + } + + if (!SetupFindFirstLine(hInf, + _T("Operating Systems"), + NULL, + &InfContext)) + { + /* expected list of operating systems */ + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + /* the ini file is messed up */ + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + /* the ini file is messed up */ + return FALSE; + } + + pRecord = ReadFreeldrSection(hInf, szName); + if (pRecord) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + if (!_tcscmp(szDefaultOs, szName)) + { + /* we store the friendly name as key */ + _tcscpy(szDefaultOs, szValue); + } + + } + else + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + /* find default os in list */ + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); + if (lResult != CB_ERR) + { + /* set cur sel */ + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + + SetTimeout(hwndDlg, TimeOut); + return TRUE; +} + +int LoadBootSettings(HINF hInf, HWND hwndDlg) +{ + INFCONTEXT InfContext; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + DWORD TimeOut = 0; + TCHAR szDefaultOS[MAX_PATH]; + TCHAR szOptions[MAX_PATH]; + PBOOTRECORD pRecord; + LRESULT lResult; + + if(!SetupFindFirstLine(hInf, + _T("boot loader"), + NULL, + &InfContext)) + { + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!_tcsnicmp(szName, _T("timeout"), 7)) + { + TimeOut = _ttoi(szValue); + } + + if (!_tcsnicmp(szName, _T("default"), 7)) + { + _tcscpy(szDefaultOS, szValue); + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + if (!SetupFindFirstLine(hInf, + _T("operating systems"), + NULL, + &InfContext)) + { + /* failed to find operating systems section */ + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + SetupGetStringField(&InfContext, + 2, + szOptions, + sizeof(szOptions) / sizeof(TCHAR), + &LineLength); + + pRecord = (PBOOTRECORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); + if (pRecord) + { + pRecord->BootType = 0; + _tcscpy(pRecord->szBootPath, szName); + _tcscpy(pRecord->szSectionName, szValue); + _tcscpy(pRecord->szOptions, szOptions); + + if (!_tcscmp(szName, szDefaultOS)) + { + /* ms boot ini stores the path not the friendly name */ + _tcscpy(szDefaultOS, szValue); + } + + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + } + else + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + /* find default os in list */ + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); + if (lResult != CB_ERR) + { + /* set cur sel */ + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + + SetTimeout(hwndDlg, TimeOut); + return TRUE; +} + +void DeleteBootRecords(HWND hwndDlg) +{ + LRESULT lIndex; + LONG index; + PBOOTRECORD pRecord; + + + lIndex = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + return; + + for (index = 0; index <lIndex; index++) + { + pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0); + if ((INT)pRecord != CB_ERR) + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0); +} + +LRESULT LoadOSList(HWND hwndDlg) +{ + DWORD dwBufSize; + TCHAR *szSystemDrive; + HINF hInf; + + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); + + dwBufSize = GetSystemDrive(&szSystemDrive); + if (!dwBufSize) + return FALSE; + + + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (PathFileExists(m_szFreeldrIni)) + { + /* freeldr.ini exists */ + hInf = SetupOpenInfFile(m_szFreeldrIni, + NULL, + INF_STYLE_OLDNT, + NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + LoadFreeldrSettings(hInf, hwndDlg); + SetupCloseInfFile(hInf); + m_FreeLdrIni = 1; + return TRUE; + } + return FALSE; + } + /* try load boot.ini settings */ + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + + if (PathFileExists(m_szFreeldrIni)) + { + /* load boot.ini settings */ + hInf = SetupOpenInfFile(m_szFreeldrIni, + NULL, + INF_STYLE_OLDNT, + NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + LoadBootSettings(hInf, hwndDlg); + SetupCloseInfFile(hInf); + m_FreeLdrIni = 2; + return TRUE; + } + return FALSE; + } + return FALSE; +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -35,11 +458,10 @@ WPARAM wParam, LPARAM lParam) { - TCHAR *szSystemDrive; - TCHAR szDefaultOS[MAX_PATH]; - TCHAR szDefaultOSName[MAX_PATH]; + PBOOTRECORD pRecord; + int iTimeout; + LRESULT lResult; TCHAR szTimeout[10]; - int iTimeout; UNREFERENCED_PARAMETER(lParam); @@ -47,76 +469,7 @@ { case WM_INITDIALOG: { - DWORD dwBufSize; - - /* get Path to freeldr.ini or boot.ini */ - szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); - if (szSystemDrive != NULL) - { - dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, MAX_PATH); - if (dwBufSize > MAX_PATH) - { - TCHAR *szTmp; - DWORD dwBufSize2; - - szTmp = HeapReAlloc(GetProcessHeap(), 0, szSystemDrive, dwBufSize * sizeof(TCHAR)); - if (szTmp == NULL) - goto FailGetSysDrive; - - szSystemDrive = szTmp; - - dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, dwBufSize); - if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) - goto FailGetSysDrive; - } - else if (dwBufSize == 0) - { -FailGetSysDrive: - HeapFree(GetProcessHeap(), 0, szSystemDrive); - szSystemDrive = NULL; - return FALSE; - } - - if (szSystemDrive != NULL) - { - if (m_szFreeldrIni != NULL) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); - if (!PathFileExists(m_szFreeldrIni)) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\boot.ini")); - _tcscpy(szBootLdrSection, _T("boot loader")); - _tcscpy(szBootLdrDefault, _T("default")); - } - else - { - _tcscpy(szBootLdrSection, _T("FREELOADER")); - _tcscpy(szBootLdrDefault, _T("DefaultOS")); - } - } - HeapFree(GetProcessHeap(), 0, szSystemDrive); - } - } - - if (m_szFreeldrIni == NULL) - return FALSE; - - SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); - - /* load settings from freeldr.ini */ - GetPrivateProfileString(szBootLdrSection, szBootLdrDefault, NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); - GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); - - /* timeout */ - iTimeout = GetPrivateProfileInt(szBootLdrSection, _T("timeout"), 0, m_szFreeldrIni); - SetTimeout(hwndDlg, iTimeout); - if (iTimeout != 0) - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - + return LoadOSList(hwndDlg); } break; @@ -127,6 +480,9 @@ case IDC_STRRECEDIT: { ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); + // FIXME use CreateProcess and wait untill finished + // DeleteBootRecords(hwndDlg); + // LoadOSList(hwndDlg); break; } case IDOK: @@ -137,14 +493,63 @@ else iTimeout = 0; _stprintf(szTimeout, _T("%i"), iTimeout); - WritePrivateProfileString(szBootLdrSection, _T("timeout"), szTimeout, m_szFreeldrIni); - } - case IDCANCEL: - { + + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lResult == CB_ERR) + { + /* ? */ + DeleteBootRecords(hwndDlg); + return TRUE; + } + + + pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0); + + + + if ((INT)pRecord != CB_ERR) + { + if (m_FreeLdrIni == 1) // FreeLdrIni style + { + /* set default timeout */ + WritePrivateProfileString(_T("FREELOADER"), + _T("TimeOut"), + szTimeout, + m_szFreeldrIni); + /* set default os */ + WritePrivateProfileString(_T("FREELOADER"), + _T("DefaultOS"), + pRecord->szSectionName, + m_szFreeldrIni); + + } + else if (m_FreeLdrIni == 2) // BootIni style + { + /* set default timeout */ + WritePrivateProfileString(_T("boot loader"), + _T("timeout"), + szTimeout, + m_szFreeldrIni); + /* set default os */ + WritePrivateProfileString(_T("boot loader"), + _T("default"), + pRecord->szBootPath, + m_szFreeldrIni); + + } + } + DeleteBootRecords(hwndDlg); EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; break; + } + case IDCANCEL: + { + DeleteBootRecords(hwndDlg); + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; } case IDC_STRECLIST: { Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/sysdm.rbuild 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/cpl/sysdm/sysdm.rbuild (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/cpl/sysdm/sysdm.rbuild Tue Aug 21 00:30:37 2007 @@ -8,6 +8,7 @@ <define name="WINVER">0x501</define> <library>kernel32</library> <library>advapi32</library> + <library>setupapi</library> <library>msvcrt</library> <library>user32</library> <library>gdi32</library>

1 0

[cfinck] 28434: Merge 28402:28433
by cfinck＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: cfinck Date: Mon Aug 20 23:50:07 2007 New Revision: 28434 URL: http://svn.reactos.org/svn/reactos?rev=28434&view=rev Log: Merge 28402:28433 Added: branches/ros-branch-0_3_3-new/reactos/dll/win32/winsta/winsta.rbuild - copied unchanged from r28432, trunk/reactos/dll/win32/winsta/winsta.rbuild branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/async.c - copied unchanged from r28432, trunk/reactos/dll/win32/ws2_32/misc/async.c branches/ros-branch-0_3_3-new/reactos/include/reactos/wine/winsock16.h - copied unchanged from r28432, trunk/reactos/include/reactos/wine/winsock16.h branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.sln - copied unchanged from r28432, trunk/reactos/tools/mkhive/mkhive.sln branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.vcproj - copied unchanged from r28432, trunk/reactos/tools/mkhive/mkhive.vcproj Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/more/more.c branches/ros-branch-0_3_3-new/reactos/baseaddress.rbuild branches/ros-branch-0_3_3-new/reactos/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/access.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/display.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/general.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/keyboard.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/cs-CZ.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/en-US.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/es-ES.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/fr-FR.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/hu-HU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/id-ID.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/it-IT.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ja-JP.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/nl-NL.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/pl-PL.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ru-RU.rc branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/mouse.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/resource.h branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/sound.c branches/ros-branch-0_3_3-new/reactos/dll/cpl/ncpa/lang/fr-FR.rc branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/gdi32.def branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/bitmap.c branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/dc.c branches/ros-branch-0_3_3-new/reactos/dll/win32/win32.rbuild branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/ns.c branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/ws2_32.rbuild branches/ros-branch-0_3_3-new/reactos/drivers/video/miniport/vbe/vbemp.c branches/ros-branch-0_3_3-new/reactos/include/ddk/ddrawint.h branches/ros-branch-0_3_3-new/reactos/include/ddk/winddk.h branches/ros-branch-0_3_3-new/reactos/include/psdk/winnt.h branches/ros-branch-0_3_3-new/reactos/include/reactos/win32k/ntgdibad.h branches/ros-branch-0_3_3-new/reactos/lib/cmlib/cmlib.mak branches/ros-branch-0_3_3-new/reactos/ntoskrnl/kdbg/i386/i386-dis.c branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ob/obhandle.c branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/ntuser/windc.c branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/color.c branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dc.c branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dibobj.c branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/w32ksvc.db branches/ros-branch-0_3_3-new/reactos/tools/cabman/cabinet.cxx branches/ros-branch-0_3_3-new/reactos/tools/cdmake/cdmake.c branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.h branches/ros-branch-0_3_3-new/reactos/tools/mkhive/reginf.c branches/ros-branch-0_3_3-new/reactos/tools/mkhive/registry.c branches/ros-branch-0_3_3-new/reactos/tools/nci/ncitool.c branches/ros-branch-0_3_3-new/reactos/tools/ssprintf.cpp branches/ros-branch-0_3_3-new/reactos/tools/tools.mak branches/ros-branch-0_3_3-new/reactos/tools/unicode/cptable.c branches/ros-branch-0_3_3-new/reactos/tools/unicode/mbtowc.c branches/ros-branch-0_3_3-new/reactos/tools/unicode/string.c branches/ros-branch-0_3_3-new/reactos/tools/unicode/unicode.mak branches/ros-branch-0_3_3-new/reactos/tools/unicode/utf8.c branches/ros-branch-0_3_3-new/reactos/tools/unicode/wctomb.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/dumpres.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/genres.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/lex.yy.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/newstruc.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.l branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.tab.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.y branches/ros-branch-0_3_3-new/reactos/tools/wrc/utils.c branches/ros-branch-0_3_3-new/reactos/tools/wrc/wrc.c branches/ros-branch-0_3_3-new/reactos/tools/xml.cpp branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml branches/ros-branch-0_3_3-new/rostests/dxtest/win32kdxtest/dump.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_3-new/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… Modified: branches/ros-branch-0_3_3-new/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… 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… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/cpl/ncpa/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… Modified: branches/ros-branch-0_3_3-new/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… Modified: branches/ros-branch-0_3_3-new/reactos/include/ddk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… Modified: branches/ros-branch-0_3_3-new/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… Modified: branches/ros-branch-0_3_3-new/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… Modified: branches/ros-branch-0_3_3-new/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/li… Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… Modified: branches/ros-branch-0_3_3-new/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/nt… Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/su… Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/su… Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/su… Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/su… Modified: branches/ros-branch-0_3_3-new/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/su… Modified: branches/ros-branch-0_3_3-new/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/to… Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do… Modified: branches/ros-branch-0_3_3-new/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rostests/d…

1 0

[janderwald] 28433: - support reading multiple boot configuration - support saving prefered boot configuration (freeldr / boot ini style) - parsing of boot options needs to be done
by janderwald＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: janderwald Date: Mon Aug 20 23:21:54 2007 New Revision: 28433 URL: http://svn.reactos.org/svn/reactos?rev=28433&view=rev Log: - support reading multiple boot configuration - support saving prefered boot configuration (freeldr / boot ini style) - parsing of boot options needs to be done Modified: trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h Mon Aug 20 23:21:54 2007 @@ -3,7 +3,6 @@ #include <ntstatus.h> #define WIN32_NO_STATUS -#include <windows.h> #include <windows.h> #include <commctrl.h> #include <powrprof.h> @@ -16,6 +15,7 @@ #include <shlobj.h> #include <cplext.h> #include <regstr.h> +#include <setupapi.h> #include "resource.h" #define NUM_APPLETS (1) @@ -66,5 +66,13 @@ PAGEFILE Pagefile[26]; } VIRTMEM, *PVIRTMEM; +typedef struct _BOOTRECORD +{ + DWORD BootType; + TCHAR szSectionName[128]; + TCHAR szBootPath[MAX_PATH]; + TCHAR szOptions[512]; + +}BOOTRECORD, *PBOOTRECORD; #endif /* __CPL_SYSDM_H */ Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Mon Aug 20 23:21:54 2007 @@ -10,10 +10,8 @@ */ #include "precomp.h" - static TCHAR m_szFreeldrIni[MAX_PATH + 15]; -static TCHAR szBootLdrSection[12]; -static TCHAR szBootLdrDefault[10]; +static int m_FreeLdrIni = 0; void SetTimeout(HWND hwndDlg, int Timeout) { @@ -27,6 +25,431 @@ } SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } + +DWORD GetSystemDrive(TCHAR ** szSystemDrive) +{ + DWORD dwBufSize; + /* get Path to freeldr.ini or boot.ini */ + *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); + if (szSystemDrive != NULL) + { + dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, MAX_PATH); + if (dwBufSize > MAX_PATH) + { + TCHAR *szTmp; + DWORD dwBufSize2; + + szTmp = HeapReAlloc(GetProcessHeap(), 0, *szSystemDrive, dwBufSize * sizeof(TCHAR)); + if (szTmp == NULL) + goto FailGetSysDrive; + + *szSystemDrive = szTmp; + + dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), *szSystemDrive, dwBufSize); + if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) + goto FailGetSysDrive; + } + else if (dwBufSize == 0) + { +FailGetSysDrive: + HeapFree(GetProcessHeap(), 0, szSystemDrive); + *szSystemDrive = NULL; + return FALSE; + } + return dwBufSize; + } + return FALSE; +} + +PBOOTRECORD ReadFreeldrSection(HINF hInf, TCHAR * szSectionName) +{ + PBOOTRECORD pRecord; + INFCONTEXT InfContext; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + + if (!SetupFindFirstLine(hInf, + szSectionName, + NULL, + &InfContext)) + { + /* failed to find section */ + return NULL; + } + + pRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); + if (pRecord == NULL) + { + return NULL; + } + _tcscpy(pRecord->szSectionName, szSectionName); + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + break; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + break; + } + + + if (!_tcsnicmp(szName, _T("BootType"), 8)) + { + if (!_tcsnicmp(szValue, _T("ReactOS"), 7)) + { + //FIXME store as enum + pRecord->BootType = 1; + } + else + { + pRecord->BootType = 0; + } + } + else if (!_tcsnicmp(szName, _T("SystemPath"), 10)) + { + _tcscpy(pRecord->szBootPath, szValue); + } + else if (!_tcsnicmp(szName, _T("Options"), 7)) + { + //FIXME store flags as values + _tcscpy(pRecord->szOptions, szValue); + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + return pRecord; +} + + +int LoadFreeldrSettings(HINF hInf, HWND hwndDlg) +{ + INFCONTEXT InfContext; + PBOOTRECORD pRecord; + TCHAR szDefaultOs[MAX_PATH]; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + DWORD TimeOut; + LRESULT lResult; + + if (!SetupFindFirstLine(hInf, + _T("FREELOADER"), + _T("DefaultOS"), + &InfContext)) + { + /* failed to find default os */ + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szDefaultOs, + sizeof(szDefaultOs) / sizeof(TCHAR), + &LineLength)) + { + /* no key */ + return FALSE; + } + + if (!SetupFindFirstLine(hInf, + _T("FREELOADER"), + _T("TimeOut"), + &InfContext)) + { + /* expected to find timeout value */ + return FALSE; + } + + + if (!SetupGetIntField(&InfContext, + 1, + (PINT)&TimeOut)) + { + /* failed to retrieve timeout */ + return FALSE; + } + + if (!SetupFindFirstLine(hInf, + _T("Operating Systems"), + NULL, + &InfContext)) + { + /* expected list of operating systems */ + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + /* the ini file is messed up */ + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + /* the ini file is messed up */ + return FALSE; + } + + pRecord = ReadFreeldrSection(hInf, szName); + if (pRecord) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + if (!_tcscmp(szDefaultOs, szName)) + { + /* we store the friendly name as key */ + _tcscpy(szDefaultOs, szValue); + } + + } + else + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + /* find default os in list */ + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); + if (lResult != CB_ERR) + { + /* set cur sel */ + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + + SetTimeout(hwndDlg, TimeOut); + return TRUE; +} + +int LoadBootSettings(HINF hInf, HWND hwndDlg) +{ + INFCONTEXT InfContext; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + DWORD TimeOut = 0; + TCHAR szDefaultOS[MAX_PATH]; + TCHAR szOptions[MAX_PATH]; + PBOOTRECORD pRecord; + LRESULT lResult; + + if(!SetupFindFirstLine(hInf, + _T("boot loader"), + NULL, + &InfContext)) + { + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!_tcsnicmp(szName, _T("timeout"), 7)) + { + TimeOut = _ttoi(szValue); + } + + if (!_tcsnicmp(szName, _T("default"), 7)) + { + _tcscpy(szDefaultOS, szValue); + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + + if (!SetupFindFirstLine(hInf, + _T("operating systems"), + NULL, + &InfContext)) + { + /* failed to find operating systems section */ + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + return FALSE; + } + + SetupGetStringField(&InfContext, + 2, + szOptions, + sizeof(szOptions) / sizeof(TCHAR), + &LineLength); + + pRecord = (PBOOTRECORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); + if (pRecord) + { + pRecord->BootType = 0; + _tcscpy(pRecord->szBootPath, szName); + _tcscpy(pRecord->szSectionName, szValue); + _tcscpy(pRecord->szOptions, szOptions); + + if (!_tcscmp(szName, szDefaultOS)) + { + /* ms boot ini stores the path not the friendly name */ + _tcscpy(szDefaultOS, szValue); + } + + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); + } + else + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + + }while(SetupFindNextLine(&InfContext, &InfContext)); + /* find default os in list */ + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); + if (lResult != CB_ERR) + { + /* set cur sel */ + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + + SetTimeout(hwndDlg, TimeOut); + return TRUE; +} + +void DeleteBootRecords(HWND hwndDlg) +{ + LRESULT lIndex; + LONG index; + PBOOTRECORD pRecord; + + + lIndex = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + return; + + for (index = 0; index <lIndex; index++) + { + pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0); + if ((INT)pRecord != CB_ERR) + { + HeapFree(GetProcessHeap(), 0, pRecord); + } + } + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0); +} + +LRESULT LoadOSList(HWND hwndDlg) +{ + DWORD dwBufSize; + TCHAR *szSystemDrive; + HINF hInf; + + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); + + dwBufSize = GetSystemDrive(&szSystemDrive); + if (!dwBufSize) + return FALSE; + + + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (PathFileExists(m_szFreeldrIni)) + { + /* freeldr.ini exists */ + hInf = SetupOpenInfFile(m_szFreeldrIni, + NULL, + INF_STYLE_OLDNT, + NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + LoadFreeldrSettings(hInf, hwndDlg); + SetupCloseInfFile(hInf); + m_FreeLdrIni = 1; + return TRUE; + } + return FALSE; + } + /* try load boot.ini settings */ + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + + if (PathFileExists(m_szFreeldrIni)) + { + /* load boot.ini settings */ + hInf = SetupOpenInfFile(m_szFreeldrIni, + NULL, + INF_STYLE_OLDNT, + NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + LoadBootSettings(hInf, hwndDlg); + SetupCloseInfFile(hInf); + m_FreeLdrIni = 2; + return TRUE; + } + return FALSE; + } + return FALSE; +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -35,11 +458,10 @@ WPARAM wParam, LPARAM lParam) { - TCHAR *szSystemDrive; - TCHAR szDefaultOS[MAX_PATH]; - TCHAR szDefaultOSName[MAX_PATH]; + PBOOTRECORD pRecord; + int iTimeout; + LRESULT lResult; TCHAR szTimeout[10]; - int iTimeout; UNREFERENCED_PARAMETER(lParam); @@ -47,76 +469,7 @@ { case WM_INITDIALOG: { - DWORD dwBufSize; - - /* get Path to freeldr.ini or boot.ini */ - szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); - if (szSystemDrive != NULL) - { - dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, MAX_PATH); - if (dwBufSize > MAX_PATH) - { - TCHAR *szTmp; - DWORD dwBufSize2; - - szTmp = HeapReAlloc(GetProcessHeap(), 0, szSystemDrive, dwBufSize * sizeof(TCHAR)); - if (szTmp == NULL) - goto FailGetSysDrive; - - szSystemDrive = szTmp; - - dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, dwBufSize); - if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) - goto FailGetSysDrive; - } - else if (dwBufSize == 0) - { -FailGetSysDrive: - HeapFree(GetProcessHeap(), 0, szSystemDrive); - szSystemDrive = NULL; - return FALSE; - } - - if (szSystemDrive != NULL) - { - if (m_szFreeldrIni != NULL) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); - if (!PathFileExists(m_szFreeldrIni)) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\boot.ini")); - _tcscpy(szBootLdrSection, _T("boot loader")); - _tcscpy(szBootLdrDefault, _T("default")); - } - else - { - _tcscpy(szBootLdrSection, _T("FREELOADER")); - _tcscpy(szBootLdrDefault, _T("DefaultOS")); - } - } - HeapFree(GetProcessHeap(), 0, szSystemDrive); - } - } - - if (m_szFreeldrIni == NULL) - return FALSE; - - SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); - - /* load settings from freeldr.ini */ - GetPrivateProfileString(szBootLdrSection, szBootLdrDefault, NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); - GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); - - /* timeout */ - iTimeout = GetPrivateProfileInt(szBootLdrSection, _T("timeout"), 0, m_szFreeldrIni); - SetTimeout(hwndDlg, iTimeout); - if (iTimeout != 0) - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - + return LoadOSList(hwndDlg); } break; @@ -127,6 +480,9 @@ case IDC_STRRECEDIT: { ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); + // FIXME use CreateProcess and wait untill finished + // DeleteBootRecords(hwndDlg); + // LoadOSList(hwndDlg); break; } case IDOK: @@ -137,14 +493,63 @@ else iTimeout = 0; _stprintf(szTimeout, _T("%i"), iTimeout); - WritePrivateProfileString(szBootLdrSection, _T("timeout"), szTimeout, m_szFreeldrIni); - } - case IDCANCEL: - { + + lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lResult == CB_ERR) + { + /* ? */ + DeleteBootRecords(hwndDlg); + return TRUE; + } + + + pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0); + + + + if ((INT)pRecord != CB_ERR) + { + if (m_FreeLdrIni == 1) // FreeLdrIni style + { + /* set default timeout */ + WritePrivateProfileString(_T("FREELOADER"), + _T("TimeOut"), + szTimeout, + m_szFreeldrIni); + /* set default os */ + WritePrivateProfileString(_T("FREELOADER"), + _T("DefaultOS"), + pRecord->szSectionName, + m_szFreeldrIni); + + } + else if (m_FreeLdrIni == 2) // BootIni style + { + /* set default timeout */ + WritePrivateProfileString(_T("boot loader"), + _T("timeout"), + szTimeout, + m_szFreeldrIni); + /* set default os */ + WritePrivateProfileString(_T("boot loader"), + _T("default"), + pRecord->szBootPath, + m_szFreeldrIni); + + } + } + DeleteBootRecords(hwndDlg); EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; break; + } + case IDCANCEL: + { + DeleteBootRecords(hwndDlg); + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; } case IDC_STRECLIST: { Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Mon Aug 20 23:21:54 2007 @@ -8,6 +8,7 @@ <define name="WINVER">0x501</define> <library>kernel32</library> <library>advapi32</library> + <library>setupapi</library> <library>msvcrt</library> <library>user32</library> <library>gdi32</library>

1 0

[greatlrd] 28432: Remove some expremnt code, need rehink how I can get current range of video memory pointer
by greatlrd＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: greatlrd Date: Mon Aug 20 19:17:06 2007 New Revision: 28432 URL: http://svn.reactos.org/svn/reactos?rev=28432&view=rev Log: Remove some expremnt code, need rehink how I can get current range of video memory pointer Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Mon Aug 20 19:17:06 2007 @@ -251,9 +251,6 @@ VBEDeviceExtension->VbeInfo.Version & 0xFF, VBEDeviceExtension->VbeInfo.TotalMemory * 64); - - - #ifdef VBE12_SUPPORT if (VBEDeviceExtension->VbeInfo.Version < 0x102) #else @@ -298,16 +295,14 @@ break; } - - /* * Allocate space for video modes information. */ VBEDeviceExtension->ModeInfo = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, (ModeCount + 1) * sizeof(VBE_MODEINFO), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(VBE_MODEINFO), TAG_VBE); VBEDeviceExtension->ModeNumbers = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, (ModeCount+ 1) * sizeof(USHORT), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(USHORT), TAG_VBE); /* * Get the actual mode infos. @@ -355,72 +350,27 @@ { if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR) { - VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000; - SuitableModeCount++; + /* Bit 15 14 13 12 | 11 10 9 8 | 7 6 5 4 | 3 2 1 0 */ + // if (ModeTemp & 0x4000) + //{ + VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000; + SuitableModeCount++; + //} } #ifdef VBE12_SUPPORT else { - /* FIXME when PCI bus scanner are inplace we need add ModeTemp | 0x4000 - * for we will map the memory our self and do not use bankswitch */ - - if (VBEDeviceExtension->VbeInfo.Version < 0x200) - { - VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp; - SuitableModeCount++; - } + VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp; + SuitableModeCount++; } #endif } } -#ifdef VBE12_SUPPORT - if (VBEDeviceExtension->VbeInfo.Version < 0x200) - { - /* FIXME add PCI bus scanner to detect the video ram phy address */ - } - else -#endif - if (VBEDeviceExtension->VbeInfo.Version >= 0x200) - { - - /* Call VBE BIOS to read the mode info.for the special mode */ - VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); - BiosRegisters.Eax = VBE_GET_MODE_INFORMATION; - BiosRegisters.Ecx = 0x81FF; - BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset + 0x200; - BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment; - VBEDeviceExtension->Int10Interface.Int10CallBios( - VBEDeviceExtension->Int10Interface.Context, - &BiosRegisters); - - VBEDeviceExtension->ModeNumbers[SuitableModeCount] = 0; - - if (BiosRegisters.Eax == VBE_SUCCESS) - { - /* transfer the special mode data to protected memory */ - VBEDeviceExtension->Int10Interface.Int10ReadMemory( - VBEDeviceExtension->Int10Interface.Context, - VBEDeviceExtension->TrampolineMemorySegment, - VBEDeviceExtension->TrampolineMemoryOffset + 0x200, - VBEDeviceExtension->ModeInfo + SuitableModeCount, - sizeof(VBE_MODEINFO)); - - VBEDeviceExtension->ModeNumbers[SuitableModeCount] = 0x81FF; - /* Do not add special mode to the list */ - //SuitableModeCount++; - - /* to gain full phy memory - * VBEDeviceExtension->ModeNumbers[SuitableModeCount].PhysBasePtr - * VBEDeviceExtension->VbeInfo.TotalMemory * 64 = x Memory on the card in Kbyte - */ - } - } - - if (SuitableModeCount == 0) { + VideoPortDebugPrint(Warn, "VBEMP: No video modes supported\n"); return FALSE; } @@ -446,9 +396,6 @@ VBEDeviceExtension->ModeInfo[CurrentMode].YResolution, VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel); } - - - /* * Enumerate our children. @@ -873,14 +820,11 @@ #ifdef VBE12_SUPPORT else { - // when pci bus scanner are in place we remove this one FrameBuffer.QuadPart = 0xA0000; MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; MapInformation->VideoRamLength = 0x10000; } -#endif - - +#endif VideoPortMapMemory(DeviceExtension, FrameBuffer, &MapInformation->VideoRamLength, &inIoSpace,

1 0

[hpoussin] 28431: Fix typo
by hpoussin＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: hpoussin Date: Mon Aug 20 16:06:12 2007 New Revision: 28431 URL: http://svn.reactos.org/svn/reactos?rev=28431&view=rev Log: Fix typo Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Aug 20 16:06:12 2007 @@ -242,7 +242,7 @@ dll\win32\winmm\winmm.dll 1 dll\win32\winmm\wavemap\msacm32.drv 1 optional dll\win32\winspool\winspool.drv 1 -dll\win32\winspool\winsta.dll 1 +dll\win32\winsta\winsta.dll 1 dll\win32\wintrust\wintrust.dll 1 dll\win32\wldap32\wldap32.dll 1 dll\win32\ws2_32\ws2_32.dll 1

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