Author: akhaldi
Date: Thu Aug 18 10:43:47 2016
New Revision: 72307
URL: http://svn.reactos.org/svn/reactos?rev=72307&view=rev
Log:
[SHLWAPI] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/reactos/dll/win32/shlwapi/url.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/shlwapi/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?rev=72307&r1=72306&r2=72307&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Thu Aug 18
10:43:47 2016
@@ -911,7 +911,7 @@
}
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 @@
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);
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72307&r1=72306&r2=72307&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:43:47 2016
@@ -177,7 +177,7 @@
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
