Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[hbelusca] 65974: [FREELDR]: DiskGetBootPath can recognize ramdisk now.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 17:08:41 2015 New Revision: 65974 URL: http://svn.reactos.org/svn/reactos?rev=65974&view=rev Log: [FREELDR]: DiskGetBootPath can recognize ramdisk now. Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Jan 4 17:08:41 2015 @@ -106,11 +106,23 @@ { static char Path[] = "multi(0)disk(0)"; char Device[4]; - char Partition[4]; - PARTITION_TABLE_ENTRY PartitionEntry; MASTER_BOOT_RECORD MasterBootRecord; - if (FrldrBootDrive < 0x80) + /* 0x49 is our magic ramdisk drive, so try to detect it first */ + if (FrldrBootDrive == 0x49) + { + /* This is the ramdisk. See ArmDiskGetBootPath too... */ + + PCCH RamDiskPath = "ramdisk(0)"; + + if (Size < sizeof(RamDiskPath)) + { + return FALSE; + } + + strcpy(BootPath, RamDiskPath); + } + else if (FrldrBootDrive < 0x80) { /* This is a floppy */ @@ -132,6 +144,8 @@ else if (DiskReadBootRecord(FrldrBootDrive, 0, &MasterBootRecord)) { ULONG BootPartition; + PARTITION_TABLE_ENTRY PartitionEntry; + char Partition[4]; /* This is a hard disk */ if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition))

9 years, 8 months

[hbelusca] 65973: [FREELDR]: Small code style fixes; add a comment about the extra PXE check case in PcDiskGetBootPath. Fix also its return value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 16:43:42 2015 New Revision: 65973 URL: http://svn.reactos.org/svn/reactos?rev=65973&view=rev Log: [FREELDR]: Small code style fixes; add a comment about the extra PXE check case in PcDiskGetBootPath. Fix also its return value. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Jan 4 16:43:42 2015 @@ -389,12 +389,19 @@ BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size) { - if (PxeInit()) - { - strcpy(BootPath, "net(0)"); - return 0; - } - return DiskGetBootPath(BootPath, Size); + // FIXME: Keep it there, or put it in DiskGetBootPath? + // Or, abstract the notion of network booting to make + // sense for other platforms than the PC (and this idea + // already exists), then we would need to check whether + // we were booting from network (and: PC --> PXE, etc...) + // and if so, set the correct ARC path. But then this new + // logic could be moved back to DiskGetBootPath... + if (PxeInit()) + { + strcpy(BootPath, "net(0)"); + return TRUE; + } + return DiskGetBootPath(BootPath, Size); } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun Jan 4 16:43:42 2015 @@ -102,10 +102,7 @@ // // Check for success // - if (ret == ESUCCESS) - return TRUE; - else - return FALSE; + return (ret == ESUCCESS); } ULONG FsGetFileSize(PFILE FileHandle) @@ -156,10 +153,10 @@ */ ULONG FsGetNumPathParts(PCSTR Path) { - size_t i; - ULONG num; - - for (i=0,num=0; i<strlen(Path); i++) + size_t i; + ULONG num; + + for (i = 0, num = 0; i < strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -181,12 +178,12 @@ */ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { - size_t i; + size_t i; // Copy all the characters up to the end of the // string or until we hit a '\' character // and put them in Buffer - for (i=0; i<strlen(Path); i++) + for (i = 0; i < strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -276,8 +273,10 @@ /* Count number of "()", which needs to be replaced by "(0)" */ Count = 0; for (p = Path; p != FileName; p++) + { if (*p == '(' && *(p + 1) == ')') Count++; + } /* Duplicate device name, and replace "()" by "(0)" (if required) */ Length = FileName - Path + Count; @@ -294,14 +293,17 @@ } } else + { DeviceName = Path; + } /* Search for the device */ - pEntry = DeviceListHead.Flink; if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly) DeviceOpenMode = OpenMode; else DeviceOpenMode = OpenReadWrite; + + pEntry = DeviceListHead.Flink; while (pEntry != &DeviceListHead) { pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); @@ -312,10 +314,13 @@ { /* Search some room for the device */ for (DeviceId = 0; DeviceId < MAX_FDS; DeviceId++) + { if (!FileData[DeviceId].FuncTable) break; + } if (DeviceId == MAX_FDS) return EMFILE; + /* Try to open the device */ FileData[DeviceId].FuncTable = pDevice->FuncTable; ret = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); @@ -376,8 +381,10 @@ /* Search some room for the device */ for (i = 0; i < MAX_FDS; i++) + { if (!FileData[i].FuncTable) break; + } if (i == MAX_FDS) return EMFILE; @@ -468,4 +475,8 @@ FileData[i].DeviceId = (ULONG)-1; InitializeListHead(&DeviceListHead); -} + + // FIXME: Retrieve the current boot device with MachDiskGetBootPath + // and store it somewhere in order to not call again and again this + // function. +}

9 years, 8 months

[hbelusca] 65972: [FREELDR]: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 16:42:37 2015 New Revision: 65972 URL: http://svn.reactos.org/svn/reactos?rev=65972&view=rev Log: [FREELDR]: Whitespace fixes only. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/cmdline.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -33,14 +33,14 @@ #define DBG_DEFAULT_LEVELS (ERR_LEVEL|FIXME_LEVEL) -#define SCREEN 1 -#define RS232 2 -#define BOCHS 4 - -#define COM1 1 -#define COM2 2 -#define COM3 3 -#define COM4 4 +#define SCREEN 1 +#define RS232 2 +#define BOCHS 4 + +#define COM1 1 +#define COM2 2 +#define COM3 3 +#define COM4 4 #define BOCHS_OUTPUT_PORT 0xe9 Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -53,10 +53,10 @@ } #ifdef _M_IX86 - HalpInitializePciStubs(); - HalpInitBusHandler(); + HalpInitializePciStubs(); + HalpInitBusHandler(); #endif - RunLoader(); + RunLoader(); quit: /* If we reach this point, something went wrong before, therefore reboot */ @@ -84,4 +84,3 @@ { return _isctype((char)wc, wctypeFlags); } - Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -21,13 +21,13 @@ typedef struct tagCMDLINEINFO { - const char *DefaultOperatingSystem; - LONG TimeOut; + const char *DefaultOperatingSystem; + LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; -void CmdLineParse(char *CmdLine); +VOID CmdLineParse(IN PCHAR CmdLine); -const char *CmdLineGetDefaultOS(void); -LONG CmdLineGetTimeOut(void); +PCCH CmdLineGetDefaultOS(VOID); +LONG CmdLineGetTimeOut(VOID); /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -26,7 +26,7 @@ DBG_DEFAULT_CHANNEL(WINDOWS); -//FIXME: Do a better way to retrieve Arc disk information +//FIXME: Find a better way to retrieve ARC disk information extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];

9 years, 8 months

[ekohl] 65971: [FMIFS] Implement Format().

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 4 15:34:23 2015 New Revision: 65971 URL: http://svn.reactos.org/svn/reactos?rev=65971&view=rev Log: [FMIFS] Implement Format(). Modified: trunk/reactos/dll/win32/fmifs/format.c Modified: trunk/reactos/dll/win32/fmifs/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/format.c?r… ============================================================================== --- trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] Sun Jan 4 15:34:23 2015 @@ -23,6 +23,13 @@ IN BOOLEAN QuickFormat, IN PFMIFSCALLBACK Callback) { + FormatEx(DriveRoot, + MediaFlag, + Format, + Label, + QuickFormat, + 0, + Callback); } /* FMIFS.7 */

9 years, 8 months

[ekohl] 65970: [KERNEL32] Tabs -> Spaces

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 4 15:28:43 2015 New Revision: 65970 URL: http://svn.reactos.org/svn/reactos?rev=65970&view=rev Log: [KERNEL32] Tabs -> Spaces Modified: trunk/reactos/dll/win32/kernel32/client/file/backup.c Modified: trunk/reactos/dll/win32/kernel32/client/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/backup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/backup.c [iso-8859-1] Sun Jan 4 15:28:43 2015 @@ -20,19 +20,18 @@ */ BOOL WINAPI -BackupRead ( - HANDLE hFile, - LPBYTE lpBuffer, - DWORD nNumberOfBytesToRead, - LPDWORD lpNumberOfBytesRead, - BOOL bAbort, - BOOL bProcessSecurity, - LPVOID * lpContext - ) +BackupRead( + HANDLE hFile, + LPBYTE lpBuffer, + DWORD nNumberOfBytesToRead, + LPDWORD lpNumberOfBytesRead, + BOOL bAbort, + BOOL bProcessSecurity, + LPVOID *lpContext) { UNIMPLEMENTED; - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; } @@ -41,18 +40,17 @@ */ BOOL WINAPI -BackupSeek ( - HANDLE hFile, - DWORD dwLowBytesToSeek, - DWORD dwHighBytesToSeek, - LPDWORD lpdwLowByteSeeked, - LPDWORD lpdwHighByteSeeked, - LPVOID * lpContext - ) +BackupSeek( + HANDLE hFile, + DWORD dwLowBytesToSeek, + DWORD dwHighBytesToSeek, + LPDWORD lpdwLowByteSeeked, + LPDWORD lpdwHighByteSeeked, + LPVOID *lpContext) { UNIMPLEMENTED; - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; } @@ -61,19 +59,18 @@ */ BOOL WINAPI -BackupWrite ( - HANDLE hFile, - LPBYTE lpBuffer, - DWORD nNumberOfBytesToWrite, - LPDWORD lpNumberOfBytesWritten, - BOOL bAbort, - BOOL bProcessSecurity, - LPVOID * lpContext - ) +BackupWrite( + HANDLE hFile, + LPBYTE lpBuffer, + DWORD nNumberOfBytesToWrite, + LPDWORD lpNumberOfBytesWritten, + BOOL bAbort, + BOOL bProcessSecurity, + LPVOID *lpContext) { UNIMPLEMENTED; - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; } /* EOF */

9 years, 8 months

[ekohl] 65969: [USETUP] - Revert partiton code to pre-r65855.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 4 13:53:45 2015 New Revision: 65969 URL: http://svn.reactos.org/svn/reactos?rev=65969&view=rev Log: [USETUP] - Revert partiton code to pre-r65855. Modified: trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/host.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/native/fslist.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -71,8 +71,7 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem, - IN UCHAR PartitionType) + IN LPCWSTR ForceFileSystem) { PFILE_SYSTEM_LIST List; PFILE_SYSTEM_ITEM Item; @@ -87,7 +86,7 @@ List->Selected = NULL; InitializeListHead(&List->ListHead); - HOST_CreateFileSystemList(List, PartitionType); + HOST_CreateFileSystemList(List); if (!ForceFormat) { Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -57,8 +57,7 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem, - IN UCHAR PartitionType); + IN LPCWSTR ForceFileSystem); VOID DestroyFileSystemList( Modified: trunk/reactos/base/setup/usetup/host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/host.h?r… ============================================================================== --- trunk/reactos/base/setup/usetup/host.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/host.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -22,8 +22,7 @@ BOOLEAN HOST_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List, - IN UCHAR PartitionType); + IN PFILE_SYSTEM_LIST List); BOOLEAN HOST_FormatPartition( Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -46,7 +46,6 @@ UNICODE_STRING SourceRootDir; UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; -BOOLEAN InstallShortcut = FALSE; LONG UnattendDestinationDiskNumber; LONG UnattendDestinationPartitionNumber; LONG UnattendMBRInstallType = -1; @@ -1602,6 +1601,14 @@ if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) continue; //return SELECT_PARTITION_PAGE; + if (PartitionList->CurrentPartition == NULL || + PartitionList->CurrentPartition->IsPartitioned == FALSE) + { + CreatePrimaryPartition(PartitionList, + 0ULL, + TRUE); + } + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, @@ -1609,20 +1616,9 @@ return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - if (PartitionList->CurrentPartition == NULL || - PartitionList->CurrentPartition->IsPartitioned == FALSE) - { - CreatePrimaryPartition(PartitionList, - 0ULL, - TRUE); - InstallShortcut = TRUE; - - return SELECT_FILE_SYSTEM_PAGE; - } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return PRE_INSTALL_SELECT_FORMAT_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ { @@ -1964,7 +1960,7 @@ SectorCount, FALSE); - return SELECT_FILE_SYSTEM_PAGE; + return SELECT_PARTITION_PAGE; } } @@ -1985,7 +1981,6 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; - NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2110,14 +2105,6 @@ CreateExtendedPartition(PartitionList, SectorCount); - - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } return SELECT_PARTITION_PAGE; } @@ -2265,7 +2252,7 @@ CreateLogicalPartition(PartitionList, SectorCount); - return SELECT_FILE_SYSTEM_PAGE; + return SELECT_PARTITION_PAGE; } } @@ -2281,8 +2268,7 @@ ULONGLONG DiskSize; ULONGLONG PartSize; PCHAR Unit; - PCHAR PartType = NULL; - NTSTATUS Status; + PCHAR PartType; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2298,29 +2284,37 @@ MUIDisplayPage(DELETE_PARTITION_PAGE); /* Determine partition type */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) - { - PartType = "FAT"; - } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - PartType = "FAT32"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - PartType = "EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - PartType = "NTFS"; /* FIXME: Not quite correct! */ - } - else if (IsContainerPartition(PartEntry->PartitionType)) - { - PartType = MUIGetString(STRING_EXTENDED_PARTITION); + PartType = NULL; + if (PartEntry->New == TRUE) + { + PartType = MUIGetString(STRING_UNFORMATTED); + } + else if (PartEntry->IsPartitioned == TRUE) + { + if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13)) + { + PartType = "FAT"; + } + else if ((PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { + PartType = "FAT32"; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + PartType = "EXT2"; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + PartType = "NTFS"; /* FIXME: Not quite correct! */ + } + else if (IsContainerPartition(PartEntry->PartitionType)) + { + PartType = MUIGetString(STRING_EXTENDED_PARTITION); + } } PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2427,80 +2421,11 @@ { DeleteCurrentPartition(PartitionList); - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - return SELECT_PARTITION_PAGE; } } return DELETE_PARTITION_PAGE; -} - - -static -VOID -UpdatePartitionType( - PPARTENTRY PartEntry, - LPCWSTR FileSystem) -{ - if (wcscmp(FileSystem, L"FAT") == 0) - { - if (PartEntry->SectorCount.QuadPart < 8192) - { - /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - PartEntry->PartitionType = PARTITION_FAT_12; - } - else if (PartEntry->StartSector.QuadPart < 1450560) - { - /* Partition starts below the 8.4GB boundary ==> CHS partition */ - - if (PartEntry->SectorCount.QuadPart < 65536) - { - /* FAT16 CHS partition (partiton size < 32MB) */ - PartEntry->PartitionType = PARTITION_FAT_16; - } - else if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 CHS partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_HUGE; - } - else - { - /* FAT32 CHS partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32; - } - } - else - { - /* Partition starts above the 8.4GB boundary ==> LBA partition */ - - if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 LBA partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_XINT13; - } - else - { - /* FAT32 LBA partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32_XINT13; - } - } - - PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - } -#if 0 - else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) - { - PartEntry->PartitionType = PARTITION_EXT2; - PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - } -#endif } @@ -2514,7 +2439,6 @@ PCHAR DiskUnit; PCHAR PartUnit; PCHAR PartType; - NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2609,16 +2533,14 @@ PartEntry->AutoCreate = FALSE; } -#if 0 else if (PartEntry->New == TRUE) { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); } -#endif else { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_FORMATPART)); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); if (PartType == NULL) { @@ -2655,12 +2577,14 @@ if (FileSystemList == NULL) { - FileSystemList = CreateFileSystemList(6, 26, TRUE, L"FAT", PARTITION_ENTRY_UNUSED); + FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, L"FAT"); if (FileSystemList == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } + + /* FIXME: Add file systems to list */ } DrawFileSystemList(FileSystemList); @@ -2675,19 +2599,6 @@ { if (UnattendFormatPartition) { - UpdatePartitionType(PartEntry, - FileSystemList->Selected->FileSystem); - - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WriteDirtyPartitions() failed (Status 0x%08lx)\n", Status); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return QUIT_PAGE; - } - return FORMAT_PARTITION_PAGE; } @@ -2703,8 +2614,6 @@ { if (ConfirmQuit(Ir) == TRUE) { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; return QUIT_PAGE; } @@ -2713,8 +2622,6 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; return SELECT_PARTITION_PAGE; } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && @@ -2735,19 +2642,6 @@ } else { - UpdatePartitionType(PartEntry, - FileSystemList->Selected->FileSystem); - - CheckActiveBootPartition(PartitionList); - - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed (Status 0x%08lx)\n", Status); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - return FORMAT_PARTITION_PAGE; } } @@ -2761,7 +2655,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; -// PDISKENTRY DiskEntry; + PDISKENTRY DiskEntry; PPARTENTRY PartEntry; NTSTATUS Status; @@ -2778,12 +2672,10 @@ PartitionList->CurrentPartition == NULL) { /* FIXME: show an error dialog */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; return QUIT_PAGE; } -// DiskEntry = PartitionList->CurrentDisk; + DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -2798,8 +2690,6 @@ { if (ConfirmQuit(Ir) == TRUE) { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; return QUIT_PAGE; } @@ -2809,12 +2699,60 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (!FileSystemList->Selected->FormatFunc) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; + if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) + { + if (PartEntry->SectorCount.QuadPart < 8192) + { + /* FAT12 CHS partition (disk is smaller than 4.1MB) */ + PartEntry->PartitionType = PARTITION_FAT_12; + } + else if (PartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + + if (PartEntry->SectorCount.QuadPart < 65536) + { + /* FAT16 CHS partition (partiton size < 32MB) */ + PartEntry->PartitionType = PARTITION_FAT_16; + } + else if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 CHS partition (partition size < 512MB) */ + PartEntry->PartitionType = PARTITION_HUGE; + } + else + { + /* FAT32 CHS partition (partition size >= 512MB) */ + PartEntry->PartitionType = PARTITION_FAT32; + } + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + + if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 LBA partition (partition size < 512MB) */ + PartEntry->PartitionType = PARTITION_XINT13; + } + else + { + /* FAT32 LBA partition (partition size >= 512MB) */ + PartEntry->PartitionType = PARTITION_FAT32_XINT13; + } + } + + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + } +#if 0 + else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + { + PartEntry->PartitionType = PARTITION_EXT2; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + } +#endif + else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE; - } #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, @@ -2852,6 +2790,15 @@ PartEntry = PartitionList->CurrentPartition; #endif + CheckActiveBootPartition(PartitionList); + + if (WritePartitionsToDisk(PartitionList) == FALSE) + { + DPRINT("WritePartitionsToDisk() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Set DestinationRootPath */ RtlFreeUnicodeString(&DestinationRootPath); swprintf(PathBuffer, @@ -2870,12 +2817,11 @@ { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); /* FIXME: show an error dialog */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; return QUIT_PAGE; } - PartEntry->FormatState = Formatted; + PartEntry->New = FALSE; + } #ifndef NDEBUG @@ -2885,11 +2831,7 @@ DestroyFileSystemList(FileSystemList); FileSystemList = NULL; - - if (IsUnattendedSetup || InstallShortcut) - return INSTALL_DIRECTORY_PAGE; - else - return SELECT_PARTITION_PAGE; + return INSTALL_DIRECTORY_PAGE; } } @@ -2974,347 +2916,6 @@ } - - -static PAGE_NUMBER -PreInstallSelectFormatPage(PINPUT_RECORD Ir) -{ - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - ULONGLONG DiskSize; - ULONGLONG PartSize; - PCHAR DiskUnit; - PCHAR PartUnit; - PCHAR PartType; - - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; - - if (PartEntry->FormatState == Formatted) - return INSTALL_DIRECTORY_PAGE; - - /* adjust disk size */ - DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; - DiskUnit = MUIGetString(STRING_GB); - } - else - { - DiskSize = DiskSize / 1048576; - DiskUnit = MUIGetString(STRING_MB); - } - - /* adjust partition size */ - PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (PartSize >= 10737418240) /* 10 GB */ - { - PartSize = PartSize / 1073741824; - PartUnit = MUIGetString(STRING_GB); - } - else - { - PartSize = PartSize / 1048576; - PartUnit = MUIGetString(STRING_MB); - } - - /* adjust partition type */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13)) - { - PartType = "FAT"; - } - else if ((PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - PartType = "FAT32"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - PartType = "EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - PartType = "NTFS"; /* FIXME: Not quite correct! */ - } - else if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED) - { - PartType = MUIGetString(STRING_FORMATUNUSED); - } - else - { - PartType = MUIGetString(STRING_FORMATUNKNOWN); - } - - if (PartEntry->AutoCreate == TRUE) - { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); - -#if 0 - CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", - PartEntry->PartitionNumber, - PartSize, - PartUnit, - PartType); -#endif - - CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName); - - CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); - - - PartEntry->AutoCreate = FALSE; - } -#if 0 - else if (PartEntry->New == TRUE) - { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); - CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); - } -#endif - else - { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART)); - - if (PartType == NULL) - { - CONSOLE_PrintTextXY(8, 10, - MUIGetString(STRING_HDDINFOUNK4), - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartEntry->PartitionType, - PartSize, - PartUnit); - } - else - { - CONSOLE_PrintTextXY(8, 10, - "%c%c %s %I64u %s", - (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, - (PartEntry->DriveLetter == 0) ? '-' : ':', - PartType, - PartSize, - PartUnit); - } - - CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS), - DiskEntry->DiskNumber, - DiskSize, - DiskUnit, - DiskEntry->Port, - DiskEntry->Bus, - DiskEntry->Id, - &DiskEntry->DriverName); - } - - MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); - - if (FileSystemList != NULL) - { - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - } - - FileSystemList = CreateFileSystemList(6, 26, FALSE, L"FAT", - PartEntry->PartitionType); - if (FileSystemList == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - DrawFileSystemList(FileSystemList); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - { - return QUIT_PAGE; - } - - break; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ - { - return SELECT_PARTITION_PAGE; - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ - { - ScrollDownFileSystemList(FileSystemList); - } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ - { - ScrollUpFileSystemList(FileSystemList); - } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ - { - if (FileSystemList->Selected->FormatFunc) - { - return PRE_INSTALL_FORMAT_PAGE; - } - } - } - - return PRE_INSTALL_SELECT_FORMAT_PAGE; -} - - -static ULONG -PreInstallFormatPage(PINPUT_RECORD Ir) -{ - WCHAR PathBuffer[MAX_PATH]; -// PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - NTSTATUS Status; - -#ifndef NDEBUG - ULONG Line; - ULONG i; - PLIST_ENTRY Entry; -#endif - - MUIDisplayPage(FORMAT_PARTITION_PAGE); - - if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) - { - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - -// DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; - - while (TRUE) - { - if (!IsUnattendedSetup) - { - CONSOLE_ConInKey(Ir); - } - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - if (ConfirmQuit(Ir) == TRUE) - { - return QUIT_PAGE; - } - - break; - } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN || IsUnattendedSetup) /* ENTER */ - { - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - - if (!FileSystemList->Selected->FormatFunc) - return QUIT_PAGE; - -#ifndef NDEBUG - CONSOLE_PrintTextXY(6, 12, - "Disk: %I64u Cylinder: %I64u Track: %I64u", - DiskEntry->DiskSize, - DiskEntry->CylinderSize, - DiskEntry->TrackSize); - - Line = 13; - DiskEntry = PartitionList->CurrentDisk; - Entry = DiskEntry->PartListHead.Flink; - - while (Entry != &DiskEntry->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); - - if (PartEntry->IsPartitioned == TRUE) - { - CONSOLE_PrintTextXY(6, Line, - "%2u: %2u %c %12I64u %12I64u %2u %c", - i, - PartEntry->PartitionNumber, - PartEntry->BootIndicator ? 'A' : '-', - PartEntry->StartSector.QuadPart, - PartEntry->SectorCount.QuadPart, - PartEntry->PartitionType, - PartEntry->Dirty ? '*' : ' '); - Line++; - } - - Entry = Entry->Flink; - } - - /* Restore the old entry */ - PartEntry = PartitionList->CurrentPartition; -#endif - - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, - PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); - - if (FileSystemList->Selected->FormatFunc) - { - Status = FormatPartition(&DestinationRootPath, - FileSystemList->Selected); - if (!NT_SUCCESS(Status)) - { - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); - /* FIXME: show an error dialog */ - return QUIT_PAGE; - } - - PartEntry->FormatState = Formatted; - } - -#ifndef NDEBUG - CONSOLE_SetStatusText(" Done. Press any key ..."); - CONSOLE_ConInKey(Ir); -#endif - - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - - return INSTALL_DIRECTORY_PAGE; - } - } - - return PRE_INSTALL_FORMAT_PAGE; -} - - - - - static PAGE_NUMBER InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, @@ -3326,16 +2927,6 @@ RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); - - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, - PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); @@ -4115,7 +3706,6 @@ BOOLEAN InstallOnFloppy; USHORT Line = 12; WCHAR PathBuffer[MAX_PATH]; - NTSTATUS Status; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -4123,10 +3713,9 @@ CheckActiveBootPartition(PartitionList); /* Update the partition table because we may have changed the active partition */ - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); + if (WritePartitionsToDisk(PartitionList) == FALSE) + { + DPRINT("WritePartitionsToDisk() failed\n"); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -4626,19 +4215,11 @@ break; case FORMAT_PARTITION_PAGE: - Page = FormatPartitionPage(&Ir); + Page = (PAGE_NUMBER) FormatPartitionPage(&Ir); break; case CHECK_FILE_SYSTEM_PAGE: - Page = CheckFileSystemPage(&Ir); - break; - - case PRE_INSTALL_SELECT_FORMAT_PAGE: - Page = PreInstallSelectFormatPage(&Ir); - break; - - case PRE_INSTALL_FORMAT_PAGE: - Page = PreInstallFormatPage(&Ir); + Page = (PAGE_NUMBER) CheckFileSystemPage(&Ir); break; case INSTALL_DIRECTORY_PAGE: Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1753,7 +1753,5 @@ ""}, {STRING_ADDKBLAYOUTS, "®¡ ¢ï¥ ª« ¢¨ âãà¨ ¯®¤à¥¤¡¨"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1737,7 +1737,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Adding keyboard layouts"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1746,7 +1746,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Pýid v m rozlo§en¡ kl ves"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1742,7 +1742,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Tastaturlayout hinzufgen"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1763,7 +1763,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "å¤« §¨¦©ã¡ «à¤ «á¥à¤ §¢¡«¨¦¢¦å¦¬"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1737,7 +1737,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Adding keyboard layouts"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1745,7 +1745,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "A¤adiendo distribuci¢n de teclado"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1738,7 +1738,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Klaviatuuriasetuste lisamine"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1751,7 +1751,5 @@ "Go"}, {STRING_ADDKBLAYOUTS, "Ajout des dispositions clavier"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1739,7 +1739,5 @@ ""}, {STRING_ADDKBLAYOUTS, "Adding keyboard layouts"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1740,7 +1740,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Aggiunta delle nazionalit di tastiera"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1741,7 +1741,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶ Á³"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1748,7 +1748,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Adding keyboard layouts"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1786,7 +1786,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Toevoegen toetsenbordindelingen"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1746,7 +1746,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Dodawanie ukad¢w klawiatury"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1777,7 +1777,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Adicionando leiautes de teclado"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1814,7 +1814,5 @@ "Go"}, {STRING_ADDKBLAYOUTS, "AdÇugare configuraîii de tastaturÇ"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1742,7 +1742,5 @@ ""}, {STRING_ADDKBLAYOUTS, "Adding keyboard layouts"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1752,7 +1752,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Prid vam rozlo§enia kl vesnice"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1744,7 +1744,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Shtim e przgjedhjes s tastiers"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1747,7 +1747,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "Lgger till tangentbordslayouter"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1725,7 +1725,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "D§me takm dzenleri ekleniyor..."}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -1747,7 +1747,5 @@ "GB"}, {STRING_ADDKBLAYOUTS, "®¤ ¢ ï à®§ª« ¤®ª ª« ¢i âãà¨"}, - {STRING_FORMATPART, - "Setup formats Partition"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -156,5 +156,3 @@ #define STRING_MB 54 #define STRING_GB 55 #define STRING_ADDKBLAYOUTS 56 -#define STRING_FORMATPART 62 - Modified: trunk/reactos/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/f… ============================================================================== --- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -2,36 +2,12 @@ BOOLEAN NATIVE_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List, - IN UCHAR PartitionType) + IN PFILE_SYSTEM_LIST List) { - if (PartitionType == PARTITION_ENTRY_UNUSED || - PartitionType == PARTITION_FAT_12 || - PartitionType == PARTITION_FAT_16 || - PartitionType == PARTITION_HUGE || - PartitionType == PARTITION_XINT13 || - PartitionType == PARTITION_FAT32 || - PartitionType == PARTITION_FAT32_XINT13) - { - FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); - } - + FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); #if 0 - if (PartitionType == PARTITION_ENTRY_UNUSED || - PartitionType == PARTITION_EXT2) - { - FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); - } + FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); #endif - -#if 0 - if (PartitionType == PARTITION_ENTRY_UNUSED || - PartitionType == PARTITION_IFS) - { - FS_AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); - } -#endif - return TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -558,7 +558,7 @@ if (IsContainerPartition(PartEntry->PartitionType)) { - PartEntry->FormatState = Formatted; + PartEntry->FormatState = Unformatted; if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; @@ -1499,7 +1499,11 @@ { /* Determine partition type */ PartType = NULL; - if (PartEntry->IsPartitioned == TRUE) + if (PartEntry->New == TRUE) + { + PartType = MUIGetString(STRING_UNFORMATTED); + } + else if (PartEntry->IsPartitioned == TRUE) { if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || @@ -2382,6 +2386,7 @@ PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; PartEntry->FormatState = Unformatted; PartEntry->AutoCreate = AutoCreate; + PartEntry->New = TRUE; PartEntry->BootIndicator = FALSE; DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); @@ -2415,13 +2420,12 @@ DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + NewPartEntry->New = TRUE; NewPartEntry->FormatState = Unformatted; NewPartEntry->BootIndicator = FALSE; PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); - - List->CurrentPartition = NewPartEntry; } UpdateDiskLayout(DiskEntry); @@ -2499,6 +2503,7 @@ PartEntry->IsPartitioned = TRUE; PartEntry->FormatState = Formatted; PartEntry->AutoCreate = FALSE; + PartEntry->New = FALSE; PartEntry->BootIndicator = FALSE; if (PartEntry->StartSector.QuadPart < 1450560) @@ -2540,6 +2545,7 @@ NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; + NewPartEntry->New = FALSE; NewPartEntry->FormatState = Formatted; NewPartEntry->BootIndicator = FALSE; @@ -2562,8 +2568,6 @@ DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); - - List->CurrentPartition = NewPartEntry; } AddLogicalDiskSpace(DiskEntry); @@ -2927,16 +2931,15 @@ } -NTSTATUS -WriteDirtyPartitions( +BOOLEAN +WritePartitionsToDisk( PPARTLIST List) { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - NTSTATUS Status; if (List == NULL) - return STATUS_SUCCESS; + return TRUE; Entry = List->DiskListHead.Flink; while (Entry != &List->DiskListHead) @@ -2945,17 +2948,13 @@ if (DiskEntry->Dirty == TRUE) { - Status = WritePartitons(List, DiskEntry); - if (!NT_SUCCESS(Status)) - return Status; - - DiskEntry->Dirty = FALSE; + WritePartitons(List, DiskEntry); } Entry = Entry->Flink; } - return STATUS_SUCCESS; + return TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -63,7 +63,7 @@ BOOLEAN IsPartitioned; /* Partition is new. Table does not exist on disk yet */ -// BOOLEAN New; + BOOLEAN New; /* Partition was created automatically. */ BOOLEAN AutoCreate; @@ -247,8 +247,8 @@ CheckForLinuxFdiskPartitions( PPARTLIST List); -NTSTATUS -WriteDirtyPartitions( +BOOLEAN +WritePartitionsToDisk( PPARTLIST List); ULONG Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Jan 4 13:53:45 2015 @@ -138,11 +138,8 @@ FORMAT_PARTITION_PAGE, CHECK_FILE_SYSTEM_PAGE, - PRE_INSTALL_SELECT_FORMAT_PAGE, - PRE_INSTALL_FORMAT_PAGE, - + PREPARE_COPY_PAGE, INSTALL_DIRECTORY_PAGE, - PREPARE_COPY_PAGE, FILE_COPY_PAGE, REGISTRY_PAGE, BOOT_LOADER_PAGE,

9 years, 8 months

[hbelusca] 65968: [FREELDR]: Do the same thing as how we fill out the ARC disk block elsewhere.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 13:01:14 2015 New Revision: 65968 URL: http://svn.reactos.org/svn/reactos?rev=65968&view=rev Log: [FREELDR]: Do the same thing as how we fill out the ARC disk block elsewhere. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Jan 4 13:01:14 2015 @@ -29,8 +29,9 @@ ULONG SecondLevelIcacheSize; ULONG SecondLevelIcacheFillSize; -ARC_DISK_SIGNATURE reactos_arc_disk_info; -ULONG reactos_disk_count; +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern CHAR reactos_arc_strings[32][256]; ULONG SizeBits[] = { @@ -146,10 +147,13 @@ RamDiskInitialize(); /* Fill out the ARC disk block */ - reactos_arc_disk_info.Signature = 0xBADAB00F; - reactos_arc_disk_info.CheckSum = 0xDEADBABE; - reactos_arc_disk_info.ArcName = "ramdisk(0)"; - reactos_disk_count = 1; + reactos_arc_disk_info[reactos_disk_count].Signature = 0xBADAB00F; + reactos_arc_disk_info[reactos_disk_count].CheckSum = 0xDEADBABE; + strcpy(reactos_arc_strings[reactos_disk_count], "ramdisk(0)"); + reactos_arc_disk_info[reactos_disk_count].ArcName = + reactos_arc_strings[reactos_disk_count]; + reactos_disk_count++; + ASSERT(reactos_disk_count == 1); /* Return the root node */ return RootNode;

9 years, 8 months

[hbelusca] 65967: [FREELDR]: Use boolean value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 4 12:49:38 2015 New Revision: 65967 URL: http://svn.reactos.org/svn/reactos?rev=65967&view=rev Log: [FREELDR]: Use boolean value. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Jan 4 12:49:38 2015 @@ -686,7 +686,7 @@ LoaderBlock, BootOptions, BootPath, - 0); + FALSE); } VOID

9 years, 8 months

[aandrejevic] 65966: [FAST486] Fix FPU exceptions (again).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jan 3 22:24:40 2015 New Revision: 65966 URL: http://svn.reactos.org/svn/reactos?rev=65966&view=rev Log: [FAST486] Fix FPU exceptions (again). Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Jan 3 22:24:40 2015 @@ -1507,16 +1507,33 @@ FORCEINLINE VOID FASTCALL +Fast486FpuException(PFAST486_STATE State) +{ + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_NE) + { + /* Call the #MF handler */ + Fast486Exception(State, FAST486_EXCEPTION_MF); + } + else + { + /* Use the external interrupt */ + State->FpuCallback(State); + } +} + +FORCEINLINE +BOOLEAN +FASTCALL Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) { UINT LeadingZeros; - if (FPU_IS_NORMALIZED(Data)) return; + if (FPU_IS_NORMALIZED(Data)) return TRUE; if (FPU_IS_ZERO(Data)) { Data->Exponent = 0; - return; + return TRUE; } LeadingZeros = CountLeadingZeros64(Data->Mantissa); @@ -1528,6 +1545,9 @@ } else { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + if (State->FpuControl.Um) { /* Make it denormalized */ @@ -1536,16 +1556,18 @@ } else { - /* Raise the underflow exception */ - State->FpuStatus.Ue = TRUE; - } - } + Fast486FpuException(State); + return FALSE; + } + } + + return TRUE; } FORCEINLINE USHORT FASTCALL -Fast486GetValueTag(PFAST486_FPU_DATA_REG Data) +Fast486FpuGetValueTag(PFAST486_FPU_DATA_REG Data) { if (FPU_IS_ZERO(Data)) return FPU_TAG_ZERO; else if (FPU_IS_NAN(Data)) return FPU_TAG_SPECIAL; @@ -1553,7 +1575,7 @@ } FORCEINLINE -VOID +BOOLEAN FASTCALL Fast486FpuPush(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) @@ -1563,13 +1585,25 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { FPU_ST(0) = *Data; - FPU_SET_TAG(0, Fast486GetValueTag(Data)); - } - else State->FpuStatus.Sf = TRUE; -} - -FORCEINLINE -VOID + FPU_UPDATE_TAG(0); + + return TRUE; + } + else + { + /* Raise the stack fault and invalid operation exception */ + State->FpuStatus.Sf = State->FpuStatus.Ie = TRUE; + + /* Set the C1 condition code bit (stack overflow) */ + State->FpuStatus.Code1 = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + return FALSE; + } +} + +FORCEINLINE +BOOLEAN FASTCALL Fast486FpuPop(PFAST486_STATE State) { @@ -1577,8 +1611,20 @@ { FPU_SET_TAG(0, FPU_TAG_EMPTY); State->FpuStatus.Top++; - } - else State->FpuStatus.Sf = TRUE; + + return TRUE; + } + else + { + /* Raise the stack fault and invalid operation exception */ + State->FpuStatus.Sf = State->FpuStatus.Ie = TRUE; + + /* Clear the C1 condition code bit (stack underflow) */ + State->FpuStatus.Code1 = FALSE; + + if (!State->FpuControl.Im) Fast486FpuException(State); + return FALSE; + } } #endif Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6596… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 3 22:24:40 2015 @@ -183,6 +183,9 @@ if (FPU_IS_NAN(Value) || !FPU_IS_NORMALIZED(Value) || (UnbiasedExp < 0) || (UnbiasedExp > 63)) { + /* Raise an invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { *Result = 0LL; @@ -190,7 +193,7 @@ } else { - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return FALSE; } } @@ -314,6 +317,9 @@ /* Check for underflow */ if (!FPU_IS_NORMALIZED(Value) || (UnbiasedExp < -1023)) { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + if (State->FpuControl.Um) { /* The result is zero due to underflow */ @@ -322,8 +328,7 @@ } else { - /* Raise the underflow exception */ - State->FpuStatus.Ue = TRUE; + Fast486FpuException(State); return FALSE; } } @@ -331,6 +336,9 @@ /* Check for overflow */ if (UnbiasedExp > 1023) { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + if (State->FpuControl.Om) { /* The result is infinity due to overflow */ @@ -339,8 +347,7 @@ } else { - /* Raise the overflow exception */ - State->FpuStatus.Oe = TRUE; + Fast486FpuException(State); return FALSE; } } @@ -452,12 +459,16 @@ FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; FAST486_FPU_DATA_REG TempResult; - if (!State->FpuControl.Dm - && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) { /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; - return; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + return; + } } /* Find the largest exponent */ @@ -503,6 +514,9 @@ { if (TempResult.Exponent == FPU_MAX_EXPONENT) { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + if (State->FpuControl.Om) { /* Total overflow, return infinity */ @@ -511,8 +525,7 @@ } else { - /* Raise the overflow exception */ - State->FpuStatus.Oe = TRUE; + Fast486FpuException(State); return; } } @@ -606,12 +619,16 @@ { FAST486_FPU_DATA_REG TempResult; - if (!State->FpuControl.Dm - && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + if ((!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) { /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; - return; + + if (!State->FpuControl.Dm) + { + Fast486FpuException(State); + return; + } } UnsignedMult128(FirstOperand->Mantissa, @@ -641,6 +658,9 @@ || (FPU_IS_INFINITY(FirstOperand) && FPU_IS_INFINITY(SecondOperand)) || (FPU_IS_ZERO(FirstOperand) && FPU_IS_ZERO(SecondOperand))) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -648,17 +668,16 @@ Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_INDEFINITE_MANTISSA; } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) { + /* Raise the division by zero exception */ + State->FpuStatus.Ze = TRUE; + if (State->FpuControl.Zm) { /* Return infinity */ @@ -666,11 +685,7 @@ Result->Exponent = FPU_MAX_EXPONENT + 1; Result->Mantissa = FPU_MANTISSA_HIGH_BIT; } - else - { - /* Raise the division by zero exception */ - State->FpuStatus.Ze = TRUE; - } + else Fast486FpuException(State); return; } @@ -705,13 +720,6 @@ { ULONG BitsToShift = 64 - CountLeadingZeros64(QuotientHigh); - if (!State->FpuControl.Pm) - { - /* Raise the precision expection */ - State->FpuStatus.Pe = TRUE; - return; - } - TempResult.Mantissa >>= BitsToShift; TempResult.Mantissa |= QuotientHigh << (64 - BitsToShift); Exponent += BitsToShift; @@ -723,13 +731,6 @@ { TempResult.Mantissa >>= -(Exponent + FPU_REAL10_BIAS); Exponent = -FPU_REAL10_BIAS; - - if ((TempResult.Mantissa == 0ULL) && !State->FpuControl.Um) - { - /* Raise the underflow exception */ - State->FpuStatus.Ue = TRUE; - return; - } // TODO: Rounding } @@ -834,6 +835,9 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -843,33 +847,32 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else + else Fast486FpuException(State); + + return; + } + + if (ModRegRm.Memory) + { + /* Load the source operand from memory */ + ULONG Value; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromSingleReal(State, Value, &MemoryData); + SourceOperand = &MemoryData; + } + else + { + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ State->FpuStatus.Ie = TRUE; - } - - return; - } - - if (ModRegRm.Memory) - { - /* Load the source operand from memory */ - ULONG Value; - - if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) - { - /* Exception occurred */ - return; - } - - Fast486FpuFromSingleReal(State, Value, &MemoryData); - SourceOperand = &MemoryData; - } - else - { - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) - { + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -879,11 +882,7 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } @@ -925,6 +924,9 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -934,11 +936,7 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } @@ -970,6 +968,9 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -979,11 +980,7 @@ FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } @@ -1124,8 +1121,10 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(1) == FPU_TAG_EMPTY)) { - /* Raise the invalid operation exception, if unmasked */ - if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + /* Raise the invalid operation exception*/ + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); return; } @@ -1151,6 +1150,9 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -1160,11 +1162,7 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } @@ -1225,10 +1223,12 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1242,7 +1242,13 @@ if ((((ULONGLONG)Temp >> 31) + 1ULL) > 1ULL) { State->FpuStatus.Ie = TRUE; - return; + + if (State->FpuControl.Im) Temp = 0LL; + else + { + Fast486FpuException(State); + return; + } } if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, (ULONG)((LONG)Temp))) @@ -1299,6 +1305,9 @@ } else { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { *((PULONGLONG)Buffer) = FPU_INDEFINITE_MANTISSA; @@ -1306,8 +1315,7 @@ } else { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1442,10 +1450,12 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1521,7 +1531,9 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -1556,7 +1568,9 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { - if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); return; } @@ -1604,6 +1618,9 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) { /* Return the indefinite NaN */ @@ -1613,11 +1630,7 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else - { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; - } + else Fast486FpuException(State); return; } @@ -1652,8 +1665,9 @@ || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { /* Raise the invalid operation exception, if unmasked */ - if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; - + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); return; } } @@ -1712,10 +1726,12 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1728,8 +1744,15 @@ /* Check if it can fit in a signed 16-bit integer */ if ((((ULONGLONG)Temp >> 15) + 1ULL) > 1ULL) { + /* Raise the invalid operation exception */ State->FpuStatus.Ie = TRUE; - return; + + if (State->FpuControl.Im) Temp = 0LL; + else + { + Fast486FpuException(State); + return; + } } if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, (USHORT)((SHORT)Temp))) @@ -1802,10 +1825,12 @@ if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1837,10 +1862,12 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) { - /* Raise the invalid operation exception */ - State->FpuStatus.Ie = TRUE; + Fast486FpuException(State); return; } } @@ -1895,7 +1922,9 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + State->FpuStatus.Ie = TRUE; + + if (!State->FpuControl.Im) Fast486FpuException(State); break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6596… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sat Jan 3 22:24:40 2015 @@ -33,14 +33,15 @@ Fast486Exception(State, FAST486_EXCEPTION_NM); \ return; \ } -#define FPU_ST(i) State->FpuRegisters[(State->FpuStatus.Top + (i)) % FAST486_NUM_FPU_REGS] +#define FPU_INDEX(i) ((State->FpuStatus.Top + (i)) % FAST486_NUM_FPU_REGS) +#define FPU_ST(i) State->FpuRegisters[FPU_INDEX(i)] -#define FPU_GET_TAG(i) ((State->FpuTag >> ((i) * 2)) & 3) +#define FPU_GET_TAG(i) ((State->FpuTag >> (FPU_INDEX(i) * 2)) & 3) #define FPU_SET_TAG(i, t) { \ - State->FpuTag &= ~((1 << ((i) * 2)) | (1 << (((i) * 2) + 1))); \ - State->FpuTag |= ((t) & 3) << ((i) * 2); \ + State->FpuTag &= ~((1 << (FPU_INDEX(i) * 2)) | (1 << ((FPU_INDEX(i) * 2) + 1))); \ + State->FpuTag |= ((t) & 3) << (FPU_INDEX(i) * 2); \ } -#define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486GetValueTag(&FPU_ST(i))) +#define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486FpuGetValueTag(&FPU_ST(i))) #define FPU_REAL4_BIAS 0x7F #define FPU_REAL8_BIAS 0x3FF Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat Jan 3 22:24:40 2015 @@ -4125,16 +4125,7 @@ || (!State->FpuControl.Dm && State->FpuStatus.De) || (!State->FpuControl.Im && State->FpuStatus.Ie)) { - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_NE) - { - /* Call the #MF handler */ - Fast486Exception(State, FAST486_EXCEPTION_MF); - } - else - { - /* Use the external interrupt */ - State->FpuCallback(State); - } + Fast486FpuException(State); } #endif

9 years, 8 months

[hbelusca] 65965: Tab2Space changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 3 22:18:36 2015 New Revision: 65965 URL: http://svn.reactos.org/svn/reactos?rev=65965&view=rev Log: Tab2Space changes. Modified: trunk/reactos/boot/freeldr/FREELDR.INI Modified: trunk/reactos/boot/freeldr/FREELDR.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/FREELDR.INI?r… ============================================================================== --- trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/FREELDR.INI [iso-8859-1] Sat Jan 3 22:18:36 2015 @@ -29,43 +29,43 @@ ; [FREELOADER] Section Commands: ; -; MessageBox - displays the specified text in a message box upon bootup -; MessageLine - adds a new line of text to a message box (must come before MessageBox command) -; TitleText - text that is displayed in the title box -; StatusBarColor - color of status bar's background -; StatusBarTextColor - color of status bar's text -; BackdropTextColor - color of the backdrop's fill -; BackdropColor - color of the backdrop's background -; BackdropFillStyle - backdrop fill style - can be Light, Medium, or Dark -; TitleBoxTextColor - title box text color -; TitleBoxColor - title box background color -; MessageBoxTextColor - message box text color -; MessageBoxColor - message box background color -; MenuTextColor - menu text color -; MenuColor - menu color -; TextColor - normal text color -; SelectedTextColor - selected text color -; SelectedColor - selected text background color -; TimeOut - sets the timeout (in seconds) before the first OS listed gets booted automagically +; MessageBox - displays the specified text in a message box upon bootup +; MessageLine - adds a new line of text to a message box (must come before MessageBox command) +; TitleText - text that is displayed in the title box +; StatusBarColor - color of status bar's background +; StatusBarTextColor - color of status bar's text +; BackdropTextColor - color of the backdrop's fill +; BackdropColor - color of the backdrop's background +; BackdropFillStyle - backdrop fill style - can be Light, Medium, or Dark +; TitleBoxTextColor - title box text color +; TitleBoxColor - title box background color +; MessageBoxTextColor - message box text color +; MessageBoxColor - message box background color +; MenuTextColor - menu text color +; MenuColor - menu color +; TextColor - normal text color +; SelectedTextColor - selected text color +; SelectedColor - selected text background color +; TimeOut - sets the timeout (in seconds) before the first OS listed gets booted automagically ; [OS-General] Section Commands: ; -; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive -; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) -; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) +; BootType - sets the boot type: ReactOS, Linux, BootSector, Partition, Drive +; BootPath - ARC path e.g. multi(0)disk(0)rdisk(x)partition(y) +; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 maps harddisk1 to harddisk0 or DriveMap=fd1,fd0) ; [BootSector OSType] Section Commands: ; -; BootSector - sets the filename of the bootsector to be loaded +; BootSector - sets the filename of the bootsector to be loaded ; [ReactOS OSType] Section Commands: ; -; SystemPath - sets the system root path (must be a valid ARC - Path): -; multi(0)disk(0)rdisk(0)partition(1)\reactos -; multi(0)disk(0)fdisk(0) -; Options - sets the command line options for the kernel being booted -; Kernel - sets the kernel filename (default: ntoskrnl.exe) -; Hal - sets the HAL filename (default: hal.dll) +; SystemPath - sets the system root path (must be a valid ARC - Path): +; multi(0)disk(0)rdisk(0)partition(1)\reactos +; multi(0)disk(0)fdisk(0) +; Options - sets the command line options for the kernel being booted +; Kernel - sets the kernel filename (default: ntoskrnl.exe) +; Hal - sets the HAL filename (default: hal.dll) [FREELOADER]

9 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015