June 2015 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Don' t pass BLOCKING_WAITALL to NETCON_recv in netconn_read.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 049a3ba40153253e40177d05e47cd59b0144c86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=049a3ba40153253e40177d05e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 16 12:24:54 2015 +0200 wininet: Don't pass BLOCKING_WAITALL to NETCON_recv in netconn_read. --- dlls/wininet/http.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b7c4661..f4f67cb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2659,24 +2659,29 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD res = ERROR_SUCCESS; - int len = 0; + int len = 0, ret = 0; size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - if((res = NETCON_recv(req->netconn, buf, size, blocking_mode, &len))) { - len = 0; - if(blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK) - res = ERROR_SUCCESS; - else + while((res = NETCON_recv(req->netconn, buf+ret, size-ret, + blocking_mode == BLOCKING_WAITALL ? BLOCKING_ALLOW : blocking_mode, &len)) == ERROR_SUCCESS) { + if(!len) { netconn_stream->content_length = netconn_stream->content_read; - }else if(!len) { - netconn_stream->content_length = netconn_stream->content_read; + break; + } + ret += len; + netconn_stream->content_read += len; + if(blocking_mode != BLOCKING_WAITALL || size == ret) + break; } + + if(ret || (blocking_mode == BLOCKING_DISALLOW && res == WSAEWOULDBLOCK)) + res = ERROR_SUCCESS; } - netconn_stream->content_read += *read = len; - TRACE("read %u bytes\n", len); + TRACE("read %u bytes\n", ret); + *read = ret; return res; }

1 0

Hugh McMaster : regsvr32: Move / i command line code to a separate function.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 00c13a20a6a078aa9582c7c2523d9d9591ef0011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c13a20a6a078aa9582c7c25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 15 21:46:06 2015 +1000 regsvr32: Move /i command line code to a separate function. --- programs/regsvr32/regsvr32.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 624acd6..e048b30 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -202,6 +202,37 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) return 0; } +static WCHAR *parse_command_line(char *command_line) +{ + WCHAR *ret = NULL; + + if (command_line[0] == ':' && command_line[1]) + { + int len = strlen(command_line); + + command_line++; + len--; + /* remove double quotes */ + if (command_line[0] == '"') + { + command_line++; + len--; + if (command_line[0]) + { + len--; + command_line[len] = 0; + } + } + if (command_line[0]) + { + len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) MultiByteToWideChar(CP_ACP, 0, command_line, -1, ret, len); + } + } + return ret; +} + int main(int argc, char* argv[]) { int i; @@ -227,45 +258,10 @@ int main(int argc, char* argv[]) Silent = TRUE; else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) { - CHAR* command_line = argv[i] + strlen("/i"); - CallInstall = TRUE; - if (command_line[0] == ':' && command_line[1]) - { - int len = strlen(command_line); - - command_line++; - len--; - /* remove double quotes */ - if (command_line[0] == '"') - { - command_line++; - len--; - if (command_line[0]) - { - len--; - command_line[len] = 0; - } - } - if (command_line[0]) - { - len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, - NULL, 0); - wsCommandLine = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if (wsCommandLine) - MultiByteToWideChar(CP_ACP, 0, command_line, -1, - wsCommandLine, len); - } - else - { - wsCommandLine = EmptyLine; - } - } - else - { + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) wsCommandLine = EmptyLine; - } } else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) CallRegister = FALSE;

1 0

Hugh McMaster : regsvr32: Convert if-else block to switch statement.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: dc1b177a1a5f362be069c9017d4d79389f064495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1b177a1a5f362be069c9017… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 15 22:12:45 2015 +1000 regsvr32: Convert if-else block to switch statement. --- programs/regsvr32/regsvr32.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index e048b30..8aa567c 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -52,6 +52,7 @@ #include "wine/port.h" #include <string.h> +#include <ctype.h> #include <windows.h> #include <ole2.h> #include "regsvr32.h" @@ -252,26 +253,33 @@ int main(int argc, char* argv[]) */ for(i = 1; i < argc; i++) { - if ((!strcasecmp(argv[i], "/u")) ||(!strcasecmp(argv[i], "-u"))) + if ((argv[i][0] == '/' || argv[i][0] == '-') && (!argv[i][2] || argv[i][2] == ':')) + { + switch (tolower(argv[i][1])) + { + case 'u': Unregister = TRUE; - else if ((!strcasecmp(argv[i], "/s"))||(!strcasecmp(argv[i], "-s"))) + break; + case 's': Silent = TRUE; - else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) - { - CallInstall = TRUE; - wsCommandLine = parse_command_line(argv[i] + strlen("/i")); - if (!wsCommandLine) - wsCommandLine = EmptyLine; - } - else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) - CallRegister = FALSE; - else if((!strcasecmp(argv[i], "/c"))||(!strcasecmp(argv[i], "-c"))) - /* console output */; - else if (argv[i][0] == '/' && (!argv[i][2] || argv[i][2] == ':')) - { - output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); - output_write(STRING_USAGE); - return 1; + break; + case 'i': + CallInstall = TRUE; + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) + wsCommandLine = EmptyLine; + break; + case 'n': + CallRegister = FALSE; + break; + case 'c': + /* console output */; + break; + default: + output_write(STRING_UNRECOGNIZED_SWITCH, argv[i]); + output_write(STRING_USAGE); + return 1; + } } else {

1 0

Mohamed Mediouni : ntdll: Multiply r4 with the word size in ARM for __chkstk.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 2b095beace7b457586bd33b3b1c81df116215193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b095beace7b457586bd33b3b… Author: Mohamed Mediouni <mmediouni(a)gmx.fr> Date: Mon Jun 15 19:22:45 2015 +0000 ntdll: Multiply r4 with the word size in ARM for __chkstk. --- dlls/ntdll/signal_arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7625d77..6509046 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -250,9 +250,10 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) /************************************************************************** * __chkstk (NTDLL.@) * - * Should check if we can decrement SP by the value provided in r4, but we shouldn't need that. + * Incoming r4 contains words to allocate, converting to bytes then return */ -__ASM_GLOBAL_FUNC( __chkstk, "bx lr" ) +__ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" + "bx lr" ) /*********************************************************************** * RtlCaptureContext (NTDLL.@)

1 0

Huw Davies : user32/tests: Try to fix the test failures on Win 2k.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 1342254422ac5dff985aeeae1d1e220a21050487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1342254422ac5dff985aeeae1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 16 12:38:53 2015 +0100 user32/tests: Try to fix the test failures on Win 2k. --- dlls/user32/tests/msg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b5f9e6a..cc74f1c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10339,13 +10339,14 @@ static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; DWORD time; - BOOL ret, go = FALSE; + BOOL ret; time = GetTickCount(); - while (GetTickCount() - time < 200 && !go) { + while (GetTickCount() - time < 200) { ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); - go = ret && msg.pt.x > x && msg.pt.y > y; + if (ret && msg.pt.x > x && msg.pt.y > y) break; if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); + else Sleep( GetTickCount() - time ); } }

1 0

Jacek Caban : secur32: Added support for a few more algorithms in schannel_get_cipher_algid.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 3617e2b2a9f028347702c87da97e6a74f854027e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3617e2b2a9f028347702c87da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 16 13:46:32 2015 +0200 secur32: Added support for a few more algorithms in schannel_get_cipher_algid. --- dlls/secur32/schannel_gnutls.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7039dcd..16b8c5f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -299,7 +299,10 @@ static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) case GNUTLS_CIPHER_DES_CBC: case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; case GNUTLS_CIPHER_AES_128_CBC: - case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES; + case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128; + case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192; + case GNUTLS_CIPHER_AES_256_GCM: + case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES_256; case GNUTLS_CIPHER_RC2_40_CBC: return CALG_RC2; default: FIXME("unknown algorithm %d\n", cipher);

1 0

Jacek Caban : secur32: Use gnutls_cipher_get_block_size to get cupher block size.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: dedbd1883611b1c72abeb05d9f93cd5ac8af2e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedbd1883611b1c72abeb05d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 16 13:46:46 2015 +0200 secur32: Use gnutls_cipher_get_block_size to get cupher block size. --- dlls/secur32/schannel_gnutls.c | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 16b8c5f..bb463c1 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -49,6 +49,7 @@ MAKE_FUNCPTR(gnutls_certificate_allocate_credentials); MAKE_FUNCPTR(gnutls_certificate_free_credentials); MAKE_FUNCPTR(gnutls_certificate_get_peers); MAKE_FUNCPTR(gnutls_cipher_get); +MAKE_FUNCPTR(gnutls_cipher_get_block_size); MAKE_FUNCPTR(gnutls_cipher_get_key_size); MAKE_FUNCPTR(gnutls_credentials_set); MAKE_FUNCPTR(gnutls_deinit); @@ -239,37 +240,6 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) return SEC_E_OK; } -static unsigned int schannel_get_cipher_block_size(gnutls_cipher_algorithm_t cipher) -{ - const struct - { - gnutls_cipher_algorithm_t cipher; - unsigned int block_size; - } - algorithms[] = - { - {GNUTLS_CIPHER_3DES_CBC, 8}, - {GNUTLS_CIPHER_AES_128_CBC, 16}, - {GNUTLS_CIPHER_AES_256_CBC, 16}, - {GNUTLS_CIPHER_ARCFOUR_128, 1}, - {GNUTLS_CIPHER_ARCFOUR_40, 1}, - {GNUTLS_CIPHER_DES_CBC, 8}, - {GNUTLS_CIPHER_NULL, 1}, - {GNUTLS_CIPHER_RC2_40_CBC, 8}, - }; - unsigned int i; - - for (i = 0; i < sizeof(algorithms) / sizeof(*algorithms); ++i) - { - if (algorithms[i].cipher == cipher) - return algorithms[i].block_size; - } - - FIXME("Unknown cipher %#x, returning 1\n", cipher); - - return 1; -} - static DWORD schannel_get_protocol(gnutls_protocol_t proto) { /* FIXME: currently schannel only implements client connections, but @@ -343,8 +313,7 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; - gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(s); - return schannel_get_cipher_block_size(cipher); + return pgnutls_cipher_get_block_size(pgnutls_cipher_get(s)); } unsigned int schan_imp_get_max_message_size(schan_imp_session session) @@ -502,6 +471,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_certificate_free_credentials) LOAD_FUNCPTR(gnutls_certificate_get_peers) LOAD_FUNCPTR(gnutls_cipher_get) + LOAD_FUNCPTR(gnutls_cipher_get_block_size) LOAD_FUNCPTR(gnutls_cipher_get_key_size) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit)

1 0

Huw Davies : user32/tests: Add some optional messages for Win XP.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 683ffd7ff163274ceb2e110d82b46063008928a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683ffd7ff163274ceb2e110d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 15 14:23:18 2015 +0100 user32/tests: Add some optional messages for Win XP. --- dlls/user32/tests/msg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5cbfec8..b5f9e6a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -793,6 +793,9 @@ static const struct message WmShowMaxPopupSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Hans Leidekker : winhttp: Improve parsing of cookie values.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 41cf9a8372e698ecfa81254fd9ed67459607c3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cf9a8372e698ecfa81254fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:25 2015 +0200 winhttp: Improve parsing of cookie values. --- dlls/winhttp/cookie.c | 53 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 6e104b2..4bf0808 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -134,22 +134,14 @@ static cookie_t *parse_cookie( const WCHAR *string ) const WCHAR *p; int len; - if (!(p = strchrW( string, '=' ))) - { - WARN("no '=' in %s\n", debugstr_w(string)); - return NULL; - } - if (p == string) - { - WARN("empty cookie name in %s\n", debugstr_w(string)); - return NULL; - } + if (!(p = strchrW( string, '=' ))) p = string + strlenW( string ); + len = p - string; + while (len && string[len - 1] == ' ') len--; + if (!len) return NULL; if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; - list_init( &cookie->entry ); - len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( cookie ); @@ -158,18 +150,20 @@ static cookie_t *parse_cookie( const WCHAR *string ) memcpy( cookie->name, string, len * sizeof(WCHAR) ); cookie->name[len] = 0; - p++; /* skip '=' */ - while (*p == ' ') p++; - - len = strlenW( p ); - if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (*p++ == '=') { - free_cookie( cookie ); - return NULL; - } - memcpy( cookie->value, p, len * sizeof(WCHAR) ); - cookie->value[len] = 0; + while (*p && *p == ' ') p++; + len = strlenW( p ); + while (len && p[len - 1] == ' ') len--; + if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + free_cookie( cookie ); + return NULL; + } + memcpy( cookie->value, p, len * sizeof(WCHAR) ); + cookie->value[len] = 0; + } return cookie; } @@ -259,14 +253,21 @@ BOOL add_cookie_headers( request_t *request ) if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR format[] = {'C','o','o','k','i','e',':',' ','%','s','=','%','s',0}; - int len; + const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + int len, len_cookie = sizeof(cookieW) / sizeof(cookieW[0]), len_name = strlenW( cookie->name ); WCHAR *header; - len = strlenW( cookie->name ) + strlenW( format ) + strlenW( cookie->value ); + len = len_cookie + len_name; + if (cookie->value) len += strlenW( cookie->value ) + 1; if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - sprintfW( header, format, cookie->name, cookie->value ); + memcpy( header, cookieW, len_cookie * sizeof(WCHAR) ); + strcpyW( header + len_cookie, cookie->name ); + if (cookie->value) + { + header[len_cookie + len_name] = '='; + strcpyW( header + len_cookie + len_name + 1, cookie->value ); + } TRACE("%s\n", debugstr_w(header)); add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3860461..10a3f06 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1799,6 +1799,15 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notokmsg[] = +"HTTP/1.1 400 Bad Request\r\n" +"\r\n"; + +static const char cookiemsg[] = +"HTTP/1.1 200 OK\r\n" +"Set-Cookie: name = value \r\n" +"\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\n" "Server: winetest\r\n" @@ -1917,6 +1926,16 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, headmsg, sizeof headmsg - 1, 0); continue; } + if (strstr(buffer, "GET /cookie2")) + { + if (strstr(buffer, "Cookie: name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } + else if (strstr(buffer, "GET /cookie")) + { + if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2503,6 +2522,103 @@ static void test_multiple_reads(int port) WinHttpCloseHandle(ses); } +static void test_cookies( int port ) +{ + static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; + static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookieW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 400, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -3478,6 +3594,7 @@ START_TEST (winhttp) test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port); + test_cookies(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

Hans Leidekker : winhttp: Correctly handle relative redirect paths.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 9736644ed50f996091afe16243c3fa4a373498a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736644ed50f996091afe1624… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:50 2015 +0200 winhttp: Correctly handle relative redirect paths. --- dlls/winhttp/request.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2fee2c3..5aa90e4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2296,13 +2296,21 @@ static BOOL handle_redirect( request_t *request, DWORD status ) { WCHAR *path, *p; - len = strlenW( location ) + 1; - if (location[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; - - if (location[0] != '/') *p++ = '/'; - strcpyW( p, location ); - + if (location[0] == '/') + { + len = strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, location ); + } + else + { + if ((p = strrchrW( request->path, '/' ))) *p = 0; + len = strlenW( request->path ) + 1 + strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, request->path ); + strcatW( path, slashW ); + strcatW( path, location ); + } heap_free( request->path ); request->path = path;

1 0