November 2013 - Wine-commits

Francois Gouget : shell32/tests: Disable a test that crashes on Windows 8.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 0a08c185180efb38150e4683a70d43885c68e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a08c185180efb38150e4683a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:35:08 2013 +0100 shell32/tests: Disable a test that crashes on Windows 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index af34b8e..0992924 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -232,10 +232,13 @@ static void test_ParseDisplayName(void) /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { - /* null name and pidl */ - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, NULL, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + if (0) + { + /* null name and pidl, also crashes on Windows 8 */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + NULL, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + } /* null name */ newPIDL = (ITEMIDLIST*)0xdeadbeef;

1 0

Francois Gouget : kernel32/tests: Remove a couple of incorrect CreateFile() console tests.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 7425d2cac2757b3310cfd67b782081a3cbc18cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7425d2cac2757b3310cfd67b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:36:35 2013 +0100 kernel32/tests: Remove a couple of incorrect CreateFile() console tests. --- dlls/kernel32/tests/console.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5cdfa62..d38315f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1160,14 +1160,13 @@ static void test_CreateFileW(void) {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, {conoutW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + /* TRUNCATE_EXISTING is forbidden starting with Windows 8 */ }; int index;

1 0

Francois Gouget : kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: c31280d6e14f19fed7db589891a1688b7a7a3fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31280d6e14f19fed7db58989… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:37:41 2013 +0100 kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode. --- dlls/kernel32/tests/comm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 455ee89..db5a369 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -855,6 +855,8 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + after = GetTickCount(); + ok(after - before < 30, "WaitCommEvent should have returned immediately, took %d ms\n", after - before); res = WaitForSingleObject(ovl_wait.hEvent, 1500); ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); if (res == WAIT_OBJECT_0)

1 0

Francois Gouget : winhttp/tests: Fix the test failure messages.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: cd5d1e54e706b8cf08216039c9239ededd1aed53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5d1e54e706b8cf08216039c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:39:24 2013 +0100 winhttp/tests: Fix the test failure messages. Don't claim the API failed when it succeeded, and show the unexpected data. --- dlls/winhttp/tests/url.c | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd5d1e54e706b8cf08216…

1 0

Jacek Caban : winhttp: Use netconn_query_data_available in get_available_data when possible.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 92426b5136355200bfbc9561fcd9601ac130c66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92426b5136355200bfbc9561f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 10:59:50 2013 +0100 winhttp: Use netconn_query_data_available in get_available_data when possible. --- dlls/winhttp/net.c | 27 +++++++++++++-------------- dlls/winhttp/request.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6d9b82a..7466d36 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -712,24 +712,23 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd return TRUE; } -BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) +ULONG netconn_query_data_available( netconn_t *conn ) { -#ifdef FIONREAD - int ret; - ULONG unread; -#endif - *available = 0; - if (!netconn_connected( conn )) return FALSE; + if(!netconn_connected(conn)) + return 0; - if (conn->secure) - { - *available = conn->peek_len; - return TRUE; - } + if(conn->secure) { + return conn->peek_len; + }else { #ifdef FIONREAD - if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread; + ULONG unread; + + if(!ioctlsocket(conn->socket, FIONREAD, &unread)) + return unread; #endif - return TRUE; + } + + return 0; } DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 930eb28..db69082 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1955,7 +1955,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify ) static DWORD get_available_data( request_t *request ) { if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); - return request->read_size; + return request->read_size + netconn_query_data_available( &request->netconn ); } /* check if we have reached the end of the data to read */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 12255ed..a149160 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -266,7 +266,7 @@ BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; -BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN;

1 0

Jeremy Newman : remove google checkout donation option
by Jeremy Newman 01 Nov '13

01 Nov '13

Module: website Branch: master Commit: 3c59cf9a8ce6a2ad03da39b15dcad2c551597aa2 URL: http://source.winehq.org/git/website.git/?a=commit;h=3c59cf9a8ce6a2ad03da39… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 1 09:46:45 2013 -0500 remove google checkout donation option --- templates/de/donate.template | 34 ---------------------------------- templates/en/donate.template | 34 ---------------------------------- templates/fr/donate.template | 35 ----------------------------------- templates/pl/donate.template | 35 ----------------------------------- templates/pt/donate.template | 34 ---------------------------------- templates/tr/donate.template | 34 ---------------------------------- templates/zh-cn/donate.template | 34 ---------------------------------- 7 files changed, 0 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3c59cf9a8ce6a2ad03…

1 0