nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[fat] align start of data region to MiB

Browse source
This commit is contained in:
Fred 2023-11-26 17:31:41 -08:00
parent 965d82c425
commit 6036bdcd71
No known key found for this signature in database
GPG key ID: 4F562738972DEF05
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/format_fat32.c
View file

@ -42,6 +42,8 @@
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|err; \ FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|err; \
goto out; } while(0) goto out; } while(0)
#define USER_AREA_ALIGN_BYTES (1 * 1024 * 1024)
extern BOOL write_as_esp; extern BOOL write_as_esp;
/* Large FAT32 */ /* Large FAT32 */
@ -175,6 +177,7 @@ BOOL FormatLargeFAT32(DWORD DriveIndex, uint64_t PartitionOffset, DWORD ClusterS
DWORD BytesPerSect = 0; DWORD BytesPerSect = 0;
DWORD SectorsPerCluster = 0; DWORD SectorsPerCluster = 0;
DWORD TotalSectors = 0; DWORD TotalSectors = 0;
DWORD AlignSectors = 0;
DWORD SystemAreaSize = 0; DWORD SystemAreaSize = 0;
DWORD UserAreaSize = 0; DWORD UserAreaSize = 0;
ULONGLONG qTotalSectors = 0; ULONGLONG qTotalSectors = 0;
@ -295,7 +298,6 @@ BOOL FormatLargeFAT32(DWORD DriveIndex, uint64_t PartitionOffset, DWORD ClusterS
SectorsPerCluster = ClusterSize / BytesPerSect; SectorsPerCluster = ClusterSize / BytesPerSect;
pFAT32BootSect->bSecPerClus = (BYTE)SectorsPerCluster; pFAT32BootSect->bSecPerClus = (BYTE)SectorsPerCluster;
pFAT32BootSect->wRsvdSecCnt = (WORD)ReservedSectCount;
pFAT32BootSect->bNumFATs = (BYTE)NumFATs; pFAT32BootSect->bNumFATs = (BYTE)NumFATs;
pFAT32BootSect->wRootEntCnt = 0; pFAT32BootSect->wRootEntCnt = 0;
pFAT32BootSect->wTotSec16 = 0; pFAT32BootSect->wTotSec16 = 0;
@ -310,6 +312,13 @@ BOOL FormatLargeFAT32(DWORD DriveIndex, uint64_t PartitionOffset, DWORD ClusterS
FatSize = GetFATSizeSectors(pFAT32BootSect->dTotSec32, pFAT32BootSect->wRsvdSecCnt, FatSize = GetFATSizeSectors(pFAT32BootSect->dTotSec32, pFAT32BootSect->wRsvdSecCnt,
pFAT32BootSect->bSecPerClus, pFAT32BootSect->bNumFATs, BytesPerSect); pFAT32BootSect->bSecPerClus, pFAT32BootSect->bNumFATs, BytesPerSect);
// Recalculate reserved sector count after FAT size is known
SystemAreaSize = ReservedSectCount + NumFATs * FatSize; // We round up from here to integral MiB
AlignSectors = USER_AREA_ALIGN_BYTES / BytesPerSect;
SystemAreaSize = (SystemAreaSize + AlignSectors - 1) / AlignSectors * AlignSectors;
ReservedSectCount = SystemAreaSize - NumFATs * FatSize;
pFAT32BootSect->wRsvdSecCnt = (WORD)ReservedSectCount;
pFAT32BootSect->dFATSz32 = FatSize; pFAT32BootSect->dFATSz32 = FatSize;
pFAT32BootSect->wExtFlags = 0; pFAT32BootSect->wExtFlags = 0;
pFAT32BootSect->wFSVer = 0; pFAT32BootSect->wFSVer = 0;