September 2011 - Wine-commits

André Hentschel : cryptnet: Use the constants from the wininet header.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 220191abe1de3614c1512704f4ada9881bacdd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=220191abe1de3614c1512704f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 4 19:29:35 2011 +0200 cryptnet: Use the constants from the wininet header. --- dlls/cryptnet/cryptnet_main.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ec9dddd..6464908 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -583,16 +583,25 @@ static BOOL CRYPT_CrackUrl(LPCWSTR pszURL, URL_COMPONENTSW *components) memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); - components->dwHostNameLength = MAX_PATH; - components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components->dwUrlPathLength = 2 * MAX_PATH; + components->lpszHostName = CryptMemAlloc(INTERNET_MAX_HOST_NAME_LENGTH * sizeof(WCHAR)); + components->dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + if (!components->lpszHostName) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + components->lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components->dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components->lpszUrlPath) + { + CryptMemFree(components->lpszHostName); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || - (components->dwHostNameLength == MAX_PATH - 1)) - FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -1025,16 +1034,19 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components.dwUrlPathLength = 2 * MAX_PATH; + components.lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components.lpszUrlPath) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; - if (components.dwUrlPathLength == 2 * MAX_PATH - 1) - FIXME("Buffers are too small\n"); - /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); if (path) @@ -1087,6 +1099,11 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, ret = FALSE; CryptMemFree(path); } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } } CryptMemFree(components.lpszUrlPath); return ret;

1 0

Frédéric Delanoy : cmd/tests: Add tests for IF '= =' operator.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: f35d52e20ee4b494636ec8e88b96ee9e2b6722b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35d52e20ee4b494636ec8e88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 4 16:33:29 2011 +0200 cmd/tests: Add tests for IF '==' operator. --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5bd375e..9a5f786 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -576,6 +576,12 @@ if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo Testing string comparisons +if abc == abc (echo equal) else echo non equal +if abc =="abc" (echo equal) else echo non equal +if "abc"== abc (echo equal) else echo non equal +if "abc"== "abc" (echo equal) else echo non equal +echo Testing tabs handling if(a)tab@1==1 echo doom if @tab(a)1==1 echo doom if 1==1 (echo doom) else(a)tab@echo quake diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c67b10f..514a635 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -387,6 +387,12 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +Testing string comparisons +equal +(a)todo_wine@non equal +(a)todo_wine@non equal +equal +Testing tabs handling doom doom doom

1 0

Alexandre Julliard : secur32: Avoid size_t and fix some printf formats.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 52fa3bf42d193d17e24dc41ab66d84b4bed07391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fa3bf42d193d17e24dc41ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 19:32:06 2011 +0200 secur32: Avoid size_t and fix some printf formats. --- dlls/secur32/schannel.c | 30 +++++++++++++++--------------- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 32 +++++++++++++++----------------- dlls/secur32/secur32_priv.h | 4 ++-- 4 files changed, 34 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52fa3bf42d193d17e24dc…

1 0

Alistair Leslie-Hughes : ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 5b49e228aebe8d373a9fe7f35c04454a08b4a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b49e228aebe8d373a9fe7f35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 31 15:34:07 2011 +1000 ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW. --- dlls/ntdsapi/ntdsapi.c | 20 ++++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- include/ntdsapi.h | 11 +++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 76565fb..1ffbd9d 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -165,3 +165,23 @@ DWORD WINAPI DsGetSpnA(DS_SPN_NAME_TYPE ServType, LPCSTR Servlass, LPCSTR ServNa return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * DsServerRegisterSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_a(ServiceClass), debugstr_a(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsServerRegisterSpnW (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 8a4758a..f4ae6f8 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -80,8 +80,8 @@ @ stub DsReplicaUpdateRefsW @ stub DsReplicaVerifyObjectsA @ stub DsReplicaVerifyObjectsW -@ stub DsServerRegisterSpnA -@ stub DsServerRegisterSpnW +@ stdcall DsServerRegisterSpnA(long str str) +@ stdcall DsServerRegisterSpnW(long wstr wstr) @ stub DsUnBindA @ stub DsUnBindW @ stub DsUnquoteRdnValueA diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 9fecdab..6d2902f 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -39,6 +39,17 @@ typedef enum DS_SPN_SERVICE = 5 } DS_SPN_NAME_TYPE; +typedef enum +{ + DS_SPN_ADD_SPN_OP = 0, + DS_SPN_REPLACE_SPN_OP = 1, + DS_SPN_DELETE_SPN_OP = 2 +} DS_SPN_WRITE_OP; + +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); +#define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn) + #ifdef __cplusplus } #endif

1 0

Francois Gouget : shlwapi: Add a message context for 'hr', 'min' and 'sec'.
by Alexandre Julliard 05 Sep '11

05 Sep '11

1 0

Francois Gouget : po: Mark a couple of broken German translation as fuzzy.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 4dcb96af56b85f0d01ed30d81e7a6b00d8b94518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb96af56b85f0d01ed30d81… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:14:38 2011 +0200 po: Mark a couple of broken German translation as fuzzy. --- po/de.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/de.po b/po/de.po index ff2c2df..184935d 100644 --- a/po/de.po +++ b/po/de.po @@ -3843,6 +3843,7 @@ msgid "Perform operation even when nothing changed\n" msgstr "Operation durchführen, auch wenn sich nichts ändert\n" #: winerror.mc:1896 +#, fuzzy msgid "The user profile is invalid\n" msgstr "Das Benutzerprofil ist ungültig." @@ -4507,6 +4508,7 @@ msgid "Installer service failed.\n" msgstr "Installer Dienst gescheitert.\n" #: winerror.mc:2731 +#, fuzzy msgid "Installation aborted by user\n" msgstr "Setup-Programme"

1 0

Francois Gouget : po: Mark a couple of broken Korean translations as fuzzy.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: dfa0acd1fd84f491ca4957feefe30d9734f04f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa0acd1fd84f491ca4957fee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:17:27 2011 +0200 po: Mark a couple of broken Korean translations as fuzzy. --- po/ko.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index 17121b0..62eacda 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8117,7 +8117,7 @@ msgid "" msgstr "" "FTYPE은 파일 형식과 관련한 열기 명령을 보여주거나 고침\n" "\n" -"형식:FSTYPE[파일형식[=[열기명령]]]\n" +"형식:FTYPE[파일형식[=[열기명령]]]\n" "\n" "매개변수가 없으면, 열기 명령 문자열에 현재 정의된 파일 형식을 보여 줍니다\n" "만약 파일 형식만 사용된다면, 열기 명령 문자열에 연결된 가능 한 것을 보여줍니" @@ -8149,6 +8149,7 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:288 +#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8593,6 +8594,7 @@ msgid "Reconnecting" msgstr "다시 연결중" #: net.rc:40 +#, fuzzy msgid "The following services are running:\n" msgstr "의존하고 있는 서비스가 실행중임\n"

1 0

Thomas Mullaly : urlmon: Use CoTaskMemFree instead of HeapFree for memory allocated with CoTaskMemAlloc .
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 9848872207cd577fa8cb2128dd273d724fe9e2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9848872207cd577fa8cb2128d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 31 18:44:28 2011 -0400 urlmon: Use CoTaskMemFree instead of HeapFree for memory allocated with CoTaskMemAlloc. --- dlls/urlmon/sec_mgr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index ffbeaa3..7cdc4dd 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -514,7 +514,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) if(hres != S_OK) { size = strlenW(url)*sizeof(WCHAR); - secur_url = heap_alloc(size); + secur_url = CoTaskMemAlloc(size); if(!secur_url) return E_OUTOFMEMORY; @@ -523,7 +523,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); if(FAILED(hres) || !*schema) { - heap_free(secur_url); + CoTaskMemFree(secur_url); return E_INVALIDARG; } @@ -571,7 +571,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) } if(FAILED(hres) || !ret_url) - heap_free(secur_url); + CoTaskMemFree(secur_url); else *ret_url = secur_url; @@ -849,7 +849,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * static const BYTE secidFile[] = {'f','i','l','e',':'}; - heap_free(url); + CoTaskMemFree(url); if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); @@ -875,12 +875,12 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; if(len+sizeof(DWORD) > *pcbSecurityId) { - heap_free(url); + CoTaskMemFree(url); return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, len, NULL, NULL); - heap_free(url); + CoTaskMemFree(url); *(DWORD*)(pbSecurityId+len) = zone;

1 0

Thomas Mullaly : urlmon: Improved GetSecurityId's support for file url's.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: e0dfbd6a94bcb74b04bf73cdd7de99b387837da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dfbd6a94bcb74b04bf73cdd… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 31 18:31:35 2011 -0400 urlmon: Improved GetSecurityId's support for file url's. --- dlls/urlmon/sec_mgr.c | 119 ++++++++++++++++++++++++------------------- dlls/urlmon/tests/sec_mgr.c | 6 ++- 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7cdc4dd..c81f44d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -652,6 +652,69 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s return hres; } +static HRESULT get_security_id(LPCWSTR url, BYTE *secid, DWORD *secid_len) +{ + LPWSTR secur_url, ptr, ptr2; + DWORD zone, len; + HRESULT hres; + + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + + hres = map_url_to_zone(url, &zone, &secur_url); + if(FAILED(hres)) + return hres == 0x80041001 ? E_INVALIDARG : hres; + + /* file protocol is a special case */ + if(strlenW(secur_url) >= sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(secur_url, wszFile, sizeof(wszFile))) { + WCHAR path[MAX_PATH]; + len = sizeof(path)/sizeof(WCHAR); + + hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, len, &len, 0); + if(hres == S_OK && !PathIsNetworkPathW(path)) { + static const BYTE secidFile[] = {'f','i','l','e',':'}; + + CoTaskMemFree(secur_url); + + if(*secid_len < sizeof(secidFile)+sizeof(zone)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + memcpy(secid, secidFile, sizeof(secidFile)); + *(DWORD*)(secid+sizeof(secidFile)) = zone; + + *secid_len = sizeof(secidFile)+sizeof(zone); + return S_OK; + } + } + + ptr = strchrW(secur_url, ':'); + ptr2 = ++ptr; + while(*ptr2 == '/') + ptr2++; + if(ptr2 != ptr) + memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); + + ptr = strchrW(ptr, '/'); + if(ptr) + *ptr = 0; + + len = WideCharToMultiByte(CP_ACP, 0, secur_url, -1, NULL, 0, NULL, NULL)-1; + + if(len+sizeof(DWORD) > *secid_len) { + CoTaskMemFree(secur_url); + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + WideCharToMultiByte(CP_ACP, 0, secur_url, -1, (LPSTR)secid, len, NULL, NULL); + CoTaskMemFree(secur_url); + + *(DWORD*)(secid+len) = zone; + + *secid_len = len+sizeof(DWORD); + + return S_OK; +} + /*********************************************************************** * InternetSecurityManager implementation * @@ -817,16 +880,13 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - LPWSTR url, ptr, ptr2; - DWORD zone, len; - HRESULT hres; - - static const WCHAR wszFile[] = {'f','i','l','e',':'}; TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, dwReserved); if(This->custom_manager) { + HRESULT hres; + hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, pwszUrl, pbSecurityId, pcbSecurityId, dwReserved); if(hres != INET_E_DEFAULT_ACTION) @@ -839,54 +899,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * if(dwReserved) FIXME("dwReserved is not supported\n"); - hres = map_url_to_zone(pwszUrl, &zone, &url); - if(FAILED(hres)) - return hres == 0x80041001 ? E_INVALIDARG : hres; - - /* file protocol is a special case */ - if(strlenW(url) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(url, wszFile, sizeof(wszFile)) && strchrW(url, '\\')) { - - static const BYTE secidFile[] = {'f','i','l','e',':'}; - - CoTaskMemFree(url); - - if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - - memcpy(pbSecurityId, secidFile, sizeof(secidFile)); - *(DWORD*)(pbSecurityId+sizeof(secidFile)) = zone; - - *pcbSecurityId = sizeof(secidFile)+sizeof(zone); - return S_OK; - } - - ptr = strchrW(url, ':'); - ptr2 = ++ptr; - while(*ptr2 == '/') - ptr2++; - if(ptr2 != ptr) - memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); - - ptr = strchrW(ptr, '/'); - if(ptr) - *ptr = 0; - - len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; - - if(len+sizeof(DWORD) > *pcbSecurityId) { - CoTaskMemFree(url); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - } - - WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, len, NULL, NULL); - CoTaskMemFree(url); - - *(DWORD*)(pbSecurityId+len) = zone; - - *pcbSecurityId = len+sizeof(DWORD); - - return S_OK; + return get_security_id(pwszUrl, pbSecurityId, pcbSecurityId); } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 3d630b8..a064b17 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -94,6 +94,8 @@ static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o' '.','w','i','n','e','t','e','s','t', '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; +static const WCHAR url11[] = {'f','i','l','e',':','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; +static const WCHAR url12[] = {'f','i','l','e',':','/','/','/','c',':','/','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -140,7 +142,9 @@ static struct secmgr_test { {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, - {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} + {url7, 3, S_OK, sizeof(secid7), secid7, S_OK}, + {url11,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url12,0, S_OK, sizeof(secid1), secid1, S_OK} }; static int strcmp_w(const WCHAR *str1, const WCHAR *str2)

1 0

Thomas Mullaly : urlmon: Added basic MapUrlToZoneEx2 implementation.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 98d5dfb83df923fae91bd5bc4d00929d141ac96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d5dfb83df923fae91bd5bc4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Aug 22 20:51:59 2011 -0400 urlmon: Added basic MapUrlToZoneEx2 implementation. --- dlls/urlmon/sec_mgr.c | 131 ++++++++++++++++++++++++++++++++----------- dlls/urlmon/tests/sec_mgr.c | 22 ++++--- 2 files changed, 112 insertions(+), 41 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index c81f44d..11f8c2a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -57,6 +57,11 @@ static const WCHAR wszZoneMapDomainsKey[] = {'S','o','f','t','w','a','r','e','\\ 'Z','o','n','e','M','a','p','\\', 'D','o','m','a','i','n','s',0}; +static inline BOOL is_drive_path(const WCHAR *path) +{ + return isalphaW(*path) && *(path+1) == ':'; +} + /******************************************************************** * get_string_from_reg [internal] * @@ -501,45 +506,37 @@ static HRESULT get_zone_from_domains(LPCWSTR url, LPCWSTR schema, DWORD *zone) return hres; } -static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +static HRESULT map_security_uri_to_zone(IUri *uri, DWORD *zone) { - LPWSTR secur_url; - WCHAR schema[64]; - DWORD size=0; HRESULT hres; + BSTR scheme; *zone = URLZONE_INVALID; - hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); - if(hres != S_OK) { - size = strlenW(url)*sizeof(WCHAR); - - secur_url = CoTaskMemAlloc(size); - if(!secur_url) - return E_OUTOFMEMORY; - - memcpy(secur_url, url, size); - } + hres = IUri_GetSchemeName(uri, &scheme); + if(FAILED(hres)) + return hres; - hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); - if(FAILED(hres) || !*schema) { - CoTaskMemFree(secur_url); - return E_INVALIDARG; - } + if(!strcmpiW(scheme, fileW)) { + BSTR path; + WCHAR *ptr, *path_start, root[20]; - /* file protocol is a special case */ - if(!strcmpW(schema, fileW)) { - WCHAR path[MAX_PATH], root[20]; - WCHAR *ptr; + hres = IUri_GetPath(uri, &path); + if(FAILED(hres)) { + SysFreeString(scheme); + return hres; + } - hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, - sizeof(path)/sizeof(WCHAR), &size, 0); + if(*path == '/' && is_drive_path(path+1)) + path_start = path+1; + else + path_start = path; - if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)/sizeof(WCHAR)) { + if(((ptr = strchrW(path_start, '\\')) || (ptr = strchrW(path_start, '/'))) && ptr-path_start < sizeof(root)/sizeof(WCHAR)) { UINT type; - memcpy(root, path, (ptr-path)*sizeof(WCHAR)); - root[ptr-path] = 0; + memcpy(root, path_start, (ptr-path_start)*sizeof(WCHAR)); + root[ptr-path_start] = 0; type = GetDriveTypeW(root); @@ -562,14 +559,56 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) FIXME("unsupported drive type %d\n", type); } } + SysFreeString(path); } if(*zone == URLZONE_INVALID) { - hres = get_zone_from_domains(secur_url, schema, zone); + BSTR secur_url; + + hres = IUri_GetDisplayUri(uri, &secur_url); + if(FAILED(hres)) { + SysFreeString(scheme); + return hres; + } + + hres = get_zone_from_domains(secur_url, scheme, zone); + SysFreeString(secur_url); if(hres == S_FALSE) - hres = get_zone_from_reg(schema, zone); + hres = get_zone_from_reg(scheme, zone); } + SysFreeString(scheme); + return hres; +} + +static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +{ + IUri *secur_uri; + LPWSTR secur_url; + HRESULT hres; + + *zone = URLZONE_INVALID; + + hres = CoInternetGetSecurityUrl(url, &secur_url, PSU_SECURITY_URL_ONLY, 0); + if(hres != S_OK) { + DWORD size = strlenW(url)*sizeof(WCHAR); + + secur_url = CoTaskMemAlloc(size); + if(!secur_url) + return E_OUTOFMEMORY; + + memcpy(secur_url, url, size); + } + + hres = CreateUri(secur_url, 0, 0, &secur_uri); + if(FAILED(hres)) { + CoTaskMemFree(secur_url); + return hres; + } + + hres = map_security_uri_to_zone(secur_uri, zone); + IUri_Release(secur_uri); + if(FAILED(hres) || !ret_url) CoTaskMemFree(secur_url); else @@ -578,6 +617,21 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) return hres; } +static HRESULT map_uri_to_zone(IUri *uri, DWORD *zone) +{ + HRESULT hres; + IUri *secur_uri; + + hres = CoInternetGetSecurityUrlEx(uri, &secur_uri, PSU_SECURITY_URL_ONLY, 0); + if(FAILED(hres)) + return hres; + + hres = map_security_uri_to_zone(secur_uri, zone); + IUri_Release(secur_uri); + + return hres; +} + static HRESULT open_zone_key(HKEY parent_key, DWORD zone, HKEY *hkey) { static const WCHAR wszFormat[] = {'%','s','%','u',0}; @@ -1033,8 +1087,21 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2 IUri *pUri, DWORD *pdwZone, DWORD dwFlags, LPWSTR *ppwszMappedUrl, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %p %08x %p %p) stub\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); + + if(!pdwZone) + return E_INVALIDARG; + + if(!pUri) { + *pdwZone = URLZONE_INVALID; + return E_INVALIDARG; + } + + if(dwFlags) + FIXME("Unsupported flags: %08x\n", dwFlags); + + return map_uri_to_zone(pUri, pdwZone); } static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManagerEx2 *iface, diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a064b17..3e8cef3 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1620,12 +1620,16 @@ static const struct { DWORD zone; BOOL map_todo; } sec_mgr_ex2_tests[] = { - {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,TRUE}, - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,TRUE}, - {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,TRUE}, - {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,TRUE}, - {"about:blank",0,0,URLZONE_INTERNET,TRUE}, - {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,TRUE} + {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE}, + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE}, + {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET}, + {"about:blank",0,0,URLZONE_INTERNET}, + {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET}, + {"/file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"file/testing/test.test",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET}, + {"zip://testing.com/",0,0,URLZONE_INTERNET}, + {"zip:testing.com",0,0,URLZONE_INTERNET} }; static void test_SecurityManagerEx2(void) @@ -1652,14 +1656,14 @@ static void test_SecurityManagerEx2(void) zone = 0xdeadbeef; hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, NULL, &zone, 0, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); - todo_wine ok(zone == URLZONE_INVALID, "zone was %d\n", zone); + ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + ok(zone == URLZONE_INVALID, "zone was %d\n", zone); hres = pCreateUri(url5, 0, 0, &uri); ok(hres == S_OK, "CreateUri failed: %08x\n", hres); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, NULL, 0, NULL, NULL); - todo_wine ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); IUri_Release(uri);

1 0