[ros-diffs] [akhaldi] 71737: [URLMON] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:11:50 2016
New Revision: 71737

URL: http://svn.reactos.org/svn/reactos?rev=71737&view=rev
Log:
[URLMON] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/urlmon/mimefilter.c
    trunk/reactos/dll/win32/urlmon/mk.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/mimefilter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/mimefilter.c	[iso-8859-1] Sat Jul  2 13:11:50 2016
@@ -686,7 +686,7 @@
     if(dwReserved)
         WARN("dwReserved=%d\n", dwReserved);
 
-    /* pBC seams to not be used */
+    /* pBC seems to not be used */
 
     if(!ppwzMimeOut || (!pwzUrl && !pBuffer))
         return E_INVALIDARG;

Modified: trunk/reactos/dll/win32/urlmon/mk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/mk.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/mk.c	[iso-8859-1] Sat Jul  2 13:11:50 2016
@@ -197,9 +197,8 @@
 {
     MkProtocol *This = impl_from_IInternetProtocolEx(iface);
     LPWSTR mime, progid, display_name, colon_ptr;
-    DWORD path_size = INTERNET_MAX_URL_LENGTH;
     DWORD bindf=0, eaten=0, scheme=0, len;
-    BSTR url, path_tmp, path = NULL;
+    BSTR url, path = NULL;
     IParseDisplayName *pdn;
     BINDINFO bindinfo;
     STATSTG statstg;
@@ -238,22 +237,20 @@
         CoTaskMemFree(mime);
     }
 
-    hres = IUri_GetPath(pUri, &path_tmp);
-    if(FAILED(hres))
-        return hres;
-    path = heap_alloc(path_size);
-    hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0);
-    SysFreeString(path_tmp);
-    if (FAILED(hres))
-    {
-        heap_free(path);
+    hres = IUri_GetPath(pUri, &path);
+    if(FAILED(hres))
+        return hres;
+    len = SysStringLen(path)+1;
+    hres = UrlUnescapeW(path, NULL, &len, URL_UNESCAPE_INPLACE);
+    if (FAILED(hres)) {
+        SysFreeString(path);
         return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND,
ERROR_INVALID_PARAMETER);
     }
+
     progid = path+1; /* skip '@' symbol */
     colon_ptr = strchrW(path, ':');
-    if(!colon_ptr)
-    {
-        heap_free(path);
+    if(!colon_ptr) {
+        SysFreeString(path);
         return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND,
ERROR_INVALID_PARAMETER);
     }
 
@@ -263,7 +260,7 @@
 
     progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */
     hres = CLSIDFromProgID(progid, &clsid);
-    heap_free(path);
+    SysFreeString(path);
     if(FAILED(hres))
     {
         heap_free(display_name);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jul  2 13:11:50 2016
@@ -192,7 +192,7 @@
 reactos/dll/win32/twain_32            # 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/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/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.11