Ros-diffs November 2020

ros-diffs@reactos.org

18 participants
162 discussions

[reactos] 01/01: [NDK] Add missing nop NEC definitions if not X86 (for consistency with what's done in the kernel-mode headers). Addendum to 9feab8e9.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de16ef3da0f179f8972b5… commit de16ef3da0f179f8972b59adc57d92d456b370e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 02:03:06 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 02:05:59 2020 +0100 [NDK] Add missing nop NEC definitions if not X86 (for consistency with what's done in the kernel-mode headers). Addendum to 9feab8e9. --- sdk/include/ndk/ketypes.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index bd9409d5d26..0fba8d3455f 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -221,8 +221,8 @@ typedef CCHAR KPROCESSOR_MODE; // #define SharedUserData ((KUSER_SHARED_DATA *)USER_SHARED_DATA) -/* Macros for user-mode run-time checks of X86 system architecture */ #ifdef _X86_ +/* Macros for user-mode run-time checks of X86 system architecture */ #ifndef IsNEC_98 #define IsNEC_98 (SharedUserData->AlternativeArchitecture == NEC98x86) @@ -242,8 +242,27 @@ typedef CCHAR KPROCESSOR_MODE; #define SetNotNEC_98 #endif +#else // !_X86_ +/* Correctly define these run-time definitions for non X86 machines */ + +#ifndef IsNEC_98 +#define IsNEC_98 (FALSE) +#endif + +#ifndef IsNotNEC_98 +#define IsNotNEC_98 (TRUE) +#endif + +#ifndef SetNEC_98 +#define SetNEC_98 +#endif + +#ifndef SetNotNEC_98 +#define SetNotNEC_98 #endif +#endif // _X86_ + // // Maximum WOW64 Entries in KUSER_SHARED_DATA //

3 years, 9 months

[reactos] 01/01: [SMSS] Fix x64 build. Addendum to a0721eb

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=131bc73555427968c01d5… commit 131bc73555427968c01d53f3e51b84f1874c5058 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Nov 26 03:50:16 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Nov 26 03:50:16 2020 +0300 [SMSS] Fix x64 build. Addendum to a0721eb This part is specific for x86 architecture. --- base/system/smss/pagefile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index 0e3b6746746..0aaed6d01ed 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -851,8 +851,12 @@ SmpCreateVolumeDescriptors(VOID) wcscpy(Buffer, L"\\??\\A:\\"); RtlInitUnicodeString(&VolumePath, Buffer); +#if defined(_M_IX86) /* Start with the C drive, except on NEC PC-98 */ StartChar = IsNEC_98 ? L'A' : L'C'; +#else + StartChar = L'C'; +#endif for (Drive = StartChar, DriveDiff = StartChar - L'A'; Drive <= L'Z'; Drive++, DriveDiff++) { /* Skip the disk if it's not in the drive map */

3 years, 9 months

[reactos] 03/03: [SMSS] Use the new IsNEC_98 macro defined for user-mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0721ebdd33f7c32546ed… commit a0721ebdd33f7c32546edd3cfaf966c64860988c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 00:25:05 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 00:29:34 2020 +0100 [SMSS] Use the new IsNEC_98 macro defined for user-mode. --- base/system/smss/pagefile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index 51429a18867..0e3b6746746 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -851,8 +851,8 @@ SmpCreateVolumeDescriptors(VOID) wcscpy(Buffer, L"\\??\\A:\\"); RtlInitUnicodeString(&VolumePath, Buffer); - /* Start with the C drive except on weird Japanese NECs... */ - StartChar = SharedUserData->AlternativeArchitecture ? L'A' : L'C'; + /* Start with the C drive, except on NEC PC-98 */ + StartChar = IsNEC_98 ? L'A' : L'C'; for (Drive = StartChar, DriveDiff = StartChar - L'A'; Drive <= L'Z'; Drive++, DriveDiff++) { /* Skip the disk if it's not in the drive map */

3 years, 9 months

[reactos] 02/03: [NDK][XDK] Add some missing macros for run-time checks of X86 system architecture (NEC support).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9feab8e95afd57e2a973c… commit 9feab8e95afd57e2a973c4ef660dc3db55016552 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 00:17:50 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 00:29:34 2020 +0100 [NDK][XDK] Add some missing macros for run-time checks of X86 system architecture (NEC support). --- sdk/include/ndk/ketypes.h | 23 +++++++++++++++++++++++ sdk/include/xdk/ketypes.h | 1 + sdk/include/xdk/x86/ke.h | 21 +++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 7a8c614a8de..bd9409d5d26 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -221,6 +221,29 @@ typedef CCHAR KPROCESSOR_MODE; // #define SharedUserData ((KUSER_SHARED_DATA *)USER_SHARED_DATA) +/* Macros for user-mode run-time checks of X86 system architecture */ +#ifdef _X86_ + +#ifndef IsNEC_98 +#define IsNEC_98 (SharedUserData->AlternativeArchitecture == NEC98x86) +#endif + +#ifndef IsNotNEC_98 +#define IsNotNEC_98 (SharedUserData->AlternativeArchitecture != NEC98x86) +#endif + +/* User-mode cannot override the architecture */ +#ifndef SetNEC_98 +#define SetNEC_98 +#endif + +/* User-mode cannot override the architecture */ +#ifndef SetNotNEC_98 +#define SetNotNEC_98 +#endif + +#endif + // // Maximum WOW64 Entries in KUSER_SHARED_DATA // diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index d8abc4089c2..23a05de1b68 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -892,6 +892,7 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE { EndAlternatives } ALTERNATIVE_ARCHITECTURE_TYPE; +/* Correctly define these run-time definitions for non X86 machines */ #ifndef _X86_ #ifndef IsNEC_98 diff --git a/sdk/include/xdk/x86/ke.h b/sdk/include/xdk/x86/ke.h index c4be5220fa0..4b66e2a9d37 100644 --- a/sdk/include/xdk/x86/ke.h +++ b/sdk/include/xdk/x86/ke.h @@ -335,4 +335,25 @@ KeGetCurrentProcessorNumber(VOID) return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); } +/* Macros for kernel-mode run-time checks of X86 system architecture */ +#ifdef IsNEC_98 +#undef IsNEC_98 +#endif +#define IsNEC_98 (SharedUserData->AlternativeArchitecture == NEC98x86) + +#ifdef IsNotNEC_98 +#undef IsNotNEC_98 +#endif +#define IsNotNEC_98 (SharedUserData->AlternativeArchitecture != NEC98x86) + +#ifdef SetNEC_98 +#undef SetNEC_98 +#endif +#define SetNEC_98 (SharedUserData->AlternativeArchitecture = NEC98x86) + +#ifdef SetNotNEC_98 +#undef SetNotNEC_98 +#endif +#define SetNotNEC_98 (SharedUserData->AlternativeArchitecture = StandardDesign) + $endif (_NTDDK_)

3 years, 9 months

[reactos] 01/03: [XDK] Minor formatting; remove some extra newlines at end of files.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c295fb95e9da150da4b4a… commit c295fb95e9da150da4b4ad5f0db71ed087c76e40 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 26 00:07:40 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 26 00:29:20 2020 +0100 [XDK] Minor formatting; remove some extra newlines at end of files. --- sdk/include/xdk/arm/ke.h | 4 +--- sdk/include/xdk/ia64/ke.h | 1 - sdk/include/xdk/mips/ke.h | 2 +- sdk/include/xdk/ppc/ke.h | 3 +-- sdk/include/xdk/x86/ke.h | 4 ---- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sdk/include/xdk/arm/ke.h b/sdk/include/xdk/arm/ke.h index 74e5bdda2c3..dc344b30c11 100644 --- a/sdk/include/xdk/arm/ke.h +++ b/sdk/include/xdk/arm/ke.h @@ -347,9 +347,7 @@ KeGetPcr( #if (NTDDI_VERSION < NTDDI_WIN7) || !defined(NT_PROCESSOR_GROUPS) FORCEINLINE ULONG -KeGetCurrentProcessorNumber( - VOID) - +KeGetCurrentProcessorNumber(VOID) { return *((PUCHAR)KeGetPcr() + 0x580); } diff --git a/sdk/include/xdk/ia64/ke.h b/sdk/include/xdk/ia64/ke.h index 27ff06ad3f0..7a8e7a45809 100644 --- a/sdk/include/xdk/ia64/ke.h +++ b/sdk/include/xdk/ia64/ke.h @@ -35,4 +35,3 @@ NTAPI KeGetCurrentThread(VOID); $endif - diff --git a/sdk/include/xdk/mips/ke.h b/sdk/include/xdk/mips/ke.h index 31384ad4d27..d3d8820e2f8 100644 --- a/sdk/include/xdk/mips/ke.h +++ b/sdk/include/xdk/mips/ke.h @@ -1,4 +1,5 @@ $if (_WDMDDK_) +/** Kernel definitions for MIPS **/ #error MIPS Headers are totally incorrect // @@ -63,4 +64,3 @@ NTAPI KeRaiseIrqlToSynchLevel(VOID); $endif - diff --git a/sdk/include/xdk/ppc/ke.h b/sdk/include/xdk/ppc/ke.h index b3a81bc7aa9..d7101618a95 100644 --- a/sdk/include/xdk/ppc/ke.h +++ b/sdk/include/xdk/ppc/ke.h @@ -1,4 +1,5 @@ $if (_WDMDDK_) +/** Kernel definitions for PPC **/ /* Interrupt request levels */ #define PASSIVE_LEVEL 0 @@ -103,5 +104,3 @@ NTAPI KeRaiseIrqlToSynchLevel(VOID); $endif - - diff --git a/sdk/include/xdk/x86/ke.h b/sdk/include/xdk/x86/ke.h index f7ef92c2972..c4be5220fa0 100644 --- a/sdk/include/xdk/x86/ke.h +++ b/sdk/include/xdk/x86/ke.h @@ -336,7 +336,3 @@ KeGetCurrentProcessorNumber(VOID) } $endif (_NTDDK_) - - - -

3 years, 9 months

[reactos] 01/01: [SETUPLIB] Add two hacks in partlist.c for temporarily setting consistently the disk partition style.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a59cecd89ddfd7e4b84e5… commit a59cecd89ddfd7e4b84e57032538fd915a2d468d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 24 04:34:56 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 24 04:37:52 2020 +0100 [SETUPLIB] Add two hacks in partlist.c for temporarily setting consistently the disk partition style. Add two hacks in UpdateDiskLayout() and WritePartitions() so that the disk partition style is consistently set to a known value MBR, especially when that disk was previously new and uninitialized (RAW). A proper fix will be developed later when support for GPT is added. --- base/setup/lib/utils/partlist.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 6682f0a36a8..008dd9947a9 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -2881,6 +2881,9 @@ UpdateDiskLayout( } } + // HACK: See the FIXMEs in WritePartitions(): (Re)set the PartitionStyle to MBR. + DiskEntry->DiskStyle = PARTITION_STYLE_MBR; + DiskEntry->Dirty = TRUE; #ifdef DUMP_PARTITION_TABLE @@ -3926,6 +3929,9 @@ WritePartitions( // DiskEntry->NoMbr was TRUE (instead of NewDisk). // + // HACK: Parts of FIXMEs described above: (Re)set the PartitionStyle to MBR. + DiskEntry->DiskStyle = PARTITION_STYLE_MBR; + /* The layout has been successfully updated, the disk is not dirty anymore */ DiskEntry->Dirty = FALSE;

3 years, 9 months

[reactos] 02/02: [SETUPLIB][USETUP] Cleanup some code in USETUP. Redefine FormatPartition() and ChkdskPartition() helpers so that they wrap the needed init steps for formatting/chkdsk'ing.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05cd77028cad3c198dba9… commit 05cd77028cad3c198dba936cf9e74a9a578db5b9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 24 02:26:52 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 24 03:24:41 2020 +0100 [SETUPLIB][USETUP] Cleanup some code in USETUP. Redefine FormatPartition() and ChkdskPartition() helpers so that they wrap the needed init steps for formatting/chkdsk'ing. These helpers now accept a PPARTENTRY, together with the usual formatting/chkdsk parameters. The helpers now determine the actual NT path to use, and can perform the init steps on the partition before performing the actual operation. In particular, FormatPartition() is now made GPT-compliant. The partition type retrieved by FileSystemToMBRPartitionType() is now used as a hint for choosing FAT32 over FAT12/16, and only in the case of a MBR partition that is *NOT* a recognized OEM partition, it is used for updating the corresponding partition type. (OEM partitions must retain their original type.) The OEM partition types we (and NT) can recognize are specified e.g. in the Microsoft Open-Specification [MS-DMRP] Appendix B https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-dmrp/5f5043… Introduce an IsOEMPartition() macro to help checking for these types (its name is based on the Is***Partition() macros from ntdddisk.h, and from a dmdskmgr.dll export of similar name). --- base/setup/lib/fsutil.c | 132 +++++++++++++++++++++++++++++--- base/setup/lib/fsutil.h | 22 ++++-- base/setup/lib/utils/partlist.h | 19 +++++ base/setup/usetup/chkdsk.c | 23 +++--- base/setup/usetup/chkdsk.h | 8 +- base/setup/usetup/format.c | 23 +++--- base/setup/usetup/format.h | 4 +- base/setup/usetup/usetup.c | 164 +++++++++++----------------------------- 8 files changed, 230 insertions(+), 165 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index f71acef487e..c244111a381 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -666,19 +666,90 @@ Quit: // Formatting routines // -BOOLEAN -PreparePartitionForFormatting( - IN struct _PARTENTRY* PartEntry, - IN PCWSTR FileSystemName) +NTSTATUS +ChkdskPartition( + IN PPARTENTRY PartEntry, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback) { + NTSTATUS Status; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; + // UNICODE_STRING PartitionRootPath; + WCHAR PartitionRootPath[MAX_PATH]; // PathBuffer + + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); + + /* HACK: Do not try to check a partition with an unknown filesystem */ + if (!*PartEntry->FileSystem) + { + PartEntry->NeedsCheck = FALSE; + return STATUS_SUCCESS; + } + + /* Set PartitionRootPath */ + RtlStringCchPrintfW(PartitionRootPath, ARRAYSIZE(PartitionRootPath), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + DPRINT("PartitionRootPath: %S\n", PartitionRootPath); + + /* Check the partition */ + Status = ChkdskFileSystem(PartitionRootPath, + PartEntry->FileSystem, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + Callback); + if (!NT_SUCCESS(Status)) + return Status; + + PartEntry->NeedsCheck = FALSE; + return STATUS_SUCCESS; +} + +NTSTATUS +FormatPartition( + IN PPARTENTRY PartEntry, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback) +{ + NTSTATUS Status; + PDISKENTRY DiskEntry = PartEntry->DiskEntry; UCHAR PartitionType; + // UNICODE_STRING PartitionRootPath; + WCHAR PartitionRootPath[MAX_PATH]; // PathBuffer + + ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); if (!FileSystemName || !*FileSystemName) { DPRINT1("No file system specified?\n"); - return FALSE; + return STATUS_UNRECOGNIZED_VOLUME; } + /* + * Prepare the partition for formatting (for MBR disks, reset the + * partition type), and adjust the filesystem name in case of FAT + * vs. FAT32, depending on the geometry of the partition. + */ + +// FIXME: Do this only if QuickFormat == FALSE? What about FAT handling? + + /* + * Retrieve a partition type as a hint only. It will be used to determine + * whether to actually use FAT12/16 or FAT32 filesystem, depending on the + * geometry of the partition. If the partition resides on an MBR disk, + * the partition style will be reset to this value as well, unless the + * partition is OEM. + */ PartitionType = FileSystemToMBRPartitionType(FileSystemName, PartEntry->StartSector.QuadPart, PartEntry->SectorCount.QuadPart); @@ -686,33 +757,70 @@ PreparePartitionForFormatting( { /* Unknown file system */ DPRINT1("Unknown file system '%S'\n", FileSystemName); - return FALSE; + return STATUS_UNRECOGNIZED_VOLUME; } - SetMBRPartitionType(PartEntry, PartitionType); + /* Reset the MBR partition type, unless this is an OEM partition */ + if (DiskEntry->DiskStyle == PARTITION_STYLE_MBR) + { + if (!IsOEMPartition(PartEntry->PartitionType)) + SetMBRPartitionType(PartEntry, PartitionType); + } /* * Adjust the filesystem name in case of FAT vs. FAT32, according to - * the type of partition set by FileSystemToPartitionType(). + * the type of partition returned by FileSystemToMBRPartitionType(). */ if (wcsicmp(FileSystemName, L"FAT") == 0) { - if ((/*PartEntry->*/PartitionType == PARTITION_FAT32) || - (/*PartEntry->*/PartitionType == PARTITION_FAT32_XINT13)) + if ((PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32_XINT13)) { FileSystemName = L"FAT32"; } } + /* Commit the partition changes to the disk */ + Status = WritePartitions(DiskEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WritePartitions(disk %lu) failed, Status 0x%08lx\n", + DiskEntry->DiskNumber, Status); + return STATUS_PARTITION_FAILURE; + } + + /* Set PartitionRootPath */ + RtlStringCchPrintfW(PartitionRootPath, ARRAYSIZE(PartitionRootPath), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + DPRINT("PartitionRootPath: %S\n", PartitionRootPath); + + /* Format the partition */ + Status = FormatFileSystem(PartitionRootPath, + FileSystemName, + MediaFlag, + Label, + QuickFormat, + ClusterSize, + Callback); + if (!NT_SUCCESS(Status)) + return Status; + // -// FIXME: Do this now, or after the partition was actually formatted?? +// TODO: Here, call a partlist.c function that update the actual +// FS name and the label fields of the volume. // + PartEntry->FormatState = Formatted; + /* Set the new partition's file system proper */ RtlStringCbCopyW(PartEntry->FileSystem, sizeof(PartEntry->FileSystem), FileSystemName); - return TRUE; + PartEntry->New = FALSE; + + return STATUS_SUCCESS; } /* EOF */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 7696be6dec8..1056cfb658d 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -101,11 +101,23 @@ InstallBtrfsBootCode( // Formatting routines // -struct _PARTENTRY; // Defined in partlist.h +NTSTATUS +ChkdskPartition( + IN PPARTENTRY PartEntry, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PFMIFSCALLBACK Callback); -BOOLEAN -PreparePartitionForFormatting( - IN struct _PARTENTRY* PartEntry, - IN PCWSTR FileSystemName); +NTSTATUS +FormatPartition( + IN PPARTENTRY PartEntry, + IN PCWSTR FileSystemName, + IN FMIFS_MEDIA_FLAG MediaFlag, + IN PCWSTR Label, + IN BOOLEAN QuickFormat, + IN ULONG ClusterSize, + IN PFMIFSCALLBACK Callback); /* EOF */ diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 4dd108ba15c..2669b9ecdef 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -20,6 +20,25 @@ typedef struct _PARTITION_TYPE extern PARTITION_TYPE PartitionTypes[NUM_PARTITION_TYPE_ENTRIES]; +/* EXTRA HANDFUL MACROS *****************************************************/ + +// NOTE: They should be moved into some global header. + +/* OEM MBR partition types recognized by NT (see [MS-DMRP] Appendix B) */ +#define PARTITION_EISA 0x12 // EISA partition +#define PARTITION_HIBERNATION 0x84 // Hibernation partition for laptops +#define PARTITION_DIAGNOSTIC 0xA0 // Diagnostic partition on some Hewlett-Packard (HP) notebooks +#define PARTITION_DELL 0xDE // Dell partition +#define PARTITION_IBM 0xFE // IBM Initial Microprogram Load (IML) partition + +#define IsOEMPartition(PartitionType) \ + ( ((PartitionType) == PARTITION_EISA) || \ + ((PartitionType) == PARTITION_HIBERNATION) || \ + ((PartitionType) == PARTITION_DIAGNOSTIC) || \ + ((PartitionType) == PARTITION_DELL) || \ + ((PartitionType) == PARTITION_IBM) ) + + /* PARTITION UTILITY FUNCTIONS **********************************************/ typedef enum _FORMATSTATE diff --git a/base/setup/usetup/chkdsk.c b/base/setup/usetup/chkdsk.c index 615e7022c0e..b302dc94581 100644 --- a/base/setup/usetup/chkdsk.c +++ b/base/setup/usetup/chkdsk.c @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/chkdsk.c * PURPOSE: Filesystem chkdsk support functions @@ -52,11 +53,9 @@ ChkdskCallback( return TRUE; } - NTSTATUS -ChkdskPartition( - IN PUNICODE_STRING DriveRoot, - IN PCWSTR FileSystemName) +DoChkdsk( + IN PPARTENTRY PartEntry) { NTSTATUS Status; @@ -71,13 +70,13 @@ ChkdskPartition( ProgressSetStepCount(ChkdskProgressBar, 100); - Status = ChkdskFileSystem_UStr(DriveRoot, - FileSystemName, - TRUE, /* FixErrors */ - FALSE, /* Verbose */ - TRUE, /* CheckOnlyIfDirty */ - FALSE, /* ScanDrive */ - ChkdskCallback); /* Callback */ + // TODO: Think about which values could be defaulted... + Status = ChkdskPartition(PartEntry, + TRUE, /* FixErrors */ + FALSE, /* Verbose */ + TRUE, /* CheckOnlyIfDirty */ + FALSE, /* ScanDrive */ + ChkdskCallback); /* Callback */ DestroyProgressBar(ChkdskProgressBar); ChkdskProgressBar = NULL; diff --git a/base/setup/usetup/chkdsk.h b/base/setup/usetup/chkdsk.h index 3207d2f7f69..594c9b13b61 100644 --- a/base/setup/usetup/chkdsk.h +++ b/base/setup/usetup/chkdsk.h @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/chkdsk.h * PURPOSE: Filesystem chkdsk support functions @@ -26,8 +27,7 @@ #pragma once NTSTATUS -ChkdskPartition( - IN PUNICODE_STRING DriveRoot, - IN PCWSTR FileSystemName); +DoChkdsk( + IN PPARTENTRY PartEntry); /* EOF */ diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index 4abb464ba3e..cc0603ed07b 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -16,7 +16,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup * FILE: base/setup/usetup/format.c * PURPOSE: Filesystem format support functions @@ -87,10 +88,9 @@ FormatCallback( return TRUE; } - NTSTATUS -FormatPartition( - IN PUNICODE_STRING DriveRoot, +DoFormat( + IN PPARTENTRY PartEntry, IN PCWSTR FileSystemName, IN BOOLEAN QuickFormat) { @@ -107,13 +107,14 @@ FormatPartition( ProgressSetStepCount(FormatProgressBar, 100); - Status = FormatFileSystem_UStr(DriveRoot, - FileSystemName, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - FormatCallback); /* Callback */ + // TODO: Think about which values could be defaulted... + Status = FormatPartition(PartEntry, + FileSystemName, + FMIFS_HARDDISK, /* MediaFlag */ + NULL, /* Label */ + QuickFormat, /* QuickFormat */ + 0, /* ClusterSize */ + FormatCallback); /* Callback */ DestroyProgressBar(FormatProgressBar); FormatProgressBar = NULL; diff --git a/base/setup/usetup/format.h b/base/setup/usetup/format.h index b84ae57559d..80c5a85039c 100644 --- a/base/setup/usetup/format.h +++ b/base/setup/usetup/format.h @@ -27,8 +27,8 @@ #pragma once NTSTATUS -FormatPartition( - IN PUNICODE_STRING DriveRoot, +DoFormat( + IN PPARTENTRY PartEntry, IN PCWSTR FileSystemName, IN BOOLEAN QuickFormat); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 01907778721..e8de2666026 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2766,7 +2766,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) * partition on the system. Otherwise if we install on a removable disk * use the install partition as the system partition. */ - // TODO: Include that logic inside the FindSupportedSystemPartition() function? if (InstallPartition->DiskEntry->MediaType == FixedMedia) { SystemPartition = FindSupportedSystemPartition(PartitionList, @@ -2949,17 +2948,11 @@ SelectFileSystemPage(PINPUT_RECORD Ir) */ if (!SystemPartition->IsPartitioned) { - // if (IsUnattendedSetup) - { - CreatePrimaryPartition(PartitionList, - SystemPartition, - 0LL, // SystemPartition->SectorCount.QuadPart, - TRUE); - ASSERT(SystemPartition->IsPartitioned); - } - // else - { - } + CreatePrimaryPartition(PartitionList, + SystemPartition, + 0LL, // SystemPartition->SectorCount.QuadPart, + TRUE); + ASSERT(SystemPartition->IsPartitioned); } /* Set it as such */ @@ -3363,16 +3356,9 @@ FormatPartitionPage(PINPUT_RECORD Ir) PPARTENTRY PartEntry; PDISKENTRY DiskEntry; PFILE_SYSTEM_ITEM SelectedFileSystem; - UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; -#ifndef NDEBUG - ULONG Line; - ULONG i; - PPARTITION_INFORMATION PartitionInfo; -#endif - DPRINT("FormatPartitionPage()\n"); MUIDisplayPage(FORMAT_PARTITION_PAGE); @@ -3413,82 +3399,40 @@ FormatPartitionPage(PINPUT_RECORD Ir) /* * Remove the "Press ENTER to continue" message prompt when the ENTER * key is pressed as the user wants to begin the partition formatting. - */ + */ MUIClearStyledText(FORMAT_PARTITION_PAGE, TEXT_ID_FORMAT_PROMPT, TEXT_TYPE_REGULAR); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (!PreparePartitionForFormatting(PartEntry, SelectedFileSystem->FileSystem)) + /* Format the partition */ + Status = DoFormat(PartEntry, + SelectedFileSystem->FileSystem, + SelectedFileSystem->QuickFormat); + if (Status == STATUS_PARTITION_FAILURE) { - /* FIXME: show an error dialog */ + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); /* Reset the filesystem list */ ResetFileSystemList(); - return QUIT_PAGE; } - -#ifndef NDEBUG - CONSOLE_PrintTextXY(6, 12, - "Cylinders: %I64u Tracks/Cyl: %lu Sectors/Trk: %lu Bytes/Sec: %lu %c", - DiskEntry->Cylinders, - DiskEntry->TracksPerCylinder, - DiskEntry->SectorsPerTrack, - DiskEntry->BytesPerSector, - DiskEntry->Dirty ? '*' : ' '); - - Line = 13; - - for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++) - { - PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i]; - - CONSOLE_PrintTextXY(6, Line, - "%2u: %2lu %c %12I64u %12I64u %02x", - i, - PartitionInfo->PartitionNumber, - PartitionInfo->BootIndicator ? 'A' : '-', - PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector, - PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector, - PartitionInfo->PartitionType); - Line++; - } -#endif - - /* Commit the partition changes to the disk */ - Status = WritePartitions(DiskEntry); - if (!NT_SUCCESS(Status)) + else if (Status == STATUS_UNRECOGNIZED_VOLUME) { - DPRINT1("WritePartitions(disk %lu) failed, Status 0x%08lx\n", - DiskEntry->DiskNumber, Status); - - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + /* FIXME: show an error dialog */ + // MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); /* Reset the filesystem list */ ResetFileSystemList(); - return QUIT_PAGE; } - - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); - - /* Format the partition */ - Status = FormatPartition(&PartitionRootPath, - PartEntry->FileSystem, - SelectedFileSystem->QuickFormat); - if (Status == STATUS_NOT_SUPPORTED) + else if (Status == STATUS_NOT_SUPPORTED) { - sprintf(Buffer, - "Setup is currently unable to format a partition in %S.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - SelectedFileSystem->FileSystem /* PartEntry->FileSystem */); + RtlStringCbPrintfA(Buffer, + sizeof(Buffer), + "Setup is currently unable to format a partition in %S.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + SelectedFileSystem->FileSystem); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -3520,28 +3464,20 @@ FormatPartitionPage(PINPUT_RECORD Ir) } else if (!NT_SUCCESS(Status)) { + /** HACK!! **/ + RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); /* Reset the filesystem list */ ResetFileSystemList(); - return QUIT_PAGE; } -// -// TODO: Here, call a partlist.c function that update the actual FS name -// and the label fields of the volume. -// - PartEntry->FormatState = Formatted; - // PartEntry->FileSystem = FileSystem; - PartEntry->New = FALSE; - -#ifndef NDEBUG - CONSOLE_SetStatusText(" Done. Press any key ..."); - CONSOLE_ConInKey(Ir); -#endif - return SELECT_FILE_SYSTEM_PAGE; } } @@ -3567,10 +3503,7 @@ static PAGE_NUMBER CheckFileSystemPage(PINPUT_RECORD Ir) { NTSTATUS Status; - PDISKENTRY DiskEntry; PPARTENTRY PartEntry; - UNICODE_STRING PartitionRootPath; - WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; if (PartitionList == NULL) @@ -3579,7 +3512,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - if (!GetNextUncheckedPartition(PartitionList, &DiskEntry, &PartEntry)) + if (!GetNextUncheckedPartition(PartitionList, NULL, &PartEntry)) { return INSTALL_DIRECTORY_PAGE; } @@ -3587,29 +3520,13 @@ CheckFileSystemPage(PINPUT_RECORD Ir) ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); - CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystem: %S\n", PartEntry->PartitionType, (*PartEntry->FileSystem ? PartEntry->FileSystem : L"n/a")); - /* HACK: Do not try to check a partition with an unknown filesystem */ - if (!*PartEntry->FileSystem) - { - PartEntry->NeedsCheck = FALSE; - return CHECK_FILE_SYSTEM_PAGE; - } - - /* Set PartitionRootPath */ - RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"\\Device\\Harddisk%lu\\Partition%lu", - DiskEntry->DiskNumber, - PartEntry->PartitionNumber); - RtlInitUnicodeString(&PartitionRootPath, PathBuffer); - DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); - /* Check the partition */ - Status = ChkdskPartition(&PartitionRootPath, PartEntry->FileSystem); + Status = DoChkdsk(PartEntry); if (Status == STATUS_NOT_SUPPORTED) { /* @@ -3650,8 +3567,13 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (!NT_SUCCESS(Status)) { - DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); - sprintf(Buffer, "ChkDsk detected some disk errors.\n(Status 0x%08lx).\n", Status); + DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", Status); + + RtlStringCbPrintfA(Buffer, + sizeof(Buffer), + "ChkDsk detected some disk errors.\n(Status 0x%08lx).\n", + Status); + PopupError(Buffer, MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER); @@ -4307,7 +4229,8 @@ BootLoaderPage(PINPUT_RECORD Ir) CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - ASSERT(SystemPartition->IsPartitioned && SystemPartition->PartitionNumber != 0); + /* We must have a supported system partition by now */ + ASSERT(SystemPartition && SystemPartition->IsPartitioned && SystemPartition->PartitionNumber != 0); RtlFreeUnicodeString(&USetupData.SystemRootPath); RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), @@ -4806,7 +4729,7 @@ ProgressCountdown( TimeElapsed = NtGetTickCount() - StartTime; if (TimeElapsed < TimerDiv) { - /* Convert the time to NT Format */ + /* Convert the time to NT format */ Timeout.QuadPart = (TimerDiv - TimeElapsed) * -10000LL; Status = NtWaitForSingleObject(StdInput, FALSE, &Timeout); } @@ -4987,7 +4910,6 @@ RunUSetup(VOID) CONSOLE_Flush(); // CONSOLE_SetUnderlinedTextXY(4, 3, " ReactOS " KERNEL_VERSION_STR " Setup "); - // CONSOLE_Flush(); switch (Page) { @@ -5041,6 +4963,7 @@ RunUSetup(VOID) Page = LayoutSettingsPage(&Ir); break; + /* Partitioning pages */ case SELECT_PARTITION_PAGE: Page = SelectPartitionPage(&Ir); break; @@ -5065,6 +4988,7 @@ RunUSetup(VOID) Page = DeletePartitionPage(&Ir); break; + /* Filesystem partition operations pages */ case SELECT_FILE_SYSTEM_PAGE: Page = SelectFileSystemPage(&Ir); break; @@ -5077,6 +5001,7 @@ RunUSetup(VOID) Page = CheckFileSystemPage(&Ir); break; + /* Installation pages */ case INSTALL_DIRECTORY_PAGE: Page = InstallDirectoryPage(&Ir); break; @@ -5093,6 +5018,7 @@ RunUSetup(VOID) Page = RegistryPage(&Ir); break; + /* Bootloader installation pages */ case BOOT_LOADER_PAGE: Page = BootLoaderPage(&Ir); break;

3 years, 9 months

[reactos] 01/02: [SETUPLIB] Make InferFileSystem() compatible for both MBR and GPT disks. Simplify the FSREC interface a bit.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9735a8379fbdc315fb7df… commit 9735a8379fbdc315fb7df97b2d3c3a49b068a912 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 24 01:49:41 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 24 03:24:36 2020 +0100 [SETUPLIB] Make InferFileSystem() compatible for both MBR and GPT disks. Simplify the FSREC interface a bit. Instead of providing an MBR partition type to InferFileSystem(), make it call IOCTL_DISK_GET_PARTITION_INFO(_EX) to determine whether the partition pointed by the path/handle is MBR or GPT. Then, only if it's MBR, we retrieve its partition type in order to "guess" an adequate file system name, in case the latter was not recognized already via regular ways (via GetFileSystemName() / NtQueryVolumeInformationFile()). - Remove the GetFileSystemNameByHandle() and InferFileSystemByHandle() functions. Instead, make the other GetFileSystemName*() and InferFileSystem*() functions accept a HANDLE as an alternative to the already-existing partition path string. These parameters are exclusive to each other. - Rename SetPartitionType() -> SetMBRPartitionType(), and FileSystemToPartitionType() -> FileSystemToMBRPartitionType() in order to really clarify what they do (since this code is meant for MBR partitions only, not GPT ones). --- base/setup/lib/fsutil.c | 8 +- base/setup/lib/utils/fsrec.c | 276 +++++++++++++++++++++++++++------------- base/setup/lib/utils/fsrec.h | 29 ++--- base/setup/lib/utils/partlist.c | 18 ++- base/setup/lib/utils/partlist.h | 2 +- 5 files changed, 214 insertions(+), 119 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 3d49be888d7..f71acef487e 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -679,9 +679,9 @@ PreparePartitionForFormatting( return FALSE; } - PartitionType = FileSystemToPartitionType(FileSystemName, - &PartEntry->StartSector, - &PartEntry->SectorCount); + PartitionType = FileSystemToMBRPartitionType(FileSystemName, + PartEntry->StartSector.QuadPart, + PartEntry->SectorCount.QuadPart); if (PartitionType == PARTITION_ENTRY_UNUSED) { /* Unknown file system */ @@ -689,7 +689,7 @@ PreparePartitionForFormatting( return FALSE; } - SetPartitionType(PartEntry, PartitionType); + SetMBRPartitionType(PartEntry, PartitionType); /* * Adjust the filesystem name in case of FAT vs. FAT32, according to diff --git a/base/setup/lib/utils/fsrec.c b/base/setup/lib/utils/fsrec.c index 918e2fb69a3..0b42113a805 100644 --- a/base/setup/lib/utils/fsrec.c +++ b/base/setup/lib/utils/fsrec.c @@ -19,26 +19,27 @@ /* FUNCTIONS ****************************************************************/ /* NOTE: Ripped & adapted from base/system/autochk/autochk.c */ +static inline NTSTATUS -GetFileSystemNameByHandle( +GetFileSystemNameWorker( IN HANDLE PartitionHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { NTSTATUS Status; - IO_STATUS_BLOCK IoStatusBlock; UCHAR Buffer[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; PFILE_FS_ATTRIBUTE_INFORMATION FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; /* Retrieve the FS attributes */ Status = NtQueryVolumeInformationFile(PartitionHandle, - &IoStatusBlock, + IoStatusBlock, FileFsAttribute, sizeof(Buffer), FileFsAttributeInformation); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQueryVolumeInformationFile failed, Status 0x%08lx\n", Status); + DPRINT1("NtQueryVolumeInformationFile() failed, Status 0x%08lx\n", Status); return Status; } @@ -52,69 +53,97 @@ GetFileSystemNameByHandle( NTSTATUS GetFileSystemName_UStr( - IN PUNICODE_STRING PartitionPath, + IN PUNICODE_STRING PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE PartitionHandle; IO_STATUS_BLOCK IoStatusBlock; - /* Open the partition */ - InitializeObjectAttributes(&ObjectAttributes, - PartitionPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&PartitionHandle, - FILE_GENERIC_READ /* | SYNCHRONIZE */, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); - if (!NT_SUCCESS(Status)) + if (PartitionPath && PartitionHandle) + return STATUS_INVALID_PARAMETER; + + /* Open the partition if a path has been given; + * otherwise just use the provided handle. */ + if (PartitionPath) { - DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", PartitionPath, Status); - return Status; + InitializeObjectAttributes(&ObjectAttributes, + PartitionPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_GENERIC_READ /* | SYNCHRONIZE */, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", + PartitionPath, Status); + return Status; + } } /* Retrieve the FS attributes */ - Status = GetFileSystemNameByHandle(PartitionHandle, FileSystemName, FileSystemNameSize); + Status = GetFileSystemNameWorker(PartitionHandle, + &IoStatusBlock, + FileSystemName, + FileSystemNameSize); if (!NT_SUCCESS(Status)) { - DPRINT1("GetFileSystemNameByHandle() failed for partition '%wZ', Status 0x%08lx\n", - PartitionPath, Status); + DPRINT1("GetFileSystemName() failed for partition '%wZ' (0x%p), Status 0x%08lx\n", + PartitionPath, PartitionHandle, Status); } - /* Close the partition */ - NtClose(PartitionHandle); + if (PartitionPath) + { + /* Close the partition */ + NtClose(PartitionHandle); + } return Status; } NTSTATUS GetFileSystemName( - IN PCWSTR Partition, + IN PCWSTR PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { - UNICODE_STRING PartitionPath; + UNICODE_STRING PartitionPathU; + + if (PartitionPath && PartitionHandle) + return STATUS_INVALID_PARAMETER; + + if (PartitionPath) + RtlInitUnicodeString(&PartitionPathU, PartitionPath); - RtlInitUnicodeString(&PartitionPath, Partition); - return GetFileSystemName_UStr(&PartitionPath, + return GetFileSystemName_UStr(PartitionPath ? &PartitionPathU : NULL, + PartitionPath ? NULL : PartitionHandle, FileSystemName, FileSystemNameSize); } +static inline NTSTATUS -InferFileSystemByHandle( +InferFileSystemWorker( IN HANDLE PartitionHandle, - IN UCHAR PartitionType, + OUT PIO_STATUS_BLOCK IoStatusBlock, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { - NTSTATUS Status; + NTSTATUS Status, Status2; + union + { + PARTITION_INFORMATION_EX InfoEx; + PARTITION_INFORMATION Info; + } PartInfo; + UCHAR PartitionType; if (FileSystemNameSize < sizeof(WCHAR)) return STATUS_BUFFER_TOO_SMALL; @@ -122,25 +151,81 @@ InferFileSystemByHandle( *FileSystemName = L'\0'; /* Try to infer a file system using NT file system recognition */ - Status = GetFileSystemNameByHandle(PartitionHandle, - FileSystemName, - FileSystemNameSize); + Status = GetFileSystemName_UStr(NULL, PartitionHandle, + FileSystemName, + FileSystemNameSize); if (NT_SUCCESS(Status) && *FileSystemName) - { goto Quit; + + /* + * Check whether the partition is MBR, and if so, retrieve its MBR + * partition type and try to infer a preferred file system for it. + */ + + // NOTE: Use Status2 in order not to clobber the original Status. + Status2 = NtDeviceIoControlFile(PartitionHandle, + NULL, + NULL, + NULL, + IoStatusBlock, + IOCTL_DISK_GET_PARTITION_INFO_EX, + NULL, + 0, + &PartInfo.InfoEx, + sizeof(PartInfo.InfoEx)); + if (!NT_SUCCESS(Status2)) + { + DPRINT1("IOCTL_DISK_GET_PARTITION_INFO_EX failed (Status %lx)\n", Status2); + + if (Status2 != STATUS_INVALID_DEVICE_REQUEST) + goto Quit; + + /* + * We could have failed because the partition is on a dynamic + * MBR or GPT data disk, so retry with the non-EX IOCTL. + */ + Status2 = NtDeviceIoControlFile(PartitionHandle, + NULL, + NULL, + NULL, + IoStatusBlock, + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartInfo.Info, + sizeof(PartInfo.Info)); + if (!NT_SUCCESS(Status2)) + { + /* We failed again, bail out */ + DPRINT1("IOCTL_DISK_GET_PARTITION_INFO failed (Status %lx)\n", Status2); + goto Quit; + } + + /* The partition is supposed to be on an MBR disk; retrieve its type */ + PartitionType = PartInfo.Info.PartitionType; + } + else + { + /* We succeeded; retrieve the partition type only if it is on an MBR disk */ + if (PartInfo.InfoEx.PartitionStyle != PARTITION_STYLE_MBR) + { + /* Disk is not MBR, bail out */ + goto Quit; + } + PartitionType = PartInfo.InfoEx.Mbr.PartitionType; } /* - * Try to infer a preferred file system for this partition, given its ID. + * Given an MBR partition type, try to infer a preferred file system. * - * WARNING: This is partly a hack, since partitions with the same ID can - * be formatted with different file systems: for example, usual Linux + * WARNING: This is partly a hack, since partitions with the same type + * can be formatted with different file systems: for example, usual Linux * partitions that are formatted in EXT2/3/4, ReiserFS, etc... have the - * same partition ID 0x83. + * same partition type 0x83. * * The proper fix is to make a function that detects the existing FS - * from a given partition (not based on the partition ID). - * On the contrary, for unformatted partitions with a given ID, the + * from a given partition (not based on the partition type). + * On the contrary, for unformatted partitions with a given type, the * following code is OK. */ if ((PartitionType == PARTITION_FAT_12) || @@ -170,93 +255,110 @@ InferFileSystemByHandle( } Quit: - if (*FileSystemName) + if (*FileSystemName && wcsicmp(FileSystemName, L"NTFS") == 0) { // WARNING: We cannot write on this FS yet! - if (PartitionType == PARTITION_IFS) - { - DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", - FileSystemName); - } + DPRINT1("Recognized file system '%S' that doesn't have write support yet!\n", + FileSystemName); } - DPRINT1("InferFileSystem -- PartitionType: 0x%02X ; FileSystem (guessed): %S\n", - PartitionType, *FileSystemName ? FileSystemName : L"None"); - return Status; } NTSTATUS InferFileSystem( - IN PCWSTR Partition, - IN UCHAR PartitionType, + IN PCWSTR PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize) { NTSTATUS Status; - UNICODE_STRING PartitionPath; + UNICODE_STRING PartitionPathU; OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE PartitionHandle; IO_STATUS_BLOCK IoStatusBlock; - /* Open the partition */ - RtlInitUnicodeString(&PartitionPath, Partition); - InitializeObjectAttributes(&ObjectAttributes, - &PartitionPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenFile(&PartitionHandle, - FILE_GENERIC_READ /* | SYNCHRONIZE */, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); - if (!NT_SUCCESS(Status)) + if (PartitionPath && PartitionHandle) + return STATUS_INVALID_PARAMETER; + + /* Open the partition if a path has been given; + * otherwise just use the provided handle. */ + if (PartitionPath) { - DPRINT1("Failed to open partition '%wZ', Status 0x%08lx\n", &PartitionPath, Status); - return Status; + RtlInitUnicodeString(&PartitionPathU, PartitionPath); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&PartitionHandle, + FILE_GENERIC_READ /* | SYNCHRONIZE */, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + 0 /* FILE_SYNCHRONOUS_IO_NONALERT */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open partition '%S', Status 0x%08lx\n", + PartitionPath, Status); + return Status; + } } /* Retrieve the FS */ - Status = InferFileSystemByHandle(PartitionHandle, - PartitionType, - FileSystemName, - FileSystemNameSize); + Status = InferFileSystemWorker(PartitionHandle, + &IoStatusBlock, + FileSystemName, + FileSystemNameSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InferFileSystem() failed for partition '%S' (0x%p), Status 0x%08lx\n", + PartitionPath, PartitionHandle, Status); + } + else + { + DPRINT1("InferFileSystem(): FileSystem (guessed): %S\n", + *FileSystemName ? FileSystemName : L"None"); + } - /* Close the partition */ - NtClose(PartitionHandle); + if (PartitionPath) + { + /* Close the partition */ + NtClose(PartitionHandle); + } return Status; } UCHAR -FileSystemToPartitionType( +FileSystemToMBRPartitionType( IN PCWSTR FileSystem, - IN PULARGE_INTEGER StartSector, - IN PULARGE_INTEGER SectorCount) + IN ULONGLONG StartSector, + IN ULONGLONG SectorCount) { - ASSERT(FileSystem && StartSector && SectorCount); + ASSERT(FileSystem); + + if (SectorCount == 0) + return PARTITION_ENTRY_UNUSED; if (wcsicmp(FileSystem, L"FAT") == 0 || wcsicmp(FileSystem, L"FAT32") == 0 || wcsicmp(FileSystem, L"RAW") == 0) { - if (SectorCount->QuadPart < 8192) + if (SectorCount < 8192ULL) { /* FAT12 CHS partition (disk is smaller than 4.1MB) */ return PARTITION_FAT_12; } - else if (StartSector->QuadPart < 1450560) + else if (StartSector < 1450560ULL) { /* Partition starts below the 8.4GB boundary ==> CHS partition */ - if (SectorCount->QuadPart < 65536) + if (SectorCount < 65536ULL) { /* FAT16 CHS partition (partition size < 32MB) */ return PARTITION_FAT_16; } - else if (SectorCount->QuadPart < 1048576) + else if (SectorCount < 1048576ULL) { /* FAT16 CHS partition (partition size < 512MB) */ return PARTITION_HUGE; @@ -271,7 +373,7 @@ FileSystemToPartitionType( { /* Partition starts above the 8.4GB boundary ==> LBA partition */ - if (SectorCount->QuadPart < 1048576) + if (SectorCount < 1048576ULL) { /* FAT16 LBA partition (partition size < 512MB) */ return PARTITION_XINT13; diff --git a/base/setup/lib/utils/fsrec.h b/base/setup/lib/utils/fsrec.h index 197cdd6e9f6..47f770691d5 100644 --- a/base/setup/lib/utils/fsrec.h +++ b/base/setup/lib/utils/fsrec.h @@ -8,42 +8,31 @@ #pragma once -NTSTATUS -GetFileSystemNameByHandle( - IN HANDLE PartitionHandle, - IN OUT PWSTR FileSystemName, - IN SIZE_T FileSystemNameSize); - NTSTATUS GetFileSystemName_UStr( - IN PUNICODE_STRING PartitionPath, + IN PUNICODE_STRING PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize); NTSTATUS GetFileSystemName( - IN PCWSTR Partition, - IN OUT PWSTR FileSystemName, - IN SIZE_T FileSystemNameSize); - -NTSTATUS -InferFileSystemByHandle( - IN HANDLE PartitionHandle, - IN UCHAR PartitionType, + IN PCWSTR PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize); NTSTATUS InferFileSystem( - IN PCWSTR Partition, - IN UCHAR PartitionType, + IN PCWSTR PartitionPath OPTIONAL, + IN HANDLE PartitionHandle OPTIONAL, IN OUT PWSTR FileSystemName, IN SIZE_T FileSystemNameSize); UCHAR -FileSystemToPartitionType( +FileSystemToMBRPartitionType( IN PCWSTR FileSystem, - IN PULARGE_INTEGER StartSector, - IN PULARGE_INTEGER SectorCount); + IN ULONGLONG StartSector, + IN ULONGLONG SectorCount); /* EOF */ diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 3837a83e255..6682f0a36a8 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -906,7 +906,10 @@ InitializePartitionEntry( PartEntry->New = TRUE; PartEntry->IsPartitioned = TRUE; - PartEntry->PartitionType = FileSystemToPartitionType(L"RAW", &PartEntry->StartSector, &PartEntry->SectorCount); +// FIXME: Use FileSystemToMBRPartitionType() only for MBR, otherwise use PARTITION_BASIC_DATA_GUID. + PartEntry->PartitionType = FileSystemToMBRPartitionType(L"RAW", + PartEntry->StartSector.QuadPart, + PartEntry->SectorCount.QuadPart); ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED); PartEntry->FormatState = Unformatted; @@ -1018,12 +1021,11 @@ AddPartitionToDisk( ASSERT(NT_SUCCESS(Status)); /* We don't have a FS, try to guess one */ - Status = InferFileSystemByHandle(PartitionHandle, - PartEntry->PartitionType, - PartEntry->FileSystem, - sizeof(PartEntry->FileSystem)); + Status = InferFileSystem(NULL, PartitionHandle, + PartEntry->FileSystem, + sizeof(PartEntry->FileSystem)); if (!NT_SUCCESS(Status)) - DPRINT1("InferFileSystemByHandle() failed, Status 0x%08lx\n", Status); + DPRINT1("InferFileSystem() failed, Status 0x%08lx\n", Status); } if (*PartEntry->FileSystem) { @@ -4105,12 +4107,14 @@ SetMountedDeviceValues( } VOID -SetPartitionType( +SetMBRPartitionType( IN PPARTENTRY PartEntry, IN UCHAR PartitionType) { PDISKENTRY DiskEntry = PartEntry->DiskEntry; + ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR); + PartEntry->PartitionType = PartitionType; DiskEntry->Dirty = TRUE; diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index fb548b0e2ed..4dd108ba15c 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -349,7 +349,7 @@ SetMountedDeviceValues( IN PPARTLIST List); VOID -SetPartitionType( +SetMBRPartitionType( IN PPARTENTRY PartEntry, IN UCHAR PartitionType);

3 years, 9 months

[reactos] 01/01: [FSLIB][FMIFS][AUTOCHK][SETUPLIB] Use more Windows-compatible (but not fully compatible yet) Format() and Chkdsk() ULIB functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3e80e43725828f00533… commit 8d3e80e43725828f0053347536f1df28ad089b7f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 22 05:35:37 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 22 21:57:07 2020 +0100 [FSLIB][FMIFS][AUTOCHK][SETUPLIB] Use more Windows-compatible (but not fully compatible yet) Format() and Chkdsk() ULIB functions. [AUTOCHK] Add also support for scanning FATX volumes. The Format(), FormatEx(), Chkdsk(), ChkdskEx() functions exposed by the U*.DLL user-mode FS library dlls are different (and have different prototypes) than the similarly-named functions exported by FMIFS.DLL . In particular, what we used to call "xxxChkdskEx()" and "xxxFormatEx()" in our U*.DLL libraries actually correspond more, from their arguments, to the "Chkdsk()" and "Format()" functions in Windows' U*.DLL . Their *Ex() counterparts instead take most of the parameters through a structure passed by pointer. On FMIFS.DLL side, while FMIFS!Chkdsk() calls U*.DLL!Chkdsk() and FMIFS!ChkdskEx() calls U*.DLL!ChkdskEx() (and we do not implement these *Ex() functions at the moment), both FMIFS!Format() and FMIFS!FormatEx() call U*.DLL!Format() instead, while FMIFS!FormatEx2() calls U*.DLL!FormatEx() (that we do not implement yet either) !! To improve that, refactor the calls to these U*.DLL functions so as to respect the more compatible prototypes: They contain the correct number of parameters in a compatible order. However, some of the parameters do not have the same types yet: the strings are kept here in PUNICODE_STRINGS, while on Windows they are passed via an undocumented DSTRING struct, and the FMIFS callback is instead a MESSAGE struct/class on Windows. Finally, the MEDIA_TYPE parameter in U*.DLL!Format() is equivalent, yet not fully 100% in 1-to-1 correspondence, with the FMIFS_MEDIA_FLAG used in the corresponding FMIFS.DLL functions. One thing to notice is that the U*.DLL!Format() (and the Ex) functions support a BOOLEAN (a flag resp.) for telling that a backwards-compatible FS version should be used instead of the (default) latest FS version. This is used e.g. by the FAT FS, where by default FAT32 is selected (depending also on other constraints like, the disk and the partition sizes), unless that bit is set in which case, FAT16 (or 12) is used. --- base/setup/lib/fsutil.c | 90 +++++++++++++++++++++------- base/setup/lib/fsutil.h | 2 +- base/setup/usetup/format.c | 15 +++-- base/system/autochk/CMakeLists.txt | 2 +- base/system/autochk/autochk.c | 55 ++++++++++------- dll/win32/fmifs/chkdsk.c | 36 +++++++---- dll/win32/fmifs/format.c | 62 +++++++++++++++---- dll/win32/fmifs/init.c | 8 ++- dll/win32/fmifs/precomp.h | 6 +- dll/win32/ubtrfs/ubtrfs.spec | 4 +- dll/win32/ucdfs/ucdfs.spec | 4 +- dll/win32/uext2/uext2.spec | 4 +- dll/win32/ufat/ufat.spec | 4 +- dll/win32/ufatx/ufatx.spec | 4 +- dll/win32/uffs/uffs.spec | 4 +- dll/win32/untfs/untfs.spec | 4 +- dll/win32/ureiserfs/ureiserfs.spec | 4 +- sdk/include/reactos/libs/fmifs/fmifs.h | 37 ++++++++---- sdk/include/reactos/libs/fslib/btrfslib.h | 43 +++++++------ sdk/include/reactos/libs/fslib/cdfslib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/ext2lib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/ffslib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/ntfslib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/reiserfslib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/vfatlib.h | 39 +++++++----- sdk/include/reactos/libs/fslib/vfatxlib.h | 35 ++++++++--- sdk/lib/fslib/btrfslib/btrfslib.c | 70 ++++++++++++++++++---- sdk/lib/fslib/cdfslib/cdfslib.c | 43 ++++++++----- sdk/lib/fslib/ext2lib/Mke2fs.c | 56 +++++++++-------- sdk/lib/fslib/ffslib/ffslib.c | 49 +++++++++------ sdk/lib/fslib/ffslib/ffslib.h | 8 --- sdk/lib/fslib/ntfslib/ntfslib.c | 49 +++++++++------ sdk/lib/fslib/ntfslib/ntfslib.h | 8 --- sdk/lib/fslib/reiserfslib/reiserfslib.c | 49 +++++++++------ sdk/lib/fslib/reiserfslib/reiserfslib.h | 8 --- sdk/lib/fslib/vfatlib/vfatlib.c | 84 +++++++++++++++----------- sdk/lib/fslib/vfatxlib/vfatxlib.c | 73 ++++++++++++---------- 37 files changed, 741 insertions(+), 413 deletions(-) diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index fec1aa7283a..3d49be888d7 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Filesystem support functions + * PURPOSE: Filesystem Format and ChkDsk support functions. * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2020 Hermes Belusca-Maito */ @@ -122,8 +122,8 @@ C_ASSERT(sizeof(BTRFS_BOOTSECTOR) == BTRFS_BOOTSECTOR_SIZE); typedef struct _FILE_SYSTEM { PCWSTR FileSystemName; - FORMATEX FormatFunc; - CHKDSKEX ChkdskFunc; + PULIB_FORMAT FormatFunc; + PULIB_CHKDSK ChkdskFunc; } FILE_SYSTEM, *PFILE_SYSTEM; /* The list of file systems on which we can install ReactOS */ @@ -137,7 +137,7 @@ static FILE_SYSTEM RegisteredFileSystems[] = { L"FATX" , VfatxFormat, VfatxChkdsk }, { L"NTFS" , NtfsFormat, NtfsChkdsk }, #endif - { L"BTRFS", BtrfsFormatEx, BtrfsChkdskEx }, + { L"BTRFS", BtrfsFormat, BtrfsChkdsk }, #if 0 { L"EXT2" , Ext2Format, Ext2Chkdsk }, { L"EXT3" , Ext2Format, Ext2Chkdsk }, @@ -224,22 +224,36 @@ ChkdskFileSystem_UStr( IN PFMIFSCALLBACK Callback) { PFILE_SYSTEM FileSystem; + NTSTATUS Status; + BOOLEAN Success; FileSystem = GetFileSystemByName(FileSystemName); if (!FileSystem || !FileSystem->ChkdskFunc) { - // BOOLEAN Argument = FALSE; - // Callback(DONE, 0, &Argument); + // Success = FALSE; + // Callback(DONE, 0, &Success); return STATUS_NOT_SUPPORTED; } - return FileSystem->ChkdskFunc(DriveRoot, - FixErrors, - Verbose, - CheckOnlyIfDirty, - ScanDrive, - Callback); + Status = STATUS_SUCCESS; + Success = FileSystem->ChkdskFunc(DriveRoot, + Callback, + FixErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + NULL, + NULL, + NULL, + NULL, + (PULONG)&Status); + if (!Success) + DPRINT1("ChkdskFunc() failed with Status 0x%lx\n", Status); + + // Callback(DONE, 0, &Success); + + return Status; } NTSTATUS @@ -277,22 +291,58 @@ FormatFileSystem_UStr( IN PFMIFSCALLBACK Callback) { PFILE_SYSTEM FileSystem; + BOOLEAN Success; + BOOLEAN BackwardCompatible = FALSE; // Default to latest FS versions. + MEDIA_TYPE MediaType; FileSystem = GetFileSystemByName(FileSystemName); if (!FileSystem || !FileSystem->FormatFunc) { - // BOOLEAN Argument = FALSE; - // Callback(DONE, 0, &Argument); + // Success = FALSE; + // Callback(DONE, 0, &Success); return STATUS_NOT_SUPPORTED; } - return FileSystem->FormatFunc(DriveRoot, - MediaFlag, - Label, - QuickFormat, - ClusterSize, - Callback); + /* Set the BackwardCompatible flag in case we format with older FAT12/16 */ + if (wcsicmp(FileSystemName, L"FAT") == 0) + BackwardCompatible = TRUE; + // else if (wcsicmp(FileSystemName, L"FAT32") == 0) + // BackwardCompatible = FALSE; + + /* Convert the FMIFS MediaFlag to a NT MediaType */ + // FIXME: Actually covert all the possible flags. + switch (MediaFlag) + { + case FMIFS_FLOPPY: + MediaType = F5_320_1024; // FIXME: This is hardfixed! + break; + case FMIFS_REMOVABLE: + MediaType = RemovableMedia; + break; + case FMIFS_HARDDISK: + MediaType = FixedMedia; + break; + default: + DPRINT1("Unknown FMIFS MediaFlag %d, converting 1-to-1 to NT MediaType\n", + MediaFlag); + MediaType = (MEDIA_TYPE)MediaFlag; + break; + } + + Success = FileSystem->FormatFunc(DriveRoot, + Callback, + QuickFormat, + BackwardCompatible, + MediaType, + Label, + ClusterSize); + if (!Success) + DPRINT1("FormatFunc() failed\n"); + + // Callback(DONE, 0, &Success); + + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } NTSTATUS diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index ef5e6a3ccd8..7696be6dec8 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Setup Library * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Filesystem support functions + * PURPOSE: Filesystem Format and ChkDsk support functions. * COPYRIGHT: Copyright 2003-2019 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017-2020 Hermes Belusca-Maito */ diff --git a/base/setup/usetup/format.c b/base/setup/usetup/format.c index 08e029ce543..4abb464ba3e 100644 --- a/base/setup/usetup/format.c +++ b/base/setup/usetup/format.c @@ -55,24 +55,27 @@ FormatCallback( break; } - /*case OUTPUT: +#if 0 + case OUTPUT: { PTEXTOUTPUT Output; output = (PTEXTOUTPUT) Argument; DPRINT("%s\n", output->Output); break; - }*/ + } +#endif case DONE: { - /*PBOOLEAN Success;*/ + // PBOOLEAN Success; DPRINT("Done\n"); - - /*Success = (PBOOLEAN)Argument; +#if 0 + Success = (PBOOLEAN)Argument; if (*Success == FALSE) { DPRINT("FormatEx was unable to complete successfully.\n\n"); - }*/ + } +#endif break; } diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt index e7a9fb1f388..d2c03339285 100644 --- a/base/system/autochk/CMakeLists.txt +++ b/base/system/autochk/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(autochk WIN32 autochk.c autochk.rc) set_module_type(autochk nativecui) -target_link_libraries(autochk nt ext2lib vfatlib ntfslib cdfslib ffslib reiserfslib btrfslib) +target_link_libraries(autochk nt vfatlib vfatxlib ntfslib btrfslib ext2lib ffslib reiserfslib cdfslib) add_importlibs(autochk ntdll) add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all) diff --git a/base/system/autochk/autochk.c b/base/system/autochk/autochk.c index 72b010f8d85..33d3593d776 100644 --- a/base/system/autochk/autochk.c +++ b/base/system/autochk/autochk.c @@ -27,11 +27,12 @@ #include <fmifs/fmifs.h> #include <fslib/vfatlib.h> +#include <fslib/vfatxlib.h> #include <fslib/ntfslib.h> -#include <fslib/ext2lib.h> #include <fslib/btrfslib.h> -#include <fslib/reiserfslib.h> +#include <fslib/ext2lib.h> #include <fslib/ffslib.h> +#include <fslib/reiserfslib.h> #include <fslib/cdfslib.h> #define NDEBUG @@ -42,20 +43,21 @@ typedef struct _FILESYSTEM_CHKDSK { WCHAR Name[10]; - CHKDSKEX ChkdskFunc; + PULIB_CHKDSK ChkdskFunc; } FILESYSTEM_CHKDSK, *PFILESYSTEM_CHKDSK; -FILESYSTEM_CHKDSK FileSystems[10] = +FILESYSTEM_CHKDSK FileSystems[] = { { L"FAT", VfatChkdsk }, { L"FAT32", VfatChkdsk }, + { L"FATX" , VfatxChkdsk }, { L"NTFS", NtfsChkdsk }, + { L"BTRFS", BtrfsChkdsk }, { L"EXT2", Ext2Chkdsk }, { L"EXT3", Ext2Chkdsk }, { L"EXT4", Ext2Chkdsk }, - { L"Btrfs", BtrfsChkdskEx }, - { L"RFSD", ReiserfsChkdsk }, { L"FFS", FfsChkdsk }, + { L"RFSD", ReiserfsChkdsk }, { L"CDFS", CdfsChkdsk }, }; @@ -379,7 +381,7 @@ ChkdskCallback( case DONE: Status = (PBOOLEAN)Argument; - if (*Status != FALSE) + if (*Status == FALSE) { PrintString("The file system check was unable to complete successfully.\r\n\r\n"); // Error = TRUE; @@ -396,6 +398,7 @@ CheckVolume( IN BOOLEAN CheckOnlyIfDirty) { NTSTATUS Status; + BOOLEAN Success; PCWSTR DisplayName; UNICODE_STRING VolumePathU; ULONG Count; @@ -450,15 +453,21 @@ CheckVolume( } /* Check whether the volume is dirty */ - Status = FileSystems[Count].ChkdskFunc(&VolumePathU, - FALSE, // FixErrors - TRUE, // Verbose - TRUE, // CheckOnlyIfDirty - FALSE, // ScanDrive - ChkdskCallback); + Status = STATUS_SUCCESS; + Success = FileSystems[Count].ChkdskFunc(&VolumePathU, + ChkdskCallback, + FALSE, // FixErrors + TRUE, // Verbose + TRUE, // CheckOnlyIfDirty + FALSE, // ScanDrive + NULL, + NULL, + NULL, + NULL, + (PULONG)&Status); /* Perform the check either when the volume is dirty or a check is forced */ - if ((Status == STATUS_DISK_CORRUPT_ERROR) || !CheckOnlyIfDirty) + if (Success && ((Status == STATUS_DISK_CORRUPT_ERROR) || !CheckOnlyIfDirty)) { /* Let the user decide whether to repair */ if (Status == STATUS_DISK_CORRUPT_ERROR) @@ -474,12 +483,18 @@ CheckVolume( if (!KeyboardHandle || WaitForKeyboard(KeyboardHandle, TimeOut) == STATUS_TIMEOUT) { PrintString("The system will now check the file system.\r\n\r\n"); - Status = FileSystems[Count].ChkdskFunc(&VolumePathU, - TRUE, // FixErrors - TRUE, // Verbose - CheckOnlyIfDirty, - FALSE, // ScanDrive - ChkdskCallback); + Status = STATUS_SUCCESS; + Success = FileSystems[Count].ChkdskFunc(&VolumePathU, + ChkdskCallback, + TRUE, // FixErrors + TRUE, // Verbose + CheckOnlyIfDirty, + FALSE, // ScanDrive + NULL, + NULL, + NULL, + NULL, + (PULONG)&Status); } else { diff --git a/dll/win32/fmifs/chkdsk.c b/dll/win32/fmifs/chkdsk.c index ba6839ff181..c3be682eeea 100644 --- a/dll/win32/fmifs/chkdsk.c +++ b/dll/win32/fmifs/chkdsk.c @@ -28,7 +28,8 @@ Chkdsk( { PIFS_PROVIDER Provider; UNICODE_STRING usDriveRoot; - BOOLEAN Argument = FALSE; + NTSTATUS Status; + BOOLEAN Success = FALSE; WCHAR VolumeName[MAX_PATH]; //CURDIR CurDir; @@ -36,7 +37,7 @@ Chkdsk( if (!Provider) { /* Unknown file system */ - Callback(DONE, 0, &Argument); + Callback(DONE, 0, &Success); return; } @@ -46,22 +47,33 @@ Chkdsk( RtlCreateUnicodeString(&usDriveRoot, VolumeName); /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ #else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) || + if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, RTL_NUMBER_OF(VolumeName)) || !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) { - /* Report an error. */ - Callback(DONE, 0, &Argument); + /* Report an error */ + Callback(DONE, 0, &Success); return; } #endif - DPRINT("ChkdskEx - %S\n", Format); - Provider->ChkdskEx(&usDriveRoot, - CorrectErrors, - Verbose, - CheckOnlyIfDirty, - ScanDrive, - Callback); + DPRINT("Chkdsk() - %S\n", Format); + Status = STATUS_SUCCESS; + Success = Provider->Chkdsk(&usDriveRoot, + Callback, + CorrectErrors, + Verbose, + CheckOnlyIfDirty, + ScanDrive, + NULL, + NULL, + NULL, + NULL, + (PULONG)&Status); + if (!Success) + DPRINT1("Chkdsk() failed with Status 0x%lx\n", Status); + + /* Report success */ + Callback(DONE, 0, &Success); RtlFreeUnicodeString(&usDriveRoot); } diff --git a/dll/win32/fmifs/format.c b/dll/win32/fmifs/format.c index 266002e08a3..82fa203b1e4 100644 --- a/dll/win32/fmifs/format.c +++ b/dll/win32/fmifs/format.c @@ -47,15 +47,21 @@ FormatEx( PIFS_PROVIDER Provider; UNICODE_STRING usDriveRoot; UNICODE_STRING usLabel; - BOOLEAN Argument = FALSE; + BOOLEAN Success = FALSE; + BOOLEAN BackwardCompatible = FALSE; // Default to latest FS versions. + MEDIA_TYPE MediaType; WCHAR VolumeName[MAX_PATH]; //CURDIR CurDir; +// +// TODO: Convert filesystem Format into ULIB format string. +// + Provider = GetProvider(Format); if (!Provider) { /* Unknown file system */ - Callback(DONE, 0, &Argument); + Callback(DONE, 0, &Success); return; } @@ -65,24 +71,56 @@ FormatEx( RtlCreateUnicodeString(&usDriveRoot, VolumeName); /* Code disabled as long as our storage stack doesn't understand IOCTL_MOUNTDEV_QUERY_DEVICE_NAME */ #else - if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, MAX_PATH) || + if (!GetVolumeNameForVolumeMountPointW(DriveRoot, VolumeName, RTL_NUMBER_OF(VolumeName)) || !RtlDosPathNameToNtPathName_U(VolumeName, &usDriveRoot, NULL, &CurDir)) { - /* Report an error. */ - Callback(DONE, 0, &Argument); + /* Report an error */ + Callback(DONE, 0, &Success); return; } #endif RtlInitUnicodeString(&usLabel, Label); - DPRINT("FormatEx - %S\n", Format); - Provider->FormatEx(&usDriveRoot, - MediaFlag, - &usLabel, - QuickFormat, - ClusterSize, - Callback); + /* Set the BackwardCompatible flag in case we format with older FAT12/16 */ + if (wcsicmp(Format, L"FAT") == 0) + BackwardCompatible = TRUE; + // else if (wcsicmp(Format, L"FAT32") == 0) + // BackwardCompatible = FALSE; + + /* Convert the FMIFS MediaFlag to a NT MediaType */ + // FIXME: Actually covert all the possible flags. + switch (MediaFlag) + { + case FMIFS_FLOPPY: + MediaType = F5_320_1024; // FIXME: This is hardfixed! + break; + case FMIFS_REMOVABLE: + MediaType = RemovableMedia; + break; + case FMIFS_HARDDISK: + MediaType = FixedMedia; + break; + default: + DPRINT1("Unknown FMIFS MediaFlag %d, converting 1-to-1 to NT MediaType\n", + MediaFlag); + MediaType = (MEDIA_TYPE)MediaFlag; + break; + } + + DPRINT("Format() - %S\n", Format); + Success = Provider->Format(&usDriveRoot, + Callback, + QuickFormat, + BackwardCompatible, + MediaType, + &usLabel, + ClusterSize); + if (!Success) + DPRINT1("Format() failed\n"); + + /* Report success */ + Callback(DONE, 0, &Success); RtlFreeUnicodeString(&usDriveRoot); } diff --git a/dll/win32/fmifs/init.c b/dll/win32/fmifs/init.c index e895f5ef9ca..b03e83a6775 100644 --- a/dll/win32/fmifs/init.c +++ b/dll/win32/fmifs/init.c @@ -66,9 +66,11 @@ AddProvider( RtlZeroMemory(Provider, RequiredSize); /* Get function pointers */ - Provider->ChkdskEx = (CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); - //Provider->Extend = (EXTEND)GetProcAddress(hMod, "Extend"); - Provider->FormatEx = (FORMATEX)GetProcAddress(hMod, "FormatEx"); + Provider->Chkdsk = (PULIB_CHKDSK)GetProcAddress(hMod, "Chkdsk"); + //Provider->ChkdskEx = (PULIB_CHKDSKEX)GetProcAddress(hMod, "ChkdskEx"); + //Provider->Extend = (PULIB_EXTEND)GetProcAddress(hMod, "Extend"); + Provider->Format = (PULIB_FORMAT)GetProcAddress(hMod, "Format"); + //Provider->FormatEx = (PULIB_FORMATEX)GetProcAddress(hMod, "FormatEx"); RtlCopyMemory(Provider->Name, FileSystem->Buffer, FileSystem->Length); diff --git a/dll/win32/fmifs/precomp.h b/dll/win32/fmifs/precomp.h index 0d2218f47f8..1a31415b696 100644 --- a/dll/win32/fmifs/precomp.h +++ b/dll/win32/fmifs/precomp.h @@ -33,9 +33,11 @@ typedef struct _IFS_PROVIDER { LIST_ENTRY ListEntry; - CHKDSKEX ChkdskEx; + PULIB_CHKDSK Chkdsk; + PVOID ChkdskEx; PVOID Extend; - FORMATEX FormatEx; + PULIB_FORMAT Format; + PVOID FormatEx; WCHAR Name[1]; } IFS_PROVIDER, *PIFS_PROVIDER; diff --git a/dll/win32/ubtrfs/ubtrfs.spec b/dll/win32/ubtrfs/ubtrfs.spec index b797157b4c2..ddf1db7f8e6 100644 --- a/dll/win32/ubtrfs/ubtrfs.spec +++ b/dll/win32/ubtrfs/ubtrfs.spec @@ -1,5 +1,5 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) BtrfsChkdskEx -@ stdcall FormatEx(ptr long ptr long long ptr) BtrfsFormatEx +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) BtrfsChkdsk +@ stdcall Format(ptr ptr long long long ptr long) BtrfsFormat @ stdcall GetFilesystemInformation(long long ptr) @ stdcall SetIncompatFlags(int64) diff --git a/dll/win32/ucdfs/ucdfs.spec b/dll/win32/ucdfs/ucdfs.spec index 5ad590f9a7c..b425670db98 100644 --- a/dll/win32/ucdfs/ucdfs.spec +++ b/dll/win32/ucdfs/ucdfs.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) CdfsChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) CdfsFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) CdfsChkdsk +@ stdcall Format(ptr ptr long long long ptr long) CdfsFormat diff --git a/dll/win32/uext2/uext2.spec b/dll/win32/uext2/uext2.spec index fb2d99b0981..cd8682132e5 100644 --- a/dll/win32/uext2/uext2.spec +++ b/dll/win32/uext2/uext2.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) Ext2Chkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) Ext2Format +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) Ext2Chkdsk +@ stdcall Format(ptr ptr long long long ptr long) Ext2Format diff --git a/dll/win32/ufat/ufat.spec b/dll/win32/ufat/ufat.spec index cc7532f0712..19cd54669cf 100644 --- a/dll/win32/ufat/ufat.spec +++ b/dll/win32/ufat/ufat.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) VfatChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) VfatFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) VfatChkdsk +@ stdcall Format(ptr ptr long long long ptr long) VfatFormat diff --git a/dll/win32/ufatx/ufatx.spec b/dll/win32/ufatx/ufatx.spec index 40ab9e02736..aff06f9c8c6 100644 --- a/dll/win32/ufatx/ufatx.spec +++ b/dll/win32/ufatx/ufatx.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) VfatxChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) VfatxFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) VfatxChkdsk +@ stdcall Format(ptr ptr long long long ptr long) VfatxFormat diff --git a/dll/win32/uffs/uffs.spec b/dll/win32/uffs/uffs.spec index 8c5627af99a..f06e34356a9 100644 --- a/dll/win32/uffs/uffs.spec +++ b/dll/win32/uffs/uffs.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) FfsChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) FfsFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) FfsChkdsk +@ stdcall Format(ptr ptr long long long ptr long) FfsFormat diff --git a/dll/win32/untfs/untfs.spec b/dll/win32/untfs/untfs.spec index 29c777772eb..bcdeca48e95 100644 --- a/dll/win32/untfs/untfs.spec +++ b/dll/win32/untfs/untfs.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) NtfsChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) NtfsFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) NtfsChkdsk +@ stdcall Format(ptr ptr long long long ptr long) NtfsFormat diff --git a/dll/win32/ureiserfs/ureiserfs.spec b/dll/win32/ureiserfs/ureiserfs.spec index 5a86418e1fd..496546ae682 100644 --- a/dll/win32/ureiserfs/ureiserfs.spec +++ b/dll/win32/ureiserfs/ureiserfs.spec @@ -1,2 +1,2 @@ -@ stdcall ChkdskEx(ptr long long long long ptr) ReiserfsChkdsk -@ stdcall FormatEx(ptr long ptr long long ptr) ReiserfsFormat +@ stdcall Chkdsk(ptr ptr long long long long ptr ptr ptr ptr ptr) ReiserfsChkdsk +@ stdcall Format(ptr ptr long long long ptr long) ReiserfsFormat diff --git a/sdk/include/reactos/libs/fmifs/fmifs.h b/sdk/include/reactos/libs/fmifs/fmifs.h index c2c8b80e7cc..482b3b02457 100644 --- a/sdk/include/reactos/libs/fmifs/fmifs.h +++ b/sdk/include/reactos/libs/fmifs/fmifs.h @@ -152,6 +152,9 @@ FormatEx( IN ULONG ClusterSize, IN PFMIFSCALLBACK Callback); +/* FormatEx2 command in FMIFS */ +// FIXME! + BOOLEAN NTAPI QueryAvailableFileSystemFormat( IN DWORD Index, @@ -194,23 +197,33 @@ SetLabel( /* Functions provided by u*.dll */ -typedef NTSTATUS -(NTAPI *FORMATEX)( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); - -typedef NTSTATUS -(NTAPI *CHKDSKEX)( +typedef BOOLEAN +(NTAPI *PULIB_CHKDSK)( IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, IN BOOLEAN CheckOnlyIfDirty, IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); + +// FIXME: PULIB_CHKDSKEX of u*.dll works with ChkdskEx() of FMIFS.DLL + +typedef BOOLEAN +(NTAPI *PULIB_FORMAT)( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); + +// FIXME: PULIB_FORMATEX of u*.dll works with FormatEx2() of FMIFS.DLL #ifdef __cplusplus } diff --git a/sdk/include/reactos/libs/fslib/btrfslib.h b/sdk/include/reactos/libs/fslib/btrfslib.h index e97f7ca9cc9..53ec74538d4 100644 --- a/sdk/include/reactos/libs/fslib/btrfslib.h +++ b/sdk/include/reactos/libs/fslib/btrfslib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/btrfslib.h * PURPOSE: Public definitions for BtrFS filesystem library */ + #ifndef __BTRFSLIB_H #define __BTRFSLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI -BtrfsChkdskEx( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); +BOOLEAN +NTAPI +BtrfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI -BtrfsFormatEx( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); +BOOLEAN +NTAPI +BtrfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__BTRFSLIB_H */ +#endif /* __BTRFSLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/cdfslib.h b/sdk/include/reactos/libs/fslib/cdfslib.h index a49cabf0bbf..60023b65d30 100644 --- a/sdk/include/reactos/libs/fslib/cdfslib.h +++ b/sdk/include/reactos/libs/fslib/cdfslib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/cdfslib.h * PURPOSE: Public definitions for CDFS filesystem library */ + #ifndef __CDFSLIB_H #define __CDFSLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI CdfsChkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI CdfsFormat( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__CDFSLIB_H */ +#endif /* __CDFSLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/ext2lib.h b/sdk/include/reactos/libs/fslib/ext2lib.h index 596bbcbf9e8..b368aa3323c 100644 --- a/sdk/include/reactos/libs/fslib/ext2lib.h +++ b/sdk/include/reactos/libs/fslib/ext2lib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/ext2lib.h * PURPOSE: Public definitions for ext2 filesystem library */ + #ifndef __EXT2LIB_H #define __EXT2LIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI Ext2Chkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI Ext2Format( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__EXT2LIB_H */ +#endif /* __EXT2LIB_H */ diff --git a/sdk/include/reactos/libs/fslib/ffslib.h b/sdk/include/reactos/libs/fslib/ffslib.h index 31e3f257364..4703c06ee9b 100644 --- a/sdk/include/reactos/libs/fslib/ffslib.h +++ b/sdk/include/reactos/libs/fslib/ffslib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/ffslib.h * PURPOSE: Public definitions for FFS filesystem library */ + #ifndef __FFSLIB_H #define __FFSLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI FfsChkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI FfsFormat( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__FFSLIB_H */ +#endif /* __FFSLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/ntfslib.h b/sdk/include/reactos/libs/fslib/ntfslib.h index d4647d4cb05..f1677a40597 100644 --- a/sdk/include/reactos/libs/fslib/ntfslib.h +++ b/sdk/include/reactos/libs/fslib/ntfslib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/ntfslib.h * PURPOSE: Public definitions for NTFS filesystem library */ + #ifndef __NTFSLIB_H #define __NTFSLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI NtfsChkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI NtfsFormat( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__NTFSLIB_H */ +#endif /* __NTFSLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/reiserfslib.h b/sdk/include/reactos/libs/fslib/reiserfslib.h index ed7bd2f79a0..519abe0495e 100644 --- a/sdk/include/reactos/libs/fslib/reiserfslib.h +++ b/sdk/include/reactos/libs/fslib/reiserfslib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/reiserfslib.h * PURPOSE: Public definitions for ReiserFS filesystem library */ + #ifndef __REISERFSLIB_H #define __REISERFSLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI ReiserfsChkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI ReiserfsFormat( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__REISERFSLIB_H */ +#endif /* __REISERFSLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/vfatlib.h b/sdk/include/reactos/libs/fslib/vfatlib.h index 9e635cd086d..cceebe6e70b 100644 --- a/sdk/include/reactos/libs/fslib/vfatlib.h +++ b/sdk/include/reactos/libs/fslib/vfatlib.h @@ -4,27 +4,36 @@ * FILE: include/reactos/libs/fslib/vfatlib.h * PURPOSE: Public definitions for vfat filesystem library */ + #ifndef __VFATLIB_H #define __VFATLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI +BOOLEAN +NTAPI VfatChkdsk( - IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); -NTSTATUS NTAPI +BOOLEAN +NTAPI VfatFormat( - IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback); + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__VFATLIB_H */ +#endif /* __VFATLIB_H */ diff --git a/sdk/include/reactos/libs/fslib/vfatxlib.h b/sdk/include/reactos/libs/fslib/vfatxlib.h index 767ec58a2b1..57960c1ae06 100644 --- a/sdk/include/reactos/libs/fslib/vfatxlib.h +++ b/sdk/include/reactos/libs/fslib/vfatxlib.h @@ -4,17 +4,36 @@ * FILE: include/reactos/libs/fslib/vfatxlib.h * PURPOSE: Public definitions for vfat filesystem library */ + #ifndef __VFATXLIB_H #define __VFATXLIB_H #include <fmifs/fmifs.h> -NTSTATUS NTAPI -VfatxFormat (PUNICODE_STRING DriveRoot, - FMIFS_MEDIA_FLAG MediaFlag, - PUNICODE_STRING Label, - BOOLEAN QuickFormat, - ULONG ClusterSize, - PFMIFSCALLBACK Callback); +BOOLEAN +NTAPI +VfatxChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus); + +BOOLEAN +NTAPI +VfatxFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize); -#endif /*__VFATLIB_H */ +#endif /* __VFATXLIB_H */ diff --git a/sdk/lib/fslib/btrfslib/btrfslib.c b/sdk/lib/fslib/btrfslib/btrfslib.c index b5222e57551..d176204b2a2 100644 --- a/sdk/lib/fslib/btrfslib/btrfslib.c +++ b/sdk/lib/fslib/btrfslib/btrfslib.c @@ -181,6 +181,7 @@ ULONG def_sector_size = 0, def_node_size = 0; uint64_t def_incompat_flags = BTRFS_INCOMPAT_FLAGS_EXTENDED_IREF | BTRFS_INCOMPAT_FLAGS_SKINNY_METADATA; uint16_t def_csum_type = CSUM_TYPE_CRC32C; +#ifndef __REACTOS__ // the following definitions come from fmifs.h in ReactOS typedef struct { @@ -237,12 +238,32 @@ typedef enum { typedef BOOLEAN (NTAPI* PFMIFSCALLBACK)(CALLBACKCOMMAND Command, ULONG SubAction, PVOID ActionInfo); +#else + +#include <fmifs/fmifs.h> + +#endif // __REACTOS__ + #ifndef __REACTOS__ NTSTATUS WINAPI ChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, + BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) { #else -NTSTATUS NTAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLEAN Verbose, BOOLEAN CheckOnlyIfDirty, +BOOLEAN +NTAPI +BtrfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) +{ #endif - BOOLEAN ScanDrive, PFMIFSCALLBACK Callback) { // STUB if (Callback) { @@ -254,7 +275,12 @@ NTSTATUS NTAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLE Callback(OUTPUT, 0, &TextOut); } +#ifndef __REACTOS__ return STATUS_SUCCESS; +#else + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; +#endif } static btrfs_root* add_root(LIST_ENTRY* roots, uint64_t id) { @@ -1316,11 +1342,7 @@ static void check_cpu() { } #endif -#ifndef __REACTOS__ static NTSTATUS NTAPI FormatEx2(PUNICODE_STRING DriveRoot, FMIFS_MEDIA_FLAG MediaFlag, PUNICODE_STRING Label, -#else -NTSTATUS NTAPI BtrfsFormatEx(PUNICODE_STRING DriveRoot, FMIFS_MEDIA_FLAG MediaFlag, PUNICODE_STRING Label, -#endif // __REACTOS__ BOOLEAN QuickFormat, ULONG ClusterSize, PFMIFSCALLBACK Callback) { NTSTATUS Status; @@ -1479,14 +1501,44 @@ end: Status = STATUS_SUCCESS; } +#ifndef __REACTOS__ if (Callback) { bool success = NT_SUCCESS(Status); Callback(DONE, 0, (PVOID)&success); } +#endif return Status; } +#ifdef __REACTOS__ + +BOOLEAN +NTAPI +BtrfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) +{ + NTSTATUS Status; + + if (BackwardCompatible) + { + // DPRINT1("BackwardCompatible == TRUE is unsupported!\n"); + return FALSE; + } + + Status = FormatEx2(DriveRoot, (FMIFS_MEDIA_FLAG)MediaType, Label, QuickFormat, ClusterSize, Callback); + + return NT_SUCCESS(Status); +} + +#else + BOOL __stdcall FormatEx(DSTRING* root, STREAM_MESSAGE* message, options* opts, uint32_t unk1) { UNICODE_STRING DriveRoot, Label; NTSTATUS Status; @@ -1505,15 +1557,13 @@ BOOL __stdcall FormatEx(DSTRING* root, STREAM_MESSAGE* message, options* opts, u Label.Buffer = NULL; } -#ifndef __REACTOS__ Status = FormatEx2(&DriveRoot, FMIFS_HARDDISK, &Label, opts && opts->flags & FORMAT_FLAG_QUICK_FORMAT, 0, NULL); -#else - Status = BtrfsFormatEx(&DriveRoot, FMIFS_HARDDISK, &Label, opts && opts->flags & FORMAT_FLAG_QUICK_FORMAT, 0, NULL); -#endif return NT_SUCCESS(Status); } +#endif // __REACTOS__ + void __stdcall SetSizes(ULONG sector, ULONG node) { if (sector != 0) def_sector_size = sector; diff --git a/sdk/lib/fslib/cdfslib/cdfslib.c b/sdk/lib/fslib/cdfslib/cdfslib.c index 296ac6650dc..7052de2870a 100644 --- a/sdk/lib/fslib/cdfslib/cdfslib.c +++ b/sdk/lib/fslib/cdfslib/cdfslib.c @@ -12,26 +12,37 @@ #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -CdfsChkdsk(IN PUNICODE_STRING DriveRoot, +BOOLEAN +NTAPI +CdfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) +{ + // Not possible for CDFS (ISO-9660). + return FALSE; +} + +BOOLEAN +NTAPI +CdfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, IN BOOLEAN FixErrors, IN BOOLEAN Verbose, IN BOOLEAN CheckOnlyIfDirty, IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; -} - -NTSTATUS NTAPI -CdfsFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) -{ - // Not possible for CDFS (ISO-9660). - return STATUS_NOT_SUPPORTED; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } diff --git a/sdk/lib/fslib/ext2lib/Mke2fs.c b/sdk/lib/fslib/ext2lib/Mke2fs.c index 91506ad7d69..b3dc5e14c8d 100644 --- a/sdk/lib/fslib/ext2lib/Mke2fs.c +++ b/sdk/lib/fslib/ext2lib/Mke2fs.c @@ -798,16 +798,18 @@ Ext2TotalBlocks(PEXT2_FILESYS Ext2Sys, ULONG DataBlocks) } -NTSTATUS +BOOLEAN NTAPI -Ext2Format(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +Ext2Format( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { - BOOLEAN bRet = FALSE; + BOOLEAN bRet; NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Super Block: 1024 bytes long */ EXT2_SUPER_BLOCK Ext2Sb; @@ -819,6 +821,9 @@ Ext2Format(IN PUNICODE_STRING DriveRoot, ULONG start; ULONG ret_blk; + // FIXME: + UNREFERENCED_PARAMETER(BackwardCompatible); + UNREFERENCED_PARAMETER(MediaType); if (Callback != NULL) { @@ -868,6 +873,7 @@ Ext2Format(IN PUNICODE_STRING DriveRoot, bLocked = TRUE; } + Status = STATUS_UNSUCCESSFUL; // Initialize if (!ext2_initialize_sb(&FileSys)) @@ -917,7 +923,6 @@ Ext2Format(IN PUNICODE_STRING DriveRoot, ext2_print_super(&Ext2Sb); bRet = ext2_allocate_tables(&FileSys); - if (!bRet) { goto clean_up; @@ -942,6 +947,7 @@ Ext2Format(IN PUNICODE_STRING DriveRoot, if (start > rsv) start -= rsv; + bRet = TRUE; if (start > 0) bRet = zero_blocks(&FileSys, start, blocks - start, &ret_blk, NULL); @@ -969,14 +975,12 @@ Ext2Format(IN PUNICODE_STRING DriveRoot, if (!ext2_flush(&FileSys)) { - bRet = false; DPRINT1("Mke2fs: Warning, had trouble writing out superblocks.\n"); goto clean_up; } DPRINT("Mke2fs: Writing superblocks and filesystem accounting information done!\n"); - bRet = true; Status = STATUS_SUCCESS; clean_up: @@ -995,23 +999,25 @@ clean_up: Ext2CloseDevice(&FileSys); - if (Callback != NULL) - { - Callback(DONE, 0, (PVOID)&bRet); - } - - return Status; + return NT_SUCCESS(Status); } -NTSTATUS +BOOLEAN NTAPI -Ext2Chkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +Ext2Chkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } diff --git a/sdk/lib/fslib/ffslib/ffslib.c b/sdk/lib/fslib/ffslib/ffslib.c index 2c7f3ed4ba5..75e361f17e2 100644 --- a/sdk/lib/fslib/ffslib/ffslib.c +++ b/sdk/lib/fslib/ffslib/ffslib.c @@ -5,32 +5,45 @@ * PURPOSE: FFS lib * PROGRAMMERS: Pierre Schweitzer */ -#include "ffslib.h" + +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -FfsFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +FfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { UNIMPLEMENTED; - return STATUS_SUCCESS; + return TRUE; } - -NTSTATUS NTAPI -FfsChkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +FfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } diff --git a/sdk/lib/fslib/ffslib/ffslib.h b/sdk/lib/fslib/ffslib/ffslib.h deleted file mode 100644 index 1ee1a87b2e4..00000000000 --- a/sdk/lib/fslib/ffslib/ffslib.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS FFS library - * FILE: lib/fslib/ffslib/ffslib.h - */ -#define NTOS_MODE_USER -#include <ndk/umtypes.h> -#include <fmifs/fmifs.h> diff --git a/sdk/lib/fslib/ntfslib/ntfslib.c b/sdk/lib/fslib/ntfslib/ntfslib.c index d99f63e8703..b3f4433e4d9 100644 --- a/sdk/lib/fslib/ntfslib/ntfslib.c +++ b/sdk/lib/fslib/ntfslib/ntfslib.c @@ -5,32 +5,45 @@ * PURPOSE: NTFS lib * PROGRAMMERS: Pierre Schweitzer */ -#include "ntfslib.h" + +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -NtfsFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +NtfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { UNIMPLEMENTED; - return STATUS_SUCCESS; + return TRUE; } - -NTSTATUS NTAPI -NtfsChkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +NtfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } diff --git a/sdk/lib/fslib/ntfslib/ntfslib.h b/sdk/lib/fslib/ntfslib/ntfslib.h deleted file mode 100644 index 200dfeeba6b..00000000000 --- a/sdk/lib/fslib/ntfslib/ntfslib.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NTFS FS library - * FILE: lib/fslib/ntfslib/ntfslib.h - */ -#define NTOS_MODE_USER -#include <ndk/umtypes.h> -#include <fmifs/fmifs.h> diff --git a/sdk/lib/fslib/reiserfslib/reiserfslib.c b/sdk/lib/fslib/reiserfslib/reiserfslib.c index 7356e143326..1f68f0200a8 100644 --- a/sdk/lib/fslib/reiserfslib/reiserfslib.c +++ b/sdk/lib/fslib/reiserfslib/reiserfslib.c @@ -5,32 +5,45 @@ * PURPOSE: ReiserFS lib * PROGRAMMERS: Pierre Schweitzer */ -#include "reiserfslib.h" + +#define NTOS_MODE_USER +#include <ndk/umtypes.h> +#include <fmifs/fmifs.h> #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -ReiserfsFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +ReiserfsFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { UNIMPLEMENTED; - return STATUS_SUCCESS; + return TRUE; } - -NTSTATUS NTAPI -ReiserfsChkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +ReiserfsChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } diff --git a/sdk/lib/fslib/reiserfslib/reiserfslib.h b/sdk/lib/fslib/reiserfslib/reiserfslib.h deleted file mode 100644 index 147c97e8a1d..00000000000 --- a/sdk/lib/fslib/reiserfslib/reiserfslib.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS ReiserFS library - * FILE: lib/fslib/reiserfslib/reiserfslib.h - */ -#define NTOS_MODE_USER -#include <ndk/umtypes.h> -#include <fmifs/fmifs.h> diff --git a/sdk/lib/fslib/vfatlib/vfatlib.c b/sdk/lib/fslib/vfatlib/vfatlib.c index 82c1282fbf0..fec1f736c20 100644 --- a/sdk/lib/fslib/vfatlib/vfatlib.c +++ b/sdk/lib/fslib/vfatlib/vfatlib.c @@ -45,14 +45,16 @@ ULONG FsCheckFlags; PVOID FsCheckMemQueue; ULONG FsCheckTotalFiles; -NTSTATUS +BOOLEAN NTAPI -VfatFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +VfatFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { OBJECT_ATTRIBUTES ObjectAttributes; DISK_GEOMETRY DiskGeometry; @@ -64,6 +66,10 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot); + // FIXME: + UNREFERENCED_PARAMETER(BackwardCompatible); + UNREFERENCED_PARAMETER(MediaType); + Context.TotalSectorCount = 0; Context.CurrentSectorCount = 0; Context.Callback = Callback; @@ -84,8 +90,8 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, FILE_SYNCHRONOUS_IO_ALERT); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile() failed with status 0x%.08x\n", Status); - return Status; + DPRINT1("NtOpenFile() failed with status 0x%08x\n", Status); + return FALSE; } Status = NtDeviceIoControlFile(FileHandle, @@ -100,9 +106,9 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, sizeof(DISK_GEOMETRY)); if (!NT_SUCCESS(Status)) { - DPRINT("IOCTL_DISK_GET_DRIVE_GEOMETRY failed with status 0x%.08x\n", Status); + DPRINT("IOCTL_DISK_GET_DRIVE_GEOMETRY failed with status 0x%08x\n", Status); NtClose(FileHandle); - return Status; + return FALSE; } if (DiskGeometry.MediaType == FixedMedia) @@ -129,9 +135,9 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, sizeof(PARTITION_INFORMATION)); if (!NT_SUCCESS(Status)) { - DPRINT("IOCTL_DISK_GET_PARTITION_INFO failed with status 0x%.08x\n", Status); + DPRINT("IOCTL_DISK_GET_PARTITION_INFO failed with status 0x%08x\n", Status); NtClose(FileHandle); - return Status; + return FALSE; } } else @@ -214,7 +220,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, if (Callback != NULL) { Context.Percent = 0; - Callback (PROGRESS, 0, (PVOID)&Context.Percent); + Callback(PROGRESS, 0, (PVOID)&Context.Percent); } LockStatus = NtFsControlFile(FileHandle, @@ -306,15 +312,8 @@ VfatFormat(IN PUNICODE_STRING DriveRoot, NtClose(FileHandle); - if (Callback != NULL) - { - Context.Success = (BOOLEAN)(NT_SUCCESS(Status)); - Callback(DONE, 0, (PVOID)&Context.Success); - } - - DPRINT("VfatFormat() done. Status 0x%.08x\n", Status); - - return Status; + DPRINT("VfatFormat() done. Status 0x%08x\n", Status); + return NT_SUCCESS(Status); } @@ -370,14 +369,20 @@ VfatPrint(PCHAR Format, ...) } -NTSTATUS +BOOLEAN NTAPI -VfatChkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +VfatChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { BOOLEAN verify; BOOLEAN salvage_files; @@ -385,6 +390,11 @@ VfatChkdsk(IN PUNICODE_STRING DriveRoot, DOS_FS fs; NTSTATUS Status; + UNREFERENCED_PARAMETER(pUnknown1); + UNREFERENCED_PARAMETER(pUnknown2); + UNREFERENCED_PARAMETER(pUnknown3); + UNREFERENCED_PARAMETER(pUnknown4); + RtlZeroMemory(&fs, sizeof(fs)); /* Store callback pointer */ @@ -416,7 +426,8 @@ VfatChkdsk(IN PUNICODE_STRING DriveRoot, if (!NT_SUCCESS(Status)) { fs_close(FALSE); - return STATUS_DISK_CORRUPT_ERROR; + *ExitStatus = (ULONG)STATUS_DISK_CORRUPT_ERROR; + return FALSE; } if (CheckOnlyIfDirty && !fs_isdirty()) @@ -426,14 +437,17 @@ VfatChkdsk(IN PUNICODE_STRING DriveRoot, fs_lock(FALSE); /* No need to check FS */ - return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); + Status = (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); + *ExitStatus = (ULONG)Status; + return (Status == STATUS_SUCCESS); } else if (CheckOnlyIfDirty && fs_isdirty()) { if (!(FsCheckFlags & FSCHECK_READ_WRITE) && !(FsCheckFlags & FSCHECK_INTERACTIVE)) { fs_close(FALSE); - return STATUS_DISK_CORRUPT_ERROR; + *ExitStatus = (ULONG)STATUS_DISK_CORRUPT_ERROR; + return FALSE; } } @@ -503,7 +517,9 @@ VfatChkdsk(IN PUNICODE_STRING DriveRoot, // https://support.microsoft.com/en-us/kb/265533 /* Close the volume */ - return (fs_close(FsCheckFlags & FSCHECK_READ_WRITE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); + Status = (fs_close(FsCheckFlags & FSCHECK_READ_WRITE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); + *ExitStatus = (ULONG)Status; + return (Status == STATUS_SUCCESS); } /* EOF */ diff --git a/sdk/lib/fslib/vfatxlib/vfatxlib.c b/sdk/lib/fslib/vfatxlib/vfatxlib.c index 4f40cad7593..d5b73e37f12 100644 --- a/sdk/lib/fslib/vfatxlib/vfatxlib.c +++ b/sdk/lib/fslib/vfatxlib/vfatxlib.c @@ -15,13 +15,16 @@ #define NDEBUG #include <debug.h> -NTSTATUS NTAPI -VfatxFormat(IN PUNICODE_STRING DriveRoot, - IN FMIFS_MEDIA_FLAG MediaFlag, - IN PUNICODE_STRING Label, - IN BOOLEAN QuickFormat, - IN ULONG ClusterSize, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +VfatxFormat( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN QuickFormat, + IN BOOLEAN BackwardCompatible, + IN MEDIA_TYPE MediaType, + IN PUNICODE_STRING Label, + IN ULONG ClusterSize) { OBJECT_ATTRIBUTES ObjectAttributes; DISK_GEOMETRY DiskGeometry; @@ -33,6 +36,15 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot, DPRINT("VfatxFormat(DriveRoot '%wZ')\n", DriveRoot); + // FIXME: + UNREFERENCED_PARAMETER(MediaType); + + if (BackwardCompatible) + { + DPRINT1("BackwardCompatible == TRUE is unsupported!\n"); + return FALSE; + } + Context.TotalSectorCount = 0; Context.CurrentSectorCount = 0; Context.Callback = Callback; @@ -53,8 +65,8 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot, FILE_SYNCHRONOUS_IO_ALERT); if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed with status 0x%.08x\n", Status); - return Status; + DPRINT("NtOpenFile() failed with status 0x%08x\n", Status); + return FALSE; } Status = NtDeviceIoControlFile(FileHandle, @@ -69,9 +81,9 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot, sizeof(DISK_GEOMETRY)); if (!NT_SUCCESS(Status)) { - DPRINT("IOCTL_DISK_GET_DRIVE_GEOMETRY failed with status 0x%.08x\n", Status); + DPRINT("IOCTL_DISK_GET_DRIVE_GEOMETRY failed with status 0x%08x\n", Status); NtClose(FileHandle); - return Status; + return FALSE; } if (DiskGeometry.MediaType == FixedMedia) @@ -98,9 +110,9 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot, sizeof(PARTITION_INFORMATION)); if (!NT_SUCCESS(Status)) { - DPRINT("IOCTL_DISK_GET_PARTITION_INFO failed with status 0x%.08x\n", Status); + DPRINT("IOCTL_DISK_GET_PARTITION_INFO failed with status 0x%08x\n", Status); NtClose(FileHandle); - return Status; + return FALSE; } } else @@ -141,27 +153,28 @@ VfatxFormat(IN PUNICODE_STRING DriveRoot, &Context); NtClose(FileHandle); - if (Callback != NULL) - { - Context.Success = (BOOLEAN)(NT_SUCCESS(Status)); - Callback(DONE, 0, (PVOID)&Context.Success); - } - - DPRINT("VfatxFormat() done. Status 0x%.08x\n", Status); - - return Status; + DPRINT("VfatxFormat() done. Status 0x%08x\n", Status); + return NT_SUCCESS(Status); } -NTSTATUS NTAPI -VfatxChkdsk(IN PUNICODE_STRING DriveRoot, - IN BOOLEAN FixErrors, - IN BOOLEAN Verbose, - IN BOOLEAN CheckOnlyIfDirty, - IN BOOLEAN ScanDrive, - IN PFMIFSCALLBACK Callback) +BOOLEAN +NTAPI +VfatxChkdsk( + IN PUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback, + IN BOOLEAN FixErrors, + IN BOOLEAN Verbose, + IN BOOLEAN CheckOnlyIfDirty, + IN BOOLEAN ScanDrive, + IN PVOID pUnknown1, + IN PVOID pUnknown2, + IN PVOID pUnknown3, + IN PVOID pUnknown4, + IN PULONG ExitStatus) { UNIMPLEMENTED; - return STATUS_SUCCESS; + *ExitStatus = (ULONG)STATUS_SUCCESS; + return TRUE; } VOID

3 years, 9 months

[reactos] 02/02: [BTRFSLIB] Reduce the diff with upstream, and fix a memory leak.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdaa5d5fc78d5abd25cfd… commit cdaa5d5fc78d5abd25cfdb007a8b50d285500eca Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 22 05:57:00 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 22 21:34:13 2020 +0100 [BTRFSLIB] Reduce the diff with upstream, and fix a memory leak. - Reduce the diff with upstream by aliasing malloc() and free() with RtlAllocateHeap() and RtlFreeHeap() respectively. - Fix a memory leak in the failure code path of the do-while memory reallocation loop for IOCTL_BTRFS_QUERY_FILESYSTEMS in is_mounted_multi_device(). --- sdk/lib/fslib/btrfslib/btrfslib.c | 153 +++----------------------------------- 1 file changed, 10 insertions(+), 143 deletions(-) diff --git a/sdk/lib/fslib/btrfslib/btrfslib.c b/sdk/lib/fslib/btrfslib/btrfslib.c index f47a47cd3be..b5222e57551 100644 --- a/sdk/lib/fslib/btrfslib/btrfslib.c +++ b/sdk/lib/fslib/btrfslib/btrfslib.c @@ -59,6 +59,11 @@ #endif #endif // __REACTOS__ +#ifdef __REACTOS__ +#define malloc(size) RtlAllocateHeap(RtlGetProcessHeap(), 0, (size)) +#define free(ptr) RtlFreeHeap(RtlGetProcessHeap(), 0, (ptr)) +#endif + #define SHA256_HASH_SIZE 32 void calc_sha256(uint8_t* hash, const void* input, size_t len); @@ -255,16 +260,10 @@ NTSTATUS NTAPI BtrfsChkdskEx(PUNICODE_STRING DriveRoot, BOOLEAN FixErrors, BOOLE static btrfs_root* add_root(LIST_ENTRY* roots, uint64_t id) { btrfs_root* root; -#ifdef __REACTOS__ - root = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(btrfs_root)); -#else root = malloc(sizeof(btrfs_root)); -#endif root->id = id; -#ifndef __REACTOS__ RtlZeroMemory(&root->header, sizeof(tree_header)); -#endif InitializeListHead(&root->items); InsertTailList(roots, &root->list_entry); @@ -285,24 +284,14 @@ static void free_roots(LIST_ENTRY* roots) { btrfs_item* item = CONTAINING_RECORD(le3, btrfs_item, list_entry); if (item->data) -#ifdef __REACTOS__ - RtlFreeHeap(RtlGetProcessHeap(), 0, item->data); - - RtlFreeHeap(RtlGetProcessHeap(), 0, item); -#else free(item->data); free(item); -#endif le3 = le4; } -#ifdef __REACTOS__ - RtlFreeHeap(RtlGetProcessHeap(), 0, r); -#else free(r); -#endif le = le2; } @@ -316,13 +305,8 @@ static void free_chunks(LIST_ENTRY* chunks) { LIST_ENTRY *le2 = le->Flink; btrfs_chunk* c = CONTAINING_RECORD(le, btrfs_chunk, list_entry); -#ifndef __REACTOS__ free(c->chunk_item); free(c); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, c->chunk_item); - RtlFreeHeap(RtlGetProcessHeap(), 0, c); -#endif le = le2; } @@ -332,11 +316,7 @@ static void add_item(btrfs_root* r, uint64_t obj_id, uint8_t obj_type, uint64_t LIST_ENTRY* le; btrfs_item* item; -#ifndef __REACTOS__ item = malloc(sizeof(btrfs_item)); -#else - item = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(btrfs_item)); -#endif item->key.obj_id = obj_id; item->key.obj_type = obj_type; @@ -346,11 +326,7 @@ static void add_item(btrfs_root* r, uint64_t obj_id, uint8_t obj_type, uint64_t if (size == 0) item->data = NULL; else { -#ifndef __REACTOS__ item->data = malloc(size); -#else - item->data = RtlAllocateHeap(RtlGetProcessHeap(), 0, size); -#endif memcpy(item->data, data, size); } @@ -423,20 +399,12 @@ static btrfs_chunk* add_chunk(LIST_ENTRY* chunks, uint64_t flags, btrfs_root* ch if (dev->dev_item.num_bytes - dev->dev_item.bytes_used < stripes * size) // not enough space return NULL; -#ifndef __REACTOS__ c = malloc(sizeof(btrfs_chunk)); -#else - c = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(btrfs_chunk)); -#endif c->offset = off; c->lastoff = off; c->used = 0; -#ifndef __REACTOS__ c->chunk_item = malloc(sizeof(CHUNK_ITEM) + (stripes * sizeof(CHUNK_ITEM_STRIPE))); -#else - c->chunk_item = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(CHUNK_ITEM) + (stripes * sizeof(CHUNK_ITEM_STRIPE))); -#endif c->chunk_item->size = size; c->chunk_item->root_id = BTRFS_ROOT_EXTENT; @@ -630,11 +598,7 @@ static NTSTATUS write_roots(HANDLE h, LIST_ENTRY* roots, uint32_t node_size, BTR NTSTATUS Status; uint8_t* tree; -#ifndef __REACTOS__ tree = malloc(node_size); -#else - tree = RtlAllocateHeap(RtlGetProcessHeap(), 0, node_size); -#endif le = roots->Flink; while (le != roots) { @@ -683,22 +647,14 @@ static NTSTATUS write_roots(HANDLE h, LIST_ENTRY* roots, uint32_t node_size, BTR Status = write_data(h, r->header.address, r->c, tree, node_size); if (!NT_SUCCESS(Status)) { -#ifndef __REACTOS__ free(tree); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, tree); -#endif return Status; } le = le->Flink; } -#ifndef __REACTOS__ free(tree); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, tree); -#endif return STATUS_SUCCESS; } @@ -798,12 +754,8 @@ static NTSTATUS write_superblocks(HANDLE h, btrfs_dev* dev, btrfs_root* chunk_ro le = le->Flink; } -#ifndef __REACTOS__ sb = malloc(sblen); memset(sb, 0, sblen); -#else - sb = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sblen); -#endif sb->uuid = *fsuuid; sb->flags = 1; @@ -837,11 +789,7 @@ static NTSTATUS write_superblocks(HANDLE h, btrfs_dev* dev, btrfs_root* chunk_ro for (unsigned int i = 0; i < label->Length / sizeof(WCHAR); i++) { #endif if (label->Buffer[i] == '/' || label->Buffer[i] == '\\') { -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return STATUS_INVALID_VOLUME_LABEL; } } @@ -855,9 +803,6 @@ static NTSTATUS write_superblocks(HANDLE h, btrfs_dev* dev, btrfs_root* chunk_ro } if (WideCharToMultiByte(CP_UTF8, 0, label->Buffer, label->Length / sizeof(WCHAR), sb->label, utf8len, NULL, NULL) == 0) { - free(sb); - return STATUS_INVALID_VOLUME_LABEL; - } #else as.Buffer = sb->label; as.Length = 0; @@ -865,10 +810,10 @@ static NTSTATUS write_superblocks(HANDLE h, btrfs_dev* dev, btrfs_root* chunk_ro if (!NT_SUCCESS(RtlUnicodeStringToAnsiString(&as, label, FALSE))) { - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); +#endif + free(sb); return STATUS_INVALID_VOLUME_LABEL; } -#endif } sb->cache_generation = 0xffffffffffffffff; @@ -893,22 +838,14 @@ static NTSTATUS write_superblocks(HANDLE h, btrfs_dev* dev, btrfs_root* chunk_ro Status = NtWriteFile(h, NULL, NULL, NULL, &iosb, sb, sblen, &off, NULL); if (!NT_SUCCESS(Status)) { -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return Status; } i++; } -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return STATUS_SUCCESS; } @@ -941,11 +878,7 @@ GetSystemTimeAsFileTime(OUT PFILETIME lpFileTime) static void add_inode_ref(btrfs_root* r, uint64_t inode, uint64_t parent, uint64_t index, const char* name) { uint16_t name_len = (uint16_t)strlen(name); -#ifndef __REACTOS__ INODE_REF* ir = malloc(offsetof(INODE_REF, name[0]) + name_len); -#else - INODE_REF* ir = RtlAllocateHeap(RtlGetProcessHeap(), 0, offsetof(INODE_REF, name[0]) + name_len); -#endif ir->index = 0; ir->n = name_len; @@ -953,11 +886,7 @@ static void add_inode_ref(btrfs_root* r, uint64_t inode, uint64_t parent, uint64 add_item(r, inode, TYPE_INODE_REF, parent, ir, (uint16_t)offsetof(INODE_REF, name[0]) + ir->n); -#ifndef __REACTOS__ free(ir); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, ir); -#endif } static void init_fs_tree(btrfs_root* r, uint32_t node_size) { @@ -1007,22 +936,14 @@ static NTSTATUS clear_first_megabyte(HANDLE h) { LARGE_INTEGER zero; uint8_t* mb; -#ifndef __REACTOS__ mb = malloc(0x100000); memset(mb, 0, 0x100000); -#else - mb = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 0x100000); -#endif zero.QuadPart = 0; Status = NtWriteFile(h, NULL, NULL, NULL, &iosb, mb, 0x100000, &zero, NULL); -#ifndef __REACTOS__ free(mb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, mb); -#endif return Status; } @@ -1035,13 +956,9 @@ static bool is_ssd(HANDLE h) { IDENTIFY_DEVICE_DATA* idd; aptelen = sizeof(ATA_PASS_THROUGH_EX) + 512; -#ifndef __REACTOS__ apte = malloc(aptelen); RtlZeroMemory(apte, aptelen); -#else - apte = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, aptelen); -#endif apte->Length = sizeof(ATA_PASS_THROUGH_EX); apte->AtaFlags = ATA_FLAGS_DATA_IN; @@ -1056,20 +973,12 @@ static bool is_ssd(HANDLE h) { idd = (IDENTIFY_DEVICE_DATA*)((uint8_t*)apte + sizeof(ATA_PASS_THROUGH_EX)); if (idd->NominalMediaRotationRate == 1) { -#ifndef __REACTOS__ free(apte); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, apte); -#endif return true; } } -#ifndef __REACTOS__ free(apte); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, apte); -#endif return false; } @@ -1077,11 +986,7 @@ static bool is_ssd(HANDLE h) { static void add_dir_item(btrfs_root* root, uint64_t inode, uint32_t hash, uint64_t key_objid, uint8_t key_type, uint64_t key_offset, uint64_t transid, uint8_t type, const char* name) { uint16_t name_len = (uint16_t)strlen(name); -#ifndef __REACTOS__ DIR_ITEM* di = malloc(offsetof(DIR_ITEM, name[0]) + name_len); -#else - DIR_ITEM* di = RtlAllocateHeap(RtlGetProcessHeap(), 0, offsetof(DIR_ITEM, name[0]) + name_len); -#endif di->key.obj_id = key_objid; di->key.obj_type = key_type; @@ -1094,11 +999,7 @@ static void add_dir_item(btrfs_root* root, uint64_t inode, uint32_t hash, uint64 add_item(root, inode, TYPE_DIR_ITEM, hash, di, (uint16_t)(offsetof(DIR_ITEM, name[0]) + di->m + di->n)); -#ifndef __REACTOS__ free(di); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, di); -#endif } static void set_default_subvol(btrfs_root* root_root, uint32_t node_size) { @@ -1292,50 +1193,30 @@ static bool is_mounted_multi_device(HANDLE h, uint32_t sector_size) { if (sblen & (sector_size - 1)) sblen = (sblen & sector_size) + sector_size; -#ifndef __REACTOS__ sb = malloc(sblen); -#else - sb = RtlAllocateHeap(RtlGetProcessHeap(), 0, sblen); -#endif off.QuadPart = superblock_addrs[0]; Status = NtReadFile(h, NULL, NULL, NULL, &iosb, sb, sblen, &off, NULL); if (!NT_SUCCESS(Status)) { -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return false; } if (sb->magic != BTRFS_MAGIC) { -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return false; } if (!check_superblock_checksum(sb)) { -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif return false; } fsuuid = sb->uuid; devuuid = sb->dev_item.device_uuid; -#ifndef __REACTOS__ free(sb); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, sb); -#endif us.Length = us.MaximumLength = (USHORT)(wcslen(btrfs) * sizeof(WCHAR)); us.Buffer = btrfs; @@ -1352,16 +1233,14 @@ static bool is_mounted_multi_device(HANDLE h, uint32_t sector_size) { do { bfssize += 1024; -#ifndef __REACTOS__ if (bfs) free(bfs); bfs = malloc(bfssize); -#else - if (bfs) RtlFreeHeap(RtlGetProcessHeap(), 0, bfs); - bfs = RtlAllocateHeap(RtlGetProcessHeap(), 0, bfssize); -#endif Status = NtDeviceIoControlFile(h2, NULL, NULL, NULL, &iosb, IOCTL_BTRFS_QUERY_FILESYSTEMS, NULL, 0, bfs, bfssize); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) { +#ifdef __REACTOS__ + if (bfs) free(bfs); +#endif NtClose(h2); return false; } @@ -1393,11 +1272,7 @@ end: NtClose(h2); if (bfs) -#ifndef __REACTOS__ free(bfs); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, bfs); -#endif return ret; } @@ -1589,22 +1464,14 @@ end: ULONG mdnsize; mdnsize = (ULONG)(offsetof(MOUNTDEV_NAME, Name[0]) + DriveRoot->Length); -#ifndef __REACTOS__ mdn = malloc(mdnsize); -#else - mdn = RtlAllocateHeap(RtlGetProcessHeap(), 0, mdnsize); -#endif mdn->NameLength = DriveRoot->Length; memcpy(mdn->Name, DriveRoot->Buffer, DriveRoot->Length); NtDeviceIoControlFile(btrfsh, NULL, NULL, NULL, &iosb, IOCTL_BTRFS_PROBE_VOLUME, mdn, mdnsize, NULL, 0); -#ifndef __REACTOS__ free(mdn); -#else - RtlFreeHeap(RtlGetProcessHeap(), 0, mdn); -#endif NtClose(btrfsh); }

3 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2020