Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP] Remove the PARTITION_EXT2 constant and use PARTITION_LINUX in favour since PARTITION_EXT2 is just an alias to PARTITION_LINUX

Browse source 
And since we're here, add PARTITION_LINUX_EXT to ReactOS I/O controls header (rosioctl.h).
This commit is contained in:
Bișoc George 2018-10-28 13:28:56 +01:00 committed by Hermès BÉLUSCA - MAÏTO
parent 538f9d6aae
commit 4c6370de16
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/setup/lib/fsutil.c
View file

@ -221,7 +221,7 @@ GetFileSystem(
else else
FileSystemName = NULL; FileSystemName = NULL;
} }
else if (PartEntry->PartitionType == PARTITION_EXT2) else if (PartEntry->PartitionType == PARTITION_LINUX)
{ {
if (CheckExt2Format()) if (CheckExt2Format())
FileSystemName = L"EXT2"; FileSystemName = L"EXT2";
@ -386,7 +386,7 @@ PreparePartitionForFormatting(
#if 0 #if 0
else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 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) else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0)
{ {

3
base/setup/lib/utils/partlist.c
View file

@ -2969,8 +2969,7 @@ CheckActiveSystemPartition(
} }
// HACK: WARNING: We cannot write on this FS yet! // HACK: WARNING: We cannot write on this FS yet!
// See fsutil.c:GetFileSystem() // See fsutil.c:GetFileSystem()
if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || if (List->OriginalSystemPartition->PartitionType == PARTITION_IFS)
List->OriginalSystemPartition->PartitionType == PARTITION_IFS)
{ {
DPRINT1("Recognized file system %S that doesn't support write support yet!\n", DPRINT1("Recognized file system %S that doesn't support write support yet!\n",
FileSystem->FileSystemName); FileSystem->FileSystemName);

4
base/system/diskpart/partlist.c
View file

@ -33,7 +33,7 @@
} }
/* We have to define it there, because it is not in the MS DDK */ /* 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 #define PARTITION_TBL_SIZE 4
@ -451,7 +451,7 @@ AddPartitionToDisk(
#endif #endif
PartEntry->FormatState = Preformatted; PartEntry->FormatState = Preformatted;
} }
else if (PartEntry->PartitionType == PARTITION_EXT2) else if (PartEntry->PartitionType == PARTITION_LINUX)
{ {
#if 0 #if 0
if (CheckExt2Format()) if (CheckExt2Format())

2
sdk/include/reactos/rosioctl.h
View file

@ -14,7 +14,7 @@
#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap #define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap
#define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition #define PARTITION_LINUX_SWAP 0x82 // Linux Swap Partition
#define PARTITION_LINUX 0x83 // Linux Partition Ext2/Ext3/Ext4 #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 #define PARTITION_LINUX_LVM 0x8E
#endif /* __ROSIOCTL_H */ #endif /* __ROSIOCTL_H */