Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=72307
This commit is contained in:
Amine Khaldi 2016-08-18 10:43:47 +00:00
parent e16af6724e
commit 4a513658de
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/shlwapi/url.c
View file

@ -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);

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

@ -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