Module: wine Branch: master Commit: 84ae4b937ffa5191db834916b8917c03f4cb684c URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ae4b937ffa5191db834916b...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Jan 23 15:51:58 2018 +0100
kernel32: Always set bytes written in WriteFile.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 86e5431..a0cd5f9 100644 --- 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) - *bytesWritten = piosb->Information; + if (bytesWritten) + *bytesWritten = overlapped && status ? 0 : piosb->Information;
if (status && status != STATUS_TIMEOUT) { diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c4beb19..e0b8713 100644 --- 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); }