[SHLWAPI] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72307

diff --git a/reactos/dll/win32/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c
index 9cfe9cf..0a8a7fe 100644 (file)
--- a/reactos/dll/win32/shlwapi/url.c
+++ b/reactos/dll/win32/shlwapi/url.c
@@ -911,7 +911,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
     }
 
     if (ret == S_OK) {
-       /* Reuse mrelative as temp storage as its already allocated and not needed anymore */
+        /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */
         if(*pcchCombined == 0)
             *pcchCombined = 1;
        ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL));
@@ -946,8 +946,10 @@ HRESULT WINAPI UrlEscapeA(
 
     if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl))
         return E_INVALIDARG;
-    if(dwFlags & URL_ESCAPE_AS_UTF8)
+    if(dwFlags & URL_ESCAPE_AS_UTF8) {
+        RtlFreeUnicodeString(&urlW);
         return E_NOTIMPL;
+    }
     if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) {
         escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
         ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 57a81cd..f685f27 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -177,7 +177,7 @@ reactos/dll/win32/shdoclc             # Synced to WineStaging-1.9.11
 reactos/dll/win32/shdocvw             # Synced to WineStaging-1.9.11
 reactos/dll/win32/shell32             # Forked at Wine-20071011
 reactos/dll/win32/shfolder            # Synced to WineStaging-1.9.11
-reactos/dll/win32/shlwapi             # Synced to WineStaging-1.9.11
+reactos/dll/win32/shlwapi             # Synced to WineStaging-1.9.16
 reactos/dll/win32/slbcsp              # Synced to WineStaging-1.9.11
 reactos/dll/win32/snmpapi             # Synced to WineStaging-1.9.11
 reactos/dll/win32/softpub             # Synced to WineStaging-1.9.11