wine/ include/urlmon.idl dlls/urlmon/urlmon.sp ...
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 10 05:04:22 CST 2005
ChangeSet ID: 21200
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/10 05:04:21
Modified files:
include : urlmon.idl
dlls/urlmon : urlmon.spec umon.c
Log message:
Jacek Caban <jack at itma.pwr.wroc.pl>
Added URLDownloadToCacheFile[AW] stub.
Patch: http://cvs.winehq.org/patch.py?id=21200
Old revision New revision Changes Path
1.24 1.25 +4 -2 wine/include/urlmon.idl
1.39 1.40 +2 -2 wine/dlls/urlmon/urlmon.spec
1.65 1.66 +45 -0 wine/dlls/urlmon/umon.c
Index: wine/include/urlmon.idl
diff -u -p wine/include/urlmon.idl:1.24 wine/include/urlmon.idl:1.25
--- wine/include/urlmon.idl:1.24 10 Nov 2005 11: 4:21 -0000
+++ wine/include/urlmon.idl 10 Nov 2005 11: 4:21 -0000
@@ -1166,8 +1166,10 @@ cpp_quote("HRESULT WINAPI CoGetClassObje
cpp_quote("HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);")
cpp_quote("HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);")
cpp_quote("HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);")
-cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, LPCSTR szURL, LPCSTR szFileName, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB);")
-cpp_quote("HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFileName, DWORD dwReserved, LPBINDSTATUSCALLBACK lpfnCB);")
+cpp_quote("HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN,LPCSTR,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);")
+cpp_quote("HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN,LPCWSTR,LPCWSTR,DWORD,LPBINDSTATUSCALLBACK);")
+cpp_quote("HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN,LPCSTR,LPSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);")
+cpp_quote("HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN,LPCWSTR,LPWSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);")
cpp_quote("HRESULT WINAPI CoInternetGetSession(DWORD,IInternetSession**,DWORD);")
cpp_quote("HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);")
cpp_quote("HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);")
Index: wine/dlls/urlmon/urlmon.spec
diff -u -p wine/dlls/urlmon/urlmon.spec:1.39 wine/dlls/urlmon/urlmon.spec:1.40
--- wine/dlls/urlmon/urlmon.spec:1.39 10 Nov 2005 11: 4:21 -0000
+++ wine/dlls/urlmon/urlmon.spec 10 Nov 2005 11: 4:21 -0000
@@ -64,8 +64,8 @@
@ stdcall RevokeFormatEnumerator(ptr ptr)
@ stub SetSoftwareUpdateAdvertisementState
@ stub URLDownloadA
-@ stub URLDownloadToCacheFileA
-@ stub URLDownloadToCacheFileW
+@ stdcall URLDownloadToCacheFileA(ptr str str long ptr)
+@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long ptr)
@ stdcall URLDownloadToFileA(ptr str str long ptr)
@ stdcall URLDownloadToFileW(ptr wstr wstr long ptr)
@ stub URLDownloadW
Index: wine/dlls/urlmon/umon.c
diff -u -p wine/dlls/urlmon/umon.c:1.65 wine/dlls/urlmon/umon.c:1.66
--- wine/dlls/urlmon/umon.c:1.65 10 Nov 2005 11: 4:21 -0000
+++ wine/dlls/urlmon/umon.c 10 Nov 2005 11: 4:21 -0000
@@ -1609,6 +1609,51 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKN
}
/***********************************************************************
+ * URLDownloadToCacheFileA (URLMON.@)
+ */
+HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPSTR szFileName,
+ DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC)
+{
+ LPWSTR url = NULL, file_name = NULL;
+ int len;
+ HRESULT hres;
+
+ TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName,
+ dwBufLength, dwReserved, pBSC);
+
+ if(szURL) {
+ len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0);
+ url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, -1);
+ }
+
+ if(szFileName)
+ file_name = HeapAlloc(GetProcessHeap(), 0, dwBufLength*sizeof(WCHAR));
+
+ hres = URLDownloadToCacheFileW(lpUnkCaller, url, file_name, dwBufLength*sizeof(WCHAR),
+ dwReserved, pBSC);
+
+ if(SUCCEEDED(hres) && file_name)
+ WideCharToMultiByte(CP_ACP, 0, file_name, -1, szFileName, dwBufLength, NULL, NULL);
+
+ HeapFree(GetProcessHeap(), 0, url);
+ HeapFree(GetProcessHeap(), 0, file_name);
+
+ return hres;
+}
+
+/***********************************************************************
+ * URLDownloadToCacheFileW (URLMON.@)
+ */
+HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPWSTR szFileName,
+ DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC)
+{
+ FIXME("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_w(szURL), szFileName,
+ dwBufLength, dwReserved, pBSC);
+ return E_NOTIMPL;
+}
+
+/***********************************************************************
* HlinkSimpleNavigateToString (URLMON.@)
*/
HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget,
More information about the wine-cvs
mailing list