April 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Add tests for buffer overflows in NtQueryDirectoryFile.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: a4dcfd11952067fa0e291645757c643e8fb73801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4dcfd11952067fa0e2916457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 28 16:44:25 2016 +0900 ntdll: Add tests for buffer overflows in NtQueryDirectoryFile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 20 +++--- dlls/ntdll/tests/directory.c | 160 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 157 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4dcfd11952067fa0e291…

1 0

Michael Stefaniuc : wineps.drv: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 148075b183cacce88e743cbe518cadedc6a802c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148075b183cacce88e743cbe5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 20:48:16 2016 +0200 wineps.drv: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 5 ++--- dlls/wineps.drv/init.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 6e89837..00a4a6c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -149,7 +149,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, r->top = 0; r->right = physDev->horzRes; r->bottom = physDev->vertRes; - TRACE("NEXTBAND returning %d,%d - %d,%d\n", r->left, r->top, r->right, r->bottom ); + TRACE("NEXTBAND returning %s\n", wine_dbgstr_rect(r)); return 1; } r->left = 0; @@ -252,8 +252,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, WARN("cbInput != sizeof(RECT) (=%d) for SET_BOUNDS\n", cbInput); return 0; } - TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top, - r->right, r->bottom); + TRACE("SET_BOUNDS %s\n", wine_dbgstr_rect(r)); return 0; } diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2cdb071..e4e17b0 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -331,9 +331,7 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) physDev->PageSize.cy = 0; } - TRACE("ImageableArea = %d,%d - %d,%d: PageSize = %dx%d\n", - physDev->ImageableArea.left, physDev->ImageableArea.bottom, - physDev->ImageableArea.right, physDev->ImageableArea.top, + TRACE("ImageableArea = %s: PageSize = %dx%d\n", wine_dbgstr_rect(&physDev->ImageableArea), physDev->PageSize.cx, physDev->PageSize.cy); /* these are in device units */

1 0

Piotr Caban : jscript: Fix handling of numbers starting with decimal separator.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 756c604d9a2d656afd972929c7d9d3cc99c611ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=756c604d9a2d656afd972929c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 11:12:35 2016 +0200 jscript: Fix handling of numbers starting with decimal separator. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/lex.c | 3 ++- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 65b16a6..3523958 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -603,7 +603,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) return '}'; case '.': - if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + if(ctx->ptr+1 < ctx->end && isdigitW(ctx->ptr[1])) { double n; HRESULT hres; hres = parse_decimal(&ctx->ptr, ctx->end, &n); @@ -614,6 +614,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) *(literal_t**)lval = new_double_literal(ctx, n); return tNumericLiteral; } + ctx->ptr++; return '.'; case '<': diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ae8e408..95655ab 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -407,6 +407,10 @@ tmp = 2.5*3.5; ok(tmp > 8.749999 && tmp < 8.750001, "2.5*3.5 !== 8.75"); ok(getVT(tmp) === "VT_R8", "getVT(2.5*3.5) !== VT_R8"); +tmp = 2*.5; +ok(tmp === 1, "2*.5 !== 1"); +ok(getVT(tmp) == "VT_I4", "getVT(2*.5) !== VT_I4"); + tmp = 4/2; ok(tmp === 2, "4/2 !== 2"); ok(getVT(tmp) === "VT_I4", "getVT(4/2) !== VT_I4");

1 0

Michael Müller : wininet: Fix async check in HTTPREQ_ReadFileEx.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: d332ff74452ee5d395bb54ffa5f0efa2c16e6bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d332ff74452ee5d395bb54ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 28 05:09:40 2016 +0200 wininet: Fix async check in HTTPREQ_ReadFileEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ef0b36e..08f5a08 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3149,7 +3149,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - if (hdr->dwFlags & INTERNET_FLAG_ASYNC) + if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { read_file_ex_task_t *task;

1 0

Sebastian Lackner : wininet/tests: Add tests for asynchronous InternetReadFileEx.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: e14f2c0b7a114d17d397c267bfa3d084f2429198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14f2c0b7a114d17d397c267b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 05:10:07 2016 +0200 wininet/tests: Add tests for asynchronous InternetReadFileEx. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 117 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 66ba526..22f8fbe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -109,7 +109,7 @@ static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static const char *status_string[MAX_INTERNET_STATUS]; -static HANDLE hCompleteEvent, conn_close_event; +static HANDLE hCompleteEvent, conn_close_event, conn_wait_event; static DWORD req_error; #define TESTF_REDIRECT 0x01 @@ -2358,6 +2358,15 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/async_read")) + { + const char *page1_mid = page1 + (sizeof page1 - 1)/2; + const char *page1_end = page1 + sizeof page1 - 1; + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, page1_mid - page1, 0); + WaitForSingleObject(conn_wait_event, INFINITE); + send(c, page1_mid, page1_end - page1_mid, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4420,6 +4429,111 @@ static void test_basic_auth_credentials_reuse(int port) InternetCloseHandle( ses ); } +static void test_async_read(int port) +{ + HINTERNET ses, con, req; + INTERNET_BUFFERSA ib; + char buffer[0x100]; + DWORD pending_reads; + DWORD res, count; + BOOL ret; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + /* test asynchronous InternetReadFileEx */ + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC ); + ok( ses != NULL, "InternetOpenA failed\n" ); + pInternetSetStatusCallbackA( ses, &callback ); + + SET_EXPECT( INTERNET_STATUS_HANDLE_CREATED ); + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0xdeadbeef ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); + + SET_EXPECT( INTERNET_STATUS_HANDLE_CREATED ); + req = HttpOpenRequestA( con, "GET", "/async_read", NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbeef ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); + + SET_OPTIONAL( INTERNET_STATUS_COOKIE_SENT ); + SET_OPTIONAL( INTERNET_STATUS_DETECTING_PROXY ); + SET_EXPECT( INTERNET_STATUS_CONNECTING_TO_SERVER ); + SET_EXPECT( INTERNET_STATUS_CONNECTED_TO_SERVER ); + SET_EXPECT( INTERNET_STATUS_SENDING_REQUEST ); + SET_EXPECT( INTERNET_STATUS_REQUEST_SENT ); + SET_EXPECT( INTERNET_STATUS_RECEIVING_RESPONSE ); + SET_EXPECT( INTERNET_STATUS_RESPONSE_RECEIVED ); + SET_OPTIONAL( INTERNET_STATUS_CLOSING_CONNECTION ); + SET_OPTIONAL( INTERNET_STATUS_CONNECTION_CLOSED ); + SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); + + SetLastError( 0xdeadbeef ); + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( !ret, "HttpSendRequestA unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + WaitForSingleObject( hCompleteEvent, INFINITE ); + ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); + + CLEAR_NOTIFIED( INTERNET_STATUS_COOKIE_SENT ); + CLEAR_NOTIFIED( INTERNET_STATUS_DETECTING_PROXY ); + CHECK_NOTIFIED( INTERNET_STATUS_CONNECTING_TO_SERVER ); + CHECK_NOTIFIED( INTERNET_STATUS_CONNECTED_TO_SERVER ); + CHECK_NOTIFIED( INTERNET_STATUS_SENDING_REQUEST ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_SENT ); + CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); + CHECK_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); + CLEAR_NOTIFIED( INTERNET_STATUS_CLOSING_CONNECTION ); + CLEAR_NOTIFIED( INTERNET_STATUS_CONNECTION_CLOSED ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); + + pending_reads = 0; + memset( &ib, 0, sizeof(ib) ); + memset( buffer, 0, sizeof(buffer) ); + ib.dwStructSize = sizeof(ib); + for (count = 0; count < sizeof(buffer); count += ib.dwBufferLength) + { + ib.lpvBuffer = buffer + count; + ib.dwBufferLength = min(16, sizeof(buffer) - count); + + SET_EXPECT( INTERNET_STATUS_RECEIVING_RESPONSE ); + SET_EXPECT( INTERNET_STATUS_RESPONSE_RECEIVED ); + + ret = InternetReadFileExA( req, &ib, 0, 0xdeadbeef ); + if (!count) /* the first part should arrive immediately */ + ok( ret, "InternetReadFileExA failed %u\n", GetLastError() ); + if (!ret) + { + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); + if (!pending_reads++) + { + res = WaitForSingleObject( hCompleteEvent, 0 ); + ok( res == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", res ); + SetEvent( conn_wait_event ); + } + res = WaitForSingleObject( hCompleteEvent, INFINITE ); + ok( res == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", res ); + ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); + todo_wine_if( pending_reads > 1 ) + ok( ib.dwBufferLength != 0, "expected ib.dwBufferLength != 0\n" ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); + } + + CLEAR_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); + CLEAR_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); + if (!ib.dwBufferLength) break; + } + + todo_wine + ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); + ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); + close_async_handle( ses, hCompleteEvent, 2 ); + + CloseHandle( hCompleteEvent ); + CloseHandle( conn_wait_event ); +} + static void test_http_connection(void) { struct server_info si; @@ -4469,6 +4583,7 @@ static void test_http_connection(void) test_request_content_length(si.port); test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); + test_async_read(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Sebastian Lackner : wininet: Send INTERNET_STATUS_RESPONSE_RECEIVED notification in async handler.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 45459965aa6e8908c765eac5b9701d6ed208daf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45459965aa6e8908c765eac5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 05:12:49 2016 +0200 wininet: Send INTERNET_STATUS_RESPONSE_RECEIVED notification in async handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 +++++++ dlls/wininet/tests/http.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 08f5a08..66ee6ba 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3134,6 +3134,13 @@ static void AsyncReadFileExProc(task_header_t *hdr) TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); + if (res == ERROR_SUCCESS) + { + DWORD read = *task->ret_read; + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, + &read, sizeof(read)); + } + send_request_complete(req, res == ERROR_SUCCESS, res); } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 22f8fbe..c90e6d2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1099,7 +1099,7 @@ static void InternetReadFileExA_test(int flags) CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } else @@ -4505,6 +4505,7 @@ static void test_async_read(int port) if (!ret) { ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); if (!pending_reads++) { @@ -4517,6 +4518,7 @@ static void test_async_read(int port) ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); todo_wine_if( pending_reads > 1 ) ok( ib.dwBufferLength != 0, "expected ib.dwBufferLength != 0\n" ); + CHECK_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); }

1 0

Michael Müller : wininet: Handle async mode in HTTPREQ_ReadFile.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 221590213ea12375cb2549afd774855dcc6c46e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221590213ea12375cb2549afd… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 28 05:14:47 2016 +0200 wininet: Handle async mode in HTTPREQ_ReadFile. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 60 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 66ee6ba..775ff61 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3101,23 +3101,6 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) return ret; } -static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) -{ - http_request_t *req = (http_request_t*)hdr; - DWORD res; - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - res = HTTPREQ_Read(req, buffer, size, read); - if(res == ERROR_SUCCESS) - res = hdr->dwError; - LeaveCriticalSection( &req->read_section ); - - return res; -} - typedef struct { task_header_t hdr; void *buf; @@ -3241,6 +3224,49 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } +static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) +{ + http_request_t *req = (http_request_t*)hdr; + DWORD res; + + if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + read_file_ex_task_t *task; + + if (TryEnterCriticalSection( &req->read_section )) + { + if (get_avail_data(req)) + { + res = HTTPREQ_Read(req, buffer, size, read); + LeaveCriticalSection( &req->read_section ); + return res; + } + LeaveCriticalSection( &req->read_section ); + } + + task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); + task->buf = buffer; + task->size = size; + task->ret_read = read; + + *read = 0; + INTERNET_AsyncCall(&task->hdr); + + return ERROR_IO_PENDING; + } + + EnterCriticalSection( &req->read_section ); + if(hdr->dwError == INTERNET_HANDLE_IN_USE) + hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; + + res = HTTPREQ_Read(req, buffer, size, read); + if(res == ERROR_SUCCESS) + res = hdr->dwError; + LeaveCriticalSection( &req->read_section ); + + return res; +} + typedef struct { task_header_t hdr; DWORD *ret_size;

1 0

Sebastian Lackner : wininet/tests: Add tests for asynchronous InternetReadFile.
by Alexandre Julliard 28 Apr '16

28 Apr '16

Module: wine Branch: master Commit: 179137c259ffed546fb6f2c88c0d4df0e140cc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=179137c259ffed546fb6f2c88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 05:15:25 2016 +0200 wininet/tests: Add tests for asynchronous InternetReadFile. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c90e6d2..b853240 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4435,7 +4435,7 @@ static void test_async_read(int port) INTERNET_BUFFERSA ib; char buffer[0x100]; DWORD pending_reads; - DWORD res, count; + DWORD res, count, bytes; BOOL ret; hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -4531,6 +4531,96 @@ static void test_async_read(int port) ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); close_async_handle( ses, hCompleteEvent, 2 ); + ResetEvent( conn_wait_event ); + + /* test asynchronous InternetReadFile */ + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC ); + ok( ses != NULL, "InternetOpenA failed\n" ); + pInternetSetStatusCallbackA( ses, &callback ); + + SET_EXPECT( INTERNET_STATUS_HANDLE_CREATED ); + con = InternetConnectA( ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0xdeadbeef ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); + + SET_EXPECT( INTERNET_STATUS_HANDLE_CREATED ); + req = HttpOpenRequestA( con, "GET", "/async_read", NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbeef ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); + + SET_OPTIONAL( INTERNET_STATUS_COOKIE_SENT ); + SET_OPTIONAL( INTERNET_STATUS_DETECTING_PROXY ); + SET_EXPECT( INTERNET_STATUS_CONNECTING_TO_SERVER ); + SET_EXPECT( INTERNET_STATUS_CONNECTED_TO_SERVER ); + SET_EXPECT( INTERNET_STATUS_SENDING_REQUEST ); + SET_EXPECT( INTERNET_STATUS_REQUEST_SENT ); + SET_EXPECT( INTERNET_STATUS_RECEIVING_RESPONSE ); + SET_EXPECT( INTERNET_STATUS_RESPONSE_RECEIVED ); + SET_OPTIONAL( INTERNET_STATUS_CLOSING_CONNECTION ); + SET_OPTIONAL( INTERNET_STATUS_CONNECTION_CLOSED ); + SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); + + SetLastError( 0xdeadbeef ); + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( !ret, "HttpSendRequestA unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + WaitForSingleObject( hCompleteEvent, INFINITE ); + ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); + + CLEAR_NOTIFIED( INTERNET_STATUS_COOKIE_SENT ); + CLEAR_NOTIFIED( INTERNET_STATUS_DETECTING_PROXY ); + CHECK_NOTIFIED( INTERNET_STATUS_CONNECTING_TO_SERVER ); + CHECK_NOTIFIED( INTERNET_STATUS_CONNECTED_TO_SERVER ); + CHECK_NOTIFIED( INTERNET_STATUS_SENDING_REQUEST ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_SENT ); + CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); + CHECK_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); + CLEAR_NOTIFIED( INTERNET_STATUS_CLOSING_CONNECTION ); + CLEAR_NOTIFIED( INTERNET_STATUS_CONNECTION_CLOSED ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); + + pending_reads = 0; + memset( buffer, 0, sizeof(buffer) ); + for (count = 0; count < sizeof(buffer); count += bytes) + { + SET_EXPECT( INTERNET_STATUS_RECEIVING_RESPONSE ); + SET_EXPECT( INTERNET_STATUS_RESPONSE_RECEIVED ); + + bytes = 0xdeadbeef; + ret = InternetReadFile( req, buffer + count, min(16, sizeof(buffer) - count), &bytes ); + if (!count) /* the first part should arrive immediately */ + ok( ret, "InternetReadFile failed %u\n", GetLastError() ); + if (!ret) + { + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + ok( bytes == 0, "expected 0, got %u\n", bytes ); + todo_wine + CHECK_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); + SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); + if (!pending_reads++) + { + res = WaitForSingleObject( hCompleteEvent, 0 ); + ok( res == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", res ); + SetEvent( conn_wait_event ); + } + res = WaitForSingleObject( hCompleteEvent, INFINITE ); + ok( res == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", res ); + ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); + todo_wine_if( pending_reads > 1 ) + ok( bytes != 0, "expected bytes != 0\n" ); + CHECK_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); + CHECK_NOTIFIED( INTERNET_STATUS_REQUEST_COMPLETE ); + } + + CLEAR_NOTIFIED( INTERNET_STATUS_RECEIVING_RESPONSE ); + CLEAR_NOTIFIED( INTERNET_STATUS_RESPONSE_RECEIVED ); + if (!bytes) break; + } + + todo_wine + ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); + ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); + close_async_handle( ses, hCompleteEvent, 2 ); CloseHandle( hCompleteEvent ); CloseHandle( conn_wait_event );

1 0

Nikolay Sivov : dwrite: For object creation helpers with many arguments pack them in structures.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 5fb8acc53659e70f0c38260c3143d88a95739411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb8acc53659e70f0c38260c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 11:19:41 2016 +0300 dwrite: For object creation helpers with many arguments pack them in structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 35 ++++++++++++++++++--- dlls/dwrite/font.c | 72 +++++++++++++++++++++----------------------- dlls/dwrite/layout.c | 59 +++++++++++------------------------- dlls/dwrite/main.c | 60 ++++++++++++++++++++++++++++++------ 4 files changed, 133 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fb8acc53659e70f0c382…

1 0

Austin English : fsutil: Add stub program.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: db77a0dba67a3a808b6dda144810957ecb8342a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db77a0dba67a3a808b6dda144… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 14 00:46:30 2015 -0600 fsutil: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/fsutil/Makefile.in | 5 +++++ programs/fsutil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index dcec63c..5fb33d6 100755 --- a/configure +++ b/configure @@ -1462,6 +1462,7 @@ enable_expand enable_explorer enable_extrac32 enable_findstr +enable_fsutil enable_hh enable_hostname enable_icacls @@ -18215,6 +18216,7 @@ wine_fn_config_program expand enable_expand install wine_fn_config_program explorer enable_explorer clean,install wine_fn_config_program extrac32 enable_extrac32 install wine_fn_config_program findstr enable_findstr install +wine_fn_config_program fsutil enable_fsutil install wine_fn_config_program hh enable_hh install wine_fn_config_program hostname enable_hostname clean,install wine_fn_config_program icacls enable_icacls install diff --git a/configure.ac b/configure.ac index b0d94ce..597b84e 100644 --- a/configure.ac +++ b/configure.ac @@ -3463,6 +3463,7 @@ WINE_CONFIG_PROGRAM(expand,,[install]) WINE_CONFIG_PROGRAM(explorer,,[clean,install]) WINE_CONFIG_PROGRAM(extrac32,,[install]) WINE_CONFIG_PROGRAM(findstr,,[install]) +WINE_CONFIG_PROGRAM(fsutil,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) WINE_CONFIG_PROGRAM(hostname,,[clean,install]) WINE_CONFIG_PROGRAM(icacls,,[install]) diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in new file mode 100644 index 0000000..f339c4c --- /dev/null +++ b/programs/fsutil/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fsutil.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c new file mode 100644 index 0000000..2bce87e --- /dev/null +++ b/programs/fsutil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fsutil); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0