February 2011 - Wine-Commits

Austin English : dplayx/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 4036cc06b059a963a363c39feedced9ce13a397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036cc06b059a963a363c39fe… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 17:21:24 2011 -0800 dplayx/tests: Make sure to use return values (LLVM/Clang). --- dlls/dplayx/tests/dplayx.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6636999..b9d641b 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1359,6 +1359,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-2, callbackData.dwCounter1 ); /* Doesn't list private */ @@ -1367,6 +1368,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-1, callbackData.dwCounter1 ); /* Doesn't list full, no new, no join, private, protected */ @@ -1374,6 +1376,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Like with DPENUMSESSIONS_AVAILABLE */ @@ -1381,6 +1384,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Doesn't list full, no new, no join, private */ @@ -1388,6 +1392,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-4, callbackData.dwCounter1 ); @@ -1396,6 +1401,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-4, callbackData.dwCounter1 ); /* Read cache of last sync enumeration */ @@ -1403,12 +1409,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Stop enumeration */ callbackData.dwFlags = DPENUMSESSIONS_ASYNC; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Start enumeration */ Sleep(500); /* Give time to fill the cache */ @@ -1417,12 +1425,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( N_SESSIONS-5, callbackData.dwCounter1 ); /* Retrieve results */ callbackData.dwFlags = DPENUMSESSIONS_STOPASYNC; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); /* Stop enumeration */ @@ -1445,12 +1455,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Both sessions automatically set DPSESSION_PASSWORDREQUIRED */ @@ -1471,6 +1483,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Without password, the flag is ignored */ @@ -1491,12 +1504,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* - Listing with incorrect password */ @@ -1505,12 +1520,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 0, callbackData.dwCounter1 ); callbackData.dwFlags = DPENUMSESSIONS_PASSWORDREQUIRED; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* - Listing with correct password */ @@ -1518,6 +1535,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); @@ -1526,6 +1544,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Read cache of last sync enumeration, even private sessions */ @@ -1556,12 +1575,14 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* Only one of the sessions */ dpsd.guidApplication = appGuid; callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 1, callbackData.dwCounter1 ); /* The other session */ /* FIXME: For some reason, if we enum 1st with appGuid and 2nd with appGuid2, @@ -1571,6 +1592,7 @@ static void test_EnumSessions(void) callbackData.dwCounter1 = -1; hr = IDirectPlayX_EnumSessions( pDP, &dpsd, 0, EnumSessions_cb, &callbackData, callbackData.dwFlags ); + checkHR( DP_OK, hr ); check( 2, callbackData.dwCounter1 ); /* Both sessions */ for (i=4; i<=5; i++) @@ -2460,7 +2482,7 @@ static void test_PlayerName(void) /* Regular operation */ hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], &playerName, 0 ); - + checkHR( DP_OK, hr ); dwDataSize = 1024; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DP_OK, hr ); @@ -2470,7 +2492,7 @@ static void test_PlayerName(void) check( 0, ((LPDPNAME)lpData)->dwFlags ); hr = IDirectPlayX_SetPlayerName( pDP[0], dpid[0], NULL, 0 ); - + checkHR( DP_OK, hr ); dwDataSize = 1024; hr = IDirectPlayX_GetPlayerName( pDP[0], dpid[0], lpData, &dwDataSize ); checkHR( DP_OK, hr ); @@ -5359,6 +5381,7 @@ static void test_Receive(void) { hr = IDirectPlayX_Receive( pDP, &idFrom, &idTo, DPRECEIVE_PEEK, lpData, &dwDataSize ); + checkHR( DP_OK, hr ); checkStr( message, (LPSTR) lpData ); }

1 0

Austin English : msi/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 6816aa295e9a3cb2643dfc65b81d40a930e53203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6816aa295e9a3cb2643dfc65b… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 18:29:14 2011 -0800 msi/tests: Make sure to use return values (LLVM/Clang). --- dlls/msi/tests/format.c | 408 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 359 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6816aa295e9a3cb2643df…

1 0

André Hentschel : msvcrt: Fixed a typo.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 68b0a13572131acd05c7f454cf40d5b7d0081368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b0a13572131acd05c7f454c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 4 17:01:48 2011 +0100 msvcrt: Fixed a typo. --- dlls/msvcr90/msvcr90.c | 2 +- dlls/msvcrt/cpp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2c811cb..32a874b 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -315,7 +315,7 @@ const char * __thiscall MSVCRT_type_info_name_internal_method(type_info * _this, if (!_this->name) { /* Create and set the demangled name */ - /* Nota: mangled name in type_info struct always start with a '.', while + /* Note: mangled name in type_info struct always starts with a '.', while * it isn't valid for mangled name. * Is this '.' really part of the mangled name, or has it some other meaning ? */ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 1e7a20a..6f6b5c6 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -605,7 +605,7 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this) if (!_this->name) { /* Create and set the demangled name */ - /* Nota: mangled name in type_info struct always start with a '.', while + /* Note: mangled name in type_info struct always starts with a '.', while * it isn't valid for mangled name. * Is this '.' really part of the mangled name, or has it some other meaning ? */

1 0

Alexander Morozov : shell32: Partially implement FolderItem::get_Path.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 9ba0f5c52ea87c2e268f779794bf410f74d3ab0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba0f5c52ea87c2e268f77979… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Feb 2 21:12:15 2011 +0300 shell32: Partially implement FolderItem::get_Path. --- dlls/shell32/shelldispatch.c | 32 ++++++++++++++++++++++++++++++-- dlls/shell32/tests/shelldispatch.c | 6 ------ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f6ad59f..0ad3b1d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -225,10 +225,38 @@ static HRESULT WINAPI FolderItemImpl_put_Name(FolderItem *iface, BSTR bs) static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem *iface, BSTR *pbs) { - FIXME("(%p,%p)\n", iface, pbs); + FolderItemImpl *This = impl_from_FolderItem(iface); + HRESULT ret = S_OK; + WCHAR *pathW; + int len; + + TRACE("(%p,%p)\n", iface, pbs); *pbs = NULL; - return E_NOTIMPL; + if (V_VT(&This->dir) == VT_I4) + { + pathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if (!pathW) return E_OUTOFMEMORY; + ret = SHGetFolderPathW(NULL, V_I4(&This->dir), NULL, SHGFP_TYPE_CURRENT, + pathW); + if (ret == S_OK) + *pbs = SysAllocString(pathW); + else if (ret == E_INVALIDARG) + { + FIXME("not implemented for %#x\n", V_I4(&This->dir)); + ret = E_NOTIMPL; + } + HeapFree(GetProcessHeap(), 0, pathW); + } + else /* VT_BSTR */ + { + pathW = V_BSTR(&This->dir); + len = lstrlenW(pathW); + *pbs = SysAllocStringLen(pathW, pathW[len - 1] == '\\' ? len - 1 : len); + } + if (ret == S_OK && !*pbs) + ret = E_OUTOFMEMORY; + return ret; } static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem *iface, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 294b3a9..a2b649a 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -150,10 +150,8 @@ static void test_namespace(void) if (r == S_OK) { r = FolderItem_get_Path(item, &item_path); - todo_wine ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (pSHGetFolderPathW) - todo_wine ok(!lstrcmpW(item_path, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(item_path)); SysFreeString(item_path); @@ -239,10 +237,8 @@ static void test_namespace(void) if (r == S_OK) { r = FolderItem_get_Path(item, &item_path); - todo_wine ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (long_pathW) - todo_wine ok(!lstrcmpW(item_path, long_pathW), "expected %s, got %s\n", wine_dbgstr_w(long_pathW), wine_dbgstr_w(item_path)); @@ -284,10 +280,8 @@ static void test_namespace(void) if (r == S_OK) { r = FolderItem_get_Path(item, &item_path); - todo_wine ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); if (long_pathW) - todo_wine ok(!lstrcmpW(item_path, long_pathW), "expected %s, got %s\n", wine_dbgstr_w(long_pathW), wine_dbgstr_w(item_path));

1 0

Jacek Caban : urlmon: Added more CoInternetGetSecurityUrl[Ex] tests.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 380e300855d0adf1bcae0ac81339a48c15621272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=380e300855d0adf1bcae0ac81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:17:37 2011 +0100 urlmon: Added more CoInternetGetSecurityUrl[Ex] tests. --- dlls/urlmon/tests/sec_mgr.c | 109 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 92 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=380e300855d0adf1bcae0…

1 0

Jacek Caban : urlmon: CoInternetGetSecurityUrl rewrite.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 69ee496fbd5d88201c7b29a652121f01eb810023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ee496fbd5d88201c7b29a65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:16:38 2011 +0100 urlmon: CoInternetGetSecurityUrl rewrite. This includes proper URL buffers, error handling and wrong pluggable protocol calls fixes. --- dlls/urlmon/sec_mgr.c | 202 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 139 insertions(+), 63 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 2aca1a9..4206d5d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1299,87 +1299,163 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM return ZoneMgrImpl_Construct(NULL, (void**)ppZM); } -/******************************************************************** - * CoInternetGetSecurityUrl (URLMON.@) - */ -HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) -{ - WCHAR buf1[INTERNET_MAX_URL_LENGTH], buf2[INTERNET_MAX_URL_LENGTH]; - LPWSTR url, domain; - DWORD len; - HRESULT hres; +static HRESULT parse_security_url(const WCHAR *url, PSUACTION action, WCHAR **result) { + IInternetProtocolInfo *protocol_info; + WCHAR *tmp, *new_url = NULL, *alloc_url = NULL; + DWORD size, new_size; + HRESULT hres = S_OK, parse_hres; - TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + while(1) { + TRACE("parsing %s\n", debugstr_w(url)); - url = buf1; - domain = buf2; - strcpyW(url, pwzUrl); + protocol_info = get_protocol_info(url); + if(!protocol_info) + break; - while(1) { - hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, domain, INTERNET_MAX_URL_LENGTH, &len, 0); - if(hres!=S_OK || !strcmpW(url, domain)) + size = strlenW(url)+1; + new_url = CoTaskMemAlloc(size*sizeof(WCHAR)); + if(!new_url) { + hres = E_OUTOFMEMORY; break; + } - if(url == buf1) { - url = buf2; - domain = buf1; - } else { - url = buf1; - domain = buf2; + new_size = 0; + parse_hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_SECURITY_URL, 0, new_url, size, &new_size, 0); + if(parse_hres == S_FALSE) { + if(!new_size) { + hres = E_UNEXPECTED; + break; + } + + tmp = CoTaskMemRealloc(new_url, new_size*sizeof(WCHAR)); + if(!tmp) { + hres = E_OUTOFMEMORY; + break; + } + new_url = tmp; + parse_hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_SECURITY_URL, 0, new_url, + new_size, &new_size, 0); + if(parse_hres == S_FALSE) { + hres = E_FAIL; + break; + } } - } - if(psuAction==PSU_SECURITY_URL_ONLY) { - len = lstrlenW(url)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; + if(parse_hres != S_OK || !strcmpW(url, new_url)) + break; - memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); - return S_OK; + CoTaskMemFree(alloc_url); + url = alloc_url = new_url; + new_url = NULL; } - hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); - if(SUCCEEDED(hres)) { - len++; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; + CoTaskMemFree(new_url); - memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); - return S_OK; + if(hres != S_OK) { + WARN("failed: %08x\n", hres); + CoTaskMemFree(alloc_url); + return hres; } - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); - if(hres == S_OK){ - const WCHAR fileW[] = {'f','i','l','e',0}; - if(!strcmpW(domain, fileW)){ - hres = CoInternetParseUrl(url, PARSE_ROOTDOCUMENT, 0, domain, INTERNET_MAX_URL_LENGTH, &len, 0); - }else{ - domain[len] = ':'; - hres = CoInternetParseUrl(url, PARSE_DOMAIN, 0, domain+len+1, - INTERNET_MAX_URL_LENGTH-len-1, &len, 0); - if(hres == S_OK) { - len = lstrlenW(domain)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; - - memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); - return S_OK; + if(action == PSU_DEFAULT && (protocol_info = get_protocol_info(url))) { + size = strlenW(url)+1; + new_url = CoTaskMemAlloc(size * sizeof(WCHAR)); + if(new_url) { + new_size = 0; + parse_hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_SECURITY_DOMAIN, 0, + new_url, size, &new_size, 0); + if(parse_hres == S_FALSE) { + if(new_size) { + tmp = CoTaskMemRealloc(new_url, new_size*sizeof(WCHAR)); + if(tmp) { + new_url = tmp; + parse_hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_SECURITY_DOMAIN, 0, new_url, + new_size, &new_size, 0); + if(parse_hres == S_FALSE) + hres = E_FAIL; + }else { + hres = E_OUTOFMEMORY; + } + }else { + hres = E_UNEXPECTED; + } + } + + if(hres == S_OK && parse_hres == S_OK) { + CoTaskMemFree(alloc_url); + url = alloc_url = new_url; + new_url = NULL; } + + CoTaskMemFree(new_url); + }else { + hres = E_OUTOFMEMORY; } - }else + IInternetProtocolInfo_Release(protocol_info); + } + + if(FAILED(hres)) { + WARN("failed %08x\n", hres); + CoTaskMemFree(alloc_url); return hres; + } - len = lstrlenW(url)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; + if(!alloc_url) { + size = strlenW(url)+1; + alloc_url = CoTaskMemAlloc(size * sizeof(WCHAR)); + if(!alloc_url) + return E_OUTOFMEMORY; + memcpy(alloc_url, url, size * sizeof(WCHAR)); + } + + *result = alloc_url; + return S_OK; +} + +/******************************************************************** + * CoInternetGetSecurityUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) +{ + WCHAR *secure_url; + HRESULT hres; + + TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + + hres = parse_security_url(pwzUrl, psuAction, &secure_url); + if(FAILED(hres)) + return hres; + + if(psuAction != PSU_SECURITY_URL_ONLY) { + PARSEDURLW parsed_url = { sizeof(parsed_url) }; + DWORD size; + + /* FIXME: Use helpers from uri.c */ + if(SUCCEEDED(ParseURLW(secure_url, &parsed_url))) { + WCHAR *new_url; + + switch(parsed_url.nScheme) { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + size = strlenW(secure_url)+1; + new_url = CoTaskMemAlloc(size * sizeof(WCHAR)); + if(new_url) + hres = UrlGetPartW(secure_url, new_url, &size, URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME); + else + hres = E_OUTOFMEMORY; + CoTaskMemFree(secure_url); + if(hres != S_OK) { + WARN("UrlGetPart failed: %08x\n", hres); + CoTaskMemFree(new_url); + return FAILED(hres) ? hres : E_FAIL; + } + secure_url = new_url; + } + } + } - memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); + *ppwzSecUrl = secure_url; return S_OK; }

1 0

Jacek Caban : urlmon: CoInternetGetSecurityUrlEx rewrite.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 139382a3f8b0cffede0c64c85c8fdbb4c1337601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139382a3f8b0cffede0c64c85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:17:15 2011 +0100 urlmon: CoInternetGetSecurityUrlEx rewrite. --- dlls/urlmon/sec_mgr.c | 89 ++++++++++-------------------------------------- 1 files changed, 19 insertions(+), 70 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 4206d5d..562680f 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -293,59 +293,6 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s return hres; } -static HRESULT parse_security_uri(IUri *uri, PSUACTION action, IUri **result) { - WCHAR buf1[INTERNET_MAX_URL_LENGTH], buf2[INTERNET_MAX_URL_LENGTH]; - LPWSTR url, tmp; - HRESULT hres; - DWORD len = 0; - BOOL use_url = FALSE; - - url = buf1; - tmp = buf2; - *result = NULL; - - hres = IUri_GetPropertyLength(uri, Uri_PROPERTY_ABSOLUTE_URI, &len, 0); - if(FAILED(hres)) - return hres; - - hres = CoInternetParseIUri(uri, PARSE_SECURITY_URL, 0, url, len+1, &len, 0); - if(hres == S_OK) { - use_url = TRUE; - while(TRUE) { - hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, tmp, len+1, &len, 0); - if(hres != S_OK || !strcmpW(url, tmp)) - break; - - if(url == buf1) { - url = buf2; - tmp = buf1; - } else { - url = buf1; - tmp = buf2; - } - } - } - - if(action == PSU_DEFAULT) { - if(use_url) { - hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, tmp, len+1, &len, 0); - url = tmp; - } else { - hres = CoInternetParseIUri(uri, PARSE_SECURITY_DOMAIN, 0, url, len+1, &len, 0); - if(hres == S_OK) - use_url = TRUE; - } - } - - if(use_url) { - hres = CreateUri(url, 0, 0, result); - if(FAILED(hres)) - return hres; - } - - return S_OK; -} - /*********************************************************************** * InternetSecurityManager implementation * @@ -1464,42 +1411,44 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA */ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION psuAction, DWORD_PTR dwReserved) { - HRESULT hres; - BSTR secure_uri; URL_SCHEME scheme_type; + BSTR secure_uri; + WCHAR *ret_url; + HRESULT hres; TRACE("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; - /* Try to find the Security url using pluggable protocols first. */ - hres = parse_security_uri(pUri, psuAction, ppSecUri); - if(FAILED(hres) || *ppSecUri) + hres = IUri_GetDisplayUri(pUri, &secure_uri); + if(FAILED(hres)) return hres; - hres = IUri_GetScheme(pUri, (DWORD*)&scheme_type); + hres = parse_security_url(secure_uri, psuAction, &ret_url); + SysFreeString(secure_uri); if(FAILED(hres)) return hres; - hres = IUri_GetDisplayUri(pUri, &secure_uri); - if(FAILED(hres)) + hres = CreateUri(ret_url, Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, 0, ppSecUri); + if(FAILED(hres)) { + CoTaskMemFree(ret_url); return hres; + } /* File URIs have to hierarchical. */ - if(scheme_type == URL_SCHEME_FILE) { - const WCHAR *tmp = secure_uri; + hres = IUri_GetScheme(pUri, (DWORD*)&scheme_type); + if(SUCCEEDED(hres) && scheme_type == URL_SCHEME_FILE) { + const WCHAR *tmp = ret_url; /* Check and see if a "//" is after the scheme name. */ tmp += sizeof(fileW)/sizeof(WCHAR); - if(*tmp != '/' || *(tmp+1) != '/') { - SysFreeString(secure_uri); - return E_INVALIDARG; - } + if(*tmp != '/' || *(tmp+1) != '/') + hres = E_INVALIDARG; } - hres = CreateUri(secure_uri, Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, 0, ppSecUri); - SysFreeString(secure_uri); - + if(SUCCEEDED(hres)) + hres = CreateUri(ret_url, Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, 0, ppSecUri); + CoTaskMemFree(ret_url); return hres; }

1 0

Jacek Caban : mshtml: Fixed size check in res protocol ParseUrl( PARSE_SECURITY_URL) call.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: e175bee277a2aac054405ad4ef6ddab8f159da8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e175bee277a2aac054405ad4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:38 2011 +0100 mshtml: Fixed size check in res protocol ParseUrl(PARSE_SECURITY_URL) call. --- dlls/mshtml/protocol.c | 2 +- dlls/mshtml/tests/protocol.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 79bcf2d..58f4dee 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -864,7 +864,7 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; if(pcchResult) *pcchResult = size; - if(size >= cchResult) + if(size > cchResult) return S_FALSE; memcpy(pwzResult, wszFile, sizeof(wszFile)); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9e6fe1a..599f43e 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -326,7 +326,7 @@ static void test_res_protocol(void) ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); if(SUCCEEDED(hres)) { WCHAR buf[128]; - DWORD size; + DWORD size, expected_size; int i; for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { @@ -342,12 +342,20 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); res_sec_url_cmp(buf, size, mshtml_dllW); + ok(size == lstrlenW(buf)+1, "size = %d\n", size); + expected_size = size; + + hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, + expected_size, &size, 0); + ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + res_sec_url_cmp(buf, size, mshtml_dllW); + ok(size == expected_size, "size = %d\n", size); size = 0; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); - ok(size, "size=0\n"); + ok(size == expected_size, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);

1 0

Jacek Caban : urlmon: Don't hardcode zone numbers.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 4ac397b6e345ca4d5afc347f6c2c12c359215538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac397b6e345ca4d5afc347f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:06 2011 +0100 urlmon: Don't hardcode zone numbers. --- dlls/urlmon/sec_mgr.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e3be8fe..2aca1a9 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -150,7 +150,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) DWORD size=0; HRESULT hres; - *zone = -1; + *zone = URLZONE_INVALID; hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); if(hres != S_OK) { @@ -193,11 +193,11 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) case DRIVE_FIXED: case DRIVE_CDROM: case DRIVE_RAMDISK: - *zone = 0; + *zone = URLZONE_LOCAL_MACHINE; hres = S_OK; break; case DRIVE_REMOTE: - *zone = 3; + *zone = URLZONE_INTERNET; hres = S_OK; break; default: @@ -206,7 +206,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) } } - if(*zone == -1) { + if(*zone == URLZONE_INVALID) { WARN("domains are not yet implemented\n"); hres = get_zone_from_reg(schema, zone); } @@ -495,7 +495,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac } if(!pwszUrl) { - *pdwZone = -1; + *pdwZone = URLZONE_INVALID; return E_INVALIDARG; }

1 0

Jacek Caban : mshtml: Return size in about protocols handler's ParseUrl( PARSE_SECURITY_URL) call.
by Alexandre Julliard Feb. 8, 2011

Feb. 8, 2011

Module: wine Branch: master Commit: 340fbb71f381af6279096ae39b68427696551bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=340fbb71f381af6279096ae39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 15:09:24 2011 +0100 mshtml: Return size in about protocols handler's ParseUrl(PARSE_SECURITY_URL) call. --- dlls/mshtml/protocol.c | 9 +++++---- dlls/mshtml/tests/protocol.c | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index f0325bf..79bcf2d 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -404,16 +404,17 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { - TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, + TRACE("%p)->(%s %d %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); if(ParseAction == PARSE_SECURITY_URL) { - unsigned int len = strlenW(pwzUrl); + unsigned int len = strlenW(pwzUrl)+1; - if(len >= cchResult) + *pcchResult = len; + if(len > cchResult) return S_FALSE; - memcpy(pwzResult, pwzUrl, (len+1)*sizeof(WCHAR)); + memcpy(pwzResult, pwzUrl, len*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 1369ff7..9e6fe1a 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -656,14 +656,17 @@ static void test_about_protocol(void) ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_blank_url, buf), "buf != blank_url\n"); + size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); + ok(size == 12, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_test_url, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_test_url, buf), "buf != test_url\n"); + ok(size == 11, "size = %d\n", size); size = 0xdeadbeef; buf[0] = '?';

1 0