[ros-diffs] [reactos] 02/05: [FREELDR] iso.h: Fix definition of the "Primary Volume Descriptor" PVD structure (#7367)

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56eede6e386c594ec7dae…

commit 56eede6e386c594ec7daedeba668ff8c722804f9
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Sep 22 17:44:58 2024 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Wed Sep 25 12:56:47 2024 +0200

    [FREELDR] iso.h: Fix definition of the "Primary Volume Descriptor" PVD
structure (#7367)
    
    For reference, see the cdfs/cd.h RAW_ISO_VD structure.
    
    Each of the old "VolumeSetSize", "VolumeSequenceNumber" and
"LogicalBlockSize"
    ULONG fields actually correspond to pairs of USHORT fields:
    "VolumeSetSizeL" and "VolumeSetSizeM", etc., where the
"L" one contains
    the value in little-endian format, while the "M" one contains the same
    value in big-endian format.
    
    Additionally, use UCHARs for the character arrays.
---
 boot/freeldr/freeldr/include/fs/iso.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/boot/freeldr/freeldr/include/fs/iso.h
b/boot/freeldr/freeldr/include/fs/iso.h
index 765f49b1fe5..493e90c1ca0 100644
--- a/boot/freeldr/freeldr/include/fs/iso.h
+++ b/boot/freeldr/freeldr/include/fs/iso.h
@@ -60,18 +60,21 @@ typedef struct _VD_HEADER
 typedef struct _PVD
 {
     UCHAR  VdType;                      // 1
-    CHAR   StandardId[5];               // 2-6
+    UCHAR  StandardId[5];               // 2-6
     UCHAR  VdVersion;                   // 7
     UCHAR  unused0;                     // 8
-    CHAR   SystemId[32];                // 9-40
-    CHAR   VolumeId[32];                // 41-72
+    UCHAR  SystemId[32];                // 9-40
+    UCHAR  VolumeId[32];                // 41-72
     UCHAR  unused1[8];                  // 73-80
     ULONG  VolumeSpaceSizeL;            // 81-84
     ULONG  VolumeSpaceSizeM;            // 85-88
     UCHAR  unused2[32];                 // 89-120
-    ULONG  VolumeSetSize;               // 121-124
-    ULONG  VolumeSequenceNumber;        // 125-128
-    ULONG  LogicalBlockSize;            // 129-132
+    USHORT VolumeSetSizeL;              // 121-122
+    USHORT VolumeSetSizeM;              // 123-124
+    USHORT VolumeSeqNumberL;            // 125-126
+    USHORT VolumeSeqNumberM;            // 127-128
+    USHORT LogicalBlockSizeL;           // 129-130
+    USHORT LogicalBlockSizeM;           // 131-132
     ULONG  PathTableSizeL;              // 133-136
     ULONG  PathTableSizeM;              // 137-140
     ULONG  LPathTablePos;               // 141-144
@@ -79,8 +82,8 @@ typedef struct _PVD
     ULONG  MPathTablePos;               // 149-152
     ULONG  MOptPathTablePos;            // 153-156
     DIR_RECORD RootDirRecord;           // 157-190
-    CHAR   VolumeSetIdentifier[128];    // 191-318
-    CHAR   PublisherIdentifier[128];    // 319-446
+    UCHAR  VolumeSetIdentifier[128];    // 191-318
+    UCHAR  PublisherIdentifier[128];    // 319-446
 
     /* more data ... */
 } PVD, *PPVD;