wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Hans Leidekker : wininet: Handle secure proxy connections inside the main loop.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 5b56624a1bc6d4ff7768f15700ef3ef00c073d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b56624a1bc6d4ff7768f1570… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:53 2014 +0200 wininet: Handle secure proxy connections inside the main loop. This adds support for authenticated secure proxy connections. --- dlls/wininet/http.c | 145 +++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 79 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 07b4787..97becd4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,43 +4176,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) return str; } -static DWORD HTTP_SecureProxyConnect(http_request_t *request) -{ - server_t *server = request->server; - LPWSTR requestString; - INT len; - INT cnt; - INT responseLen; - char *ascii_req; - DWORD res; - - static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; - - TRACE("\n"); - - requestString = build_request_header( request, connectW, server->host_port, g_szHttp1_1, TRUE ); - - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - len--; /* the nul terminator isn't needed */ - ascii_req = heap_alloc(len); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, ascii_req, len, NULL, NULL ); - heap_free( requestString ); - - TRACE("full request -> %s\n", debugstr_an( ascii_req, len ) ); - - NETCON_set_timeout( request->netconn, TRUE, request->send_timeout ); - res = NETCON_send( request->netconn, ascii_req, len, 0, &cnt ); - heap_free( ascii_req ); - if (res != ERROR_SUCCESS) - return res; - - if (HTTP_GetResponseHeaders( request, &responseLen ) || !responseLen) - return ERROR_HTTP_INVALID_HEADER; - - return ERROR_SUCCESS; -} - static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; @@ -4837,29 +4800,24 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_STATUS_CONNECTED_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - if(is_https) { - /* Note: we differ from Microsoft's WinINet here. they seem to have - * a bug that causes no status callbacks to be sent when starting - * a tunnel to a proxy server using the CONNECT verb. i believe our - * behaviour to be more correct and to not cause any incompatibilities - * because using a secure connection through a proxy server is a rare - * case that would be hard for anyone to depend on */ - if(request->proxy) - res = HTTP_SecureProxyConnect(request); - if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, request->server); - } - - if(res != ERROR_SUCCESS) { - http_release_netconn(request, FALSE); - return res; - } - *reusing = FALSE; TRACE("Created connection to %s: %p\n", debugstr_w(request->server->name), netconn); return ERROR_SUCCESS; } +static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, DWORD *out_len ) +{ + int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + char *ret; + + if (!(ret = heap_alloc( len + data_len ))) return NULL; + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + if (data_len) memcpy( ret + len - 1, data, data_len ); + *out_len = len + data_len - 1; + ret[*out_len] = 0; + return ret; +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4874,13 +4832,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest) { - INT cnt; - BOOL redirected = FALSE; - LPWSTR requestString = NULL; - INT responseLen; - BOOL loop_next; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; + BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; + LPWSTR requestString = NULL; + INT responseLen, cnt; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; DWORD res; @@ -4929,7 +4885,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, do { - DWORD len; + DWORD len, data_len = dwOptionalLength; BOOL reusing_connection; char *ascii_req; @@ -4957,7 +4913,31 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); - if (request->proxy) + res = open_http_connection(request, &reusing_connection); + if (res != ERROR_SUCCESS) + break; + + if (!reusing_connection && (request->hdr.dwFlags & INTERNET_FLAG_SECURE)) + { + if (request->proxy) secure_proxy_connect = TRUE; + else + { + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure connection\n"); + http_release_netconn(request, FALSE); + break; + } + } + } + if (secure_proxy_connect) + { + static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; + const WCHAR *target = request->server->host_port; + requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); + } + else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { WCHAR *url = build_proxy_path_url(request); requestString = build_request_header(request, request->verb, url, request->version, TRUE); @@ -4966,25 +4946,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, else requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); - TRACE("Request header -> %s\n", debugstr_w(requestString) ); - res = open_http_connection(request, &reusing_connection); - if (res != ERROR_SUCCESS) - break; - /* send the request as ASCII, tack on the optional data */ - if (!lpOptional || redirected) - dwOptionalLength = 0; - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - ascii_req = heap_alloc(len + dwOptionalLength); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, - ascii_req, len, NULL, NULL ); - if( lpOptional ) - memcpy( &ascii_req[len-1], lpOptional, dwOptionalLength ); - len = (len + dwOptionalLength - 1); - ascii_req[len] = 0; + if (!lpOptional || redirected || secure_proxy_connect) + data_len = 0; + + ascii_req = build_ascii_request( requestString, lpOptional, data_len, &len ); TRACE("full request -> %s\n", debugstr_a(ascii_req) ); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -5002,7 +4970,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, continue; } - request->bytesWritten = dwOptionalLength; + request->bytesWritten = data_len; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REQUEST_SENT, @@ -5139,6 +5107,25 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } } } + if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) + { + int index; + + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure proxy connection\n"); + http_release_netconn( request, FALSE ); + break; + } + index = HTTP_GetCustomHeaderIndex(request, szProxy_Authorization, 0, TRUE); + if (index != -1) HTTP_DeleteCustomHeader(request, index); + destroy_authinfo(request->proxyAuthInfo); + request->proxyAuthInfo = NULL; + + secure_proxy_connect = FALSE; + loop_next = TRUE; + } } else res = ERROR_SUCCESS;

1 0

Hans Leidekker : wininet: Only parse proxy URLs taken from the environment.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 4036475dc6d2c134f20b49cb34a1c8714bbb6ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036475dc6d2c134f20b49cb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:26 2014 +0200 wininet: Only parse proxy URLs taken from the environment. Proxy server strings stored in the registry use a different format. --- dlls/wininet/internet.c | 118 ++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7f325a5..30e8f60 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -105,6 +105,8 @@ typedef struct DWORD proxyEnabled; LPWSTR proxy; LPWSTR proxyBypass; + LPWSTR proxyUsername; + LPWSTR proxyPassword; } proxyinfo_t; static ULONG max_conns = 2, max_1_0_conns = 4; @@ -504,6 +506,8 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) { heap_free(lpwpi->proxy); heap_free(lpwpi->proxyBypass); + heap_free(lpwpi->proxyUsername); + heap_free(lpwpi->proxyPassword); } static proxyinfo_t *global_proxy; @@ -519,6 +523,50 @@ static void free_global_proxy( void ) LeaveCriticalSection( &WININET_cs ); } +static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) +{ + static const WCHAR fmt[] = {'%','s',':','%','u',0}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + URL_COMPONENTSW uc; + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszHostName = hostname; + uc.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + uc.lpszUserName = username; + uc.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; + uc.lpszPassword = password; + uc.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + + if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE; + if (!hostname[0]) + { + if (!(info->proxy = heap_strdupW( url ))) return FALSE; + info->proxyUsername = NULL; + info->proxyPassword = NULL; + return TRUE; + } + if (!(info->proxy = heap_alloc( (strlenW(hostname) + 12) * sizeof(WCHAR) ))) return FALSE; + sprintfW( info->proxy, fmt, hostname, uc.nPort ); + + if (!username[0]) info->proxyUsername = NULL; + else if (!(info->proxyUsername = heap_strdupW( username ))) + { + heap_free( info->proxy ); + return FALSE; + } + if (!password[0]) info->proxyPassword = NULL; + else if (!(info->proxyPassword = heap_strdupW( password ))) + { + heap_free( info->proxyUsername ); + heap_free( info->proxy ); + return FALSE; + } + return TRUE; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -620,10 +668,20 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); FreeProxyInfo( lpwpi ); - lpwpi->proxyEnabled = 1; - lpwpi->proxy = envproxyW; - - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + if (parse_proxy_url( lpwpi, envproxyW )) + { + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + lpwpi->proxyEnabled = 1; + lpwpi->proxyBypass = NULL; + } + else + { + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + lpwpi->proxyEnabled = 0; + lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; + } + heap_free( envproxyW ); } if (lpwpi->proxyEnabled) @@ -675,6 +733,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); } } + else TRACE("Proxy is disabled.\n"); RegCloseKey( key ); return ERROR_SUCCESS; @@ -685,56 +744,21 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) */ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { - proxyinfo_t wpi = {0}; + proxyinfo_t wpi; if (INTERNET_LoadProxySettings( &wpi )) return FALSE; if (wpi.proxyEnabled) { - WCHAR proxyurl[INTERNET_MAX_URL_LENGTH]; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; - URL_COMPONENTSW UrlComponents; - - UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.dwSchemeLength = 0; - UrlComponents.lpszHostName = hostname; - UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - UrlComponents.lpszUserName = username; - UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - UrlComponents.lpszPassword = password; - UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; - UrlComponents.dwUrlPathLength = 0; - UrlComponents.dwExtraInfoLength = 0; - - if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents)) - { - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - - if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = heap_strdupW(proxyurl); - lpwai->proxyBypass = heap_strdupW(wpi.proxyBypass); - if (UrlComponents.dwUserNameLength) - { - lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); - lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); - } - - TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - FreeProxyInfo(&wpi); - return TRUE; - } - else - { - TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy)); - lpwai->proxy = NULL; - } + lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->proxy = wpi.proxy; + lpwai->proxyBypass = wpi.proxyBypass; + lpwai->proxyUsername = wpi.proxyUsername; + lpwai->proxyPassword = wpi.proxyPassword; + return TRUE; } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;

1 0

Hans Leidekker : wininet: Fix a couple of memory leaks.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 9946e8a87ed3a49a5c54e9f3f7e817dbb3bfc4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9946e8a87ed3a49a5c54e9f3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:53 2014 +0200 wininet: Fix a couple of memory leaks. --- dlls/wininet/internet.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 08bdd7c..7f325a5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -538,6 +538,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LPCSTR envproxy; LONG ret; + memset( lpwpi, 0, sizeof(*lpwpi) ); + EnterCriticalSection( &WININET_cs ); if (global_proxy) { @@ -548,7 +550,10 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LeaveCriticalSection( &WININET_cs ); if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) + { + FreeProxyInfo( lpwpi ); return ret; + } len = sizeof(DWORD); if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) @@ -556,6 +561,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) lpwpi->proxyEnabled = 0; if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) { + FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } @@ -563,8 +569,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) { - TRACE("Proxy is enabled.\n"); - /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { @@ -574,6 +578,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = heap_alloc(len))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); @@ -588,14 +593,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p = strchrW( szProxy, ';' ); if (p) *p = 0; + FreeProxyInfo( lpwpi ); lpwpi->proxy = szProxy; + lpwpi->proxyBypass = NULL; - TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy)); + TRACE("http proxy (from registry) = %s\n", debugstr_w(lpwpi->proxy)); } else { TRACE("No proxy server settings in registry.\n"); + FreeProxyInfo( lpwpi ); lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; } } else if (envproxy) @@ -604,18 +613,23 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + FreeProxyInfo( lpwpi ); lpwpi->proxyEnabled = 1; lpwpi->proxy = envproxyW; TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } - lpwpi->proxyBypass = NULL; if (lpwpi->proxyEnabled) { + TRACE("Proxy is enabled.\n"); + if (!(envproxy = getenv( "no_proxy" ))) { /* figure out how much memory the proxy setting takes */ @@ -630,24 +644,32 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; - TRACE("http proxy bypass = %s\n", debugstr_w(lpwpi->proxyBypass)); + TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); } else { + heap_free( lpwpi->proxyBypass ); + lpwpi->proxyBypass = NULL; + TRACE("No proxy bypass server settings in registry.\n"); } } - else if (envproxy) + else { WCHAR *envproxyW; len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW; TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); @@ -655,7 +677,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegCloseKey( key ); - return ERROR_SUCCESS; } @@ -2890,7 +2911,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, unsigned int i; proxyinfo_t pi; - INTERNET_LoadProxySettings(&pi); + if (INTERNET_LoadProxySettings(&pi)) return FALSE; for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;

1 0

Hans Leidekker : wininet: Use a semicolon to delimit registered proxy servers.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 282b9c7bb7c5939a5ed55d70680f1e18b9cd165c URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b9c7bb7c5939a5ed55d706… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:35 2014 +0200 wininet: Use a semicolon to delimit registered proxy servers. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a37606a..08bdd7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -585,7 +585,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p += lstrlenW( szHttp ); lstrcpyW( szProxy, p ); } - p = strchrW( szProxy, ' ' ); + p = strchrW( szProxy, ';' ); if (p) *p = 0; lpwpi->proxy = szProxy;

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: e759105cdd14d7db09881520dc601adf057a959d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e759105cdd14d7db09881520d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 6 10:41:19 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlattr.c | 6 +++--- dlls/mshtml/htmlcurstyle.c | 20 +++++++------------- dlls/mshtml/htmlelemcol.c | 23 +++++++++-------------- dlls/mshtml/main.c | 23 +++++++++++++++-------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 1b01662..420a275 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -43,16 +43,16 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { - TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("%s not supported\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 71d57a1..ca5d60f 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -69,34 +69,28 @@ static HRESULT WINAPI HTMLCurrentStyle_QueryInterface(IHTMLCurrentStyle *iface, { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle2, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle2 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle2_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle3, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle3 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle4, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle4_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLCurrentStyle_AddRef(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 5819d44..cb7bad1 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -104,14 +104,14 @@ static HRESULT WINAPI HTMLElementCollectionEnum_QueryInterface(IEnumVARIANT *ifa { HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { - TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -217,25 +217,20 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - *ppv = NULL; - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { - TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); - return S_OK; - } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); + return S_OK; } static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1f90686..0bdc145 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -204,7 +204,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID return S_OK; } - WARN("not supported iid %s\n", debugstr_guid(riid)); + WARN("not supported iid %s\n", debugstr_mshtml_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } @@ -277,25 +277,25 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { - TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLDocument_Create); }else if(IsEqualGUID(&CLSID_AboutProtocol, rclsid)) { - TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_JSProtocol, rclsid)) { - TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_MailtoProtocol, rclsid)) { - TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_ResProtocol, rclsid)) { - TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_SysimageProtocol, rclsid)) { - TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_HTMLLoadOptions, rclsid)) { - TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLLoadOptions_Create); } @@ -540,7 +540,12 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_ICustomDoc); X(IID_IDispatch); X(IID_IDispatchEx); + X(IID_IEnumVARIANT); X(IID_IHlinkTarget); + X(IID_IHTMLCurrentStyle); + X(IID_IHTMLCurrentStyle2); + X(IID_IHTMLCurrentStyle3); + X(IID_IHTMLCurrentStyle4); X(IID_IHTMLDocument); X(IID_IHTMLDocument2); X(IID_IHTMLDocument3); @@ -548,6 +553,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); + X(IID_IHTMLDOMAttribute); + X(IID_IHTMLElementCollection); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); X(IID_IObjectSafety);

1 0

Nikolay Sivov : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 0563c78cb63b8e021fdba2b9049c6875b784ff0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0563c78cb63b8e021fdba2b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:58:03 2014 +0400 ntdll/tests: Fix some string leaks (Valgrind). --- dlls/ntdll/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6406930..d70ed6b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -267,6 +267,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); attr.ObjectName = &nameW; @@ -281,6 +282,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); } static void open_file_test(void) @@ -1966,6 +1968,7 @@ static void test_NtCreateFile(void) } } + pRtlFreeUnicodeString( &nameW ); SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); }

1 0

Nikolay Sivov : oleaut32/tests: Fixed a couple of string leaks (Valgrind).
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 29eace89e9d6379a4ca33a8ea5d121ab7ccec99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29eace89e9d6379a4ca33a8ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:57:48 2014 +0400 oleaut32/tests: Fixed a couple of string leaks (Valgrind). --- dlls/oleaut32/tests/olefont.c | 2 ++ dlls/oleaut32/tests/vartest.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index ded1838..4f421e4 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -412,10 +412,12 @@ static void test_font_events_disp(void) IConnectionPoint_Release(pCP); fonteventsdisp_invoke_called = 0; + fonteventsdisp_invoke_arg0 = NULL; hr = IFont_put_Bold(pFont, TRUE); EXPECT_HR(hr, S_OK); ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + SysFreeString(fonteventsdisp_invoke_arg0); hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp); EXPECT_HR(hr, S_OK); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bfbc0b2..d139b42 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5611,6 +5611,7 @@ static void test_VarCat(void) VARTYPE leftvt, rightvt, resultvt; HRESULT hres; HRESULT expected_error_num; + int cmp; CHECKPTR(VarCat); @@ -5952,7 +5953,11 @@ static void test_VarCat(void) V_BSTR(&right) = SysAllocStringLen(NULL,0); hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - if(!strcmp_wa(V_BSTR(&result), "True")) { + VariantClear(&right); + + cmp = strcmp_wa(V_BSTR(&result), "True"); + VariantClear(&result); + if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result);

1 0

Nikolay Sivov : msxml3: Fix some string leaks (Valgrind).
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 9e576e1089a376c3fdc793e5ec1aeec390bd5530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e576e1089a376c3fdc793e5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:47:46 2014 +0400 msxml3: Fix some string leaks (Valgrind). --- dlls/msxml3/element.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4fe53a8..0de9c34 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1287,6 +1287,7 @@ static HRESULT WINAPI domelem_setAttribute( { int cmp = xmlStrEqual(ns->href, xml_value); heap_free(xml_value); + heap_free(xml_name); return cmp ? S_OK : E_INVALIDARG; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8d8c7c0..19b2951 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1940,6 +1940,7 @@ static void test_domnode( void ) ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + SysFreeString(str); str = SysAllocString( szdl ); V_VT(&var) = VT_I4; @@ -8121,6 +8122,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SysFreeString(str); array = SafeArrayCreateVector(VT_UI1, 0, 7); hr = SafeArrayAccessData(array, (void*)&ptr); @@ -8160,6 +8162,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); /* bin.hex */ V_VT(&value) = VT_BSTR; @@ -8208,6 +8211,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); @@ -9509,6 +9513,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); V_VT(&v) = VT_I2; hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); @@ -9530,6 +9535,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); @@ -11784,6 +11790,7 @@ static void test_create_attribute(void) ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); } + SysFreeString(str); str = NULL; hr = IXMLDOMNode_get_namespaceURI(node, &str);

1 0

Vijay Kiran Kamuju : usp10: Show fixme once in ScriptShapeOpenType.
by Alexandre Julliard 06 May '14

06 May '14

Module: wine Branch: master Commit: 8b50762b18fce7de81133b7ef82f12431b47ac01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50762b18fce7de81133b7ef… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon May 5 18:55:37 2014 +0000 usp10: Show fixme once in ScriptShapeOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ae164d2..ac9c0fd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2848,6 +2848,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, unsigned int g; BOOL rtl; int cluster; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", hdc, psc, psa, @@ -2862,7 +2863,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; if (cRanges) - FIXME("Ranges not supported yet\n"); + if(!once++) FIXME("Ranges not supported yet\n"); rtl = (psa && !psa->fLogicalOrder && psa->fRTL);

1 0

Francois Gouget : testbot/lib: Set the VM status to running in Task::Run() .
by Alexandre Julliard 06 May '14

06 May '14

Module: tools Branch: master Commit: cfde7ca87f7a2608b2c13939d9d41a52799ac751 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfde7ca87f7a2608b2c13939… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:43:14 2014 +0200 testbot/lib: Set the VM status to running in Task::Run(). It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status. --- testbot/lib/WineTestBot/Jobs.pm | 5 +---- testbot/lib/WineTestBot/Tasks.pm | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b042bea..4532d4e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -507,11 +507,8 @@ sub ScheduleOnHost($$$) { $IdleVMs{$VMKey} = 0; $IdleCount--; - $VM->Status("running"); - my ($ErrProperty, $ErrMessage) = $VM->Save(); - return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Step); + my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fd848f2..dd22749 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -79,6 +79,11 @@ sub Run($$) $self->Status("running"); $self->Save(); + my $VM = $self->VM; + $VM->Status("running"); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + return $ErrMessage if (defined $ErrMessage); + my $RunScript; if ($Step->Type eq "build") { @@ -131,8 +136,7 @@ sub Run($$) # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); - my ($ErrProperty, $ErrMessage) = $self->Save(); - + ($ErrProperty, $ErrMessage) = $self->Save(); return $ErrMessage; }

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2014