Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 03:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[URLMON] Sync with Wine Staging 1.9.11. CORE-11368

Browse source 
svn path=/trunk/; revision=71737
This commit is contained in:
Amine Khaldi 2016-07-02 13:11:50 +00:00
parent a6a823f8ed
commit a9c2a0cb11
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/urlmon/mimefilter.c
View file

@ -686,7 +686,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer,
if(dwReserved) if(dwReserved)
WARN("dwReserved=%d\n", dwReserved); WARN("dwReserved=%d\n", dwReserved);
/* pBC seams to not be used */ /* pBC seems to not be used */
if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) if(!ppwzMimeOut || (!pwzUrl && !pBuffer))
return E_INVALIDARG; return E_INVALIDARG;

23
reactos/dll/win32/urlmon/mk.c
View file

@ -197,9 +197,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;
@ -238,22 +237,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);
} }
@ -263,7 +260,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);

2
reactos/media/doc/README.WINE
View file

@ -192,7 +192,7 @@ reactos/dll/win32/traffic # Synced to WineStaging-1.9.4
reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4
reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4
reactos/dll/win32/url # Synced to WineStaging-1.9.4 reactos/dll/win32/url # Synced to WineStaging-1.9.4
reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.11
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11