OrcLib: replace UINT64 by ULONG64 for consistency

Author: jgautier-anssi

src/OrcLib/EvtLibrary.h

@@ -69,7 +69,7 @@ typedef struct _EVT_VARIANT
         UINT8 ByteVal;
         UINT16 UInt16Val;
         UINT32 UInt32Val;
-        UINT64 UInt64Val;
+        ULONG64 UInt64Val;
         float SingleVal;
         double DoubleVal;
         ULONGLONG FileTimeVal;
@@ -90,7 +90,7 @@ typedef struct _EVT_VARIANT
         UINT8* ByteArr;
         UINT16* UInt16Arr;
         UINT32* UInt32Arr;
-        UINT64* UInt64Arr;
+        ULONG64* UInt64Arr;
         float* SingleArr;
         double* DoubleArr;
         FILETIME* FileTimeArr;

src/OrcLib/NtfsDataStructures.h

@@ -384,7 +384,7 @@ struct SECURITY_DESCRIPTOR_ENTRY
 {
     UINT32 Hash;
     UINT32 SecID;
-    UINT64 OffsetEntry;
+    ULONG64 OffsetEntry;
     UINT32 SizeEntry;
     SECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor;
 };

src/OrcLib/Partition.h

@@ -56,9 +56,9 @@ class Partition
     Flags PartitionFlags;
     UINT PartitionNumber;
     UINT SectorSize;
-    UINT64 Start;
-    UINT64 End;
-    UINT64 Size;
+    ULONG64 Start;
+    ULONG64 End;
+    ULONG64 Size;
 
     ~Partition(void) {};
 };

src/OrcLib/PartitionTable.cpp

@@ -130,13 +130,13 @@ void PartitionTable::ParseDiskPartition(
     DiskPartition* diskPartition,
     UINT sectorSize,
     Partition& p,
-    UINT64 partitionOffset)
+    ULONG64 partitionOffset)
 {
     p.SectorSize = sectorSize;
 
     // partition start offset & size
-    p.Start = ((UINT64)diskPartition->SectorAddress) * sectorSize + partitionOffset;
-    p.Size = ((UINT64)diskPartition->NumberOfSector) * sectorSize;
+    p.Start = ((ULONG64)diskPartition->SectorAddress) * sectorSize + partitionOffset;
+    p.Size = ((ULONG64)diskPartition->NumberOfSector) * sectorSize;
     p.End = p.Start + p.Size;
 
     // field flag
@@ -213,8 +213,8 @@ void PartitionTable::ParseDiskPartition(
 
     p.SectorSize = sectorSize;
 
-    UINT64 start = gptPartitionEntry->FirstLba * sectorSize;
-    UINT64 end = gptPartitionEntry->LastLba * sectorSize;
+    ULONG64 start = gptPartitionEntry->FirstLba * sectorSize;
+    ULONG64 end = gptPartitionEntry->LastLba * sectorSize;
 
     p.Start = start;
     p.End = end;
@@ -493,7 +493,7 @@ HRESULT PartitionTable::ParseExtendedPartition(
     IDiskExtent& diskExtend,
     const Partition& p,
     ExtendedBootRecord* pExtendedRecord,
-    UINT64 u64ExtendedPartitionStart)
+    ULONG64 u64ExtendedPartitionStart)
 {
     HRESULT hr = E_FAIL;
 
@@ -572,7 +572,7 @@ HRESULT PartitionTable::OpenDiskExtend(IDiskExtent& diskExtend)
     return S_OK;
 }
 
-HRESULT PartitionTable::SeekDiskExtend(IDiskExtent& diskExtend, UINT64 offset)
+HRESULT PartitionTable::SeekDiskExtend(IDiskExtent& diskExtend, ULONG64 offset)
 {
     HRESULT hr = E_FAIL;
     LARGE_INTEGER off;

src/OrcLib/PartitionTable.h

@@ -33,7 +33,7 @@ class PartitionTable
 
     // static methods
     static HRESULT GuessPartitionType(const CBinaryBuffer& buffer, Partition& p);
-    static void ParseDiskPartition(DiskPartition* diskPartition, UINT sectorSize, Partition& p, UINT64 partitionOffset);
+    static void ParseDiskPartition(DiskPartition* diskPartition, UINT sectorSize, Partition& p, ULONG64 partitionOffset);
     static void
     ParseDiskPartition(IDiskExtent& diskExtend, GPTPartitionEntry* gptPartitionEntry, UINT sectorSize, Partition& p);
     static UINT GetSectorSize(IDiskExtent& extent);
@@ -47,14 +47,14 @@ class PartitionTable
         IDiskExtent& diskExtend,
         const Partition& p,
         ExtendedBootRecord* pExtendedRecord,
-        UINT64 u64ExtendedPartitionStart);
+        ULONG64 u64ExtendedPartitionStart);
 
     void AddPartition(const Partition& p);
     UINT8 GetPartitionNumber();
 
     // internal methods
     HRESULT OpenDiskExtend(IDiskExtent& diskExtend);
-    HRESULT SeekDiskExtend(IDiskExtent& diskExtend, UINT64 offset);
+    HRESULT SeekDiskExtend(IDiskExtent& diskExtend, ULONG64 offset);
     HRESULT ReadDiskExtend(IDiskExtent& diskExtend, CBinaryBuffer& buffer);
 
     DWORD Crc32(const CBinaryBuffer& buffer);