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

Jacek Caban : urlmon: Unescape path in place in MkProtocol::StartEx.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 414ff43b12a07e39ca8b0eb4228963ed9257b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=414ff43b12a07e39ca8b0eb42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:29:26 2016 +0200 urlmon: Unescape path in place in MkProtocol::StartEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/mk.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 5437b54..984f381 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -203,9 +203,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, { MkProtocol *This = impl_from_IInternetProtocolEx(iface); LPWSTR mime, progid, display_name, colon_ptr; - DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; - BSTR url, path_tmp, path = NULL; + BSTR url, path = NULL; IParseDisplayName *pdn; BINDINFO bindinfo; STATSTG statstg; @@ -244,22 +243,20 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path_tmp); + hres = IUri_GetPath(pUri, &path); if(FAILED(hres)) return hres; - path = heap_alloc(path_size); - hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); - SysFreeString(path_tmp); - if (FAILED(hres)) - { - heap_free(path); + len = SysStringLen(path)+1; + hres = UrlUnescapeW(path, NULL, &len, URL_UNESCAPE_INPLACE); + if (FAILED(hres)) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } + progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); - if(!colon_ptr) - { - heap_free(path); + if(!colon_ptr) { + SysFreeString(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -269,7 +266,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - heap_free(path); + SysFreeString(path); if(FAILED(hres)) { heap_free(display_name);

1 0

Jacek Caban : wininet: Use compose_request_url in INTERNET_OPTION_URL implementation.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 216474c24e65e886d980426280ea52e591a95ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=216474c24e65e886d98042628… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:02:30 2016 +0200 wininet: Use compose_request_url in INTERNET_OPTION_URL implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 15 ++++++++------- dlls/wininet/tests/http.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 14d4d1e..d1becf8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2116,17 +2116,18 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_SUCCESS; case INTERNET_OPTION_URL: { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR *url; + DWORD res; TRACE("INTERNET_OPTION_URL\n"); - strcpyW(url, httpW); - strcatW(url, req->server->canon_host_port); - strcatW(url, req->path); + url = compose_request_url(req); + if(!url) + return ERROR_OUTOFMEMORY; - TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); - return str_to_buffer(url, buffer, size, unicode); + res = str_to_buffer(url, buffer, size, unicode); + heap_free(url); + return res; } case INTERNET_OPTION_USER_AGENT: return str_to_buffer(req->session->appInfo->agent, buffer, size, unicode); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 29dd965..f27db62 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4720,8 +4720,9 @@ static void test_http_read(int port) static void test_long_url(int port) { char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; - char buf[sizeof(long_path)*2]; + char buf[sizeof(long_path)*2], url[sizeof(buf)]; test_request_t req; + DWORD size, len; BOOL ret; memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path)); @@ -4735,6 +4736,15 @@ static void test_long_url(int port) receive_simple_request(req.request, buf, sizeof(buf)); ok(strstr(buf, long_path) != NULL, "long pathnot found in %s\n", buf); + sprintf(url, "http://localhost:%u%s", port, long_path); + + size = sizeof(buf); + ret = InternetQueryOptionA(req.request, INTERNET_OPTION_URL, buf, &size); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); + len = strlen(url); + ok(size == len, "size = %u, expected %u\n", size, len); + ok(!strcmp(buf, url), "Wrong URL %s, expected %s\n", buf, url); + close_request(&req); }

1 0

Jacek Caban : wininet: Moved more redirect URL handling to a helper function and get rid of its maximum size assumption.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: e73f5782ff38dc69e0c16752c8c4a591340ac22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73f5782ff38dc69e0c16752c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:03:09 2016 +0200 wininet: Moved more redirect URL handling to a helper function and get rid of its maximum size assumption. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 124 +++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 889c606..dfe8a39 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -203,7 +203,6 @@ static INT HTTP_GetCustomHeaderIndex(http_request_t *req, LPCWSTR lpszField, INT static BOOL HTTP_DeleteCustomHeader(http_request_t *req, DWORD index); static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD); -static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL drain_content(http_request_t*,BOOL); @@ -4048,64 +4047,57 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, return result; } -/*********************************************************************** - * HTTP_GetRedirectURL (internal) - */ -static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) +static WCHAR *get_redirect_url(http_request_t *request) { static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0}; http_session_t *session = request->session; - URL_COMPONENTSW urlComponents; - DWORD url_length = 0; - LPWSTR orig_url; - LPWSTR combined_url; + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; + WCHAR *orig_url = NULL, *redirect_url = NULL, *combined_url = NULL; + DWORD url_length = 0, res; + BOOL b; + + url_length = 0; + res = HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, redirect_url, &url_length, NULL); + if(res == ERROR_INSUFFICIENT_BUFFER) { + redirect_url = heap_alloc(url_length); + res = HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, redirect_url, &url_length, NULL); + } + if(res != ERROR_SUCCESS) { + heap_free(redirect_url); + return NULL; + } - urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; - urlComponents.dwSchemeLength = 0; urlComponents.lpszHostName = request->server->name; - urlComponents.dwHostNameLength = 0; urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName; - urlComponents.dwUserNameLength = 0; - urlComponents.lpszPassword = NULL; - urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = request->path; - urlComponents.dwUrlPathLength = 0; - urlComponents.lpszExtraInfo = NULL; - urlComponents.dwExtraInfoLength = 0; - if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) && - (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) - return NULL; - - orig_url = heap_alloc(url_length); + b = InternetCreateUrlW(&urlComponents, 0, NULL, &url_length); + if(!b && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + orig_url = heap_alloc(url_length); - /* convert from bytes to characters */ - url_length = url_length / sizeof(WCHAR) - 1; - if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) - { - heap_free(orig_url); - return NULL; + /* convert from bytes to characters */ + url_length = url_length / sizeof(WCHAR) - 1; + b = InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length); } - url_length = 0; - if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) && - (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) - { - heap_free(orig_url); - return NULL; + if(b) { + url_length = 0; + b = InternetCombineUrlW(orig_url, redirect_url, NULL, &url_length, ICU_ENCODE_SPACES_ONLY); + if(!b && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + combined_url = heap_alloc(url_length * sizeof(WCHAR)); + b = InternetCombineUrlW(orig_url, redirect_url, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY); + if(!b) { + heap_free(combined_url); + combined_url = NULL; + } + } } - combined_url = heap_alloc(url_length * sizeof(WCHAR)); - if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY)) - { - heap_free(orig_url); - heap_free(combined_url); - return NULL; - } heap_free(orig_url); + heap_free(redirect_url); return combined_url; } @@ -5095,14 +5087,15 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen) { - WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; - dwBufferSize=sizeof(szNewLocation); + WCHAR *new_url; + switch(request->status_code) { case HTTP_STATUS_REDIRECT: case HTTP_STATUS_MOVED: case HTTP_STATUS_REDIRECT_KEEP_VERB: case HTTP_STATUS_REDIRECT_METHOD: - if(HTTP_HttpQueryInfoW(request,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL) != ERROR_SUCCESS) + new_url = get_redirect_url(request); + if(!new_url) break; if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && @@ -5112,17 +5105,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) - { - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); - res = HTTP_HandleRedirect(request, new_url); - if (res == ERROR_SUCCESS) - { - heap_free(requestString); - loop_next = TRUE; - } - heap_free( new_url ); + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); + res = HTTP_HandleRedirect(request, new_url); + heap_free(new_url); + if (res == ERROR_SUCCESS) { + heap_free(requestString); + loop_next = TRUE; } redirected = TRUE; } @@ -5265,7 +5254,6 @@ static void AsyncHttpSendRequestProc(task_header_t *hdr) static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_PTR dwContext) { - DWORD dwBufferSize; INT responseLen; DWORD res = ERROR_SUCCESS; @@ -5302,9 +5290,10 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ case HTTP_STATUS_MOVED: case HTTP_STATUS_REDIRECT_METHOD: case HTTP_STATUS_REDIRECT_KEEP_VERB: { - WCHAR *new_url, szNewLocation[INTERNET_MAX_URL_LENGTH]; - dwBufferSize=sizeof(szNewLocation); - if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL) != ERROR_SUCCESS) + WCHAR *new_url; + + new_url = get_redirect_url(request); + if(!new_url) break; if (strcmpW(request->verb, szGET) && strcmpW(request->verb, szHEAD) && @@ -5314,15 +5303,12 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) - { - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); - res = HTTP_HandleRedirect(request, new_url); - if (res == ERROR_SUCCESS) - res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE); - heap_free( new_url ); - } + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); + res = HTTP_HandleRedirect(request, new_url); + heap_free(new_url); + if (res == ERROR_SUCCESS) + res = HTTP_HttpSendRequestW(request, NULL, 0, NULL, 0, 0, TRUE); } } }

1 0

Jacek Caban : wininet: Don' t assume maximal URL length in HTTP_GetRedirectURL.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 5141c911ff0924efb9a787276aecd54a39609ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5141c911ff0924efb9a787276… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:02:46 2016 +0200 wininet: Don't assume maximal URL length in HTTP_GetRedirectURL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d1becf8..889c606 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4116,29 +4116,22 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; - WCHAR path[INTERNET_MAX_PATH_LENGTH]; + WCHAR *path; if(lpszUrl[0]=='/') { /* if it's an absolute path, keep the same session info */ - lstrcpynW(path, lpszUrl, INTERNET_MAX_URL_LENGTH); + path = heap_strdupW(lpszUrl); } else { URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; - WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; - WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; BOOL custom_port = FALSE; + substr_t host; - userName[0] = 0; - hostName[0] = 0; - - urlComponents.lpszHostName = hostName; - urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - urlComponents.lpszUserName = userName; - urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - urlComponents.lpszUrlPath = path; - urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + urlComponents.dwHostNameLength = 1; + urlComponents.dwUserNameLength = 1; + urlComponents.dwUrlPathLength = 1; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return INTERNET_GetLastError(); @@ -4162,20 +4155,23 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) heap_free(session->hostName); - session->hostName = heap_strdupW(hostName); + session->hostName = heap_strndupW(urlComponents.lpszHostName, urlComponents.dwHostNameLength); session->hostPort = urlComponents.nPort; heap_free(session->userName); session->userName = NULL; - if (userName[0]) - session->userName = heap_strdupW(userName); + if (urlComponents.dwUserNameLength) + session->userName = heap_strndupW(urlComponents.lpszUserName, urlComponents.dwUserNameLength); reset_data_stream(request); - if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { + host = substr(urlComponents.lpszHostName, urlComponents.dwHostNameLength); + + if(host.len != strlenW(request->server->name) || strncmpiW(request->server->name, host.str, host.len) + || request->server->port != urlComponents.nPort) { server_t *new_server; - new_server = get_server(substrz(hostName), urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); + new_server = get_server(host, urlComponents.nPort, urlComponents.nScheme == INTERNET_SCHEME_HTTPS, TRUE); server_release(request->server); request->server = new_server; } @@ -4184,16 +4180,18 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); } heap_free(request->path); - request->path=NULL; + request->path = NULL; if (*path) { DWORD needed = 0; HRESULT rc; rc = UrlEscapeW(path, NULL, &needed, URL_ESCAPE_SPACES_ONLY); - if (rc != E_POINTER) + if (rc == E_POINTER) needed = strlenW(path)+1; request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, @@ -4201,10 +4199,12 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); - strcpyW(request->path,path); + strcpyW(request->path, path); } } + heap_free(path); + /* Remove custom content-type/length headers on redirects. */ remove_header(request, szContent_Type, TRUE); remove_header(request, szContent_Length, TRUE);

1 0

Frédéric Delanoy : winemaker: Fix a couple typos in comments.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 58cc34f4d35dc5a8b243b25727f58234ae0dd12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cc34f4d35dc5a8b243b2572… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 21:46:04 2016 +0200 winemaker: Fix a couple typos in comments. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index af26243..d077061 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -328,7 +328,7 @@ my $P_PATH=0; ## # This index contains a reference to an array containing the project-wide -# settings. The structure of that arrray is actually identical to that of +# settings. The structure of that array is actually identical to that of # a regular target since it can also contain extra sources. my $P_SETTINGS=1; @@ -767,7 +767,7 @@ sub source_scan_project_file($$$) # Build a DLL $prj_target_type=$TT_DLL; } elsif (/^incremental:[[:alpha:]]+$/) { - # Link Incrmentally + # Link Incrementally } elsif (/^implib:/) { # Name import library } elsif (/^libpath:\"(.*)\"/) {

1 0

Jacek Caban : wininet: Store cookie URL in cookie_container_t.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 441347f084963ef9f9ae721e5731284443c40656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441347f084963ef9f9ae721e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:03:23 2016 +0200 wininet: Store cookie URL in cookie_container_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 147 ++++++++++++++++++++++-------------------------- dlls/wininet/urlcache.c | 2 +- 2 files changed, 68 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=441347f084963ef9f9ae7…

1 0

Jacek Caban : wininet: Don't use host header in compose_request_url.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 453e0e11126275c834870dd9c529f4d289b10902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453e0e11126275c834870dd9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:02:16 2016 +0200 wininet: Don't use host header in compose_request_url. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f932a27..14d4d1e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1855,16 +1855,11 @@ static WCHAR *compose_request_url(http_request_t *req) { static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; - LPHTTPHEADERW host_header; const WCHAR *host, *scheme; WCHAR *buf, *ptr; size_t len; - EnterCriticalSection( &req->headers_section ); - - host_header = HTTP_GetHeader(req, hostW); - if (host_header) host = host_header->lpszValue; - else host = req->server->canon_host_port; + host = req->server->canon_host_port; if (req->server->is_https) scheme = https; @@ -1888,7 +1883,6 @@ static WCHAR *compose_request_url(http_request_t *req) *ptr = 0; } - LeaveCriticalSection( &req->headers_section ); return buf; }

1 0

Jacek Caban : wininet: Use scheme id instead of string in HTTP_HandleRedirect.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 7528f4d533c8e282279aba2f1fdc70fc868d1758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7528f4d533c8e282279aba2f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 18 18:02:02 2016 +0200 wininet: Use scheme id instead of string in HTTP_HandleRedirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 21f6ff2..f932a27 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4130,36 +4130,24 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } else { - URL_COMPONENTSW urlComponents; - WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; BOOL custom_port = FALSE; - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - userName[0] = 0; hostName[0] = 0; - protocol[0] = 0; - urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); - urlComponents.lpszScheme = protocol; - urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH; urlComponents.lpszHostName = hostName; urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; urlComponents.lpszUserName = userName; urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - urlComponents.lpszPassword = NULL; - urlComponents.dwPasswordLength = 0; urlComponents.lpszUrlPath = path; urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; - urlComponents.lpszExtraInfo = NULL; - urlComponents.dwExtraInfoLength = 0; if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return INTERNET_GetLastError(); - if(!strcmpiW(protocol, httpW)) { + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { TRACE("redirect from secure page to non-secure page\n"); /* FIXME: warn about from secure redirect to non-secure page */ @@ -4167,7 +4155,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } custom_port = urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT; - }else if(!strcmpiW(protocol, httpsW)) { + }else if(urlComponents.nScheme == INTERNET_SCHEME_HTTPS) { if(!(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { TRACE("redirect from non-secure page to secure page\n"); /* FIXME: notify about redirect to secure page */

1 0

Hans Leidekker : webservices: Implement WsReadValue.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 177d8d781f61cd3f6895a05fec51b3dcb71f2b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d8d781f61cd3f6895a05fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:22 2016 +0200 webservices: Implement WsReadValue. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++ dlls/webservices/tests/reader.c | 52 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 2 +- 5 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c79f8cc..56fa28c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3616,6 +3616,24 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO } /************************************************************************** + * WsReadValue [webservices.@] + */ +HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + WS_TYPE type = map_value_type( value_type ); + + TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !value || type == ~0u) return E_INVALIDARG; + + return read_type( reader, WS_ELEMENT_TYPE_MAPPING, type, NULL, NULL, NULL, WS_READ_REQUIRED_VALUE, + NULL, value, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4430a76..1e167c3 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3308,6 +3308,57 @@ static void test_WsReadElement(void) WsFreeReader( reader ); } +static void test_WsReadValue(void) +{ + HRESULT hr; + WS_XML_READER *reader; + UINT32 val; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( NULL, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( reader, WS_UINT32_TYPE, NULL, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* reader must be positioned correctly */ + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val = 0xdeadbeef; + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == 1, "got %u\n", val ); + + prepare_struct_type_test( reader, "<u t='1'></u>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3338,4 +3389,5 @@ START_TEST(reader) test_WsFileTimeToDateTime(); test_double(); test_WsReadElement(); + test_WsReadValue(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9b58d99..22cfe95 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -122,7 +122,7 @@ @ stdcall WsReadStartElement(ptr ptr) @ stdcall WsReadToStartElement(ptr ptr ptr ptr ptr) @ stdcall WsReadType(ptr long long ptr long ptr ptr long ptr) -@ stub WsReadValue +@ stdcall WsReadValue(ptr long ptr long ptr) @ stub WsReadXmlBuffer @ stub WsReadXmlBufferFromBytes @ stub WsReceiveMessage diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index c33038d..363f164 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,6 +32,7 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a6ecf24..20e17d0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1559,7 +1559,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T return hr; } -static WS_TYPE map_value_type( WS_VALUE_TYPE type ) +WS_TYPE map_value_type( WS_VALUE_TYPE type ) { switch (type) {

1 0

Hans Leidekker : webservices: Implement WsReadElement.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: ec0cae49d2746eacf6a5ef4d5d23fa81905d32c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0cae49d2746eacf6a5ef4d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:21 2016 +0200 webservices: Implement WsReadElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++++++++ dlls/webservices/tests/reader.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 +++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9337f19..c79f8cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3598,6 +3598,24 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY } /************************************************************************** + * WsReadElement [webservices.@] + */ +HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !desc || !value) return E_INVALIDARG; + + return read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, + desc->elementNs, desc->typeDescription, option, heap, value, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bc200e2..4430a76 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3271,6 +3271,43 @@ static void test_double(void) WsFreeHeap( heap ); } +static void test_WsReadElement(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + HRESULT hr; + WS_XML_READER *reader; + WS_ELEMENT_DESCRIPTION desc; + UINT32 val; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + desc.elementLocalName = &localname; + desc.elementNs = &ns; + desc.type = WS_UINT32_TYPE; + desc.typeDescription = NULL; + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( NULL, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, NULL, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, NULL, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + val = 0xdeadbeef; + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == 1, "got %u\n", val ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3300,4 +3337,5 @@ START_TEST(reader) test_WsDateTimeToFileTime(); test_WsFileTimeToDateTime(); test_double(); + test_WsReadElement(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6ff4718..9b58d99 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -107,7 +107,7 @@ @ stub WsReadBytes @ stub WsReadChars @ stub WsReadCharsUtf8 -@ stub WsReadElement +@ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) @ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension diff --git a/include/webservices.h b/include/webservices.h index a55072f..62e1182 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1069,6 +1069,8 @@ HRESULT WINAPI WsOpenServiceProxy(WS_SERVICE_PROXY*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, + WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*); @@ -1078,6 +1080,7 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const BOOL*, WS_ERROR*); HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*);

1 0