[PATCH v16 1/3] kernelbase: Access internal fields of OVERLAPPED as IO_STATUS_BLOCK.

[Jinoh Kang]

From: Jinoh Kang

Make it clear that we're accessing an IO_STATUS_BLOCK.

Don't rely on the little endian representation of the Internal field on
64-bit build, when we're in fact accessing the Status field.
---
 dlls/kernelbase/file.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 661bc0c2778..3f3c3649c31 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -3151,12 +3151,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResult( HANDLE file, LPOVERLAPPED ove
 BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *overlapped,
                                                      DWORD *result, DWORD timeout, BOOL alertable )
 {
+    union {
+        IO_STATUS_BLOCK iosb;
+        OVERLAPPED ovl;
+    } const *io = (void *)overlapped;
     NTSTATUS status;
     DWORD ret;

TRACE( "(%p %p %p %lu %d)\n", file, overlapped, result, timeout, alertable );

-    status = overlapped->Internal;
+    status = io->iosb.u.Status;
     if (status == STATUS_PENDING)
     {
         if (!timeout)
@@ -3164,7 +3168,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov
             SetLastError( ERROR_IO_INCOMPLETE );
             return FALSE;
         }
-        ret = WaitForSingleObjectEx( overlapped->hEvent ? overlapped->hEvent : file, timeout, alertable );
+        ret = WaitForSingleObjectEx( io->ovl.hEvent ? io->ovl.hEvent : file, timeout, alertable );
         if (ret == WAIT_FAILED)
             return FALSE;
         else if (ret)
@@ -3173,11 +3177,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov
             return FALSE;
         }

-        status = overlapped->Internal;
+        status = io->iosb.u.Status;
         if (status == STATUS_PENDING) status = STATUS_SUCCESS;
     }

-    *result = overlapped->InternalHigh;
+    *result = io->iosb.Information;
     return set_ntstatus( status );
 }