January 2017 - Wine-commits

André Hentschel : wininet: Fix some spec file entries.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 07e3181db3cf7ef4740d271ae0d5060d79c4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e3181db3cf7ef4740d271ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 29 21:59:07 2017 +0100 wininet: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/wininet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 3c4bf5a..ef27009 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -80,10 +80,10 @@ @ stdcall FtpSetCurrentDirectoryW(ptr wstr) @ stdcall GetUrlCacheConfigInfoA(ptr ptr long) @ stdcall GetUrlCacheConfigInfoW(ptr ptr long) -@ stdcall GetUrlCacheEntryInfoA(str ptr long) +@ stdcall GetUrlCacheEntryInfoA(str ptr ptr) @ stdcall GetUrlCacheEntryInfoExA(str ptr ptr str ptr ptr long) @ stdcall GetUrlCacheEntryInfoExW(wstr ptr ptr wstr ptr ptr long) -@ stdcall GetUrlCacheEntryInfoW(wstr ptr long) +@ stdcall GetUrlCacheEntryInfoW(wstr ptr ptr) @ stdcall GetUrlCacheGroupAttributeA(int64 long long ptr ptr ptr) @ stdcall GetUrlCacheGroupAttributeW(int64 long long ptr ptr ptr) @ stub GetUrlCacheHeaderData

1 0

Jarkko Korpi : wined3d: Add Rx 460 binary driver.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: b380450ad473a605f041dc2810293b851fbf10ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b380450ad473a605f041dc281… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Mon Jan 30 11:32:38 2017 +0200 wined3d: Add Rx 460 binary driver. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83d68b5..f3af990 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1981,6 +1981,7 @@ cards_nvidia_binary[] = cards_amd_binary[] = { {"RX 480", CARD_AMD_RADEON_RX_480}, + {"RX 460", CARD_AMD_RADEON_RX_460}, {"R9 Fury Series", CARD_AMD_RADEON_R9_FURY}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900},

1 0

Henri Verbeet : wined3d: Do not evict the system memory copy in buffer_create_buffer_object().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 451e137c1b491da467cfaa34b55d0d301a3002f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451e137c1b491da467cfaa34b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:37 2017 +0100 wined3d: Do not evict the system memory copy in buffer_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b31394b..f0029b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -267,8 +267,6 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi else wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_evict_sysmem(buffer); - return TRUE; fail: @@ -911,7 +909,14 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; } - wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) + { + ERR("Failed to prepare buffer location.\n"); + return; + } + + if (buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */

1 0

Henri Verbeet : wined3d: Do not upload data in buffer_create_buffer_object ().
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a5f7aff3bbfb54c07b5eb2cf3a72d0248a9cd50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f7aff3bbfb54c07b5eb2cf3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:38 2017 +0100 wined3d: Do not upload data in buffer_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f0029b0..d957667 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -247,12 +247,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi /* No setup is needed here for GL_ARB_map_buffer_range. */ } - /* Reserve memory for the buffer. The amount of data won't change - * so we are safe with calling glBufferData once and - * calling glBufferSubData on updates. Upload the actual data in case - * we're not double buffering, so we can release the heap mem afterwards. - */ - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, buffer->resource.heap_memory, gl_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -261,11 +256,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi } buffer->buffer_object_usage = gl_usage; - - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) - buffer_invalidate_bo_range(buffer, 0, 0); - else - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + buffer_invalidate_bo_range(buffer, 0, 0); return TRUE; @@ -915,9 +906,6 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; } - if (buffer->resource.heap_memory) - wined3d_buffer_evict_sysmem(buffer); - /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */ if (state) @@ -995,17 +983,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!buffer->conversion_map) { - /* That means that there is nothing to fixup. Just upload from - * buffer->resource.heap_memory directly into the BO. Do not - * free the system memory copy because drawPrimitive may need it if - * the stride is 0, for instancing emulation, vertex blending - * emulation or shader emulation. */ TRACE("No conversion needed.\n"); - /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ - if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM)) - return; - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, buffer->modified_areas, buffer->maps); } @@ -1014,6 +993,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_conversion_upload(buffer, context); } wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + + if (buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Henri Verbeet : wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: efdb898befe42ebb04d5df0cc5f1b566368e9d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdb898befe42ebb04d5df0cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:39 2017 +0100 wined3d: Evict system memory for dynamic buffers on the first WINED3D_MAP_DISCARD map. Mostly to avoid making things worse for applications that map dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d957667..33571d0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -994,8 +994,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - if (buffer->resource.heap_memory) + if (buffer->resource.heap_memory && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) wined3d_buffer_evict_sysmem(buffer); + } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) @@ -1055,6 +1056,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (!(flags & WINED3D_MAP_READONLY)) buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory) + wined3d_buffer_evict_sysmem(buffer); + if (count == 1) { const struct wined3d_gl_info *gl_info;

1 0

Henri Verbeet : wined3d: Try to avoid stalling on dynamic buffer maps.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: afb2aa2512d4c5ffa7256ce5137bc2c142a5d065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb2aa2512d4c5ffa7256ce51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:40 2017 +0100 wined3d: Try to avoid stalling on dynamic buffer maps. Particularly for applications that use dynamic buffers without WINED3D_MAP_DISCARD/WINED3D_MAP_NOOVERWRITE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 33571d0..abf3f7f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1039,7 +1039,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) {

1 0

Henri Verbeet : wined3d: Return success in wined3d_buffer_load_location() when the location is already current.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: ca6014b19aad2b826c276daea14755e915b40d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6014b19aad2b826c276daea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 13:04:41 2017 +0100 wined3d: Return success in wined3d_buffer_load_location() when the location is already current. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index abf3f7f..6b48d98 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -574,7 +574,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, if (buffer->locations & location) { TRACE("Location (%#x) is already up to date.\n", location); - return WINED3D_OK; + return TRUE; } if (!buffer->locations)

1 0

Jacek Caban : kernel32/tests: Don't mark win8+ result as broken.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: f608a4130c39c7b8dfaf2bb77c4647eb91ac1d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f608a4130c39c7b8dfaf2bb77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:09 2017 +0100 kernel32/tests: Don't mark win8+ result as broken. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 33440bf..45c6fd9 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1522,7 +1522,7 @@ static void test_CloseHandle(void) numbytes = 0xdeadbeef; memset(buffer, 0, sizeof(buffer)); ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); - todo_wine ok(ret || broken(GetLastError() == ERROR_MORE_DATA) /* >= Win 8 */, + todo_wine ok(ret || GetLastError() == ERROR_MORE_DATA /* >= Win 8 */, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes);

1 0

Jacek Caban : ntdll: Check input buffer before server_read_file call and don' t touch event on error.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a240bfcf9b614bc52036bf241177b1856ebb4a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a240bfcf9b614bc52036bf241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:24 2017 +0100 ntdll: Check input buffer before server_read_file call and don't touch event on error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 ++++-------- dlls/ntdll/tests/file.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e1583da..93374c8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -853,19 +853,15 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_READ_DATA, &unix_handle, &needs_close, &type, &options ); + if (status && status != STATUS_BAD_DEVICE_TYPE) return status; + + if (!virtual_check_buffer_for_write( buffer, length )) return STATUS_ACCESS_VIOLATION; + if (status == STATUS_BAD_DEVICE_TYPE) return server_read_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); - if (status) return status; - async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); - if (!virtual_check_buffer_for_write( buffer, length )) - { - status = STATUS_ACCESS_VIOLATION; - goto done; - } - if (type == FD_TYPE_FILE) { if (async_read && (!offset || offset->QuadPart < 0)) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 586b2c9..d56843d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3451,13 +3451,15 @@ static void test_read_write(void) { static const char contents[14] = "1234567890abcd"; char buf[256]; - HANDLE hfile; + HANDLE hfile, event; OVERLAPPED ovl; IO_STATUS_BLOCK iob; DWORD ret, bytes, status, off; LARGE_INTEGER offset; LONG i; + event = CreateEventA( NULL, TRUE, FALSE, NULL ); + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; @@ -3469,6 +3471,14 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, NULL, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = 0; status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); @@ -3493,6 +3503,24 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; + SetEvent(event); + status = pNtReadFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; + SetEvent(event); + status = pNtReadFile(hfile, event, NULL, NULL, &iob, (void*)0xdeadbeef, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, 7, NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); @@ -4156,6 +4184,7 @@ static void test_read_write(void) off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); + CloseHandle(event); CloseHandle(hfile); }

1 0

Jacek Caban : ntdll: Check output buffer before server_write_file call.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 0d23bfd3982fb0140f7319425e782f67a9e571a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d23bfd3982fb0140f7319425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 00:51:35 2017 +0100 ntdll: Check output buffer before server_write_file call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 8 ++++---- dlls/ntdll/tests/file.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 93374c8..907c2aa 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1227,16 +1227,13 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &options ); - if (status == STATUS_BAD_DEVICE_TYPE) - return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); - if (status == STATUS_ACCESS_DENIED) { status = server_get_unix_fd( hFile, FILE_APPEND_DATA, &unix_handle, &needs_close, &type, &options ); append_write = TRUE; } - if (status) return status; + if (status && status != STATUS_BAD_DEVICE_TYPE) return status; if (!virtual_check_buffer_for_read( buffer, length )) { @@ -1244,6 +1241,9 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + if (status == STATUS_BAD_DEVICE_TYPE) + return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); + async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); if (type == FD_TYPE_FILE) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d56843d..57d7df9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3484,6 +3484,14 @@ static void test_read_write(void) ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + U(iob).Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + hfile = create_temp_file(0); if (!hfile) return; @@ -3496,6 +3504,15 @@ static void test_read_write(void) U(iob).Status = -1; iob.Information = -1; + SetEvent(event); + status = pNtWriteFile(hfile, event, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + ok(!is_signaled(event), "event is not signaled\n"); + + U(iob).Status = -1; + iob.Information = -1; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status);

1 0