Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 65970: [KERNEL32] Tabs -> Spaces
by ekohl＠svn.reactos.org 04 Jan '15

04 Jan '15

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

1 0

[ekohl] 65969: [USETUP] - Revert partiton code to pre-r65855.
by ekohl＠svn.reactos.org 04 Jan '15

04 Jan '15

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,

1 0

[hbelusca] 65968: [FREELDR]: Do the same thing as how we fill out the ARC disk block elsewhere.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

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;

1 0

[hbelusca] 65967: [FREELDR]: Use boolean value.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

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

1 0

[aandrejevic] 65966: [FAST486] Fix FPU exceptions (again).
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

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

1 0

[hbelusca] 65965: Tab2Space changes.
by hbelusca＠svn.reactos.org 03 Jan '15

03 Jan '15

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]

1 0

[hbelusca] 65964: [FREELDR][INCLUDES] - ARC disk functions return ARC_STATUS codes (that are ULONG btw, not LONG). Fix prototypes where needed. - Rearrange a bit our arc.h header by putting togethe...
by hbelusca＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: hbelusca Date: Sat Jan 3 20:45:34 2015 New Revision: 65964 URL: http://svn.reactos.org/svn/reactos?rev=65964&view=rev Log: [FREELDR][INCLUDES] - ARC disk functions return ARC_STATUS codes (that are ULONG btw, not LONG). Fix prototypes where needed. - Rearrange a bit our arc.h header by putting together related structures. [FREELDR] - Remove arcemul/time.c (put functions back into machine.c). ARC functions should use some SYSTEM_PARAMETER_BLOCK firmware vector array instead... Removed: trunk/reactos/boot/freeldr/freeldr/arcemul/ Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/fs/pxe.c trunk/reactos/boot/freeldr/freeldr/include/arcemul.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/fs.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -40,7 +40,6 @@ options.c oslist.c version.c - arcemul/time.c cache/blocklist.c cache/cache.c comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -44,7 +44,7 @@ CHAR PcDiskIdentifier[32][20]; -static LONG DiskClose(ULONG FileId) +static ARC_STATUS DiskClose(ULONG FileId) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -52,7 +52,7 @@ return ESUCCESS; } -static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +static ARC_STATUS DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -63,7 +63,7 @@ return ESUCCESS; } -static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +static ARC_STATUS DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { DISKCONTEXT* Context; UCHAR DriveNumber; @@ -110,7 +110,7 @@ return ESUCCESS; } -static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; @@ -155,7 +155,7 @@ return (!ret) ? EIO : ESUCCESS; } -static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -109,7 +109,7 @@ } DISKCONTEXT; static -LONG +ARC_STATUS DiskClose(ULONG FileId) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -119,7 +119,7 @@ } static -LONG +ARC_STATUS DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -132,7 +132,7 @@ } static -LONG +ARC_STATUS DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { DISKCONTEXT* Context; @@ -185,7 +185,7 @@ } static -LONG +ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -219,7 +219,7 @@ } static -LONG +ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -21,7 +21,7 @@ /* FUNCTIONS ******************************************************************/ -static LONG RamDiskClose(ULONG FileId) +static ARC_STATUS RamDiskClose(ULONG FileId) { // // Nothing to do @@ -29,7 +29,7 @@ return ESUCCESS; } -static LONG RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +static ARC_STATUS RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { // // Give current seek offset and ram disk size to caller @@ -41,7 +41,7 @@ return ESUCCESS; } -static LONG RamDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +static ARC_STATUS RamDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { // // Always return success, as contents are already in memory @@ -49,7 +49,7 @@ return ESUCCESS; } -static LONG RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +static ARC_STATUS RamDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PVOID StartAddress; @@ -76,7 +76,7 @@ return ESUCCESS; } -static LONG RamDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +static ARC_STATUS RamDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { // // Only accept absolute mode now Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -148,7 +148,7 @@ ULONGLONG SectorNumber; } DISKCONTEXT; -static LONG DiskClose(ULONG FileId) +static ARC_STATUS DiskClose(ULONG FileId) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -156,7 +156,7 @@ return ESUCCESS; } -static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +static ARC_STATUS DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -167,7 +167,7 @@ return ESUCCESS; } -static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +static ARC_STATUS DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PSCSI_REQUEST_BLOCK Srb; PCDB Cdb; @@ -237,7 +237,7 @@ return ESUCCESS; } -static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); PSCSI_REQUEST_BLOCK Srb; @@ -345,7 +345,7 @@ return ESUCCESS; } -static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -1196,7 +1196,7 @@ return TRUE; } -LONG Ext2Close(ULONG FileId) +ARC_STATUS Ext2Close(ULONG FileId) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -1205,7 +1205,7 @@ return ESUCCESS; } -LONG Ext2GetFileInformation(ULONG FileId, FILEINFORMATION* Information) +ARC_STATUS Ext2GetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -1221,7 +1221,7 @@ return ESUCCESS; } -LONG Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +ARC_STATUS Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PEXT2_FILE_INFO FileHandle; //ULONG DeviceId; @@ -1251,7 +1251,7 @@ return ESUCCESS; } -LONG Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +ARC_STATUS Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); ULONGLONG BytesReadBig; @@ -1272,7 +1272,7 @@ return EIO; } -LONG Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +ARC_STATUS Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -1397,7 +1397,7 @@ return TRUE; } -LONG FatClose(ULONG FileId) +ARC_STATUS FatClose(ULONG FileId) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -1407,7 +1407,7 @@ return ESUCCESS; } -LONG FatGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +ARC_STATUS FatGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -1423,7 +1423,7 @@ return ESUCCESS; } -LONG FatOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +ARC_STATUS FatOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PFAT_VOLUME_INFO FatVolume; FAT_FILE_INFO TempFileInfo; @@ -1465,7 +1465,7 @@ return ESUCCESS; } -LONG FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); BOOLEAN ret; @@ -1484,7 +1484,7 @@ return EIO; } -LONG FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +ARC_STATUS FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); 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] Sat Jan 3 20:45:34 2015 @@ -224,7 +224,7 @@ static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; -LONG ArcClose(ULONG FileId) +ARC_STATUS ArcClose(ULONG FileId) { LONG ret; @@ -242,14 +242,14 @@ return ret; } -LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return EBADF; return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); } -LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { ULONG Count, i, ret; PLIST_ENTRY pEntry; @@ -398,14 +398,14 @@ return ret; } -LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return EBADF; return FileData[FileId].FuncTable->Read(FileId, Buffer, N, Count); } -LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return EBADF; Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -240,7 +240,7 @@ return ESUCCESS; } -LONG IsoClose(ULONG FileId) +ARC_STATUS IsoClose(ULONG FileId) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -249,7 +249,7 @@ return ESUCCESS; } -LONG IsoGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +ARC_STATUS IsoGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); @@ -263,7 +263,7 @@ return ESUCCESS; } -LONG IsoOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +ARC_STATUS IsoOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { ISO_FILE_INFO TempFileInfo; PISO_FILE_INFO FileHandle; @@ -292,7 +292,7 @@ return ESUCCESS; } -LONG IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); UCHAR SectorBuffer[SECTORSIZE]; @@ -461,7 +461,7 @@ return ESUCCESS; } -LONG IsoSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +ARC_STATUS IsoSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -755,7 +755,7 @@ return TRUE; } -LONG NtfsClose(ULONG FileId) +ARC_STATUS NtfsClose(ULONG FileId) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); @@ -765,7 +765,7 @@ return ESUCCESS; } -LONG NtfsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +ARC_STATUS NtfsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); @@ -781,7 +781,7 @@ return ESUCCESS; } -LONG NtfsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +ARC_STATUS NtfsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PNTFS_VOLUME_INFO Volume; PNTFS_FILE_HANDLE FileHandle; @@ -828,7 +828,7 @@ return ESUCCESS; } -LONG NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); ULONGLONG BytesRead64; @@ -848,7 +848,7 @@ return EIO; } -LONG NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +ARC_STATUS NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -116,7 +116,7 @@ return TRUE; } -static LONG PxeClose(ULONG FileId) +static ARC_STATUS PxeClose(ULONG FileId) { t_PXENV_TFTP_CLOSE closeData; @@ -136,7 +136,7 @@ return ESUCCESS; } -static LONG PxeGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +static ARC_STATUS PxeGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { if (_OpenFile == NO_FILE || FileId != _OpenFile) return EBADF; @@ -148,7 +148,7 @@ return ESUCCESS; } -static LONG PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +static ARC_STATUS PxeOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { t_PXENV_TFTP_GET_FSIZE sizeData; t_PXENV_TFTP_OPEN openData; @@ -197,7 +197,7 @@ return ESUCCESS; } -static LONG PxeRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +static ARC_STATUS PxeRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { t_PXENV_TFTP_READ readData; ULONG i; @@ -240,7 +240,7 @@ return ESUCCESS; } -static LONG PxeSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +static ARC_STATUS PxeSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { t_PXENV_TFTP_READ readData; @@ -290,31 +290,31 @@ return &PxeVtbl; } -static LONG PxeDiskClose(ULONG FileId) +static ARC_STATUS PxeDiskClose(ULONG FileId) { // Nothing to do return ESUCCESS; } -static LONG PxeDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +static ARC_STATUS PxeDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { // No disk access in PXE mode return EINVAL; } -static LONG PxeDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +static ARC_STATUS PxeDiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { // Nothing to do return ESUCCESS; } -static LONG PxeDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +static ARC_STATUS PxeDiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { // No disk access in PXE mode return EINVAL; } -static LONG PxeDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +static ARC_STATUS PxeDiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { // No disk access in PXE mode return EINVAL; Modified: trunk/reactos/boot/freeldr/freeldr/include/arcemul.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arcemul.h [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -16,24 +16,3 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -/* component.c */ -CONFIGURATION_COMPONENT* ArcGetChild(CONFIGURATION_COMPONENT *Current); -CONFIGURATION_COMPONENT* ArcGetParent(CONFIGURATION_COMPONENT *Current); -CONFIGURATION_COMPONENT* ArcGetPeer(CONFIGURATION_COMPONENT *Current); -CONFIGURATION_COMPONENT* -ArcAddChild( - CONFIGURATION_COMPONENT *Current, - CONFIGURATION_COMPONENT *Template, - VOID *ConfigurationData); -LONG -ArcDeleteComponent( - CONFIGURATION_COMPONENT *ComponentToDelete); -LONG -ArcGetConfigurationData( - VOID* ConfigurationData, - CONFIGURATION_COMPONENT* Component); - -/* time.c */ -TIMEINFO* ArcGetTime(VOID); -ULONG ArcGetRelativeTime(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -55,7 +55,7 @@ #endif /* internal headers */ -#include <arcemul.h> +// #include <arcemul.h> #include <bytesex.h> #include <cache.h> #include <cmdline.h> Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -43,11 +43,11 @@ ULONG FsGetDeviceId(ULONG FileId); VOID FsInit(VOID); -LONG ArcClose(ULONG FileId); -LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); -LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); -LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); -LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); +ARC_STATUS ArcClose(ULONG FileId); +ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); +ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); +ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); +ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); VOID FileSystemError(PCSTR ErrorString); PFILE FsOpenFile(PCSTR FileName); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -127,4 +127,9 @@ #define MachHwDetect() MachVtbl.HwDetect() #define MachHwIdle() MachVtbl.HwIdle() +/* ARC FUNCTIONS **************************************************************/ + +TIMEINFO* ArcGetTime(VOID); +ULONG ArcGetRelativeTime(VOID); + /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -168,4 +168,24 @@ return MachVtbl.DiskGetCacheableBlockCount(DriveNumber); } + +/* ARC FUNCTIONS **************************************************************/ + +TIMEINFO* +ArcGetTime(VOID) +{ + return MachVtbl.GetTime(); +} + +ULONG +ArcGetRelativeTime(VOID) +{ + TIMEINFO* TimeInfo; + ULONG ret; + + TimeInfo = ArcGetTime(); + ret = ((TimeInfo->Hour * 24) + TimeInfo->Minute) * 60 + TimeInfo->Second; + return ret; +} + /* EOF */ Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Sat Jan 3 20:45:34 2015 @@ -72,6 +72,31 @@ MemoryClass, MaximumClass } CONFIGURATION_CLASS; + +// enum CONFIGURATION_TYPE is defined in ntddk.h + +typedef struct _CONFIGURATION_COMPONENT +{ + CONFIGURATION_CLASS Class; + CONFIGURATION_TYPE Type; + IDENTIFIER_FLAG Flags; + USHORT Version; + USHORT Revision; + ULONG Key; + ULONG AffinityMask; + ULONG ConfigurationDataLength; + ULONG IdentifierLength; + LPSTR Identifier; +} CONFIGURATION_COMPONENT, *PCONFIGURATION_COMPONENT; + +typedef struct _CONFIGURATION_COMPONENT_DATA +{ + struct _CONFIGURATION_COMPONENT_DATA *Parent; + struct _CONFIGURATION_COMPONENT_DATA *Child; + struct _CONFIGURATION_COMPONENT_DATA *Sibling; + CONFIGURATION_COMPONENT ComponentEntry; + PVOID ConfigurationData; +} CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; typedef enum _TYPE_OF_MEMORY { @@ -167,29 +192,6 @@ CHAR GptSignature[16]; } ARC_DISK_SIGNATURE, *PARC_DISK_SIGNATURE; -typedef struct _CONFIGURATION_COMPONENT -{ - CONFIGURATION_CLASS Class; - CONFIGURATION_TYPE Type; - IDENTIFIER_FLAG Flags; - USHORT Version; - USHORT Revision; - ULONG Key; - ULONG AffinityMask; - ULONG ConfigurationDataLength; - ULONG IdentifierLength; - LPSTR Identifier; -} CONFIGURATION_COMPONENT, *PCONFIGURATION_COMPONENT; - -typedef struct _CONFIGURATION_COMPONENT_DATA -{ - struct _CONFIGURATION_COMPONENT_DATA *Parent; - struct _CONFIGURATION_COMPONENT_DATA *Child; - struct _CONFIGURATION_COMPONENT_DATA *Sibling; - CONFIGURATION_COMPONENT ComponentEntry; - PVOID ConfigurationData; -} CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA; - typedef struct _ARC_DISK_INFORMATION { LIST_ENTRY DiskSignatureListHead; @@ -497,9 +499,41 @@ CHAR Filename[32]; } FILEINFORMATION; -typedef LONG (*ARC_CLOSE)(ULONG FileId); -typedef LONG (*ARC_GET_FILE_INFORMATION)(ULONG FileId, FILEINFORMATION* Information); -typedef LONG (*ARC_OPEN)(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); -typedef LONG (*ARC_READ)(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); -typedef LONG (*ARC_SEEK)(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); +typedef +ARC_STATUS +(*ARC_CLOSE)( + ULONG FileId +); + +typedef +ARC_STATUS +(*ARC_GET_FILE_INFORMATION)( + ULONG FileId, + FILEINFORMATION* Information +); + +typedef +ARC_STATUS +(*ARC_OPEN)( + CHAR* Path, + OPENMODE OpenMode, + ULONG* FileId +); + +typedef +ARC_STATUS +(*ARC_READ)( + ULONG FileId, + VOID* Buffer, + ULONG N, ULONG* Count +); + +typedef +ARC_STATUS +(*ARC_SEEK)( + ULONG FileId, + LARGE_INTEGER* Position, + SEEKMODE SeekMode +); + #endif

1 0

[hbelusca] 65963: [FREELDR] - Move inXfile and rtl code into a lib subdir, - Minor comment formatting.
by hbelusca＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: hbelusca Date: Sat Jan 3 16:51:26 2015 New Revision: 65963 URL: http://svn.reactos.org/svn/reactos?rev=65963&view=rev Log: [FREELDR] - Move inXfile and rtl code into a lib subdir, - Minor comment formatting. Added: trunk/reactos/boot/freeldr/freeldr/lib/ (with props) trunk/reactos/boot/freeldr/freeldr/lib/inffile/ - copied from r65943, trunk/reactos/boot/freeldr/freeldr/inffile/ trunk/reactos/boot/freeldr/freeldr/lib/inifile/ - copied from r65943, trunk/reactos/boot/freeldr/freeldr/inifile/ trunk/reactos/boot/freeldr/freeldr/lib/rtl/ - copied from r65943, trunk/reactos/boot/freeldr/freeldr/rtl/ Removed: trunk/reactos/boot/freeldr/freeldr/inffile/ trunk/reactos/boot/freeldr/freeldr/inifile/ trunk/reactos/boot/freeldr/freeldr/rtl/ Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jan 3 16:51:26 2015 @@ -53,9 +53,9 @@ fs/fs.c fs/iso.c fs/ntfs.c - inifile/ini_init.c - inifile/inifile.c - inifile/parse.c + lib/inifile/ini_init.c + lib/inifile/inifile.c + lib/inifile/parse.c mm/meminit.c mm/mm.c mm/heap.c @@ -177,8 +177,8 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c - inffile/inffile.c - rtl/libsupp.c) + lib/inffile/inffile.c + lib/rtl/libsupp.c) if(NOT MSVC) list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) Propchange: trunk/reactos/boot/freeldr/freeldr/lib/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jan 3 16:51:26 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/boot/freeldr/freeldr/lib/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/boot/freeldr/freeldr/lib/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/boot/freeldr/freeldr/lib/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Sat Jan 3 16:51:26 2015 @@ -296,7 +296,7 @@ /* Close the inf file */ InfCloseFile(InfHandle); - /* Load ReactOS */ + /* Load ReactOS Setup */ LoadAndBootWindowsCommon(_WIN32_WINNT_WS03, LoaderBlock, BootOptions, 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] Sat Jan 3 16:51:26 2015 @@ -603,13 +603,12 @@ BOOLEAN Status; PLOADER_PARAMETER_BLOCK LoaderBlock; - // Get OS setting value + /* Get OS setting value */ SettingsValue[0] = ANSI_NULL; IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue)); - // Open the operating system section - // specified in the .ini file + /* Open the operating system section specified in the .ini file */ HasSection = IniOpenSection(SectionName, &SectionId); UiDrawBackdrop(); @@ -781,13 +780,6 @@ WinLdrpDumpArcDisks(LoaderBlockVA); #endif - //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below - //while (1) {}; - /*asm(".intel_syntax noprefix\n"); - asm("test1:\n"); - asm("jmp test1\n"); - asm(".att_syntax\n");*/ - /* Pass control */ (*KiSystemStartup)(LoaderBlockVA); }

1 0

[ekohl] 65962: [USETUP] Implement pre-install 'select format' and 'format' pages. These enable the user to re-format an existing install partitition. CORE-9005 #resolve
by ekohl＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: ekohl Date: Sat Jan 3 15:33:22 2015 New Revision: 65962 URL: http://svn.reactos.org/svn/reactos?rev=65962&view=rev Log: [USETUP] Implement pre-install 'select format' and 'format' pages. These enable the user to re-format an existing install partitition. CORE-9005 #resolve 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] Sat Jan 3 15:33:22 2015 @@ -71,7 +71,8 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem) + IN LPCWSTR ForceFileSystem, + IN UCHAR PartitionType) { PFILE_SYSTEM_LIST List; PFILE_SYSTEM_ITEM Item; @@ -86,7 +87,7 @@ List->Selected = NULL; InitializeListHead(&List->ListHead); - HOST_CreateFileSystemList(List); + HOST_CreateFileSystemList(List, PartitionType); 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] Sat Jan 3 15:33:22 2015 @@ -57,7 +57,8 @@ IN SHORT Left, IN SHORT Top, IN BOOLEAN ForceFormat, - IN LPCWSTR ForceFileSystem); + IN LPCWSTR ForceFileSystem, + IN UCHAR PartitionType); 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] Sat Jan 3 15:33:22 2015 @@ -22,7 +22,8 @@ BOOLEAN HOST_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List); + IN PFILE_SYSTEM_LIST List, + IN UCHAR PartitionType); 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] Sat Jan 3 15:33:22 2015 @@ -1606,7 +1606,7 @@ { MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, RequiredPartitionDiskSpace); - continue; //return SELECT_PARTITION_PAGE; /* let the user select another partition */ + return SELECT_PARTITION_PAGE; /* let the user select another partition */ } if (PartitionList->CurrentPartition == NULL || @@ -1622,7 +1622,7 @@ DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return INSTALL_DIRECTORY_PAGE; + return PRE_INSTALL_SELECT_FORMAT_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ { @@ -2281,7 +2281,7 @@ ULONGLONG DiskSize; ULONGLONG PartSize; PCHAR Unit; - PCHAR PartType; + PCHAR PartType = NULL; NTSTATUS Status; if (PartitionList == NULL || @@ -2298,37 +2298,29 @@ MUIDisplayPage(DELETE_PARTITION_PAGE); /* Determine partition type */ - 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); - } + 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; @@ -2617,14 +2609,16 @@ 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)); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_FORMATPART)); if (PartType == NULL) { @@ -2661,14 +2655,12 @@ if (FileSystemList == NULL) { - FileSystemList = CreateFileSystemList(6, 26, PartEntry->New, L"FAT"); + FileSystemList = CreateFileSystemList(6, 26, TRUE, L"FAT", PARTITION_ENTRY_UNUSED); if (FileSystemList == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - - /* FIXME: Add file systems to list */ } DrawFileSystemList(FileSystemList); @@ -2691,6 +2683,8 @@ { DPRINT1("WriteDirtyPartitions() failed (Status 0x%08lx)\n", Status); MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; } @@ -2709,6 +2703,8 @@ { if (ConfirmQuit(Ir) == TRUE) { + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; } @@ -2717,6 +2713,8 @@ 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) && @@ -2780,6 +2778,8 @@ PartitionList->CurrentPartition == NULL) { /* FIXME: show an error dialog */ + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; } @@ -2798,6 +2798,8 @@ { if (ConfirmQuit(Ir) == TRUE) { + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; } @@ -2808,7 +2810,11 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); if (!FileSystemList->Selected->FormatFunc) + { + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; + } #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, @@ -2864,11 +2870,12 @@ { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); /* FIXME: show an error dialog */ + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; return QUIT_PAGE; } - PartEntry->New = FALSE; - + PartEntry->FormatState = Formatted; } #ifndef NDEBUG @@ -2965,6 +2972,347 @@ return INSTALL_DIRECTORY_PAGE; } } + + + + +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 @@ -4278,11 +4626,19 @@ break; case FORMAT_PARTITION_PAGE: - Page = (PAGE_NUMBER) FormatPartitionPage(&Ir); + Page = FormatPartitionPage(&Ir); break; case CHECK_FILE_SYSTEM_PAGE: - Page = (PAGE_NUMBER) CheckFileSystemPage(&Ir); + Page = CheckFileSystemPage(&Ir); + break; + + case PRE_INSTALL_SELECT_FORMAT_PAGE: + Page = PreInstallSelectFormatPage(&Ir); + break; + + case PRE_INSTALL_FORMAT_PAGE: + Page = PreInstallFormatPage(&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] Sat Jan 3 15:33:22 2015 @@ -1753,5 +1753,7 @@ ""}, {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] Sat Jan 3 15:33:22 2015 @@ -1737,5 +1737,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1746,5 +1746,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1742,5 +1742,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1763,5 +1763,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1737,5 +1737,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1745,5 +1745,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1738,5 +1738,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1751,5 +1751,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1739,5 +1739,7 @@ ""}, {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] Sat Jan 3 15:33:22 2015 @@ -1740,5 +1740,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1741,5 +1741,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1748,5 +1748,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1786,5 +1786,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1746,5 +1746,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1777,5 +1777,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1814,5 +1814,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1742,5 +1742,7 @@ ""}, {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] Sat Jan 3 15:33:22 2015 @@ -1752,5 +1752,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1744,5 +1744,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1747,5 +1747,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1725,5 +1725,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -1747,5 +1747,7 @@ "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] Sat Jan 3 15:33:22 2015 @@ -156,3 +156,5 @@ #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] Sat Jan 3 15:33:22 2015 @@ -2,12 +2,36 @@ BOOLEAN NATIVE_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List) + IN PFILE_SYSTEM_LIST List, + IN UCHAR PartitionType) { - FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); + 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); + } + #if 0 - FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); + if (PartitionType == PARTITION_ENTRY_UNUSED || + PartitionType == PARTITION_EXT2) + { + 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] Sat Jan 3 15:33:22 2015 @@ -558,7 +558,7 @@ if (IsContainerPartition(PartEntry->PartitionType)) { - PartEntry->FormatState = Unformatted; + PartEntry->FormatState = Formatted; if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; @@ -1499,11 +1499,7 @@ { /* Determine partition type */ PartType = NULL; - if (PartEntry->New == TRUE) - { - PartType = MUIGetString(STRING_UNFORMATTED); - } - else if (PartEntry->IsPartitioned == TRUE) + if (PartEntry->IsPartitioned == TRUE) { if ((PartEntry->PartitionType == PARTITION_FAT_12) || (PartEntry->PartitionType == PARTITION_FAT_16) || @@ -2386,7 +2382,6 @@ 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); @@ -2420,7 +2415,6 @@ 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; @@ -2505,7 +2499,6 @@ PartEntry->IsPartitioned = TRUE; PartEntry->FormatState = Formatted; PartEntry->AutoCreate = FALSE; - PartEntry->New = FALSE; PartEntry->BootIndicator = FALSE; if (PartEntry->StartSector.QuadPart < 1450560) @@ -2547,7 +2540,6 @@ NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - NewPartEntry->StartSector.QuadPart; - NewPartEntry->New = FALSE; NewPartEntry->FormatState = Formatted; NewPartEntry->BootIndicator = FALSE; 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] Sat Jan 3 15:33:22 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; 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] Sat Jan 3 15:33:22 2015 @@ -138,8 +138,11 @@ FORMAT_PARTITION_PAGE, CHECK_FILE_SYSTEM_PAGE, + PRE_INSTALL_SELECT_FORMAT_PAGE, + PRE_INSTALL_FORMAT_PAGE, + + INSTALL_DIRECTORY_PAGE, PREPARE_COPY_PAGE, - INSTALL_DIRECTORY_PAGE, FILE_COPY_PAGE, REGISTRY_PAGE, BOOT_LOADER_PAGE,

1 0

[aandrejevic] 65961: [FAST486][NTVDM] Use an external interrupt for the FPU when the NE bit of CR0 is cleared.
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: aandrejevic Date: Sat Jan 3 15:16:41 2015 New Revision: 65961 URL: http://svn.reactos.org/svn/reactos?rev=65961&view=rev Log: [FAST486][NTVDM] Use an external interrupt for the FPU when the NE bit of CR0 is cleared. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/subsystems/ntvdm/cpu/cpu.c trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/emulator.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Jan 3 15:16:41 2015 @@ -223,6 +223,13 @@ typedef UCHAR (NTAPI *FAST486_INT_ACK_PROC) +( + PFAST486_STATE State +); + +typedef +VOID +(NTAPI *FAST486_FPU_PROC) ( PFAST486_STATE State ); @@ -473,6 +480,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback; FAST486_BOP_PROC BopCallback; FAST486_INT_ACK_PROC IntAckCallback; + FAST486_FPU_PROC FpuCallback; FAST486_REG GeneralRegs[FAST486_NUM_GEN_REGS]; FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; @@ -514,6 +522,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback, FAST486_BOP_PROC BopCallback, FAST486_INT_ACK_PROC IntAckCallback, + FAST486_FPU_PROC FpuCallback, PULONG Tlb); VOID Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Jan 3 15:16:41 2015 @@ -179,6 +179,12 @@ return 0x01; } +static VOID NTAPI +Fast486FpuCallback(PFAST486_STATE State) +{ + UNREFERENCED_PARAMETER(State); +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID @@ -190,6 +196,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback, FAST486_BOP_PROC BopCallback, FAST486_INT_ACK_PROC IntAckCallback, + FAST486_FPU_PROC FpuCallback, PULONG Tlb) { /* Set the callbacks (or use default ones if some are NULL) */ @@ -199,6 +206,7 @@ State->IoWriteCallback = (IoWriteCallback ? IoWriteCallback : Fast486IoWriteCallback ); State->BopCallback = (BopCallback ? BopCallback : Fast486BopCallback ); State->IntAckCallback = (IntAckCallback ? IntAckCallback : Fast486IntAckCallback ); + State->FpuCallback = (FpuCallback ? FpuCallback : Fast486FpuCallback ); /* Set the TLB (if given) */ State->Tlb = Tlb; @@ -220,6 +228,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; FAST486_BOP_PROC BopCallback = State->BopCallback; FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; + FAST486_FPU_PROC FpuCallback = State->FpuCallback; PULONG Tlb = State->Tlb; /* Clear the entire structure */ @@ -273,6 +282,7 @@ State->IoWriteCallback = IoWriteCallback; State->BopCallback = BopCallback; State->IntAckCallback = IntAckCallback; + State->FpuCallback = FpuCallback; State->Tlb = Tlb; } 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 15:16:41 2015 @@ -4125,8 +4125,16 @@ || (!State->FpuControl.Dm && State->FpuStatus.De) || (!State->FpuControl.Im && State->FpuStatus.Ie)) { - /* Call the #MF handler */ - Fast486Exception(State, FAST486_EXCEPTION_MF); + 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); + } } #endif Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Sat Jan 3 15:16:41 2015 @@ -165,6 +165,7 @@ EmulatorWriteIo, EmulatorBiosOperation, EmulatorIntAcknowledge, + EmulatorFpu, NULL /* TODO: Use a TLB */); /* Initialize the software callback system and register the emulator BOPs */ Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Sat Jan 3 15:16:41 2015 @@ -210,6 +210,12 @@ /* Get the interrupt number from the PIC */ return PicGetInterrupt(); +} + +VOID WINAPI EmulatorFpu(PFAST486_STATE State) +{ + /* The FPU is wired to IRQ 13 */ + PicInterruptRequest(13); } VOID EmulatorException(BYTE ExceptionNumber, LPWORD Stack) Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Sat Jan 3 15:16:41 2015 @@ -92,6 +92,11 @@ PFAST486_STATE State ); +VOID WINAPI EmulatorFpu +( + PFAST486_STATE State +); + VOID EmulatorException(BYTE ExceptionNumber, LPWORD Stack); VOID EmulatorTerminate(VOID);

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