[DISKPART] Replace some magic values and enter the Terabyte era

EricKohl · EricKohl · commit 74999e6670d8 · 2025-12-14T18:19:26.000+01:00
diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h
@@ -231,6 +231,15 @@ typedef struct _VOLENTRY
 
 } VOLENTRY, *PVOLENTRY;
 
+#define SIZE_1KB    (1024ULL)
+#define SIZE_10KB   (10ULL * 1024ULL)
+#define SIZE_1MB    (1024ULL * 1024ULL)
+#define SIZE_10MB   (10ULL * 1024ULL * 1024ULL)
+#define SIZE_1GB    (1024ULL * 1024ULL * 1024ULL)
+#define SIZE_10GB   (10ULL * 1024ULL * 1024ULL * 1024ULL)
+#define SIZE_1TB    (1024ULL * 1024ULL * 1024ULL * 1024ULL)
+#define SIZE_10TB   (10ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL)
+
 
 /* GLOBAL VARIABLES ***********************************************************/
 
diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c
@@ -91,33 +91,43 @@ PrintDisk(
     DiskSize = DiskEntry->SectorCount.QuadPart *
                (ULONGLONG)DiskEntry->BytesPerSector;
 
-    if (DiskSize >= 10737418240) /* 10 GB */
+    if (DiskSize >= SIZE_10TB) /* 10 TB */
     {
-        DiskSize = RoundingDivide(DiskSize, 1073741824);
+        DiskSize = RoundingDivide(DiskSize, SIZE_1TB);
+        lpSizeUnit = L"TB";
+    }
+    else if (DiskSize >= SIZE_10GB) /* 10 GB */
+    {
+        DiskSize = RoundingDivide(DiskSize, SIZE_1GB);
         lpSizeUnit = L"GB";
     }
     else
     {
-        DiskSize = RoundingDivide(DiskSize, 1048576);
+        DiskSize = RoundingDivide(DiskSize, SIZE_1MB);
         if (DiskSize == 0)
             DiskSize = 1;
         lpSizeUnit = L"MB";
     }
 
     FreeSize = GetFreeDiskSize(DiskEntry);
-    if (FreeSize >= 10737418240) /* 10 GB */
+    if (FreeSize >= SIZE_10TB) /* 10 TB */
     {
-        FreeSize = RoundingDivide(FreeSize, 1073741824);
+        FreeSize = RoundingDivide(FreeSize, SIZE_1TB);
+        lpFreeUnit = L"TB";
+    }
+    else if (FreeSize >= SIZE_10GB) /* 10 GB */
+    {
+        FreeSize = RoundingDivide(FreeSize, SIZE_1GB);
         lpFreeUnit = L"GB";
     }
-    else if (FreeSize >= 10485760) /* 10 MB */
+    else if (FreeSize >= SIZE_10MB) /* 10 MB */
     {
-        FreeSize = RoundingDivide(FreeSize, 1048576);
+        FreeSize = RoundingDivide(FreeSize, SIZE_1MB);
         lpFreeUnit = L"MB";
     }
-    else if (FreeSize >= 10240) /* 10 KB */
+    else if (FreeSize >= SIZE_10KB) /* 10 KB */
     {
-        FreeSize = RoundingDivide(FreeSize, 1024);
+        FreeSize = RoundingDivide(FreeSize, SIZE_1KB);
         lpFreeUnit = L"KB";
     }
     else
@@ -202,37 +212,47 @@ ListPartition(
             {
                 PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartSize >= 10737418240) /* 10 GB */
+                if (PartSize >= SIZE_10TB) /* 10 TB */
+                {
+                    PartSize = RoundingDivide(PartSize, SIZE_1TB);
+                    lpSizeUnit = L"TB";
+                }
+                else if (PartSize >= SIZE_10GB) /* 10 GB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1073741824);
+                    PartSize = RoundingDivide(PartSize, SIZE_1GB);
                     lpSizeUnit = L"GB";
                 }
-                else if (PartSize >= 10485760) /* 10 MB */
+                else if (PartSize >= SIZE_10MB) /* 10 MB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1048576);
+                    PartSize = RoundingDivide(PartSize, SIZE_1MB);
                     lpSizeUnit = L"MB";
                 }
                 else
                 {
-                    PartSize = RoundingDivide(PartSize, 1024);
+                    PartSize = RoundingDivide(PartSize, SIZE_1KB);
                     lpSizeUnit = L"KB";
                 }
 
                 PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartOffset >= 10737418240) /* 10 GB */
+                if (PartOffset >= SIZE_10TB) /* 10 TB */
+                {
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1TB);
+                    lpOffsetUnit = L"TB";
+                }
+                else if (PartOffset >= SIZE_10GB) /* 10 GB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1073741824);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1GB);
                     lpOffsetUnit = L"GB";
                 }
-                else if (PartOffset >= 10485760) /* 10 MB */
+                else if (PartOffset >= SIZE_10MB) /* 10 MB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1048576);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1MB);
                     lpOffsetUnit = L"MB";
                 }
                 else
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1024);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1KB);
                     lpOffsetUnit = L"KB";
                 }
 
@@ -258,37 +278,47 @@ ListPartition(
             {
                 PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartSize >= 10737418240) /* 10 GB */
+                if (PartSize >= SIZE_10TB) /* 10 TB */
+                {
+                    PartSize = RoundingDivide(PartSize, SIZE_1TB);
+                    lpSizeUnit = L"TB";
+                }
+                else if (PartSize >= SIZE_10GB) /* 10 GB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1073741824);
+                    PartSize = RoundingDivide(PartSize, SIZE_1GB);
                     lpSizeUnit = L"GB";
                 }
-                else if (PartSize >= 10485760) /* 10 MB */
+                else if (PartSize >= SIZE_10MB) /* 10 MB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1048576);
+                    PartSize = RoundingDivide(PartSize, SIZE_1MB);
                     lpSizeUnit = L"MB";
                 }
                 else
                 {
-                    PartSize = RoundingDivide(PartSize, 1024);
+                    PartSize = RoundingDivide(PartSize, SIZE_1KB);
                     lpSizeUnit = L"KB";
                 }
 
                 PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartOffset >= 10737418240) /* 10 GB */
+                if (PartOffset >= SIZE_10TB) /* 10 TB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1073741824);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1TB);
+                    lpOffsetUnit = L"TB";
+                }
+                else if (PartOffset >= SIZE_10GB) /* 10 GB */
+                {
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1GB);
                     lpOffsetUnit = L"GB";
                 }
-                else if (PartOffset >= 10485760) /* 10 MB */
+                else if (PartOffset >= SIZE_10MB) /* 10 MB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1048576);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1MB);
                     lpOffsetUnit = L"MB";
                 }
                 else
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1024);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1KB);
                     lpOffsetUnit = L"KB";
                 }
 
@@ -318,37 +348,47 @@ ListPartition(
             {
                 PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartSize >= 10737418240) /* 10 GB */
+                if (PartSize >= SIZE_10TB) /* 10 TB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1073741824);
+                    PartSize = RoundingDivide(PartSize, SIZE_1TB);
+                    lpSizeUnit = L"TB";
+                }
+                else if (PartSize >= SIZE_10GB) /* 10 GB */
+                {
+                    PartSize = RoundingDivide(PartSize, SIZE_1GB);
                     lpSizeUnit = L"GB";
                 }
-                else if (PartSize >= 10485760) /* 10 MB */
+                else if (PartSize >= SIZE_10MB) /* 10 MB */
                 {
-                    PartSize = RoundingDivide(PartSize, 1048576);
+                    PartSize = RoundingDivide(PartSize, SIZE_1MB);
                     lpSizeUnit = L"MB";
                 }
                 else
                 {
-                    PartSize = RoundingDivide(PartSize, 1024);
+                    PartSize = RoundingDivide(PartSize, SIZE_1KB);
                     lpSizeUnit = L"KB";
                 }
 
                 PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;
 
-                if (PartOffset >= 10737418240) /* 10 GB */
+                if (PartOffset >= SIZE_10TB) /* 10 TB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1073741824);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1TB);
+                    lpOffsetUnit = L"TB";
+                }
+                else if (PartOffset >= SIZE_10GB) /* 10 GB */
+                {
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1GB);
                     lpOffsetUnit = L"GB";
                 }
-                else if (PartOffset >= 10485760) /* 10 MB */
+                else if (PartOffset >= SIZE_10MB) /* 10 MB */
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1048576);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1MB);
                     lpOffsetUnit = L"MB";
                 }
                 else
                 {
-                    PartOffset = RoundingDivide(PartOffset, 1024);
+                    PartOffset = RoundingDivide(PartOffset, SIZE_1KB);
                     lpOffsetUnit = L"KB";
                 }
 
@@ -402,21 +442,27 @@ PrintVolume(
     PWSTR pszVolumeType;
 
     VolumeSize = VolumeEntry->Size.QuadPart;
-    if (VolumeSize >= 10737418240) /* 10 GB */
+    if (VolumeSize >= SIZE_10TB) /* 10 TB */
+    {
+        VolumeSize = RoundingDivide(VolumeSize, SIZE_1TB);
+        pszSizeUnit = L"TB";
+    }
+    else if (VolumeSize >= SIZE_10GB) /* 10 GB */
     {
-        VolumeSize = RoundingDivide(VolumeSize, 1073741824);
+        VolumeSize = RoundingDivide(VolumeSize, SIZE_1GB);
         pszSizeUnit = L"GB";
     }
-    else if (VolumeSize >= 10485760) /* 10 MB */
+    else if (VolumeSize >= SIZE_10MB) /* 10 MB */
     {
-        VolumeSize = RoundingDivide(VolumeSize, 1048576);
+        VolumeSize = RoundingDivide(VolumeSize, SIZE_1MB);
         pszSizeUnit = L"MB";
     }
     else
     {
-        VolumeSize = RoundingDivide(VolumeSize, 1024);
+        VolumeSize = RoundingDivide(VolumeSize, SIZE_1KB);
         pszSizeUnit = L"KB";
     }
+
     switch (VolumeEntry->VolumeType)
     {
         case VOLUME_TYPE_CDROM:

Original file line number	Diff line number	Diff line change
`@@ -91,33 +91,43 @@ PrintDisk(`
`91`	`91`	`DiskSize = DiskEntry->SectorCount.QuadPart *`
`92`	`92`	`(ULONGLONG)DiskEntry->BytesPerSector;`
`93`	`93`
`94`		`- if (DiskSize >= 10737418240) /* 10 GB */`
	`94`	`+ if (DiskSize >= SIZE_10TB) /* 10 TB */`
`95`	`95`	`{`
`96`		`- DiskSize = RoundingDivide(DiskSize, 1073741824);`
	`96`	`+ DiskSize = RoundingDivide(DiskSize, SIZE_1TB);`
	`97`	`+ lpSizeUnit = L"TB";`
	`98`	`+ }`
	`99`	`+ else if (DiskSize >= SIZE_10GB) /* 10 GB */`
	`100`	`+ {`
	`101`	`+ DiskSize = RoundingDivide(DiskSize, SIZE_1GB);`
`97`	`102`	`lpSizeUnit = L"GB";`
`98`	`103`	`}`
`99`	`104`	`else`
`100`	`105`	`{`
`101`		`- DiskSize = RoundingDivide(DiskSize, 1048576);`
	`106`	`+ DiskSize = RoundingDivide(DiskSize, SIZE_1MB);`
`102`	`107`	`if (DiskSize == 0)`
`103`	`108`	`DiskSize = 1;`
`104`	`109`	`lpSizeUnit = L"MB";`
`105`	`110`	`}`
`106`	`111`
`107`	`112`	`FreeSize = GetFreeDiskSize(DiskEntry);`
`108`		`- if (FreeSize >= 10737418240) /* 10 GB */`
	`113`	`+ if (FreeSize >= SIZE_10TB) /* 10 TB */`
`109`	`114`	`{`
`110`		`- FreeSize = RoundingDivide(FreeSize, 1073741824);`
	`115`	`+ FreeSize = RoundingDivide(FreeSize, SIZE_1TB);`
	`116`	`+ lpFreeUnit = L"TB";`
	`117`	`+ }`
	`118`	`+ else if (FreeSize >= SIZE_10GB) /* 10 GB */`
	`119`	`+ {`
	`120`	`+ FreeSize = RoundingDivide(FreeSize, SIZE_1GB);`
`111`	`121`	`lpFreeUnit = L"GB";`
`112`	`122`	`}`
`113`		`- else if (FreeSize >= 10485760) /* 10 MB */`
	`123`	`+ else if (FreeSize >= SIZE_10MB) /* 10 MB */`
`114`	`124`	`{`
`115`		`- FreeSize = RoundingDivide(FreeSize, 1048576);`
	`125`	`+ FreeSize = RoundingDivide(FreeSize, SIZE_1MB);`
`116`	`126`	`lpFreeUnit = L"MB";`
`117`	`127`	`}`
`118`		`- else if (FreeSize >= 10240) /* 10 KB */`
	`128`	`+ else if (FreeSize >= SIZE_10KB) /* 10 KB */`
`119`	`129`	`{`
`120`		`- FreeSize = RoundingDivide(FreeSize, 1024);`
	`130`	`+ FreeSize = RoundingDivide(FreeSize, SIZE_1KB);`
`121`	`131`	`lpFreeUnit = L"KB";`
`122`	`132`	`}`
`123`	`133`	`else`
`@@ -202,37 +212,47 @@ ListPartition(`
`202`	`212`	`{`
`203`	`213`	`PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;`
`204`	`214`
`205`		`- if (PartSize >= 10737418240) /* 10 GB */`
	`215`	`+ if (PartSize >= SIZE_10TB) /* 10 TB */`
	`216`	`+ {`
	`217`	`+ PartSize = RoundingDivide(PartSize, SIZE_1TB);`
	`218`	`+ lpSizeUnit = L"TB";`
	`219`	`+ }`
	`220`	`+ else if (PartSize >= SIZE_10GB) /* 10 GB */`
`206`	`221`	`{`
`207`		`- PartSize = RoundingDivide(PartSize, 1073741824);`
	`222`	`+ PartSize = RoundingDivide(PartSize, SIZE_1GB);`
`208`	`223`	`lpSizeUnit = L"GB";`
`209`	`224`	`}`
`210`		`- else if (PartSize >= 10485760) /* 10 MB */`
	`225`	`+ else if (PartSize >= SIZE_10MB) /* 10 MB */`
`211`	`226`	`{`
`212`		`- PartSize = RoundingDivide(PartSize, 1048576);`
	`227`	`+ PartSize = RoundingDivide(PartSize, SIZE_1MB);`
`213`	`228`	`lpSizeUnit = L"MB";`
`214`	`229`	`}`
`215`	`230`	`else`
`216`	`231`	`{`
`217`		`- PartSize = RoundingDivide(PartSize, 1024);`
	`232`	`+ PartSize = RoundingDivide(PartSize, SIZE_1KB);`
`218`	`233`	`lpSizeUnit = L"KB";`
`219`	`234`	`}`
`220`	`235`
`221`	`236`	`PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;`
`222`	`237`
`223`		`- if (PartOffset >= 10737418240) /* 10 GB */`
	`238`	`+ if (PartOffset >= SIZE_10TB) /* 10 TB */`
	`239`	`+ {`
	`240`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1TB);`
	`241`	`+ lpOffsetUnit = L"TB";`
	`242`	`+ }`
	`243`	`+ else if (PartOffset >= SIZE_10GB) /* 10 GB */`
`224`	`244`	`{`
`225`		`- PartOffset = RoundingDivide(PartOffset, 1073741824);`
	`245`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1GB);`
`226`	`246`	`lpOffsetUnit = L"GB";`
`227`	`247`	`}`
`228`		`- else if (PartOffset >= 10485760) /* 10 MB */`
	`248`	`+ else if (PartOffset >= SIZE_10MB) /* 10 MB */`
`229`	`249`	`{`
`230`		`- PartOffset = RoundingDivide(PartOffset, 1048576);`
	`250`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1MB);`
`231`	`251`	`lpOffsetUnit = L"MB";`
`232`	`252`	`}`
`233`	`253`	`else`
`234`	`254`	`{`
`235`		`- PartOffset = RoundingDivide(PartOffset, 1024);`
	`255`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1KB);`
`236`	`256`	`lpOffsetUnit = L"KB";`
`237`	`257`	`}`
`238`	`258`
`@@ -258,37 +278,47 @@ ListPartition(`
`258`	`278`	`{`
`259`	`279`	`PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;`
`260`	`280`
`261`		`- if (PartSize >= 10737418240) /* 10 GB */`
	`281`	`+ if (PartSize >= SIZE_10TB) /* 10 TB */`
	`282`	`+ {`
	`283`	`+ PartSize = RoundingDivide(PartSize, SIZE_1TB);`
	`284`	`+ lpSizeUnit = L"TB";`
	`285`	`+ }`
	`286`	`+ else if (PartSize >= SIZE_10GB) /* 10 GB */`
`262`	`287`	`{`
`263`		`- PartSize = RoundingDivide(PartSize, 1073741824);`
	`288`	`+ PartSize = RoundingDivide(PartSize, SIZE_1GB);`
`264`	`289`	`lpSizeUnit = L"GB";`
`265`	`290`	`}`
`266`		`- else if (PartSize >= 10485760) /* 10 MB */`
	`291`	`+ else if (PartSize >= SIZE_10MB) /* 10 MB */`
`267`	`292`	`{`
`268`		`- PartSize = RoundingDivide(PartSize, 1048576);`
	`293`	`+ PartSize = RoundingDivide(PartSize, SIZE_1MB);`
`269`	`294`	`lpSizeUnit = L"MB";`
`270`	`295`	`}`
`271`	`296`	`else`
`272`	`297`	`{`
`273`		`- PartSize = RoundingDivide(PartSize, 1024);`
	`298`	`+ PartSize = RoundingDivide(PartSize, SIZE_1KB);`
`274`	`299`	`lpSizeUnit = L"KB";`
`275`	`300`	`}`
`276`	`301`
`277`	`302`	`PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;`
`278`	`303`
`279`		`- if (PartOffset >= 10737418240) /* 10 GB */`
	`304`	`+ if (PartOffset >= SIZE_10TB) /* 10 TB */`
`280`	`305`	`{`
`281`		`- PartOffset = RoundingDivide(PartOffset, 1073741824);`
	`306`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1TB);`
	`307`	`+ lpOffsetUnit = L"TB";`
	`308`	`+ }`
	`309`	`+ else if (PartOffset >= SIZE_10GB) /* 10 GB */`
	`310`	`+ {`
	`311`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1GB);`
`282`	`312`	`lpOffsetUnit = L"GB";`
`283`	`313`	`}`
`284`		`- else if (PartOffset >= 10485760) /* 10 MB */`
	`314`	`+ else if (PartOffset >= SIZE_10MB) /* 10 MB */`
`285`	`315`	`{`
`286`		`- PartOffset = RoundingDivide(PartOffset, 1048576);`
	`316`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1MB);`
`287`	`317`	`lpOffsetUnit = L"MB";`
`288`	`318`	`}`
`289`	`319`	`else`
`290`	`320`	`{`
`291`		`- PartOffset = RoundingDivide(PartOffset, 1024);`
	`321`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1KB);`
`292`	`322`	`lpOffsetUnit = L"KB";`
`293`	`323`	`}`
`294`	`324`
`@@ -318,37 +348,47 @@ ListPartition(`
`318`	`348`	`{`
`319`	`349`	`PartSize = PartEntry->SectorCount.QuadPart * CurrentDisk->BytesPerSector;`
`320`	`350`
`321`		`- if (PartSize >= 10737418240) /* 10 GB */`
	`351`	`+ if (PartSize >= SIZE_10TB) /* 10 TB */`
`322`	`352`	`{`
`323`		`- PartSize = RoundingDivide(PartSize, 1073741824);`
	`353`	`+ PartSize = RoundingDivide(PartSize, SIZE_1TB);`
	`354`	`+ lpSizeUnit = L"TB";`
	`355`	`+ }`
	`356`	`+ else if (PartSize >= SIZE_10GB) /* 10 GB */`
	`357`	`+ {`
	`358`	`+ PartSize = RoundingDivide(PartSize, SIZE_1GB);`
`324`	`359`	`lpSizeUnit = L"GB";`
`325`	`360`	`}`
`326`		`- else if (PartSize >= 10485760) /* 10 MB */`
	`361`	`+ else if (PartSize >= SIZE_10MB) /* 10 MB */`
`327`	`362`	`{`
`328`		`- PartSize = RoundingDivide(PartSize, 1048576);`
	`363`	`+ PartSize = RoundingDivide(PartSize, SIZE_1MB);`
`329`	`364`	`lpSizeUnit = L"MB";`
`330`	`365`	`}`
`331`	`366`	`else`
`332`	`367`	`{`
`333`		`- PartSize = RoundingDivide(PartSize, 1024);`
	`368`	`+ PartSize = RoundingDivide(PartSize, SIZE_1KB);`
`334`	`369`	`lpSizeUnit = L"KB";`
`335`	`370`	`}`
`336`	`371`
`337`	`372`	`PartOffset = PartEntry->StartSector.QuadPart * CurrentDisk->BytesPerSector;`
`338`	`373`
`339`		`- if (PartOffset >= 10737418240) /* 10 GB */`
	`374`	`+ if (PartOffset >= SIZE_10TB) /* 10 TB */`
`340`	`375`	`{`
`341`		`- PartOffset = RoundingDivide(PartOffset, 1073741824);`
	`376`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1TB);`
	`377`	`+ lpOffsetUnit = L"TB";`
	`378`	`+ }`
	`379`	`+ else if (PartOffset >= SIZE_10GB) /* 10 GB */`
	`380`	`+ {`
	`381`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1GB);`
`342`	`382`	`lpOffsetUnit = L"GB";`
`343`	`383`	`}`
`344`		`- else if (PartOffset >= 10485760) /* 10 MB */`
	`384`	`+ else if (PartOffset >= SIZE_10MB) /* 10 MB */`
`345`	`385`	`{`
`346`		`- PartOffset = RoundingDivide(PartOffset, 1048576);`
	`386`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1MB);`
`347`	`387`	`lpOffsetUnit = L"MB";`
`348`	`388`	`}`
`349`	`389`	`else`
`350`	`390`	`{`
`351`		`- PartOffset = RoundingDivide(PartOffset, 1024);`
	`391`	`+ PartOffset = RoundingDivide(PartOffset, SIZE_1KB);`
`352`	`392`	`lpOffsetUnit = L"KB";`
`353`	`393`	`}`
`354`	`394`
`@@ -402,21 +442,27 @@ PrintVolume(`
`402`	`442`	`PWSTR pszVolumeType;`
`403`	`443`
`404`	`444`	`VolumeSize = VolumeEntry->Size.QuadPart;`
`405`		`- if (VolumeSize >= 10737418240) /* 10 GB */`
	`445`	`+ if (VolumeSize >= SIZE_10TB) /* 10 TB */`
	`446`	`+ {`
	`447`	`+ VolumeSize = RoundingDivide(VolumeSize, SIZE_1TB);`
	`448`	`+ pszSizeUnit = L"TB";`
	`449`	`+ }`
	`450`	`+ else if (VolumeSize >= SIZE_10GB) /* 10 GB */`
`406`	`451`	`{`
`407`		`- VolumeSize = RoundingDivide(VolumeSize, 1073741824);`
	`452`	`+ VolumeSize = RoundingDivide(VolumeSize, SIZE_1GB);`
`408`	`453`	`pszSizeUnit = L"GB";`
`409`	`454`	`}`
`410`		`- else if (VolumeSize >= 10485760) /* 10 MB */`
	`455`	`+ else if (VolumeSize >= SIZE_10MB) /* 10 MB */`
`411`	`456`	`{`
`412`		`- VolumeSize = RoundingDivide(VolumeSize, 1048576);`
	`457`	`+ VolumeSize = RoundingDivide(VolumeSize, SIZE_1MB);`
`413`	`458`	`pszSizeUnit = L"MB";`
`414`	`459`	`}`
`415`	`460`	`else`
`416`	`461`	`{`
`417`		`- VolumeSize = RoundingDivide(VolumeSize, 1024);`
	`462`	`+ VolumeSize = RoundingDivide(VolumeSize, SIZE_1KB);`
`418`	`463`	`pszSizeUnit = L"KB";`
`419`	`464`	`}`
	`465`	`+`
`420`	`466`	`switch (VolumeEntry->VolumeType)`
`421`	`467`	`{`
`422`	`468`	`case VOLUME_TYPE_CDROM:`