mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 19:45:39 +00:00
urlmon: Handle implicit file scheme in MapUrlToZone and GetSecurityId functions.
This commit is contained in:
parent
773c46b929
commit
804a9d80d8
|
@ -602,7 +602,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url)
|
|||
memcpy(secur_url, url, size);
|
||||
}
|
||||
|
||||
hres = CreateUri(secur_url, 0, 0, &secur_uri);
|
||||
hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &secur_uri);
|
||||
if(FAILED(hres)) {
|
||||
CoTaskMemFree(secur_url);
|
||||
return hres;
|
||||
|
@ -805,7 +805,7 @@ static HRESULT get_security_id_for_url(LPCWSTR url, BYTE *secid, DWORD *secid_le
|
|||
if(FAILED(hres))
|
||||
return hres == 0x80041001 ? E_INVALIDARG : hres;
|
||||
|
||||
hres = CreateUri(secur_url, 0, 0, &uri);
|
||||
hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri);
|
||||
CoTaskMemFree(secur_url);
|
||||
if(FAILED(hres))
|
||||
return hres;
|
||||
|
|
|
@ -105,6 +105,7 @@ static const WCHAR url14[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c
|
|||
static const WCHAR url15[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','c','o','m','.','u','k',0};
|
||||
static const WCHAR url16[] = {'f','i','l','e',':','/','/','/','c',':',0};
|
||||
static const WCHAR url17[] = {'f','i','l','e',':','/','/','/','c',':','c','\\',0};
|
||||
static const WCHAR url18[] = {'c',':','\\','t','e','s','t','.','h','t','m',0};
|
||||
|
||||
static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e',
|
||||
'.','j','p','g',0};
|
||||
|
@ -161,7 +162,8 @@ static struct secmgr_test {
|
|||
{url11,0, S_OK, sizeof(secid1), secid1, S_OK},
|
||||
{url12,0, S_OK, sizeof(secid1), secid1, S_OK},
|
||||
{url16,0, S_OK, sizeof(secid1), secid1, S_OK},
|
||||
{url17,0, S_OK, sizeof(secid1), secid1, S_OK}
|
||||
{url17,0, S_OK, sizeof(secid1), secid1, S_OK},
|
||||
{url18,0, S_OK, sizeof(secid1), secid1, S_OK}
|
||||
};
|
||||
|
||||
static int strcmp_w(const WCHAR *str1, const WCHAR *str2)
|
||||
|
|
Loading…
Reference in a new issue