kernel32: Always set bytes written in WriteFile.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Always set bytes written in WriteFile.
84ae4b93 · Jacek Caban · Alexandre Julliard · c47c74e5 · 84ae4b93 · 84ae4b93
Commit 84ae4b93 authored Jan 23, 2018 by Jacek Caban Committed by Alexandre Julliard Jan 23, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

file.c dlls/kernel32/file.c +2 -2

pipe.c dlls/kernel32/tests/pipe.c +1 -1

No files found.
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -577,8 +577,8 @@ BOOL WINAPI WriteFile( HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite,
        status = piosb->u.Status;
    }
-    if (status != STATUS_PENDING && bytesWritten)
+    if (bytesWritten)
-        *bytesWritten = piosb->Information;
+        *bytesWritten = overlapped && status ? 0 : piosb->Information;
    if (status && status != STATUS_TIMEOUT)
    {

--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -2767,7 +2767,7 @@ static void _overlapped_write_async(unsigned line, HANDLE writer, void *buf, DWO
    overlapped->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
    res = WriteFile(writer, buf, size, &written_bytes, overlapped);
    ok_(__FILE__,line)(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %x(%u)\n", res, GetLastError());
-    todo_wine ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes);
+    ok_(__FILE__,line)(!written_bytes, "written_bytes = %u\n", written_bytes);
    _test_not_signaled(line, overlapped->hEvent);
 }