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

Piotr Caban : gdi32/enhmfdrv: Fix PolyBezierTo bounding box computation.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: a3e741fd4c4b8ab76c1be19b3bb5a233729eb3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e741fd4c4b8ab76c1be19b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:04 2016 +0200 gdi32/enhmfdrv: Fix PolyBezierTo bounding box computation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index ae05378..e5553e0 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -348,10 +348,22 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; - emr->rclBounds.left = emr->rclBounds.right = pt[0].x; - emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + if(iType == EMR_POLYBEZIERTO) { + POINT cur_pt; - for(i = 1; i < count; i++) { + GetCurrentPositionEx( dev->hdc, &cur_pt ); + emr->rclBounds.left = emr->rclBounds.right = cur_pt.x; + emr->rclBounds.top = emr->rclBounds.bottom = cur_pt.y; + i = 0; + } + else + { + emr->rclBounds.left = emr->rclBounds.right = pt[0].x; + emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + i = 1; + } + + for(; i < count; i++) { if(pt[i].x < emr->rclBounds.left) emr->rclBounds.left = pt[i].x; else if(pt[i].x > emr->rclBounds.right) @@ -402,10 +414,22 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; - emr->rclBounds.left = emr->rclBounds.right = pt[0].x; - emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + if(iType == EMR_POLYBEZIERTO16) { + POINT cur_pt; + + GetCurrentPositionEx( dev->hdc, &cur_pt ); + emr->rclBounds.left = emr->rclBounds.right = cur_pt.x; + emr->rclBounds.top = emr->rclBounds.bottom = cur_pt.y; + i = 0; + } + else + { + emr->rclBounds.left = emr->rclBounds.right = pt[0].x; + emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + i = 1; + } - for(i = 1; i < count; i++) { + for(; i < count; i++) { if(pt[i].x < emr->rclBounds.left) emr->rclBounds.left = pt[i].x; else if(pt[i].x > emr->rclBounds.right)

1 0

Jeremy Newman : fix outdated links in the non-english help pages
by Jeremy Newman April 28, 2016

April 28, 2016

Module: website Branch: master Commit: 105454a15196779a9af303eeae69d910523f732a URL: http://source.winehq.org/git/website.git/?a=commit;h=105454a15196779a9af303… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 28 14:58:54 2016 -0500 fix outdated links in the non-english help pages --- templates/de/help.template | 6 +++--- templates/fr/help.template | 6 +++--- templates/pl/help.template | 6 +++--- templates/pt/help.template | 6 +++--- templates/tr/help.template | 6 +++--- templates/uk/help.template | 4 ++-- templates/zh-cn/help.template | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=105454a15196779a9a…

1 0

Sebastian Lackner : wininet/tests: Add tests for asynchronous InternetReadFile.
by Alexandre Julliard April 28, 2016

April 28, 2016

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

Sebastian Lackner : wininet/tests: Add tests for asynchronous InternetReadFileEx.
by Alexandre Julliard April 28, 2016

April 28, 2016

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

Michael Stefaniuc : wineps.drv: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard April 28, 2016

April 28, 2016

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

Alexandre Julliard : ntdll: Add tests for buffer overflows in NtQueryDirectoryFile.
by Alexandre Julliard April 28, 2016

April 28, 2016

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

Jacek Caban : wininet: Don' t use INTERNET_MAX_HOST_NAME_LENGTH in InternetGetSecurityInfoByURLW, .
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 72f5c3f2e711f0fe4ff6afa799e1424933d46d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f5c3f2e711f0fe4ff6afa79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 27 19:19:47 2016 +0200 wininet: Don't use INTERNET_MAX_HOST_NAME_LENGTH in InternetGetSecurityInfoByURLW,. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e82a6a4..6cf890b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4499,23 +4499,28 @@ BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *p */ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) { - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; URL_COMPONENTSW url = {sizeof(url)}; server_t *server; - BOOL res = FALSE; + WCHAR *hostname; + BOOL res; TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); - url.lpszHostName = hostname; - url.dwHostNameLength = sizeof(hostname)/sizeof(WCHAR); - + url.dwHostNameLength = 1; res = InternetCrackUrlW(lpszURL, 0, 0, &url); if(!res || url.nScheme != INTERNET_SCHEME_HTTPS) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE; } + hostname = heap_strndupW(url.lpszHostName, url.dwHostNameLength); + if(!hostname) { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + server = get_server(hostname, url.nPort, TRUE, FALSE); + heap_free(hostname); if(!server) { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); return FALSE;

1 0

Andrey Gusev : kernel32/nls: Update currency name and fix a typo.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 1a20354ca56484d78884f33e531032329a1fe364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a20354ca56484d78884f33e5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 27 19:39:15 2016 +0300 kernel32/nls: Update currency name and fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/ukr.nls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/nls/ukr.nls b/dlls/kernel32/nls/ukr.nls index f61e07b..fa50528 100644 --- a/dlls/kernel32/nls/ukr.nls +++ b/dlls/kernel32/nls/ukr.nls @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "неділя" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Ukraine" - LOCALE_SENGCURRNAME "Ukrainian Grivna" + LOCALE_SENGCURRNAME "Ukrainian Hryvnia" LOCALE_SENGLANGUAGE "Ukrainian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "UAH" @@ -127,8 +127,8 @@ STRINGTABLE LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT LOCALE_SNATIVECTRYNAME "Україна" LOCALE_SNATIVECURRNAME "гривня" LOCALE_SNATIVEDIGITS "0123456789" - LOCALE_SNATIVEDISPLAYNAME "україньска (Україна)" - LOCALE_SNATIVELANGNAME "україньска" + LOCALE_SNATIVEDISPLAYNAME "українська (Україна)" + LOCALE_SNATIVELANGNAME "українська" LOCALE_SNEGATIVESIGN "-" LOCALE_SOPENTYPELANGUAGETAG "UKR " LOCALE_SPOSITIVESIGN ""

1 0

Aurimas Fišeras : kernel32/nls: Update currency for Baltic states.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 4eca454729bfb7764e461267f55915992bfa3773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eca454729bfb7764e461267f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 27 19:10:22 2016 +0300 kernel32/nls: Update currency for Baltic states. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/eti.nls | 6 +++--- dlls/kernel32/nls/lth.nls | 6 +++--- dlls/kernel32/nls/lvi.nls | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/nls/eti.nls b/dlls/kernel32/nls/eti.nls index cd7b3b2..b9cf956 100644 --- a/dlls/kernel32/nls/eti.nls +++ b/dlls/kernel32/nls/eti.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "dets" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Estonia" - LOCALE_SCURRENCY "kr" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "esmaspäev" LOCALE_SDAYNAME2 "teisipäev" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "pühapäev" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Estonia" - LOCALE_SENGCURRNAME "Estonian Kroon" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Estonian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "EEK" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "et-EE" LOCALE_SNATIVECTRYNAME "Eesti" - LOCALE_SNATIVECURRNAME "Kroon" + LOCALE_SNATIVECURRNAME "Euro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "eesti (Eesti)" LOCALE_SNATIVELANGNAME "eesti" diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 7b44d6a..46a766e 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SABBREVMONTHNAME12 "Grd" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Lithuania" - LOCALE_SCURRENCY "Lt" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmadienis" LOCALE_SDAYNAME2 "antradienis" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SDAYNAME7 "sekmadienis" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Lithuania" - LOCALE_SENGCURRNAME "Lithuanian Litas" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Lithuanian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LTL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_SMONTHOUSANDSEP "." LOCALE_SNAME "lt-LT" LOCALE_SNATIVECTRYNAME "Lietuva" - LOCALE_SNATIVECURRNAME "Litas" + LOCALE_SNATIVECURRNAME "Euras" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "lietuvių (Lietuva)" LOCALE_SNATIVELANGNAME "lietuvių" diff --git a/dlls/kernel32/nls/lvi.nls b/dlls/kernel32/nls/lvi.nls index f1dcb2f..8a7a8e7 100644 --- a/dlls/kernel32/nls/lvi.nls +++ b/dlls/kernel32/nls/lvi.nls @@ -87,7 +87,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME12 "Dec" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Latvia" - LOCALE_SCURRENCY "Ls" + LOCALE_SCURRENCY "€" LOCALE_SDATE "." LOCALE_SDAYNAME1 "pirmdiena" LOCALE_SDAYNAME2 "otrdiena" @@ -98,7 +98,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SDAYNAME7 "svētdiena" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Latvia" - LOCALE_SENGCURRNAME "Latvian Lats" + LOCALE_SENGCURRNAME "Euro" LOCALE_SENGLANGUAGE "Latvian" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "LVL" @@ -125,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_LATVIAN, SUBLANG_DEFAULT LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "lv-LV" LOCALE_SNATIVECTRYNAME "Latvija" - LOCALE_SNATIVECURRNAME "Lats" + LOCALE_SNATIVECURRNAME "Eiro" LOCALE_SNATIVEDIGITS "0123456789" LOCALE_SNATIVEDISPLAYNAME "latviešu (Latvija)" LOCALE_SNATIVELANGNAME "latviešu"

1 0

Sebastian Lackner : server: Fix detection of duplicate console history lines.
by Alexandre Julliard April 28, 2016

April 28, 2016

Module: wine Branch: master Commit: 152b00b20f09062a97cf0f05d8bad84cc56a02f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b00b20f09062a97cf0f05d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 28 04:23:26 2016 +0200 server: Fix detection of duplicate console history lines. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index efb20da..4d275f0 100644 --- a/server/console.c +++ b/server/console.c @@ -1055,7 +1055,7 @@ static void console_input_append_hist( struct console_input* console, const WCHA ptr[len] = 0; if (console->history_mode && console->history_index && - strncmpW( console->history[console->history_index - 1], ptr, len ) == 0) + !strcmpW( console->history[console->history_index - 1], ptr )) { /* ok, mode ask us to not use twice the same string... * so just free mem and returns

1 0