From ade016e3a41e9fc9fe802428a572ce0d74783c1e Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 12 May 2016 15:30:49 +0000
Subject: [PATCH] [USETUP] Debug output in usetup. Patch by Wim Hueskes.
 CORE-11230 #resolve #comment Thanks a lot!

svn path=/trunk/; revision=71320
---
 reactos/base/setup/usetup/interface/usetup.c | 45 ++++++++------------
 reactos/base/setup/usetup/partlist.c         | 10 ++---
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c
index ce649377085..bb778e008d2 100644
--- a/reactos/base/setup/usetup/interface/usetup.c
+++ b/reactos/base/setup/usetup/interface/usetup.c
@@ -2878,7 +2878,7 @@ FormatPartitionPage(PINPUT_RECORD Ir)
 #ifndef NDEBUG
     ULONG Line;
     ULONG i;
-    PLIST_ENTRY Entry;
+    PPARTITION_INFORMATION PartitionInfo;
 #endif
 
     DPRINT("FormatPartitionPage()\n");
@@ -2988,38 +2988,29 @@ FormatPartitionPage(PINPUT_RECORD Ir)
 
 #ifndef NDEBUG
             CONSOLE_PrintTextXY(6, 12,
-                                "Disk: %I64u  Cylinder: %I64u  Track: %I64u",
-                                DiskEntry->DiskSize,
-                                DiskEntry->CylinderSize,
-                                DiskEntry->TrackSize);
+                                "Cylinders: %I64u  Tracks/Cyl: %lu  Sectors/Trk: %lu  Bytes/Sec: %lu  %c",
+                                DiskEntry->Cylinders,
+                                DiskEntry->TracksPerCylinder,
+                                DiskEntry->SectorsPerTrack,
+                                DiskEntry->BytesPerSector,
+                                DiskEntry->Dirty ? '*' : ' ');
 
             Line = 13;
-            DiskEntry = PartitionList->TempDisk;
-            Entry = DiskEntry->PartListHead.Flink;
 
-            while (Entry != &DiskEntry->PrimaryPartListHead)
+            for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++)
             {
-                PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
+                PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i];
 
-                if (PartEntry->IsPartitioned == TRUE)
-                {
-                    CONSOLE_PrintTextXY(6, Line,
-                                        "%2u:  %2u  %c  %12I64u  %12I64u  %2u  %c",
-                                        i,
-                                        PartEntry->PartitionNumber,
-                                        PartEntry->BootIndicator ? 'A' : '-',
-                                        PartEntry->StartSector.QuadPart,
-                                        PartEntry->SectorCount.QuadPart,
-                                        PartEntry->PartitionType,
-                                        PartEntry->Dirty ? '*' : ' ');
-                    Line++;
-                }
-
-                Entry = Entry->Flink;
+                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++;
             }
-
-            /* Restore the old entry */
-            PartEntry = PartitionList->TempPartition;
 #endif
 
             if (WritePartitionsToDisk(PartitionList) == FALSE)
diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c
index 0d3aa027b80..88ae8996c52 100644
--- a/reactos/base/setup/usetup/partlist.c
+++ b/reactos/base/setup/usetup/partlist.c
@@ -291,7 +291,7 @@ GetDriverName(
                          NULL);
 
     swprintf(KeyName,
-             L"\\Scsi\\Scsi Port %lu",
+             L"\\Scsi\\Scsi Port %hu",
              DiskEntry->Port);
 
     RtlZeroMemory(&QueryTable,
@@ -1267,9 +1267,9 @@ AddDiskToList(
     DiskEntry->BytesPerSector = DiskGeometry.BytesPerSector;
 
     DPRINT("Cylinders %I64u\n", DiskEntry->Cylinders);
-    DPRINT("TracksPerCylinder %I64u\n", DiskEntry->TracksPerCylinder);
-    DPRINT("SectorsPerTrack %I64u\n", DiskEntry->SectorsPerTrack);
-    DPRINT("BytesPerSector %I64u\n", DiskEntry->BytesPerSector);
+    DPRINT("TracksPerCylinder %lu\n", DiskEntry->TracksPerCylinder);
+    DPRINT("SectorsPerTrack %lu\n", DiskEntry->SectorsPerTrack);
+    DPRINT("BytesPerSector %lu\n", DiskEntry->BytesPerSector);
 
     DiskEntry->SectorCount.QuadPart = DiskGeometry.Cylinders.QuadPart *
                                       (ULONGLONG)DiskGeometry.TracksPerCylinder *
@@ -1279,7 +1279,7 @@ AddDiskToList(
     DiskEntry->CylinderAlignment = DiskGeometry.TracksPerCylinder *
                                    DiskGeometry.SectorsPerTrack;
 
-    DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount);
+    DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount.QuadPart);
     DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment);
 
     DiskEntry->DiskNumber = DiskNumber;