Skip to content

W
wine-cw
Commit 270c23d8 authored by Paul Quinn's avatar Paul Quinn Committed by Alexandre Julliard
Browse files
Options

Add a few stubs, some C++ compatibility, and fix a few types.

parent dcbb9c0f
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 16 deletions
include/docobj.h
View file @ 270c23d8
......@@ -206,7 +206,7 @@ ICOM_DEFINE(IOleDocumentSite,IUnknown)
ICOM_METHOD1(HRESULT,GetDocument, IUnknown**,ppunk) \
ICOM_METHOD1(HRESULT,SetRect, LPRECT,prcView) \
ICOM_METHOD1(HRESULT,GetRect, LPRECT,prcView) \
ICOM_METHOD4(HRESULT,GetRectComplex, LPRECT,prcView, LPRECT,prcHScroll, LPRECT,prcVScroll, LPRECT,prcSizeBox) \
ICOM_METHOD4(HRESULT,SetRectComplex, LPRECT,prcView, LPRECT,prcHScroll, LPRECT,prcVScroll, LPRECT,prcSizeBox) \
ICOM_METHOD1(HRESULT,Show, BOOL,fShow) \
ICOM_METHOD1(HRESULT,UIActivate, BOOL,fUIActivate) \
ICOM_METHOD (HRESULT,Open) \
......@@ -275,7 +275,7 @@ ICOM_DEFINE(IEnumOleDocumentViews,IUnknown)
*/
#define ICOM_INTERFACE IOleCommandTarget
#define IOleCommandTarget_METHODS \
ICOM_METHOD4(HRESULT,QueryStatus, const GUID*,pguidCmdGroup, ULONG,cCmds, OLECMD*,prgCmds[1], OLECMDTEXT*,pCmdText) \
ICOM_METHOD4(HRESULT,QueryStatus, const GUID*,pguidCmdGroup, ULONG,cCmds, OLECMD*,prgCmds, OLECMDTEXT*,pCmdText) \
ICOM_METHOD5(HRESULT,Exec, const GUID*,pguidCmdGroup, DWORD,nCmdID, DWORD,nCmdexecopt, VARIANT*,pvaIn, VARIANT*,pvaOut)
#define IOleCommandTarget_IMETHODS \
IUnknown_IMETHODS \
......
include/wine/obj_base.h
View file @ 270c23d8
......@@ -669,7 +669,11 @@ typedef struct IUnknown IUnknown, *LPUNKNOWN;
typedef struct ICOM_VTABLE(IUnknown) ICOM_VTABLE(IUnknown);
struct IUnknown {
ICOM_VTABLE(IUnknown)* lpvtbl;
#if defined(ICOM_USE_COM_INTERFACE_ATTRIBUTE) && !defined(ICOM_CINTERFACE)
} __attribute__ ((com_interface));
#else
};
#endif /* ICOM_US_COM_INTERFACE_ATTRIBUTE, !ICOM_CINTERFACE */
struct ICOM_VTABLE(IUnknown) {
#ifdef ICOM_MSVTABLE_COMPAT
......@@ -847,6 +851,9 @@ HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsC
HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
void WINAPI CoUninitialize16(void);
void WINAPI CoUninitialize(void);
/*****************************************************************************
* COM Server dll - exports
*/
......
include/wine/obj_dataobject.h
View file @ 270c23d8
......@@ -335,5 +335,8 @@ ICOM_DEFINE(IEnumSTATDATA,IUnknown)
/* FIXME: not implemented */
HRESULT WINAPI CreateDataCache(LPUNKNOWN pUnkOuter, REFCLSID rclsid, REFIID iid, LPVOID* ppv);
#ifdef __cplusplus
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE_WINE_OBJ_DATAOBJECT_H */
include/wine/obj_dragdrop.h
View file @ 270c23d8
......@@ -46,7 +46,8 @@ typedef struct IDropTarget IDropTarget,*LPDROPTARGET;
ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL, fEscapePressed, DWORD, grfKeyState) \
ICOM_METHOD1(HRESULT, GiveFeedback, DWORD, dwEffect)
#define IDropSource_IMETHODS \
ICOM_INHERITS(IDropSource,IUnknown)
IUnknown_IMETHODS \
IDropSource_METHODS
ICOM_DEFINE(IDropSource,IUnknown)
#undef ICOM_INTERFACE
......@@ -55,7 +56,7 @@ ICOM_DEFINE(IDropSource,IUnknown)
#define IDropSource_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
#define IDropSource_AddRef(p) ICOM_CALL (AddRef,p)
#define IDropSource_Release(p) ICOM_CALL (Release,p)
/*** IDropTarget methods ***/
/*** IDropSource methods ***/
#define IDropSource_QueryContinueDrag(p,a,b) ICOM_CALL2(QueryContinueDrag,p,a,b)
#define IDropSource_GiveFeedback(p,a) ICOM_CALL1(GiveFeedback,p,a)
#endif
......@@ -70,7 +71,8 @@ ICOM_DEFINE(IDropSource,IUnknown)
ICOM_METHOD(HRESULT, DragLeave) \
ICOM_METHOD4(HRESULT, Drop, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect)
#define IDropTarget_IMETHODS \
ICOM_INHERITS(IDropTarget,IUnknown)
IUnknown_IMETHODS \
IDropTarget_METHODS
ICOM_DEFINE(IDropTarget,IUnknown)
#undef ICOM_INTERFACE
......
include/wine/obj_inplace.h
View file @ 270c23d8
......@@ -432,8 +432,8 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
*/
#define ICOM_INTERFACE IOleItemContainer
#define IOleItemContainer_METHODS \
ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject) \
ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage) \
ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void**,ppvObject) \
ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void**,ppvStorage) \
ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR,pszItem)
#define IOleItemContainer_IMETHODS \
IOleContainer_IMETHODS \
......
include/wine/obj_olefont.h
View file @ 270c23d8
......@@ -55,7 +55,8 @@ typedef TEXTMETRICW TEXTMETRICOLE;
ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)
#define IFont_IMETHODS \
ICOM_INHERITS(IFont,IUnknown)
IUnknown_IMEHTODS \
IFont_METHODS
ICOM_DEFINE(IFont,IUnknown)
#undef ICOM_INTERFACE
......
include/wine/obj_oleundo.h
View file @ 270c23d8
......@@ -115,7 +115,7 @@ ICOM_DEFINE(IQuickActivate,IUnknown)
#define ICOM_INTERFACE IPointerInactive
#define IPointerInactive_METHODS \
ICOM_METHOD1(HRESULT,GetActivationPolicy, DWORD*,pdwPolicy) \
ICOM_METHOD4(HRESULT,OnInactiveMoveMouse, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,grfKeyState) \
ICOM_METHOD4(HRESULT,OnInactiveMouseMove, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,grfKeyState) \
ICOM_METHOD5(HRESULT,OnInactiveSetCursor, LPCRECT,pRectBounds, LONG,x, LONG,y, DWORD,dwMouseMsg, BOOL,fSetAlways)
#define IPointerInactive_IMETHODS \
IUnknown_IMETHODS \
......
include/wine/obj_propertystorage.h
View file @ 270c23d8
......@@ -35,6 +35,9 @@ typedef struct IPropertyStorage IPropertyStorage,*LPPROPERTYSTORAGE;
typedef struct tagSTATPROPSETSTG STATPROPSETSTG;
typedef struct tagSTATPROPSTG STATPROPSTG;
extern const FMTID FMTID_SummaryInformation;
extern const FMTID FMTID_DocSummaryInformation;
extern const FMTID FMTID_UserDefinedProperties;
/*****************************************************************************
* PROPSPEC structure
......@@ -136,7 +139,8 @@ struct tagSTATPROPSTG
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSETSTG**,ppenum)
#define IEnumSTATPROPSETSTG_IMETHODS \
ICOM_INHERITS(IEnumSTATPROPSETSTG,IUnknown)
IUnknown_IMETHODS \
IEnumSTATPROPSETSTG_METHODS
ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
#undef ICOM_INTERFACE
......@@ -163,7 +167,8 @@ ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSTG**,ppenum)
#define IEnumSTATPROPSTG_IMETHODS \
ICOM_INHERITS(IEnumSTATPROPSTG,IUnknown)
IUnknown_IMETHODS \
IEnumSTATPROPSTG_METHODS
ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
#undef ICOM_INTERFACE
......@@ -190,7 +195,8 @@ ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
ICOM_METHOD1(HRESULT,Delete, REFFMTID,rfmtid) \
ICOM_METHOD1(HRESULT,Enum, IEnumSTATPROPSETSTG**,ppenum)
#define IPropertySetStorage_IMETHODS \
ICOM_INHERITS(IPropertySetStorage,IUnknown)
IUnknown_IMETHODS \
IPropertySetStorage_METHODS
ICOM_DEFINE(IPropertySetStorage,IUnknown)
#undef ICOM_INTERFACE
......@@ -411,7 +417,8 @@ struct tagPROPVARIANT
ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid) \
ICOM_METHOD1(HRESULT,Stat, STATPROPSETSTG*,pstatpsstg)
#define IPropertyStorage_IMETHODS \
ICOM_INHERITS(IPropertyStorage,IUnknown)
IUnknown_IMETHODS \
IPropertyStorage_METHODS
ICOM_DEFINE(IPropertyStorage,IUnknown)
#undef ICOM_INTERFACE
......
include/wine/obj_storage.h
View file @ 270c23d8
......@@ -283,7 +283,7 @@ ICOM_DEFINE(ILockBytes,IUnknown)
*/
#define ICOM_INTERFACE IPersist
#define IPersist_METHODS \
ICOM_CMETHOD1(HRESULT,GetClassID, CLSID*,pClassID)
ICOM_METHOD1(HRESULT,GetClassID, CLSID*,pClassID)
#define IPersist_IMETHODS \
IUnknown_IMETHODS \
IPersist_METHODS
......@@ -305,11 +305,11 @@ ICOM_DEFINE(IPersist,IUnknown)
*/
#define ICOM_INTERFACE IPersistFile
#define IPersistFile_METHODS \
ICOM_CMETHOD (HRESULT,IsDirty) \
ICOM_METHOD (HRESULT,IsDirty) \
ICOM_METHOD2 (HRESULT,Load, LPCOLESTR,pszFileName, DWORD,dwMode) \
ICOM_METHOD2 (HRESULT,Save, LPCOLESTR,pszFileName, BOOL,fRemember) \
ICOM_METHOD1 (HRESULT,SaveCompleted, LPCOLESTR,pszFileName) \
ICOM_CMETHOD1(HRESULT,GetCurFile, LPOLESTR*,ppszFileName)
ICOM_METHOD1(HRESULT,GetCurFile, LPOLESTR*,ppszFileName)
#define IPersistFile_IMETHODS \
IPersist_IMETHODS \
IPersistFile_METHODS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment