January 2017 - Wine-Commits

André Hentschel : ntdll: Remove dead initializations (clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: f130a5acef7107ad78aa067b8e7e16795f6ae26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f130a5acef7107ad78aa067b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:05 2017 +0100 ntdll: Remove dead initializations (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7be2a07..86beb03 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1297,7 +1297,7 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT (*pdata)[i].u.Reserved[1] = id; *len = i+1; }else{ - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex = *pdataex; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; DWORD ofs = 0; while(ofs < *len) @@ -1365,7 +1365,7 @@ static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMAT } else { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex = *pdataex; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; DWORD ofs; for (ofs = 0; ofs < *len; )

1 0

André Hentschel : msxml3: Remove dead initialization (clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 1242648faefa04d6f9b18ecb917267cea9b036e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1242648faefa04d6f9b18ecb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:06 2017 +0100 msxml3: Remove dead initialization (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d39ed57..ccecaa8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -829,7 +829,7 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *las case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) { - xmlChar* ret = str; + xmlChar* ret; int len; if (!str)

1 0

André Hentschel : dwrite: Remove dead initialization (clang).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: e07e8293b96298832b1e530d978cf1c2fdf70f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07e8293b96298832b1e530d9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:06 2017 +0100 dwrite: Remove dead initialization (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 014fba4..3d931cb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -883,7 +883,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.fontEmSize = range->fontsize * scale; if (mapped_length < length) { - struct regular_layout_run *nextrun = &r->u.regular; + struct regular_layout_run *nextrun; struct layout_run *nextr; /* keep mapped part for current run, add another run for the rest */

1 0

Alexandre Julliard : update-winehq: Get the download URL from the ANNOUNCE file.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: tools Branch: master Commit: 0b92f47d3ca1b10eb1f085198642965506c6c660 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0b92f47d3ca1b10eb1f08519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:45:08 2017 +0100 update-winehq: Get the download URL from the ANNOUNCE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/update-winehq b/update-winehq index efcf1d5..4ba11d4 100755 --- a/update-winehq +++ b/update-winehq @@ -36,6 +36,7 @@ open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE"; my $whats_new = 0; my $release_notes = 0; my $first = 1; +my $url; push @text, "<body>\n<p>"; @@ -90,9 +91,17 @@ while (<ANNOUNCE>) } } -(my $dir = $rel) =~ s/^([0-9]+\.[0-9]+).*/$1/; +while (<ANNOUNCE>) +{ + if (/https?:(\/\/dl.winehq.org\/wine\/source\/.*\/wine-$rel\..*)$/) + { + $url = $1; + last; + } +} +die "Download URL not found" unless $url; -push @text, "<p>The source is <a href=\"//dl.winehq.org/wine/source/$dir/wine-$rel.tar.bz2\">available now</a>.\n"; +push @text, "<p>The source is <a href=\"$url\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</p></body></news>\n"; close ANNOUNCE;

1 0

Bruno Jesus : patches: Allow sorting the patches list by clicking table headers.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: tools Branch: master Commit: f4dc8670692a4257a6da9f2607e1573cc0ff3870 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f4dc8670692a4257a6da9f26… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 29 00:11:56 2017 -0200 patches: Allow sorting the patches list by clicking table headers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 0d991dc..ddf1396 100755 --- a/patches/update +++ b/patches/update @@ -122,14 +122,14 @@ print INDEX "<div id=\"tabs\"><ul>", "<li><a href=\"//forum.winehq.org/\">Forums</a></li></ul></div>\n"; print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status</div>\n"; print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; -print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", +print INDEX "<table id=\"main_table\" class=\"main\"><thead><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", "<th class=\"status\">Testbot</th>", - "<th class=\"status\">Job ID</th></tr>\n"; + "<th class=\"status\">Job ID</th></tr></thead><tbody>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -262,7 +262,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } $row++; } -print INDEX "</table></div>\n"; +print INDEX "</tbody></table></div>\n"; $row = 0; print INDEX "<div class=\"legend\"><h2 id=\"legend\">Legend</h2>\n"; @@ -274,6 +274,120 @@ foreach my $status (@legend) $row++; } print INDEX "</table></div></div></div>\n"; + +my $sorter = <<END; +<script> + var table = document.getElementById('main_table'), + thead = table.children[0], + tbody = table.children[1], + ths = thead.getElementsByTagName('th'), + trs = tbody.getElementsByTagName('tr'), + i, do_reverse, th, sort_func; + + for (i = 0; i < ths.length; i++) + ths[i].onclick = sort_table; + + function sort_table(event) + { + th = event.target; + var sort_type = text_content(th), clone_trs = [], sign_trs = {}, tr, j, k; + + if (sort_type == 'ID' || sort_type == 'Job ID') + sort_func = int_sort; + else if(sort_type == 'Sign') + sort_func = sign_sort; + else + sort_func = text_sort; + + if (th.getAttribute('data-order')==1) + do_reverse = 0; + else + do_reverse = 1; + th.setAttribute('data-order', do_reverse) + + for (j = 0, i = trs.length - 1; i != -1; i--) + { + tr = tbody.removeChild(trs[i]) + if (!tr.getAttribute('id')) + clone_trs[j++] = tr; + else + sign_trs[text_content(trs[i - 1].children[0])] = tr; /* based on the patch ID */ + } + clone_trs.sort(sorter); + + for (i = 0; i < clone_trs.length; i++) + { + odd_even(clone_trs[i], i & 1); + tbody.appendChild(clone_trs[i]); + j = text_content(clone_trs[i].children[0]); + if (sign_trs[j]) + tbody.appendChild(sign_trs[j]); + } + } + + function odd_even(tr, i) + { + var cl = tr.getAttribute('class').replace(/odd|even/gi,''); + tr.setAttribute('class', cl + (i & 1 ? ' odd ' : ' even ')); + } + + function sorter(a, b) + { + var r = sort_func(a.children[th.cellIndex], b.children[th.cellIndex]); + + if (do_reverse) + { + if (r == 1) r = -1; + else if(r == -1) r = 1; + } + return r; + } + + function text_content(ele) + { + if (typeof ele.textContent == 'string') + return ele.textContent; + else if (typeof ele.innerText == 'string') + return ele.innerText; + return ele.innerHTML; + } + + function int_sort(a, b, r) + { + var ret, t1 = text_content(a), t2 = text_content(b); + if (!r) r = 1; //when R is set reverse_order is ignored + + if (t1.length == 0 && t2.length == 0) return 0; + if (t1.length && !t2.length) return -1; + if (!t1.length && t2.length) return 1; + return parseInt(t1) - parseInt(t2) < 0 ? -1 * r : 1 * r; + } + + function text_sort(a, b) + { + var t1 = text_content(a), t2 = text_content(b); + + //if equal sort by patch id + return t1 === t2 ? int_sort(a.parentElement.children[0], b.parentElement.children[0], 2) : t1 > t2 ? -1 : 1; + } + + function sign_sort(a, b) + { + var ret, t1 = text_content(a), t2 = text_content(b); + + if (t1 == 'X') return -1; + if (t2 == 'X') return 1; + ret = t1.length - t2.length; + + //if equal sort by patch id + return ret ? ret : int_sort(a.parentElement.children[0], b.parentElement.children[0], 2); + } + +</script> +END + +print INDEX $sorter; + print INDEX end_html; close INDEX;

1 0

Alistair Leslie-Hughes : include: Add UnlockResource prototype.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: a9e50da352e32d4c1bc8d0a686efa1e1bb7a84da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e50da352e32d4c1bc8d0a68… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 30 07:05:03 2017 +0000 include: Add UnlockResource prototype. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index eff5972..bf14d79 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2600,6 +2600,7 @@ WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_IN WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); +#define UnlockResource(handle) ((handle), 0) #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void);

1 0

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

Jan. 30, 2017

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

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

Jan. 30, 2017

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

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

Jan. 30, 2017

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 : ntdll: Check input buffer before server_read_file call and don' t touch event on error.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

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