commit 75b93ff1aaff202fa1b86d42019264225f6c62ea
author Dmitry Timoshkov <dmitry@codeweavers.com> Thu Mar 17 19:00:08 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 17 19:00:08 2005 +0000
tree 349c5bd57c7884c3192d05a18cec6b2d0b1889c6
parent 99042cfe6401c4ef3bcf42423b982e4e9fbdb01e

Match OVERLAPPED structure to the SDK definition.

dlls/kernel/file.c

diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c
index b1817ac..8ebdd22 100644
--- a/dlls/kernel/file.c
+++ b/dlls/kernel/file.c
@@ -323,8 +323,8 @@
         return FALSE;
     }
 
-    offset.u.LowPart = overlapped->Offset;
-    offset.u.HighPart = overlapped->OffsetHigh;
+    offset.u.LowPart = overlapped->u.s.Offset;
+    offset.u.HighPart = overlapped->u.s.OffsetHigh;
     io_status = (PIO_STATUS_BLOCK)overlapped;
     io_status->u.Status = STATUS_PENDING;
 
@@ -364,8 +364,8 @@
 
     if (overlapped != NULL)
     {
-        offset.u.LowPart = overlapped->Offset;
-        offset.u.HighPart = overlapped->OffsetHigh;
+        offset.u.LowPart = overlapped->u.s.Offset;
+        offset.u.HighPart = overlapped->u.s.OffsetHigh;
         poffset = &offset;
         hEvent = overlapped->hEvent;
         io_status = (PIO_STATUS_BLOCK)overlapped;
@@ -405,8 +405,8 @@
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
-    offset.u.LowPart = overlapped->Offset;
-    offset.u.HighPart = overlapped->OffsetHigh;
+    offset.u.LowPart = overlapped->u.s.Offset;
+    offset.u.HighPart = overlapped->u.s.OffsetHigh;
 
     io_status = (PIO_STATUS_BLOCK)overlapped;
     io_status->u.Status = STATUS_PENDING;
@@ -439,8 +439,8 @@
 
     if (overlapped)
     {
-        offset.u.LowPart = overlapped->Offset;
-        offset.u.HighPart = overlapped->OffsetHigh;
+        offset.u.LowPart = overlapped->u.s.Offset;
+        offset.u.HighPart = overlapped->u.s.OffsetHigh;
         poffset = &offset;
         hEvent = overlapped->hEvent;
         piosb = (PIO_STATUS_BLOCK)overlapped;
@@ -999,13 +999,13 @@
     }
 
     TRACE( "%p %lx%08lx %lx%08lx flags %lx\n",
-           hFile, overlapped->OffsetHigh, overlapped->Offset, 
+           hFile, overlapped->u.s.OffsetHigh, overlapped->u.s.Offset, 
            count_high, count_low, flags );
 
     count.u.LowPart = count_low;
     count.u.HighPart = count_high;
-    offset.u.LowPart = overlapped->Offset;
-    offset.u.HighPart = overlapped->OffsetHigh;
+    offset.u.LowPart = overlapped->u.s.Offset;
+    offset.u.HighPart = overlapped->u.s.OffsetHigh;
 
     status = NtLockFile( hFile, overlapped->hEvent, NULL, NULL, 
                          NULL, &offset, &count, NULL, 
@@ -1050,7 +1050,7 @@
     }
     if (overlapped->hEvent) FIXME("Unimplemented overlapped operation\n");
 
-    return UnlockFile( hFile, overlapped->Offset, overlapped->OffsetHigh, count_low, count_high );
+    return UnlockFile( hFile, overlapped->u.s.Offset, overlapped->u.s.OffsetHigh, count_low, count_high );
 }