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:
Chris Sutcliffe
2006-04-11 22:56:08 +00:00
parent 34e666798a
commit 076887efab
19 changed files with 213 additions and 192 deletions

View File

@@ -642,7 +642,6 @@ DEFINE_AVIGUID(IID_IGetFrame,0x00020023,0,0);
DEFINE_AVIGUID(IID_IAVIEditStream,0x00020024,0,0);
DEFINE_AVIGUID(CLSID_AVIFile,0x00020000,0,0);
#undef INTERFACE
#define INTERFACE IAVIStream
DECLARE_INTERFACE_(IAVIStream, IUnknown)
{
@@ -661,9 +660,9 @@ DECLARE_INTERFACE_(IAVIStream, IUnknown)
STDMETHOD(WriteData)(THIS_ DWORD,LPVOID,LONG) PURE;
STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW*,LONG) PURE;
};
#undef INTERFACE
typedef IAVIStream *PAVISTREAM;
#undef INTERFACE
#define INTERFACE IAVIStreaming
DECLARE_INTERFACE_(IAVIStreaming, IUnknown)
{
@@ -673,9 +672,9 @@ DECLARE_INTERFACE_(IAVIStreaming, IUnknown)
STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE;
STDMETHOD(End)(THIS) PURE;
};
#undef INTERFACE
typedef IAVIStreaming *PAVISTREAMING;
#undef INTERFACE
#define INTERFACE IAVIEditStream
DECLARE_INTERFACE_(IAVIEditStream, IUnknown)
{
@@ -688,9 +687,9 @@ DECLARE_INTERFACE_(IAVIEditStream, IUnknown)
STDMETHOD(Clone)(THIS_ PAVISTREAM*) PURE;
STDMETHOD(SetInfo)(THIS_ LPAVISTREAMINFOW,LONG) PURE;
};
#undef INTERFACE
typedef IAVIEditStream *PAVIEDITSTREAM;
#undef INTERFACE
#define INTERFACE IAVIFile
DECLARE_INTERFACE_(IAVIFile, IUnknown)
{
@@ -705,9 +704,9 @@ DECLARE_INTERFACE_(IAVIFile, IUnknown)
STDMETHOD(EndRecord)(THIS) PURE;
STDMETHOD(DeleteStream)(THIS_ DWORD,LONG) PURE;
};
#undef INTERFACE
typedef IAVIFile *PAVIFILE;
#undef INTERFACE
#define INTERFACE IGetFrame
DECLARE_INTERFACE_(IGetFrame, IUnknown)
{
@@ -719,6 +718,7 @@ DECLARE_INTERFACE_(IGetFrame, IUnknown)
STDMETHOD(End)(THIS) PURE;
STDMETHOD(SetFormat)(THIS_ LPBITMAPINFOHEADER,LPVOID,INT,INT,INT,INT) PURE;
};
#undef INTERFACE
typedef IGetFrame *PGETFRAME;
#endif /* !defined (__OBJC__) */