On Wed, 18 Dec 2002, Ove Kaaven wrote:
> This moves all the prototypes (that I could see) out of the wine/obj_*.h
> files that's currently referenced by objidl.h, and into objbase.h.
Looks like I missed some of the obj_misc.h prototypes, so here's an
updated patch. The STGM_* defines should also be in objbase.h so I moved
them too.
Log:
Ove Kaaven <ovek@transgaming.com>
Moved COM API prototypes to objbase.h, from wine/obj_*.h.
Index: include/objbase.h
===================================================================
RCS file: /home/wine/wine/include/objbase.h,v
retrieving revision 1.25
diff -u -r1.25 objbase.h
--- include/objbase.h 6 Dec 2002 19:49:56 -0000 1.25
+++ include/objbase.h 18 Dec 2002 17:13:37 -0000
@@ -50,24 +50,7 @@
/*****************************************************************************
* Standard API
*/
-HRESULT WINAPI CoCreateGuid(GUID* pguid);
-
-HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
-
-void WINAPI CoFreeAllLibraries(void);
-
-void WINAPI CoFreeLibrary(HINSTANCE hLibrary);
-
-void WINAPI CoFreeUnusedLibraries(void);
-
-HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv);
-
-HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv);
-
-HRESULT WINAPI CoInitialize(LPVOID lpReserved);
-HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit);
-
-void WINAPI CoUninitialize(void);
+DWORD WINAPI CoBuildVersion(void);
typedef enum tagCOINIT
{
@@ -77,11 +60,34 @@
COINIT_SPEED_OVER_MEMORY = 0x8 /* Trade memory for speed */
} COINIT;
+HRESULT WINAPI CoInitialize(LPVOID lpReserved);
+HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit);
+void WINAPI CoUninitialize(void);
+DWORD WINAPI CoGetCurrentProcess(void);
-/* FIXME: not implemented */
-BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);
+HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);
+void WINAPI CoFreeAllLibraries(void);
+void WINAPI CoFreeLibrary(HINSTANCE hLibrary);
+void WINAPI CoFreeUnusedLibraries(void);
-HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases);
+HRESULT WINAPI CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID iid, LPVOID *ppv);
+HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid,
+ LPUNKNOWN pUnkOuter,
+ DWORD dwClsContext,
+ COSERVERINFO* pServerInfo,
+ ULONG cmq,
+ MULTI_QI* pResults);
+
+HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults);
+HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults);
+
+HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc);
+LPVOID WINAPI CoTaskMemAlloc(ULONG size);
+void WINAPI CoTaskMemFree(LPVOID ptr);
+LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size);
+
+HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy);
+HRESULT WINAPI CoRevokeMallocSpy(void);
/* class registration flags; passed to CoRegisterClassObject */
typedef enum tagREGCLS
@@ -92,14 +98,56 @@
REGCLS_SUSPENDED = 4
} REGCLS;
+HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, REFIID iid, LPVOID *ppv);
HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsContext,DWORD flags,LPDWORD lpdwRegister);
-
HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
-
HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid);
+HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid);
+HRESULT WINAPI CoSuspendClassObjects(void);
+HRESULT WINAPI CoResumeClassObjects(void);
+ULONG WINAPI CoAddRefServerProcess(void);
+HRESULT WINAPI CoReleaseServerProcess(void);
+
+/* marshalling */
+HRESULT WINAPI CoCreateFreeThreadedMarshaler(LPUNKNOWN punkOuter, LPUNKNOWN* ppunkMarshal);
+HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID iid, LPVOID* ppv);
+HRESULT WINAPI CoGetMarshalSizeMax(ULONG* pulSize, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
+HRESULT WINAPI CoGetStandardMarshal(REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL* ppMarshal);
+HRESULT WINAPI CoMarshalHresult(LPSTREAM pstm, HRESULT hresult);
+HRESULT WINAPI CoMarshalInterface(LPSTREAM pStm, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
+HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, LPUNKNOWN pUnk, LPSTREAM* ppStm);
+HRESULT WINAPI CoReleaseMarshalData(LPSTREAM pStm);
+HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult);
+HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv);
+HRESULT WINAPI CoLockObjectExternal(LPUNKNOWN pUnk, BOOL fLock, BOOL fLastUnlockReleases);
+BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk);
+
+/* security */
+HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3);
+HRESULT WINAPI CoGetCallContext(REFIID riid, void** ppInterface);
+HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc);
+
+HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilites);
+HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities);
+HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy);
+
+HRESULT WINAPI CoImpersonateClient(void);
+HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR16** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities);
+HRESULT WINAPI CoRevertToSelf(void);
+
+/* misc */
+HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew);
+HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew);
+
+HRESULT WINAPI CoCreateGuid(GUID* pguid);
+BOOL WINAPI CoIsOle1Class(REFCLSID rclsid);
+
+BOOL WINAPI CoDosDateTimeToFileTime(WORD nDosDate, WORD nDosTime, FILETIME* lpFileTime);
+BOOL WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime);
+HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime);
/*****************************************************************************
- * GUID API
+ * GUID API
*/
HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
@@ -121,9 +169,76 @@
HRESULT WINAPI DllCanUnloadNow(void);
/*****************************************************************************
+ * Data Object
+ */
+HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
+HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, LPVOID* ppv);
+
+/*****************************************************************************
* Moniker API
*/
HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid);
+
+HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc);
+HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
+
+HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk);
+HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk);
+
+HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk);
+HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk);
+
+HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk);
+
+HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite);
+
+HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID iidResult, LPVOID* ppvResult);
+
+HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, LPMONIKER* ppmk);
+
+HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER* ppmk);
+
+HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon);
+
+HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
+HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
+
+/*****************************************************************************
+ * Storage API
+ */
+#define STGM_DIRECT 0x00000000
+#define STGM_TRANSACTED 0x00010000
+#define STGM_SIMPLE 0x08000000
+#define STGM_READ 0x00000000
+#define STGM_WRITE 0x00000001
+#define STGM_READWRITE 0x00000002
+#define STGM_SHARE_DENY_NONE 0x00000040
+#define STGM_SHARE_DENY_READ 0x00000030
+#define STGM_SHARE_DENY_WRITE 0x00000020
+#define STGM_SHARE_EXCLUSIVE 0x00000010
+#define STGM_PRIORITY 0x00040000
+#define STGM_DELETEONRELEASE 0x04000000
+#define STGM_CREATE 0x00001000
+#define STGM_CONVERT 0x00020000
+#define STGM_FAILIFTHERE 0x00000000
+#define STGM_NOSCRATCH 0x00100000
+#define STGM_NOSNAPSHOT 0x00200000
+
+HRESULT WINAPI StgCreateDocFile16(LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen);
+HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen);
+
+HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn);
+HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);
+HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt);
+
+HRESULT WINAPI StgOpenStorage16(const OLECHAR16* pwcsName,IStorage16* pstgPriority,DWORD grfMode,SNB16 snbExclude,DWORD reserved,IStorage16**ppstgOpen);
+HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen);
+
+HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid);
+HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid);
+
+HRESULT WINAPI StgCreateDocfileOnILockBytes(ILockBytes *plkbyt,DWORD grfMode, DWORD reserved, IStorage** ppstgOpen);
+HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstgOpen);
#ifdef __cplusplus
}
Index: include/wine/obj_clientserver.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_clientserver.h,v
retrieving revision 1.11
diff -u -r1.11 obj_clientserver.h
--- include/wine/obj_clientserver.h 10 Mar 2002 00:02:38 -0000 1.11
+++ include/wine/obj_clientserver.h 18 Dec 2002 17:13:38 -0000
@@ -203,68 +203,6 @@
#define IServerSecurity_IsImpersonating(p) ICOM_CALL (IsImpersonating,p)
-/*****************************************************************************
- * Additional client API
- */
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoCopyProxy(IUnknown* pProxy, IUnknown** ppCopy);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoQueryProxyBlanket(IUnknown* pProxy, DWORD* pwAuthnSvc, DWORD* pAuthzSvc, OLECHAR** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTH_IDENTITY_HANDLE* pAuthInfo, DWORD* pCapabilites);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoSetProxyBlanket(IUnknown* pProxy, DWORD dwAuthnSvc, DWORD dwAuthzSvc, OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel, RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities);
-
-
-/*****************************************************************************
- * Additional server API
- */
-
-/* FIXME: not implemented */
-ULONG WINAPI CoAddRefServerProcess(void);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoImpersonateClient(void);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoQueryClientBlanket(DWORD* pAuthnSvc, DWORD* pAuthzSvc, OLECHAR16** pServerPrincName, DWORD* pAuthnLevel, DWORD* pImpLevel, RPC_AUTHZ_HANDLE* pPrivs, DWORD* pCapabilities);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoReleaseServerProcess(void);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoRevertToSelf(void);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoSuspendClassObjects(void);
-
-
-/*****************************************************************************
- * Additional API
- */
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetCallContext(REFIID riid, void** ppInterface);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID* pClsid);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE* asAuthSvc, void* pReserved1, DWORD dwAuthnLevel, DWORD dwImpLevel, void* pReserved2, DWORD dwCapabilities, void* pReserved3);
-
-/* FIXME: not implemented */
-BOOL WINAPI CoIsHandlerConnected(LPUNKNOWN pUnk);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoQueryAuthenticationServices(DWORD* pcAuthSvc, SOLE_AUTHENTICATION_SERVICE** asAuthSvc);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoResumeClassObjects(void);
-
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
Index: include/wine/obj_dataobject.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_dataobject.h,v
retrieving revision 1.16
diff -u -r1.16 obj_dataobject.h
--- include/wine/obj_dataobject.h 31 May 2002 23:06:50 -0000 1.16
+++ include/wine/obj_dataobject.h 18 Dec 2002 17:13:38 -0000
@@ -232,9 +232,6 @@
#define IDataAdviseHolder_EnumAdvise(p,a) ICOM_CALL1(EnumAdvise,p,a)
#define IDataAdviseHolder_SendOnDataChange(p,a,b,c) ICOM_CALL3(SendOnDataChange,p,a,b,c)
-/* FIXME: not implemented */
-HRESULT WINAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER* ppDAHolder);
-
/*****************************************************************************
* IDataObject interface
@@ -323,13 +320,6 @@
#define IEnumSTATDATA_Reset(p) ICOM_CALL (Reset,p)
#define IEnumSTATDATA_Clone(p,a) ICOM_CALL1(Clone,p,a)
-
-/*****************************************************************************
- * Additional API
- */
-
-/* FIXME: not implemented */
-HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, LPVOID* ppv);
#ifdef __cplusplus
} /* extern "C" */
Index: include/wine/obj_marshal.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_marshal.h,v
retrieving revision 1.12
diff -u -r1.12 obj_marshal.h
--- include/wine/obj_marshal.h 31 May 2002 23:06:50 -0000 1.12
+++ include/wine/obj_marshal.h 18 Dec 2002 17:13:38 -0000
@@ -88,40 +88,6 @@
#define IStdMarshalInfo_GetClassForHandler(p,a,b,c) ICOM_CALL3(GetClassForHandler,p,a,b,c)
-/*****************************************************************************
- * Additional marshalling API
- */
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoCreateFreeThreadedMarshaler(LPUNKNOWN punkOuter, LPUNKNOWN* ppunkMarshal);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID iid, LPVOID* ppv);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetMarshalSizeMax(ULONG* pulSize, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetStandardMarshal(REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL* ppMarshal);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoMarshalHresult(LPSTREAM pstm, HRESULT hresult);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoMarshalInterface(LPSTREAM pStm, REFIID riid, LPUNKNOWN pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, LPUNKNOWN pUnk, LPSTREAM* ppStm);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoReleaseMarshalData(LPSTREAM pStm);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pstm, HRESULT* phresult);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoUnmarshalInterface(LPSTREAM pStm, REFIID riid, LPVOID* ppv);
-
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
Index: include/wine/obj_misc.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_misc.h,v
retrieving revision 1.16
diff -u -r1.16 obj_misc.h
--- include/wine/obj_misc.h 5 Dec 2002 20:33:07 -0000 1.16
+++ include/wine/obj_misc.h 18 Dec 2002 17:13:38 -0000
@@ -140,15 +140,6 @@
#define MEMCTX_UNKNOWN -1
#define MEMCTX_SAME -2
-HRESULT WINAPI CoGetMalloc(DWORD dwMemContext,LPMALLOC* lpMalloc);
-
-LPVOID WINAPI CoTaskMemAlloc(ULONG size);
-
-void WINAPI CoTaskMemFree(LPVOID ptr);
-
-/* FIXME: unimplemented */
-LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size);
-
/*****************************************************************************
* IMallocSpy interface
@@ -191,8 +182,6 @@
#define IMallocSpy_PreHeapMinimize(p) ICOM_CALL (PreHeapMinimize,p)
#define IMallocSpy_PostHeapMinimize(p) ICOM_CALL (PostHeapMinimize,p)
-HRESULT WINAPI CoFileTimeNow(FILETIME* lpFileTime);
-
/*****************************************************************************
* IMultiQI interface
@@ -221,26 +210,6 @@
#define IMultiQI_QueryMultipleInterfaces(p,a,b) ICOM_CALL2(QueryMultipleInterfaces,p,a,b)
-/*****************************************************************************
- * Additional API
- */
-
-DWORD WINAPI CoBuildVersion(void);
-
-DWORD WINAPI CoGetCurrentProcess(void);
-
-/* FIXME: unimplemented */
-HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID pClsidNew);
-
-/* FIXME: unimplemented */
-HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew);
-
-HRESULT WINAPI CoCreateInstanceEx(REFCLSID rclsid,
- LPUNKNOWN pUnkOuter,
- DWORD dwClsContext,
- COSERVERINFO* pServerInfo,
- ULONG cmq,
- MULTI_QI* pResults);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
Index: include/wine/obj_moniker.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_moniker.h,v
retrieving revision 1.17
diff -u -r1.17 obj_moniker.h
--- include/wine/obj_moniker.h 10 Mar 2002 00:02:38 -0000 1.17
+++ include/wine/obj_moniker.h 18 Dec 2002 17:13:39 -0000
@@ -119,8 +119,6 @@
#define IBindCtx_EnumObjectParam(p,a) ICOM_CALL1(EnumObjectParam,p,a)
#define IBindCtx_RevokeObjectParam(p,a) ICOM_CALL1(RevokeObjectParam,p,a)
-HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC* ppbc);
-HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC* ppbc);
/*****************************************************************************
* IClassActivator interface
@@ -242,27 +240,7 @@
#define IMoniker_ParseDisplayName(p,a,b,c,d,e) ICOM_CALL5(ParseDisplayName,p,a,b,c,d,e)
#define IMoniker_IsSystemMoniker(p,a) ICOM_CALL1(IsSystemMoniker,p,a)
-HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName, LPMONIKER* ppmk);
-HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER* ppmk);
-HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk);
-HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, LPMONIKER* ppmk);
-
-HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk);
-
-HRESULT WINAPI CreateGenericComposite(LPMONIKER pmkFirst, LPMONIKER pmkRest, LPMONIKER* ppmkComposite);
-
-/* FIXME: not implemented */
-HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID iidResult, LPVOID* ppvResult);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, LPMONIKER* ppmk);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER* ppmk);
-
-/* FIXME: not implemented */
-HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon);
/*****************************************************************************
* IROTData interface
*/
@@ -347,18 +325,6 @@
#define IRunningObjectTable_GetTimeOfLastChange(p,a,b) ICOM_CALL2(GetTimeOfLastChange,p,a,b)
#define IRunningObjectTable_EnumRunning(p,a) ICOM_CALL1(EnumRunning,p,a)
-HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
-HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot);
-
-/*****************************************************************************
- * Additional API
- */
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, DWORD grfMode, OLECHAR* pwszName, DWORD dwCount, MULTI_QI* pResults);
-
-/* FIXME: not implemented */
-HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults);
#ifdef __cplusplus
} /* extern "C" */
Index: include/wine/obj_storage.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_storage.h,v
retrieving revision 1.24
diff -u -r1.24 obj_storage.h
--- include/wine/obj_storage.h 10 Mar 2002 00:02:38 -0000 1.24
+++ include/wine/obj_storage.h 18 Dec 2002 17:13:39 -0000
@@ -122,29 +122,6 @@
/*****************************************************************************
- * STGM enumeration
- *
- * See IStorage and IStream
- */
-#define STGM_DIRECT 0x00000000
-#define STGM_TRANSACTED 0x00010000
-#define STGM_SIMPLE 0x08000000
-#define STGM_READ 0x00000000
-#define STGM_WRITE 0x00000001
-#define STGM_READWRITE 0x00000002
-#define STGM_SHARE_DENY_NONE 0x00000040
-#define STGM_SHARE_DENY_READ 0x00000030
-#define STGM_SHARE_DENY_WRITE 0x00000020
-#define STGM_SHARE_EXCLUSIVE 0x00000010
-#define STGM_PRIORITY 0x00040000
-#define STGM_DELETEONRELEASE 0x04000000
-#define STGM_CREATE 0x00001000
-#define STGM_CONVERT 0x00020000
-#define STGM_FAILIFTHERE 0x00000000
-#define STGM_NOSCRATCH 0x00100000
-#define STGM_NOSNAPSHOT 0x00200000
-
-/*****************************************************************************
* STGTY enumeration
*
* See IStorage
@@ -622,36 +599,6 @@
#define IStream_Stat(p,a,b) ICOM_CALL2(Stat,p,a,b)
#define IStream_Clone(p,a) ICOM_CALL1(Clone,p,a)
-
-/*****************************************************************************
- * StgXXX API
- */
-/* FIXME: many functions are missing */
-HRESULT WINAPI StgCreateDocFile16(LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen);
-HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen);
-
-HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn);
-HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);
-HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt);
-
-HRESULT WINAPI StgOpenStorage16(const OLECHAR16* pwcsName,IStorage16* pstgPriority,DWORD grfMode,SNB16 snbExclude,DWORD reserved,IStorage16**ppstgOpen);
-HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen);
-
-HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid);
-HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid);
-
-HRESULT WINAPI StgCreateDocfileOnILockBytes(ILockBytes *plkbyt,DWORD grfMode, DWORD reserved, IStorage** ppstgOpen);
-HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstgOpen);
-
-/*****************************************************************************
- * Other storage API
- */
-
-/* FIXME: not implemented */
-BOOL WINAPI CoDosDateTimeToFileTime(WORD nDosDate, WORD nDosTime, FILETIME* lpFileTime);
-
-/* FIXME: not implemented */
-BOOL WINAPI CoFileTimeToDosDateTime(FILETIME* lpFileTime, WORD* lpDosDate, WORD* lpDosTime);
#ifdef __cplusplus
} /* extern "C" */
