wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Henri Verbeet : d3d9: Avoid CONST.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 11ced88a37ac5bfa33a5d7578205a04ee27b4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ced88a37ac5bfa33a5d7578… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:47 2013 +0200 d3d9: Avoid CONST. --- dlls/d3d9/tests/vertexdeclaration.c | 103 ++++++++++---------- include/d3d9.h | 175 +++++++++++++++++++---------------- 2 files changed, 149 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ced88a37ac5bfa33a5d…

1 0

Henri Verbeet : d3dx9: Avoid CONST.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 49a3dbc453783b0c7c118726eaa331f5e918653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a3dbc453783b0c7c118726e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:46 2013 +0200 d3dx9: Avoid CONST. --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/line.c | 17 +++++------ dlls/d3dx9_36/mesh.c | 66 ++++++++++++++++++++--------------------------- dlls/d3dx9_36/skin.c | 15 ++++++---- dlls/d3dx9_36/sprite.c | 20 +++++++------- dlls/d3dx9_36/surface.c | 6 ++-- 6 files changed, 59 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a3dbc453783b0c7c118…

1 0

Henri Verbeet : wined3d: Set the default scissor rect from the swapchain desc in state_init_default ().
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 0eae0858ae19e4ad14951252c833d8e9e8e9ca46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eae0858ae19e4ad14951252c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:45 2013 +0200 wined3d: Set the default scissor rect from the swapchain desc in state_init_default(). We always have a swapchain here, even if there are no back buffers. --- dlls/wined3d/stateblock.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 00ab69a..c2a5208 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1181,8 +1181,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain *swapchain; - struct wined3d_surface *backbuffer; + struct wined3d_swapchain_desc *swapchain_desc; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1386,32 +1385,21 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->textures[i] = NULL; } - /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ - if ((swapchain = wined3d_device_get_swapchain(device, 0))) - { - if ((backbuffer = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(&backbuffer->resource, &desc); + swapchain_desc = &device->swapchains[0]->desc; - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = desc.width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = desc.height; - } - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain->desc.backbuffer_width; - state->viewport.height = swapchain->desc.backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; - } + /* Set the default scissor rect values */ + state->scissor_rect.left = 0; + state->scissor_rect.right = swapchain_desc->backbuffer_width; + state->scissor_rect.top = 0; + state->scissor_rect.bottom = swapchain_desc->backbuffer_height; - TRACE("Done.\n"); + /* Set the default viewport */ + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = swapchain_desc->backbuffer_width; + state->viewport.height = swapchain_desc->backbuffer_height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : wined3d: Only print a warning about render target usage in wined3d_device_set_render_target ().
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 49c6b87a324f91afef9fef1a9a767bab59fc3bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c6b87a324f91afef9fef1a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:44 2013 +0200 wined3d: Only print a warning about render target usage in wined3d_device_set_render_target(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30dcc06..58c3db1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3997,7 +3997,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("Surface %p doesn't have render target usage.\n", render_target); + WARN("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : ddraw/tests: Add a test for render target surface capabilities.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 31de4f1670536df30ba0c518c4de1cfa97f72c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31de4f1670536df30ba0c518c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:43 2013 +0200 ddraw/tests: Add a test for render target surface capabilities. --- dlls/ddraw/tests/ddraw1.c | 242 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 318 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 302 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 308 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31de4f1670536df30ba0c…

1 0

Bruno Jesus : ws2_32: ConnectEx should not work on unbound socket.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 68377494c6f1d22a1c0ca12901ffd2bf7e788344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68377494c6f1d22a1c0ca1290… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 20 00:14:27 2013 -0300 ws2_32: ConnectEx should not work on unbound socket. --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2cb077e..45166de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2726,6 +2726,8 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) { int fd, ret, status; + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); if (!ov) { @@ -2743,7 +2745,17 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); - /* FIXME: technically the socket has to be bound */ + if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) + { + SetLastError(wsaErrno()); + return FALSE; + } + else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + SetLastError(WSAEINVAL); + return FALSE; + } + ret = do_connect(fd, name, namelen); if (ret == 0) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b77bb3c..c1d6956 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5097,7 +5097,7 @@ static void test_ConnectEx(void) "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); if (bret == TRUE || WSAGetLastError() != WSAEINVAL) {

1 0

André Hentschel : include: Don't redefine _GNU_SOURCE.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 128bfdf6daee613aae909ecdfc619d82ecbb4106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128bfdf6daee613aae909ecdf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 19 20:50:55 2013 +0200 include: Don't redefine _GNU_SOURCE. --- include/wine/port.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 09dbf61..c5359dd 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -29,7 +29,9 @@ # error You must include port.h before all other headers #endif -#define _GNU_SOURCE /* for pread/pwrite */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE /* for pread/pwrite */ +#endif #include <fcntl.h> #include <math.h> #include <sys/types.h>

1 0

Frédéric Delanoy : winecfg: Use BOOL type where appropriate.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: e0bb0adee592f56d29af0f519d424d7b862a35f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bb0adee592f56d29af0f519… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 19 09:59:44 2013 +0200 winecfg: Use BOOL type where appropriate. --- programs/winecfg/libraries.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 3b50203..660737b 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -198,7 +198,7 @@ static int compare_dll( const void *ptr1, const void *ptr2 ) } /* check if dll is recommended as builtin only */ -static inline int is_builtin_only( const char *name ) +static inline BOOL is_builtin_only( const char *name ) { const char *ext = strrchr( name, '.' ); @@ -214,7 +214,7 @@ static inline int is_builtin_only( const char *name ) } /* check if dll should be offered in the drop-down list */ -static int show_dll_in_list( const char *name ) +static BOOL show_dll_in_list( const char *name ) { const char *ext = strrchr( name, '.' );

1 0

Hans Leidekker : wininet: Don' t assume that end of chunk means end of stream.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: c0e1dda04cce1192d477a831ece4b9e2c22353e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e1dda04cce1192d477a831e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 18 13:40:24 2013 +0200 wininet: Don't assume that end of chunk means end of stream. --- dlls/wininet/http.c | 26 ++++++++++++++++++-------- dlls/wininet/tests/http.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1832b4f..2d11040 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -400,6 +400,7 @@ typedef struct { DWORD buf_size; DWORD buf_pos; DWORD chunk_size; + BOOL end_of_data; } chunked_stream_t; static inline void destroy_data_stream(data_stream_t *stream) @@ -2697,6 +2698,8 @@ static DWORD read_more_chunked_data(chunked_stream_t *stream, http_request_t *re DWORD res; int len; + assert(!stream->end_of_data); + if (stream->buf_pos) { /* move existing data to the start of the buffer */ @@ -2744,10 +2747,14 @@ static DWORD discard_chunked_eol(chunked_stream_t *stream, http_request_t *req) /* read the size of the next chunk (the read section must be held) */ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) { - /* TODOO */ DWORD chunk_size = 0, res; - if(stream->chunk_size != ~0u && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + assert(!stream->chunk_size || stream->chunk_size == ~0u); + + if (stream->end_of_data) return ERROR_NO_MORE_FILES; + + /* read terminator for the previous chunk */ + if(!stream->chunk_size && (res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) return res; for (;;) @@ -2764,6 +2771,8 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) stream->chunk_size = chunk_size; if (req->contentLength == ~0u) req->contentLength = chunk_size; else req->contentLength += chunk_size; + + if (!chunk_size) stream->end_of_data = TRUE; return discard_chunked_eol(stream, req); } remove_chunked_data(stream, 1); @@ -2786,7 +2795,7 @@ static DWORD chunked_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return !chunked_stream->chunk_size; + return chunked_stream->end_of_data; } static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2795,13 +2804,13 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; DWORD read_bytes = 0, ret_read = 0, res = ERROR_SUCCESS; - if(chunked_stream->chunk_size == ~0u) { + if(!chunked_stream->chunk_size || chunked_stream->chunk_size == ~0u) { res = start_next_chunk(chunked_stream, req); if(res != ERROR_SUCCESS) return res; } - while(size && chunked_stream->chunk_size) { + while(size && chunked_stream->chunk_size && !chunked_stream->end_of_data) { if(chunked_stream->buf_size) { read_bytes = min(size, min(chunked_stream->buf_size, chunked_stream->chunk_size)); @@ -2835,7 +2844,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, chunked_stream->chunk_size -= read_bytes; size -= read_bytes; ret_read += read_bytes; - if(!chunked_stream->chunk_size) { + if(size && !chunked_stream->chunk_size) { assert(read_mode != READMODE_NOBLOCK); res = start_next_chunk(chunked_stream, req); if(res != ERROR_SUCCESS) @@ -2855,8 +2864,8 @@ static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - /* FIXME: we can do better */ - return !chunked_stream->chunk_size; + remove_chunked_data(chunked_stream, chunked_stream->buf_size); + return chunked_stream->end_of_data; } static void chunked_destroy(data_stream_t *stream) @@ -2905,6 +2914,7 @@ static DWORD set_content_length(http_request_t *request) chunked_stream->data_stream.vtbl = &chunked_stream_vtbl; chunked_stream->buf_size = chunked_stream->buf_pos = 0; chunked_stream->chunk_size = ~0u; + chunked_stream->end_of_data = FALSE; if(request->read_size) { memcpy(chunked_stream->buf, request->read_buf+request->read_pos, request->read_size); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf57223..2526681 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4777,8 +4777,37 @@ static const struct notification async_send_request_ex_resolve_failure_test[] = { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; +static const struct notification async_send_request_ex_chunked_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_COOKIE_SENT, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_SENT, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, 1 }, + { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING } +}; + static const struct notification_data notification_data[] = { { + async_send_request_ex_chunked_test, + sizeof(async_send_request_ex_chunked_test)/sizeof(async_send_request_ex_chunked_test[0]), + "GET", + "test.winehq.org", + "tests/data.php" + }, + { async_send_request_ex_test, sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), "POST", @@ -5100,6 +5129,7 @@ START_TEST(http) test_async_HttpSendRequestEx(&notification_data[0]); test_async_HttpSendRequestEx(&notification_data[1]); test_async_HttpSendRequestEx(&notification_data[2]); + test_async_HttpSendRequestEx(&notification_data[3]); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test();

1 0

Dmitry Timoshkov : kernel32: Remove a 0-length read optimization from ReadFile.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: b4ab43b3de134d2816393ba7f23f67bfc36bd33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ab43b3de134d2816393ba7f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:55:20 2013 +0900 kernel32: Remove a 0-length read optimization from ReadFile. --- dlls/kernel32/file.c | 1 - dlls/kernel32/tests/comm.c | 1 - dlls/kernel32/tests/mailslot.c | 3 --- dlls/kernel32/tests/pipe.c | 9 +++------ dlls/ntdll/tests/file.c | 5 ----- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 506b651..7dd65cd 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -408,7 +408,6 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, bytesRead, overlapped ); if (bytesRead) *bytesRead = 0; /* Do this before anything else */ - if (!bytesToRead) return TRUE; if (is_console_handle(hFile)) { diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index baf3368..dfd148c 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2152,7 +2152,6 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hcom, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index ca0b108..4171504 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -80,16 +80,13 @@ static int mailslot_test(void) count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buffer, 0, &count, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); ok(count == 0, "expected 0, got %u\n", count); count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); todo_wine ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 07e82a8..273641d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1860,9 +1860,7 @@ static void test_readfileex_pending(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, read_buf, 0, &num_bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); ok(num_bytes == 0, "expected 0, got %u\n", num_bytes); @@ -1877,12 +1875,11 @@ todo_wine todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(num_bytes == 0, "bytes %u\n", num_bytes); -todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); +todo_wine ok(overlapped.InternalHigh == -1, "expected -1, got %lu\n", overlapped.InternalHigh); wait = WaitForSingleObject(event, 100); -todo_wine ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", wait); num_bytes = 0xdeadbeef; @@ -1890,13 +1887,13 @@ todo_wine ok(ret, "WriteFile failed\n"); ok(num_bytes == 1, "bytes %u\n", num_bytes); - wait = WaitForSingleObject(event, 0); + wait = WaitForSingleObject(event, 100); +todo_wine ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); ok(num_bytes == 1, "bytes %u\n", num_bytes); todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", overlapped.Internal); -todo_wine ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh); /* read the pending byte and clear the pipe */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5ae605b..66299ea 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1986,9 +1986,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); @@ -2201,9 +2199,7 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); -todo_wine ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); @@ -2220,7 +2216,6 @@ todo_wine ok(bytes == 0, "bytes %u\n", bytes); todo_wine ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); -todo_wine ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); bytes = 0xdeadbeef;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013