Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-01 23:48:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHDOCVW] Sync with Wine 3.0. CORE-14225

Browse source
This commit is contained in:
Amine Khaldi 2018-01-20 13:14:14 +01:00
parent 90155f749f
commit b2462dae72
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/shdocvw/shdocvw_main.c
View file

@ -365,7 +365,8 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
HRESULT hr; HRESULT hr;
DWORD needed; DWORD needed;
DWORD len; DWORD len;
DWORD res; DWORD res = 0;
TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
plen ? *plen : 0, unknown ? *unknown : 0); 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; needed = lstrlenW(buffer_out)+1;
TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed);
res = 0;
if (*plen >= needed) { if (*plen >= needed) {
if (out != NULL) { if (out != NULL) {
lstrcpyW(out, buffer_out); lstrcpyW(out, buffer_out);
/* On success, 1 is returned for unicode version */ res++;
res = 1;
} }
needed--; needed--;
} }
@ -439,7 +438,6 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD
if (*plen >= needed) { if (*plen >= needed) {
if (out != NULL) { if (out != NULL) {
WideCharToMultiByte(CP_ACP, 0, buffer, -1, out, *plen, NULL, 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; res = needed;
} }
needed--; needed--;

2
media/doc/README.WINE
View file

@ -171,7 +171,7 @@ reactos/dll/win32/security # Forked (different .spec)
reactos/dll/win32/sensapi # Synced to WineStaging-2.9 reactos/dll/win32/sensapi # Synced to WineStaging-2.9
reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/setupapi # Forked at Wine-20050524
reactos/dll/win32/shdoclc # Synced to WineStaging-2.9 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/shell32 # Forked at Wine-20071011
reactos/dll/win32/shfolder # Synced to WineStaging-2.9 reactos/dll/win32/shfolder # Synced to WineStaging-2.9
reactos/dll/win32/shlwapi # Synced to WineStaging-2.16 reactos/dll/win32/shlwapi # Synced to WineStaging-2.16