CVS: winex/include urlmon.h, 1.4, 1.5 urlmon.idl, 1.3, 1.4
[email protected] 14 Dec 2007 20:33:22 -0000
| Newsgroups | gmane.comp.emulators.winex.cvs |
|---|---|
| Message-ID | <[email protected]> |
Subject: winex/include urlmon.h,1.4,1.5 urlmon.idl,1.3,1.4Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv17085/include
Modified Files:
urlmon.h urlmon.idl
Log Message:
Moved API definitions to bottom of header, rather than the top.
Added prototype for URLDownloadToCacheFile.
Index: urlmon.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/urlmon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- urlmon.h 14 Dec 2007 20:23:38 -0000 1.4
+++ urlmon.h 14 Dec 2007 20:33:20 -0000 1.5
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 20020228 from urlmon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from ../include/urlmon.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -61,36 +61,6 @@
typedef interface IHttpNegotiate2 IHttpNegotiate2;
#endif
-#define MK_S_ASYNCHRONOUS 0x000401E8
-#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS
-#define INET_E_ERROR_FIRST 0x800C0002L
-#define INET_E_INVALID_URL 0x800C0002L
-#define INET_E_NO_SESSION 0x800C0003L
-#define INET_E_CANNOT_CONNECT 0x800C0004L
-#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
-#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
-#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
-#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
-#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
-#define INET_E_NO_VALID_MEDIA 0x800C000AL
-#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
-#define INET_E_INVALID_REQUEST 0x800C000CL
-#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
-#define INET_E_SECURITY_PROBLEM 0x800C000EL
-#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
-#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
-#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
-#define INET_E_REDIRECT_FAILED 0x800C0014L
-#define INET_E_REDIRECT_TO_DIR 0x800C0015L
-#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
-#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR
-HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);
-HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);
-HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);
-HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,DWORD);
-HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);
-HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);
-HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);
typedef IPersistMoniker *LPPERSISTMONIKER;
/*****************************************************************************
* IPersistMoniker interface
@@ -4590,6 +4560,40 @@
#endif /* __IWrappedProtocol_INTERFACE_DEFINED__ */
+#define MK_S_ASYNCHRONOUS 0x000401E8
+#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS
+#define INET_E_ERROR_FIRST 0x800C0002L
+#define INET_E_INVALID_URL 0x800C0002L
+#define INET_E_NO_SESSION 0x800C0003L
+#define INET_E_CANNOT_CONNECT 0x800C0004L
+#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
+#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
+#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
+#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
+#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
+#define INET_E_NO_VALID_MEDIA 0x800C000AL
+#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
+#define INET_E_INVALID_REQUEST 0x800C000CL
+#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
+#define INET_E_SECURITY_PROBLEM 0x800C000EL
+#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
+#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
+#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
+#define INET_E_REDIRECT_FAILED 0x800C0014L
+#define INET_E_REDIRECT_TO_DIR 0x800C0015L
+#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
+#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR
+HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker **ppmk);
+HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc, IBindStatusCallback **ppbsc, DWORD dwReserved);
+HRESULT WINAPI CompareSecurityIds(BYTE*,DWORD,BYTE*,DWORD,DWORD);
+HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN,LPCSTR,LPCSTR,DWORD,LPBINDSTATUSCALLBACK);
+HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN,LPCWSTR,LPCWSTR,DWORD,LPBINDSTATUSCALLBACK);
+HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN,LPCSTR,LPSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);
+HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN,LPCWSTR,LPWSTR,DWORD,DWORD,LPBINDSTATUSCALLBACK);
+HRESULT WINAPI CoInternetGetSession(DWORD,/*IInternetSession*/void**,DWORD);
+HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);
+HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);
+HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);
/* Begin additional prototypes for all interfaces */
ULONG __RPC_USER STGMEDIUM_UserSize (ULONG *, ULONG, STGMEDIUM *);
Index: urlmon.idl
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/urlmon.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- urlmon.idl 20 Apr 2004 22:27:42 -0000 1.3
+++ urlmon.idl 14 Dec 2007 20:33:20 -0000 1.4
@@ -26,42 +26,6 @@
interface IHttpNegotiate;
interface IHttpNegotiate2;
-cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8")
-cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS")
-
-cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002L")
-cpp_quote("#define INET_E_INVALID_URL 0x800C0002L")
-cpp_quote("#define INET_E_NO_SESSION 0x800C0003L")
-cpp_quote("#define INET_E_CANNOT_CONNECT 0x800C0004L")
-cpp_quote("#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L")
-cpp_quote("#define INET_E_OBJECT_NOT_FOUND 0x800C0006L")
-cpp_quote("#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L")
-cpp_quote("#define INET_E_DOWNLOAD_FAILURE 0x800C0008L")
-cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L")
-cpp_quote("#define INET_E_NO_VALID_MEDIA 0x800C000AL")
-cpp_quote("#define INET_E_CONNECTION_TIMEOUT 0x800C000BL")
-cpp_quote("#define INET_E_INVALID_REQUEST 0x800C000CL")
-cpp_quote("#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL")
-cpp_quote("#define INET_E_SECURITY_PROBLEM 0x800C000EL")
-cpp_quote("#define INET_E_CANNOT_LOAD_DATA 0x800C000FL")
-cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L")
-cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L")
-cpp_quote("#define INET_E_REDIRECT_FAILED 0x800C0014L")
-cpp_quote("#define INET_E_REDIRECT_TO_DIR 0x800C0015L")
-cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L")
-cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR")
-
-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 CoInternetGetSession(DWORD,/*IInternetSession*/void**,DWORD);")
-cpp_quote("HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);")
-cpp_quote("HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);")
-cpp_quote("HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);")
-
-
/*****************************************************************************
* Interface: IPersistMoniker
*/
@@ -1718,3 +1682,39 @@
);
}
+cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8")
+cpp_quote("#define S_ASYNCHRONOUS MK_S_ASYNCHRONOUS")
+
+cpp_quote("#define INET_E_ERROR_FIRST 0x800C0002L")
+cpp_quote("#define INET_E_INVALID_URL 0x800C0002L")
+cpp_quote("#define INET_E_NO_SESSION 0x800C0003L")
+cpp_quote("#define INET_E_CANNOT_CONNECT 0x800C0004L")
+cpp_quote("#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L")
+cpp_quote("#define INET_E_OBJECT_NOT_FOUND 0x800C0006L")
+cpp_quote("#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L")
+cpp_quote("#define INET_E_DOWNLOAD_FAILURE 0x800C0008L")
+cpp_quote("#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L")
+cpp_quote("#define INET_E_NO_VALID_MEDIA 0x800C000AL")
+cpp_quote("#define INET_E_CONNECTION_TIMEOUT 0x800C000BL")
+cpp_quote("#define INET_E_INVALID_REQUEST 0x800C000CL")
+cpp_quote("#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL")
+cpp_quote("#define INET_E_SECURITY_PROBLEM 0x800C000EL")
+cpp_quote("#define INET_E_CANNOT_LOAD_DATA 0x800C000FL")
+cpp_quote("#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L")
+cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L")
+cpp_quote("#define INET_E_REDIRECT_FAILED 0x800C0014L")
+cpp_quote("#define INET_E_REDIRECT_TO_DIR 0x800C0015L")
+cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L")
+cpp_quote("#define INET_E_ERROR_LAST INET_E_REDIRECT_TO_DIR")
+
+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,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*/void**,DWORD);")
+cpp_quote("HRESULT WINAPI MkParseDisplayNameEx(IBindCtx*,LPCWSTR,ULONG*,IMoniker**);")
+cpp_quote("HRESULT WINAPI IsAsyncMoniker(IMoniker* pmk);")
+cpp_quote("HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumFORMATETC*, IBindCtx**);")