https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2462dae72bdcdbfe18b58f41a5597382aca64db
commit b2462dae72bdcdbfe18b58f41a5597382aca64db Author: Amine Khaldi <[email protected]> AuthorDate: Sat Jan 20 13:14:14 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Jan 20 13:14:14 2018 +0100 [SHDOCVW] Sync with Wine 3.0. CORE-14225 --- dll/win32/shdocvw/shdocvw_main.c | 8 +++----- media/doc/README.WINE | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index 89081e8840..8a4c8c0269 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -365,7 +365,8 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L HRESULT hr; DWORD needed; DWORD len; - DWORD res; + DWORD res = 0; + TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); @@ -391,12 +392,10 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L needed = lstrlenW(buffer_out)+1; TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); - res = 0; if (*plen >= needed) { if (out != NULL) { lstrcpyW(out, buffer_out); - /* On success, 1 is returned for unicode version */ - res = 1; + res++; } needed--; } @@ -439,7 +438,6 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD if (*plen >= needed) { if (out != NULL) { WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, NULL); - /* On success, string size including terminating 0 is returned for ansi version */ res = needed; } needed--; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2f9a3b8ed4..44d037d760 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -171,7 +171,7 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-2.9 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 -reactos/dll/win32/shdocvw # Synced to WineStaging-2.9 +reactos/dll/win32/shdocvw # Synced to Wine-3.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-2.9 reactos/dll/win32/shlwapi # Synced to WineStaging-2.16
