https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c6370de16611a4361453556dca394596a775e1d
commit 4c6370de16611a4361453556dca394596a775e1d Author: Bișoc George <[email protected]> AuthorDate: Sun Oct 28 13:28:56 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <[email protected]> CommitDate: Wed Nov 7 23:16:29 2018 +0100 [USETUP] Remove the PARTITION_EXT2 constant and use PARTITION_LINUX in favour since PARTITION_EXT2 is just an alias to PARTITION_LINUX And since we're here, add PARTITION_LINUX_EXT to ReactOS I/O controls header (rosioctl.h). --- base/setup/lib/fsutil.c | 4 ++-- base/setup/lib/utils/partlist.c | 3 +-- base/system/diskpart/partlist.c | 4 ++-- sdk/include/reactos/rosioctl.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 2fb61bf0ea..e561806b83 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -221,7 +221,7 @@ GetFileSystem( else FileSystemName = NULL; } - else if (PartEntry->PartitionType == PARTITION_EXT2) + else if (PartEntry->PartitionType == PARTITION_LINUX) { if (CheckExt2Format()) FileSystemName = L"EXT2"; @@ -386,7 +386,7 @@ PreparePartitionForFormatting( #if 0 else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 0) { - SetPartitionType(PartEntry, PARTITION_EXT2); + SetPartitionType(PartEntry, PARTITION_LINUX); } else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0) { diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 4047bc1ff9..7145b2f10d 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2969,8 +2969,7 @@ CheckActiveSystemPartition( } // HACK: WARNING: We cannot write on this FS yet! // See fsutil.c:GetFileSystem() - if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || - List->OriginalSystemPartition->PartitionType == PARTITION_IFS) + if (List->OriginalSystemPartition->PartitionType == PARTITION_IFS) { DPRINT1("Recognized file system %S that doesn't support write support yet!\n", FileSystem->FileSystemName); diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index 0fd99eabda..6202eb0439 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -33,7 +33,7 @@ } /* We have to define it there, because it is not in the MS DDK */ -#define PARTITION_EXT2 0x83 +#define PARTITION_LINUX 0x83 #define PARTITION_TBL_SIZE 4 @@ -451,7 +451,7 @@ AddPartitionToDisk( #endif PartEntry->FormatState = Preformatted; } - else if (PartEntry->PartitionType == PARTITION_EXT2) + else if (PartEntry->PartitionType == PARTITION_LINUX) { #if 0 if (CheckExt2Format()) diff --git a/sdk/include/reactos/rosioctl.h b/sdk/include/reactos/rosioctl.h index 9c017c6621..9c8397a174 100644 --- a/sdk/include/reactos/rosioctl.h +++ b/sdk/include/reactos/rosioctl.h @@ -14,7 +14,7 @@ #define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap #define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition #define PARTITION_LINUX 0x83 // Linux Partition Ext2/Ext3/Ext4 -#define PARTITION_EXT2 PARTITION_LINUX // some apps use this identifier +#define PARTITION_LINUX_EXT 0x85 // Linux Extended Partition #define PARTITION_LINUX_LVM 0x8E #endif /* __ROSIOCTL_H */
