CVS: winex/include oaidl.h,1.4,1.5

Subject: winex/include oaidl.h,1.4,1.5Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv16039/include

Modified Files:
	oaidl.h 
Log Message:
Recompiled remaining IDL files with new widl.


Index: oaidl.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/oaidl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- oaidl.h	14 Dec 2007 20:23:38 -0000	1.4
+++ oaidl.h	14 Dec 2007 20:24:04 -0000	1.5
@@ -645,7 +645,6 @@
     CONST_VTBL IDispatchVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define IDispatch_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,GetTypeInfoCount,UINT *,pctinfo) \
@@ -653,6 +652,7 @@
     ICOM_METHOD5 (HRESULT,GetIDsOfNames,REFIID,riid,LPOLESTR *,rgszNames,UINT,cNames,LCID,lcid,DISPID *,rgDispId) \
     ICOM_METHOD8 (HRESULT,Invoke,DISPID,dispIdMember,REFIID,riid,LCID,lcid,WORD,wFlags,DISPPARAMS *,pDispParams,VARIANT *,pVarResult,EXCEPINFO *,pExcepInfo,UINT *,puArgErr)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IDispatch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define IDispatch_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -811,7 +811,6 @@
     CONST_VTBL IEnumVARIANTVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define IEnumVARIANT_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD3 (HRESULT,Next,ULONG,celt,VARIANT *,rgVar,ULONG *,pCeltFetched) \
@@ -819,6 +818,7 @@
     ICOM_METHOD  (HRESULT,Reset) \
     ICOM_METHOD1 (HRESULT,Clone,IEnumVARIANT **,ppEnum)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IEnumVARIANT_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define IEnumVARIANT_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -962,12 +962,12 @@
     CONST_VTBL ITypeCompVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeComp_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD6 (HRESULT,Bind,LPOLESTR,szName,ULONG,lHashVal,WORD,wFlags,ITypeInfo **,ppTInfo,DESCKIND *,pDescKind,BINDPTR *,pBindPtr) \
     ICOM_METHOD4 (HRESULT,BindType,LPOLESTR,szName,ULONG,lHashVal,ITypeInfo **,ppTInfo,ITypeComp **,ppTComp)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeComp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeComp_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -1266,7 +1266,6 @@
     CONST_VTBL ITypeInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,GetTypeAttr,TYPEATTR **,ppTypeAttr) \
@@ -1289,6 +1288,7 @@
     ICOM_VMETHOD1(ReleaseFuncDesc,FUNCDESC *,pFuncDesc) \
     ICOM_VMETHOD1(ReleaseVarDesc,VARDESC *,pVarDesc)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -1910,7 +1910,6 @@
     CONST_VTBL ITypeInfo2Vtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeInfo2_IMETHODS \
     ITypeInfo_IMETHODS \
     ICOM_METHOD1 (HRESULT,GetTypeKind,TYPEKIND *,pTypeKind) \
@@ -1929,6 +1928,7 @@
     ICOM_METHOD2 (HRESULT,GetAllVarCustData,UINT,index,CUSTDATA *,pCustData) \
     ICOM_METHOD2 (HRESULT,GetAllImplTypeCustData,UINT,index,CUSTDATA *,pCustData)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeInfo2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeInfo2_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -2284,7 +2284,6 @@
     CONST_VTBL ITypeLibVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeLib_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD  (UINT,GetTypeInfoCount) \
@@ -2298,6 +2297,7 @@
     ICOM_METHOD5 (HRESULT,FindName,LPOLESTR,szNameBuf,ULONG,lHashVal,ITypeInfo **,ppTInfo,MEMBERID *,rgMemId,USHORT *,pcFound) \
     ICOM_VMETHOD1(ReleaseTLibAttr,TLIBATTR *,pTLibAttr)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeLib_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeLib_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -2607,7 +2607,6 @@
     CONST_VTBL ITypeLib2Vtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeLib2_IMETHODS \
     ITypeLib_IMETHODS \
     ICOM_METHOD2 (HRESULT,GetCustData,REFGUID,guid,VARIANT *,pVarVal) \
@@ -2615,6 +2614,7 @@
     ICOM_METHOD5 (HRESULT,GetDocumentation2,INT,index,LCID,lcid,BSTR *,pbstrHelpString,DWORD *,pdwHelpStringContext,BSTR *,pbstrHelpStringDll) \
     ICOM_METHOD1 (HRESULT,GetAllCustData,CUSTDATA *,pCustData)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeLib2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeLib2_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -2778,12 +2778,12 @@
     CONST_VTBL ITypeChangeEventsVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeChangeEvents_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD4 (HRESULT,RequestTypeChange,CHANGEKIND,changeKind,ITypeInfo *,pTInfoBefore,LPOLESTR,pStrName,INT *,pfCancel) \
     ICOM_METHOD3 (HRESULT,AfterTypeChange,CHANGEKIND,changeKind,ITypeInfo *,pTInfoAfter,LPOLESTR,pStrName)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeChangeEvents_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeChangeEvents_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -2894,7 +2894,6 @@
     CONST_VTBL IErrorInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define IErrorInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,GetGUID,GUID *,pGUID) \
@@ -2903,6 +2902,7 @@
     ICOM_METHOD1 (HRESULT,GetHelpFile,BSTR *,pBstrHelpFile) \
     ICOM_METHOD1 (HRESULT,GetHelpContext,DWORD *,pdwHelpContext)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define IErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -3035,7 +3035,6 @@
     CONST_VTBL ICreateErrorInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ICreateErrorInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,SetGUID,REFGUID,rguid) \
@@ -3044,6 +3043,7 @@
     ICOM_METHOD1 (HRESULT,SetHelpFile,LPOLESTR,szHelpFile) \
     ICOM_METHOD1 (HRESULT,SetHelpContext,DWORD,dwHelpContext)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ICreateErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ICreateErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -3148,11 +3148,11 @@
     CONST_VTBL ISupportErrorInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ISupportErrorInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,InterfaceSupportsErrorInfo,REFIID,riid)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ISupportErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ISupportErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -3224,11 +3224,11 @@
     CONST_VTBL ITypeFactoryVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeFactory_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD3 (HRESULT,CreateFromTypeInfo,ITypeInfo *,pTypeInfo,REFIID,riid,IUnknown **,ppv)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeFactory_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -3343,7 +3343,6 @@
     CONST_VTBL ITypeMarshalVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ITypeMarshal_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD4 (HRESULT,Size,PVOID,pvType,DWORD,dwDestContext,PVOID,pvDestContext,ULONG *,pSize) \
@@ -3351,6 +3350,7 @@
     ICOM_METHOD5 (HRESULT,Unmarshal,PVOID,pvType,DWORD,dwFlags,ULONG,cbBufferLength,BYTE *,pBuffer,ULONG *,pcbRead) \
     ICOM_METHOD1 (HRESULT,Free,PVOID,pvType)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ITypeMarshal_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ITypeMarshal_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -3585,7 +3585,6 @@
     CONST_VTBL IRecordInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define IRecordInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,RecordInit,PVOID,pvNew) \
@@ -3605,6 +3604,7 @@
     ICOM_METHOD2 (HRESULT,RecordCreateCopy,PVOID,pvSource,PVOID *,ppvDest) \
     ICOM_METHOD1 (HRESULT,RecordDestroy,PVOID,pvRecord)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IRecordInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define IRecordInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -4006,7 +4006,6 @@
     CONST_VTBL ICreateTypeInfoVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ICreateTypeInfo_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD1 (HRESULT,SetGuid,REFGUID,guid) \
@@ -4033,6 +4032,7 @@
     ICOM_METHOD1 (HRESULT,SetTypeIdldesc,IDLDESC *,pIdlDesc) \
     ICOM_METHOD  (HRESULT,LayOut)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ICreateTypeInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ICreateTypeInfo_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -4545,7 +4545,6 @@
     CONST_VTBL ICreateTypeInfo2Vtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ICreateTypeInfo2_IMETHODS \
     ICreateTypeInfo_IMETHODS \
     ICOM_METHOD1 (HRESULT,DeleteFuncDesc,UINT,index) \
@@ -4564,6 +4563,7 @@
     ICOM_METHOD  (HRESULT,Invalidate) \
     ICOM_METHOD1 (HRESULT,SetName,LPOLESTR,szName)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ICreateTypeInfo2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ICreateTypeInfo2_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -4862,7 +4862,6 @@
     CONST_VTBL ICreateTypeLibVtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ICreateTypeLib_IMETHODS \
     IUnknown_IMETHODS \
     ICOM_METHOD3 (HRESULT,CreateTypeInfo,LPOLESTR,szName,TYPEKIND,tkind,ICreateTypeInfo **,ppCTInfo) \
@@ -4876,6 +4875,7 @@
     ICOM_METHOD1 (HRESULT,SetLibFlags,UINT,uLibFlags) \
     ICOM_METHOD  (HRESULT,SaveAllChanges)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ICreateTypeLib_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ICreateTypeLib_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -5093,7 +5093,6 @@
     CONST_VTBL ICreateTypeLib2Vtbl* lpVtbl;
 };
 
-#ifdef COBJMACROS
 #define ICreateTypeLib2_IMETHODS \
     ICreateTypeLib_IMETHODS \
     ICOM_METHOD1 (HRESULT,DeleteTypeInfo,LPOLESTR,szName) \
@@ -5101,6 +5100,7 @@
     ICOM_METHOD1 (HRESULT,SetHelpStringContext,ULONG,dwHelpStringContext) \
     ICOM_METHOD1 (HRESULT,SetHelpStringDll,LPOLESTR,szFileName)
 
+#ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define ICreateTypeLib2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
 #define ICreateTypeLib2_AddRef(p) (p)->lpVtbl->AddRef(p)