Dan Kegel : ntdll: Fix endianness of three fields in DVD_LAYER_DESCRIPTOR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6077b623f299861732d1f2ea1f3ab5af09d03adf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6077b623f299861732d1f2ea1f...

Author: Dan Kegel 
Date:   Mon Feb 13 10:51:18 2012 -0800

ntdll: Fix endianness of three fields in DVD_LAYER_DESCRIPTOR.

---

dlls/ntdll/cdrom.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 802782b..1cd511c 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -144,6 +144,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(cdrom);
 # define CD_FRAMES            75 /* frames per second */
 #endif

+#ifdef WORDS_BIGENDIAN
+#define GET_BE_DWORD(x) (x)
+#else
+#define GET_BE_DWORD(x) RtlUlongByteSwap(x)
+#endif
+
 static const struct iocodexs
 {
   DWORD code;
@@ -2568,9 +2574,9 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure,
             p->Reserved1 = 0;
             p->TrackDensity = l->track_density;
             p->LinearDensity = l->linear_density;
-            p->StartingDataSector = l->start_sector;
-            p->EndDataSector = l->end_sector;
-            p->EndLayerZeroSector = l->end_sector_l0;
+            p->StartingDataSector = GET_BE_DWORD(l->start_sector);
+            p->EndDataSector = GET_BE_DWORD(l->end_sector);
+            p->EndLayerZeroSector = GET_BE_DWORD(l->end_sector_l0);
             p->Reserved5 = 0;
             p->BCAFlag = l->bca;
             p->Reserved6 = 0;
@@ -2693,9 +2699,9 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure,
             nt_desc.xlayer->TrackDensity = desc.phys.trackDensity;
             nt_desc.xlayer->LinearDensity = desc.phys.linearDensity;
             nt_desc.xlayer->BCAFlag = desc.phys.bcaFlag;
-            nt_desc.xlayer->StartingDataSector = OSReadBigInt32(&desc.phys.zero1, 0);
-            nt_desc.xlayer->EndDataSector = OSReadBigInt32(&desc.phys.zero2, 0);
-            nt_desc.xlayer->EndLayerZeroSector = OSReadBigInt32(&desc.phys.zero3, 0);
+            nt_desc.xlayer->StartingDataSector = *(DWORD *)&desc.phys.zero1;
+            nt_desc.xlayer->EndDataSector = *(DWORD *)&desc.phys.zero2;
+            nt_desc.xlayer->EndLayerZeroSector = *(DWORD *)&desc.phys.zero3;
             nt_desc.xlayer->Reserved5 = 0;
             nt_desc.xlayer->Reserved6 = 0;
             break;