Changeset 303 for trunk/Include/OAIdl.ab

Timestamp:

Aug 24, 2007, 11:14:46 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

フルコンパイルでのミスあぶり出し。註：修正は全て@300や@301以前に行われた。

File:

• trunk/Include/OAIdl.ab (modified) (15 diffs)

trunk/Include/OAIdl.ab

@@ -7 +7 @@
 
 '#ifndef COM_NO_WINDOWS_H
-#include <windows.sbp>
-#include <ole2.ab>
+#require <windows.sbp>
+#require <ole2.ab>
 '#endif /*COM_NO_WINDOWS_H*/
 
-#include <objidl.sbp>
+#require <objidl.sbp>
 
 #ifndef __IOleAutomationTypes_INTERFACE_DEFINED__
 #define __IOleAutomationTypes_INTERFACE_DEFINED__
-
-TypeDef SCODE = Long
 
 /* interface IOleAutomationTypes */
@@ -694 +692 @@
 Const Enum VARKIND
     VAR_PERINSTANCE = 0
-    VAR_STATIC = VAR_PERINSTANCE + 1
-    VAR_CONST = VAR_STATIC + 1
-    VAR_DISPATCH = VAR_CONST + 1
+    VAR_STATIC = 1
+    VAR_CONST = 2
+    VAR_DISPATCH = 3
 End Enum
 
@@ -893 +891 @@
     Function DeleteFuncDesc(
         /* [in] */ index As DWord) As HRESULT
-
     Function DeleteFuncDescByMemId(
         /* [in] */ memid As *MEMBERID,
         /* [in] */ invKind As *INVOKEKIND) As HRESULT
-
     Function DeleteVarDesc(
         /* [in] */ index As DWord) As HRESULT
-
     Function DeleteVarDescByMemId(
         /* [in] */ memid As *MEMBERID) As HRESULT
-
     Function DeleteImplType(
         /* [in] */ index As DWord) As HRESULT
-
     Function SetCustData(
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetFuncCustData(
         /* [in] */ index As DWord,
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetParamCustData(
         /* [in] */ indexFunc As DWord,
@@ -921 +912 @@
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetVarCustData(
         /* [in] */ index As DWord,
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetImplTypeCustData(
         /* [in] */ index As DWord,
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetHelpStringContext(
         /* [in] */ dwHelpStringContext As DWord) As HRESULT
-
     Function SetFuncHelpStringContext(
         /* [in] */ index As DWord,
         /* [in] */ dwHelpStringContext As DWord) As HRESULT
-
     Function SetVarHelpStringContext(
         /* [in] */ index As DWord,
         /* [in] */ dwHelpStringContext As DWord) As HRESULT
-
     Function Invalidate() As HRESULT
-
     Function SetName(
         /* [in] */ szName As LPOLESTR) As HRESULT
@@ -959 +943 @@
 
 TypeDef LPCREATETYPELIB = /* [unique] */ *ICreateTypeLib
-
 
 Dim IID_ICreateTypeLib = [&h00020406, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
@@ -968 +951 @@
         /* [in] */ szName As LPOLESTR,
         /* [in] */ tkind As *TYPEKIND,
-        /* [out] */ ByRef pCTInfo As *ICreateTypeInfo) As HRESULT
-
+        /* [out] */ ByRef CTInfo As ICreateTypeInfo) As HRESULT
     Function SetName(
         /* [in] */ szName As LPOLESTR) As HRESULT
-
     Function SetVersion(
         /* [in] */ wMajorVerNum As Word,
         /* [in] */ wMinorVerNum As Word) As HRESULT
-
     Function SetGuid(
         /* [in] */ ByRef guid As GUID) As HRESULT
-
     Function SetDocString(
         /* [in] */ szDoc As LPOLESTR) As HRESULT
-
     Function SetHelpFileName(
         /* [in] */ szHelpFileName As LPOLESTR) As HRESULT
-
     Function SetHelpContext(
         /* [in] */ dwHelpContext As DWord) As HRESULT
-
     Function SetLcid(
         /* [in] */ lcid As LCID) As HRESULT
-
     Function SetLibFlags(
         /* [in] */ uLibFlags As DWord) As HRESULT
-
     Function SaveAllChanges() As HRESULT
 End Interface
-
 
 #endif  /* __ICreateTypeLib_INTERFACE_DEFINED__ */
@@ -1017 +990 @@
     Function DeleteTypeInfo(
         /* [in] */ szName As LPOLESTR) As HRESULT
-
     Function SetCustData(
         /* [in] */ ByRef guid As GUID,
         /* [in] */ ByRef VarVal As VARIANT) As HRESULT
-
     Function SetHelpStringContext(
         /* [in] */ dwHelpStringContext As DWord) As HRESULT
-
     Function SetHelpStringDll(
         /* [in] */ szFileName As LPOLESTR) As HRESULT
-
 End Interface
 
@@ -1182 +1151 @@
     Function /* [local] */ GetTypeAttr(
         /* [out] */ ByRef pTypeAttr As *TYPEATTR) As HRESULT
-
     Function GetTypeComp(
-        /* [out] */ ByRef pTComp As *ITypeComp) As HRESULT
-
+        /* [out] */ ByRef TComp As ITypeComp) As HRESULT
     Function /* [local] */ GetFuncDesc(
         /* [in] */ index As DWord,
         /* [out] */ ByRef pFuncDesc As *FUNCDESC) As HRESULT
-
     Function /* [local] */ GetVarDesc(
         /* [in] */ index As DWord,
         /* [out] */ ByRef pVarDesc As *VARDESC) As HRESULT
-
     Function /* [local] */ GetNames(
         /* [in] */ memid As MEMBERID,
@@ -1199 +1164 @@
         /* [in] */ cMaxNames As DWord,
         /* [out] */ ByRef cNames As DWord) As HRESULT
-
     Function GetRefTypeOfImplType(
         /* [in] */ index As DWord,
         /* [out] */ ByRef RefType As HREFTYPE) As HRESULT
-
     Function GetImplTypeFlags(
         /* [in] */ index As DWord,
         /* [out] */ ByRef ImplTypeFlags As Long) As HRESULT
-
     Function /* [local] */ GetIDsOfNames(
         /* [size_is][in] */ rgszNames As *LPOLESTR,
         /* [in] */ cNames As DWord,
         /* [size_is][out] */ pMemId As *MEMBERID) As HRESULT
-
     Function /* [local] */ Invoke(
         /* [in] */ pvInstance As VoidPtr,
@@ -1221 +1182 @@
         /* [out] */ ByRef ExcepInfo As EXCEPINFO,
         /* [out] */ ByRef uArgErr As DWord) As HRESULT
-
     Function /* [local] */ GetDocumentation(
         /* [in] */ memid As MEMBERID,
@@ -1228 +1188 @@
         /* [out] */ ByRef dwHelpContext As DWord,
         /* [out] */ ByRef BstrHelpFile As BSTR) As HRESULT
-
     Function /* [local] */ GetDllEntry(
         /* [in] */ memid As MEMBERID,
@@ -1235 +1194 @@
         /* [out] */ ByRef BstrName As BSTR,
         /* [out] */ ByRef wOrdinal As Word) As HRESULT
-
     Function GetRefTypeInfo(
         /* [in] */ hRefType As HREFTYPE,
-        /* [out] */ ByRef pTInfo As *ITypeInfo) As HRESULT
-
+        /* [out] */ ByRef TInfo As ITypeInfo) As HRESULT
     Function /* [local] */ AddressOfMember(
         /* [in] */ memid As MEMBERID,
         /* [in] */ invKind As INVOKEKIND,
         /* [out] */ ByRef pv As VoidPtr) As HRESULT
-
     Function /* [local] */ CreateInstance(
-        /* [in] */ pUnkOuter As *IUnknown,
+        /* [in] */ pUnkOuter As IUnknown,
         /* [in] */ ByRef riid As IID,
         /* [iid_is][out] */ ByRef pvObj As Any) As HRESULT
-
     Function GetMops(
         /* [in] */ memid As MEMBERID,
         /* [out] */ ByRef BstrMops As BSTR) As HRESULT
-
     Function /* [local] */ GetContainingTypeLib(
-        /* [out] */ ByRef pTLib As *ITypeLib,
+        /* [out] */ ByRef TLib As ITypeLib,
         /* [out] */ ByRef Index As DWord) As HRESULT
-
     Sub /* [local] */ ReleaseTypeAttr(
         /* [in] */ pTypeAttr As *TYPEATTR)
-
     Sub /* [local] */ ReleaseFuncDesc(
         /* [in] */ pFuncDesc As *FUNCDESC)
-
     Sub /* [local] */ ReleaseVarDesc(
         /* [in] */ pVarDesc As *VARDESC)
@@ -1645 +1596 @@
         /* [out] */ ByRef cbSize As DWord) As HRESULT
     Function GetTypeInfo(
-        /* [out] */ ByRef pTypeInfo As *ITypeInfo) As HRESULT
+        /* [out] */ ByRef TypeInfo As ITypeInfo) As HRESULT
     Function GetField(
         /* [in] */ pvData As VoidPtr,
@@ -1656 +1607 @@
         /* [out] */ ByRef pvDataCArray As VoidPtr) As HRESULT
     Function PutField(
-        /* [in] */ wFlags As DWord,
+        /* [in] */ wFlags As DWord,
         /* [out][in] */ pvData As VoidPtr,
         /* [in] */ szFieldName As LPCOLESTR,
         /* [in] */ ByRef varField As VARIANT) As HRESULT
     Function PutFieldNoCopy(
-        /* [in] */ wFlags As DWord,
+        /* [in] */ wFlags As DWord,
         /* [out][in] */ pvData As VoidPtr,
         /* [in] */ szFieldName As LPCOLESTR,
@@ -1718 +1669 @@
         /* [in] */ pszPropName As LPCOLESTR,
         /* [out][in] */ ByRef Var As VARIANT,
-        /* [in] */ pErrorLog As *IErrorLog) As HRESULT
+        /* [in] */ ErrorLog As IErrorLog) As HRESULT
 
     Function Write(