Wrote a new oaidl.idl to replace include/wine/obj_oleaut.h and

include/Makefile.in

@@ -5,6 +5,7 @@ VPATH	  = @srcdir@
 MODULE	  = none
 
 IDL_SRCS = \
+	oaidl.idl \
 	objidl.idl \
 	unknwn.idl \
 	wtypes.idl
@@ -88,7 +89,6 @@ WINDOWS_INCLUDES = \
 	ntddstor.h \
 	ntsecapi.h \
 	ntstatus.h \
-	oaidl.h \
 	objbase.h \
 	ocidl.h \
 	ole2.h \
@@ -214,10 +214,8 @@ WINE_INCLUDES = \
 	obj_dragdrophelper.h \
 	obj_enumguid.h \
 	obj_enumidlist.h \
-	obj_errorinfo.h \
 	obj_extracticon.h \
 	obj_inplace.h \
-	obj_oleaut.h \
 	obj_olefont.h \
 	obj_oleobj.h \
 	obj_oleundo.h \

include/wine/obj_errorinfo.h

-/*
- * Defines the COM interfaces and APIs related to ErrorInfo
- *
- * Copyright (C) 2000 Juergen Schmied
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_WINE_OBJ_ERRORINFO_H
-#define __WINE_WINE_OBJ_ERRORINFO_H
-
-DEFINE_GUID(IID_IErrorInfo,0x1CF2B120,0x547D,0x101B,0x8E,0x65,0x08,0x00,0x2B,0x2B,0xD1,0x19);
-typedef struct IErrorInfo IErrorInfo,*LPERRORINFO;
-
-DEFINE_GUID(IID_ICreateErrorInfo,0x22F03340,0x547D,0x101B,0x8E,0x65,0x08,0x00,0x2B,0x2B,0xD1,0x19);
-typedef struct ICreateErrorInfo ICreateErrorInfo,*LPCREATEERRORINFO;
-
-DEFINE_GUID(IID_ISupportErrorInfo,0xDF0B3D60,0x547D,0x101B,0x8E,0x65,0x08,0x00,0x2B,0x2B,0xD1,0x19);
-typedef struct ISupportErrorInfo ISupportErrorInfo,*LPSUPPORTERRORINFO;
-
-/*****************************************************************************
- * IErrorInfo
- */
-#define ICOM_INTERFACE IErrorInfo
-#define IErrorInfo_METHODS \
-  ICOM_METHOD1(HRESULT, GetGUID, GUID * , pGUID) \
-  ICOM_METHOD1(HRESULT, GetSource, BSTR* ,pBstrSource) \
-  ICOM_METHOD1(HRESULT, GetDescription, BSTR*, pBstrDescription) \
-  ICOM_METHOD1(HRESULT, GetHelpFile, BSTR*, pBstrHelpFile) \
-  ICOM_METHOD1(HRESULT, GetHelpContext, DWORD*, pdwHelpContext)
-
-#define IErrorInfo_IMETHODS \
-	IUnknown_IMETHODS \
-	IErrorInfo_METHODS
-ICOM_DEFINE(IErrorInfo, IUnknown)
-#undef ICOM_INTERFACE
-
-/*** IUnknown methods ***/
-#define IErrorInfo_QueryInterface(p,a,b)	ICOM_CALL2(QueryInterface,p,a,b)
-#define IErrorInfo_AddRef(p)			ICOM_CALL (AddRef,p)
-#define IErrorInfo_Release(p)			ICOM_CALL (Release,p)
-/*** IErrorInfo methods ***/
-#define IErrorInfo_GetGUID(p,a)		ICOM_CALL1 (GetGUID,p,a)
-#define IErrorInfo_GetSource(p,a)	ICOM_CALL1 (GetSource,p,a)
-#define IErrorInfo_GetDescription(p,a)	ICOM_CALL1 (GetDescription,p,a)
-#define IErrorInfo_GetHelpFile(p,a)	ICOM_CALL1 (GetHelpFile,p,a)
-#define IErrorInfo_GetHelpContext(p,a)	ICOM_CALL1 (GetHelpContext,p,a)
-
-/*****************************************************************************
- * ICreateErrorInfo
- */
-#define ICOM_INTERFACE ICreateErrorInfo
-#define ICreateErrorInfo_METHODS \
-  ICOM_METHOD1(HRESULT, SetGUID, REFGUID, rguid) \
-  ICOM_METHOD1(HRESULT, SetSource, LPOLESTR, szSource) \
-  ICOM_METHOD1(HRESULT, SetDescription, LPOLESTR, szDescription) \
-  ICOM_METHOD1(HRESULT, SetHelpFile, LPOLESTR, szHelpFile) \
-  ICOM_METHOD1(HRESULT, SetHelpContext, DWORD, dwHelpContext)
-
-#define ICreateErrorInfo_IMETHODS \
-	IUnknown_IMETHODS \
-	ICreateErrorInfo_METHODS
-ICOM_DEFINE(ICreateErrorInfo, IUnknown)
-#undef ICOM_INTERFACE
-
-/*** IUnknown methods ***/
-#define ICreateErrorInfo_QueryInterface(p,a,b)		ICOM_CALL2(QueryInterface,p,a,b)
-#define ICreateErrorInfo_AddRef(p)			ICOM_CALL (AddRef,p)
-#define ICreateErrorInfo_Release(p)			ICOM_CALL (Release,p)
-/*** ICreateErrorInfo methods ***/
-#define ICreateErrorInfo_SetGUID(p,a)		ICOM_CALL1 (SetGUID,p,a)
-#define ICreateErrorInfo_SetSource(p,a)		ICOM_CALL1 (SetSource,p,a)
-#define ICreateErrorInfo_SetDescription(p,a)	ICOM_CALL1 (SetDescription,p,a)
-#define ICreateErrorInfo_SetHelpFile(p,a)	ICOM_CALL1 (SetHelpFile,p,a)
-#define ICreateErrorInfo_SetHelpContext(p,a)	ICOM_CALL1 (SetHelpContext,p,a)
-
-/*****************************************************************************
- * ISupportErrorInfo
- */
-#define ICOM_INTERFACE ISupportErrorInfo
-#define ISupportErrorInfo_METHODS \
-  ICOM_METHOD1(HRESULT, InterfaceSupportsErrorInfo,  REFIID,  riid  )
-
-#define ISupportErrorInfo_IMETHODS \
-	IUnknown_IMETHODS \
-	ISupportErrorInfo_METHODS
-ICOM_DEFINE(ISupportErrorInfo, IUnknown)
-#undef ICOM_INTERFACE
-
-/*** IUnknown methods ***/
-#define ISupportErrorInfo_QueryInterface(p,a,b)		ICOM_CALL2(QueryInterface,p,a,b)
-#define ISupportErrorInfo_AddRef(p)			ICOM_CALL (AddRef,p)
-#define ISupportErrorInfo_Release(p)			ICOM_CALL (Release,p)
-/*** ISupportErrorInfo methods ***/
-#define ISupportErrorInfo_InterfaceSupportsErrorInfo(p,a)	ICOM_CALL1 (InterfaceSupportsErrorInfo,p,a)
-
-
-#endif /* __WINE_WINE_OBJ_ERRORINFO_H */