2006-04-11 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/comcat.h: INTERFACE should not remain defined at the end of the header. * include/docobj.h: Ditto. * include/exdisp.h: Ditto. * include/intshcut.h: Ditto. * include/mlang.h: Ditto. * include/mshtml.h: Ditto. * include/oaidl.h: Ditto.
This commit is contained in:
@ -20,7 +20,6 @@ EXTERN_C const IID IID_IUnknown;
|
||||
EXTERN_C const IID IID_IClassFactory;
|
||||
#ifndef __IUnknown_INTERFACE_DEFINED__
|
||||
#define __IUnknown_INTERFACE_DEFINED__
|
||||
#undef INTERFACE
|
||||
#define INTERFACE IUnknown
|
||||
DECLARE_INTERFACE(IUnknown)
|
||||
{
|
||||
@ -28,11 +27,11 @@ DECLARE_INTERFACE(IUnknown)
|
||||
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
|
||||
STDMETHOD_(ULONG,Release)(THIS) PURE;
|
||||
};
|
||||
#undef INTERFACE
|
||||
typedef IUnknown *LPUNKNOWN;
|
||||
#endif
|
||||
#ifndef __IClassFactory_INTERFACE_DEFINED__
|
||||
#define __IClassFactory_INTERFACE_DEFINED__
|
||||
#undef INTERFACE
|
||||
#define INTERFACE IClassFactory
|
||||
DECLARE_INTERFACE_(IClassFactory,IUnknown)
|
||||
{
|
||||
@ -42,6 +41,7 @@ DECLARE_INTERFACE_(IClassFactory,IUnknown)
|
||||
STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
|
||||
STDMETHOD(LockServer)(THIS_ BOOL) PURE;
|
||||
};
|
||||
#undef INTERFACE
|
||||
typedef IClassFactory *LPCLASSFACTORY;
|
||||
#endif
|
||||
HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown*,REFIID,void**);
|
||||
|
Reference in New Issue
Block a user