September 2013 - Wine-commits

Bruno Jesus : server: Fix a comment.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: c52eb217548146c8f3810e0d4a4d7be470273aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52eb217548146c8f3810e0d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 14:42:25 2013 -0300 server: Fix a comment. --- server/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index 145e2a7..1a3a8f7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -785,7 +785,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) return TRUE; } -/* set the last error depending on errno */ +/* return an errno value mapped to a WSA error */ static int sock_get_error( int err ) { switch (err)

1 0

Bruno Jesus : ws2_32: Add missing else to getsockopt(SO_ACCEPTCONN).
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: cba19b90277b8faa6e83872411ad48df5dce4f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba19b90277b8faa6e8387241… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 15:44:57 2013 -0300 ws2_32: Add missing else to getsockopt(SO_ACCEPTCONN). --- dlls/ws2_32/socket.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 45166de..fac090d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2967,10 +2967,11 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; } - - /* BSD returns != 0 while Windows return exact == 1 */ - if (*(int *)optval) *(int *)optval = 1; - + else + { + /* BSD returns != 0 while Windows return exact == 1 */ + if (*(int *)optval) *(int *)optval = 1; + } release_sock_fd( s, fd ); return ret; case WS_SO_DONTLINGER:

1 0

Dmitry Timoshkov : ntdll/tests: Add 0-length read tests for a disk file.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: d6900fc55652edc2dc53d9859a487b0fc12ec7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6900fc55652edc2dc53d9859… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:53:02 2013 +0900 ntdll/tests: Add 0-length read tests for a disk file. --- dlls/ntdll/tests/file.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 120fdac..5ae605b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1985,6 +1985,22 @@ 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); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); ok(ret, "ReadFile error %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); @@ -2184,6 +2200,31 @@ 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); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + 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; + SetLastError(0xdeadbeef); ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); ok(!ret, "WriteFile should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Dmitry Timoshkov : kernel32/tests: Add 0-length read tests for a mailslot.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 0c024503dbf22310cc276f6e197d6ba614079138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c024503dbf22310cc276f6e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:53:50 2013 +0900 kernel32/tests: Add 0-length read tests for a mailslot. --- dlls/kernel32/tests/mailslot.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index fb3ec34..ca0b108 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -77,6 +77,24 @@ static int mailslot_test(void) ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); /* try and read/write to it */ + 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()); + ok(count == 0, "expected 0, got %u\n", count); + count = 0; memset(buffer, 0, sizeof buffer); ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL);

1 0

Dmitry Timoshkov : kernel32/tests: Add 0-length read tests for a pipe.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 70930fa12cf9d6d8240af3e842260e6f7e38cd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70930fa12cf9d6d8240af3e84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:54:32 2013 +0900 kernel32/tests: Add 0-length read tests for a pipe. --- dlls/kernel32/tests/pipe.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 923c0e7..07e82a8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winsock.h> @@ -1855,6 +1857,54 @@ static void test_readfileex_pending(void) ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + 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); + + S(U(overlapped)).Offset = 0; + S(U(overlapped)).OffsetHigh = 0; + overlapped.Internal = -1; + overlapped.InternalHigh = -1; + overlapped.hEvent = event; + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); +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); + 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; + ret = WriteFile(client, test_string, 1, &num_bytes, NULL); + ok(ret, "WriteFile failed\n"); + ok(num_bytes == 1, "bytes %u\n", num_bytes); + + wait = WaitForSingleObject(event, 0); + 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 */ + num_bytes = 0xdeadbeef; + ret = ReadFile(server, read_buf, 1, &num_bytes, &overlapped); + ok(ret, "ReadFile failed\n"); + ok(num_bytes == 1, "bytes %u\n", num_bytes); + CloseHandle(client); CloseHandle(server); CloseHandle(event);

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

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

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

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

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