ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Unescape path in place in MkProtocol::StartEx. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-05-18 18:29:26 +02:00 committed by Alexandre Julliard
parent 441347f084
commit 414ff43b12
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/urlmon/mk.c
View File

@ -203,9 +203,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
{ {
MkProtocol *This = impl_from_IInternetProtocolEx(iface); MkProtocol *This = impl_from_IInternetProtocolEx(iface);
LPWSTR mime, progid, display_name, colon_ptr; LPWSTR mime, progid, display_name, colon_ptr;
DWORD path_size = INTERNET_MAX_URL_LENGTH;
DWORD bindf=0, eaten=0, scheme=0, len; DWORD bindf=0, eaten=0, scheme=0, len;
BSTR url, path_tmp, path = NULL; BSTR url, path = NULL;
IParseDisplayName *pdn; IParseDisplayName *pdn;
BINDINFO bindinfo; BINDINFO bindinfo;
STATSTG statstg; STATSTG statstg;
@ -244,22 +243,20 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
CoTaskMemFree(mime); CoTaskMemFree(mime);
} }
hres = IUri_GetPath(pUri, &path_tmp); hres = IUri_GetPath(pUri, &path);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
path = heap_alloc(path_size); len = SysStringLen(path)+1;
hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); hres = UrlUnescapeW(path, NULL, &len, URL_UNESCAPE_INPLACE);
SysFreeString(path_tmp); if (FAILED(hres)) {
if (FAILED(hres)) SysFreeString(path);
{
heap_free(path);
return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER);
} }
progid = path+1; /* skip '@' symbol */ progid = path+1; /* skip '@' symbol */
colon_ptr = strchrW(path, ':'); colon_ptr = strchrW(path, ':');
if(!colon_ptr) if(!colon_ptr) {
{ SysFreeString(path);
heap_free(path);
return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER);
} }
@ -269,7 +266,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri,
progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */
hres = CLSIDFromProgID(progid, &clsid); hres = CLSIDFromProgID(progid, &clsid);
heap_free(path); SysFreeString(path);
if(FAILED(hres)) if(FAILED(hres))
{ {
heap_free(display_name); heap_free(display_name);