Module: wine Branch: master Commit: 455e6c64ae8751e185820820c4adc5edddab861a URL: http://source.winehq.org/git/wine.git/?a=commit;h=455e6c64ae8751e185820820c4...
Author: Sebastian Lackner sebastian@fds-team.de Date: Thu Mar 31 05:19:43 2016 +0200
kernel32: Fix handling of GetOverlappedResult when status remains STATUS_PENDING.
Spotted by Michael Müller.
Signed-off-by: Sebastian Lackner sebastian@fds-team.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/file.c | 2 ++ dlls/kernel32/tests/file.c | 5 +++++ 2 files changed, 7 insertions(+)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b6dba6a..a518e08 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -625,7 +625,9 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : hFile, INFINITE ) == WAIT_FAILED) return FALSE; + status = lpOverlapped->Internal; + if (status == STATUS_PENDING) status = STATUS_SUCCESS; }
*lpTransferred = lpOverlapped->InternalHigh; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8353c21..a066692 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3361,6 +3361,11 @@ static void test_overlapped(void) "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n");
+ r = GetOverlappedResult( 0, &ov, &result, TRUE ); + ok( r == TRUE, "should return TRUE\n" ); + ok( result == 0xabcd, "wrong result %u\n", result ); + ok( ov.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", ov.Internal ); + ResetEvent( ov.hEvent );
SetLastError( 0xb00 );