mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 21:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHDOCVW] Sync with Wine Staging 1.7.37. CORE-9246

Browse Source 
svn path=/trunk/; revision=67396
This commit is contained in:
Amine Khaldi 2015-04-25 10:56:22 +00:00
parent 4c29c0e668
commit b1253f2d04
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactos/dll/win32/shdocvw/shdocvw.spec
View File

@ -25,7 +25,7 @@
125 stdcall -noname RunInstallUninstallStubs()
126 stub DoAddToFavDlg
127 stub DoAddToFavDlgW
128 stub DoFileDownload
128 stdcall DoFileDownload(wstr)
129 stub DoFileDownloadEx
130 stdcall -noname RunInstallUninstallStubs2()
131 stub -noname SHCreateSplashScreen

17
reactos/dll/win32/shdocvw/shdocvw_main.c
View File

@ -364,8 +364,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L
HRESULT hr;
DWORD needed;
DWORD len;
DWORD res = 0;
DWORD res;
TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown,
plen ? *plen : 0, unknown ? *unknown : 0);
@ -391,10 +390,12 @@ 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);
res++;
/* On success, 1 is returned for unicode version */
res = 1;
}
needed--;
}
@ -437,6 +438,7 @@ 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--;
@ -536,3 +538,12 @@ void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT s
{
FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show);
}
/******************************************************************
* DoFileDownload (SHDOCVW.@)
*/
BOOL WINAPI DoFileDownload(LPWSTR filename)
{
FIXME("(%s) stub\n", debugstr_w(filename));
return FALSE;
}

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

@ -177,7 +177,7 @@ reactos/dll/win32/security # Forked (different .spec)
reactos/dll/win32/sensapi # Synced to Wine-1.7.27
reactos/dll/win32/setupapi # Forked at Wine-20050524
reactos/dll/win32/shdoclc # Synced to Wine-1.7.27
reactos/dll/win32/shdocvw # Synced to Wine-1.7.27
reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.37
reactos/dll/win32/shell32 # Forked at Wine-20071011
reactos/dll/win32/shfolder # Synced to Wine-1.7.27
reactos/dll/win32/shlwapi # Synced to Wine-1.7.27