Changeset 200

Timestamp:

Apr 2, 2007, 11:55:39 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Currencyにメンバを追加

Location:

Include

Files:

• OAIdl.ab (modified) (6 diffs)
• OleAuto.ab (modified) (1 diff)
• com/currency.ab (modified) (2 diffs)
• com/index.ab (modified) (1 diff)
• com/variant.ab (modified) (5 diffs)
• com/vbobject.ab (modified) (2 diffs)

Include/OAIdl.ab

@@ -1326 +1326 @@
 TypeDef LPTYPEINFO = /* [unique] */ *ITypeInfo
 
-Dim IID_ITypeInfo = [&H00020401, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
+Dim IID_ITypeInfo = [&h00020401, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
 
 Interface ITypeInfo
@@ -1429 +1429 @@
 TypeDef LPTYPEINFO2 = /* [unique] */ *ITypeInfo2
 
-Dim IID_ITypeInfo2 = [&H00020412, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
+Dim IID_ITypeInfo2 = [&h00020412, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
 
 Interface ITypeInfo2
@@ -1490 +1490 @@
 #endif  /* __ITypeInfo2_INTERFACE_DEFINED__ */
 
-#ifdef __UNDECLARED__
-
 #ifndef __ITypeLib_INTERFACE_DEFINED__
 #define __ITypeLib_INTERFACE_DEFINED__
@@ -1499 +1497 @@
 
 /* [v1_enum] */
-Enum SYSKIND
+Const Enum SYSKIND
     SYS_WIN16 = 0
-    SYS_WIN32 = SYS_WIN16 + 1
-    SYS_MAC = SYS_WIN32 + 1
-    SYS_WIN64 = SYS_MAC + 1
+    SYS_WIN32 = 1
+    SYS_MAC = 2
+    SYS_WIN64 = 3
 End Enum
 
 /* [v1_enum] */
-Enum LIBFLAGS
+Const Enum LIBFLAGS
     LIBFLAG_FRESTRICTED = &h1
     LIBFLAG_FCONTROL = &h2
@@ -1514 +1512 @@
 End Enum
 
-TypeDef /* [unique] */ ITypeLib *LPTYPELIB;
+TypeDef LPTYPELIB = /* [unique] */ *ITypeLib
 
 Type TLIBATTR
@@ -1525 +1523 @@
 End Type
 
-TypeDef struct tagTLIBATTR *LPTLIBATTR;
-
-
-EXTERN_C const IID IID_ITypeLib;
-
-    MIDL_INTERFACE("00020402-0000-0000-C000-000000000046")
-    ITypeLib : public IUnknown
-    {
-    public:
-        virtual /* [local] */ UINT STDMETHODCALLTYPE GetTypeInfoCount( void) As HRESULT
-
-        Function GetTypeInfo(
-            /* [in] */ UINT index,
-            /* [out] */ ITypeInfo **ppTInfo) As HRESULT
-
-        Function GetTypeInfoType(
-            /* [in] */ UINT index,
-            /* [out] */ TYPEKIND *pTKind) As HRESULT
-
-        Function GetTypeInfoOfGuid(
-            /* [in] */ REFGUID guid,
-            /* [out] */ ITypeInfo **ppTinfo) As HRESULT
-
-        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetLibAttr(
-            /* [out] */ TLIBATTR **ppTLibAttr) As HRESULT
-
-        Function GetTypeComp(
-            /* [out] */ ITypeComp **ppTComp) As HRESULT
-
-        virtual /* [local] */ HRESULT STDMETHODCALLTYPE GetDocumentation(
-            /* [in] */ INT index,
-            /* [out] */ BSTR *pBstrName,
-            /* [out] */ BSTR *pBstrDocString,
-            /* [out] */ DWORD *pdwHelpContext,
-            /* [out] */ BSTR *pBstrHelpFile) As HRESULT
-
-        virtual /* [local] */ HRESULT STDMETHODCALLTYPE IsName(
-            /* [out][in] */ LPOLESTR szNameBuf,
-            /* [in] */ ULONG lHashVal,
-            /* [out] */ BOOL *pfName) As HRESULT
-
-        virtual /* [local] */ HRESULT STDMETHODCALLTYPE FindName(
-            /* [out][in] */ LPOLESTR szNameBuf,
-            /* [in] */ ULONG lHashVal,
-            /* [length_is][size_is][out] */ ITypeInfo **ppTInfo,
-            /* [length_is][size_is][out] */ MEMBERID *rgMemId,
-            /* [out][in] */ USHORT *pcFound) As HRESULT
-
-        virtual /* [local] */ void STDMETHODCALLTYPE ReleaseTLibAttr(
-            /* [in] */ TLIBATTR *pTLibAttr) As HRESULT
-
-    };
+TypeDef LPTLIBATTR = TLIBATTR
+
+Dim ITypeLib = [&h00020402, &h0000, &h0000, [&hC0, &h00, &h00, &h00, &h00, &h00, &h00, &h46]] As IID
+
+Interface ITypeLib
+    Inherits IUnknown
+
+    Function /* [local] */ GetTypeInfoCount() As DWord
+    Function GetTypeInfo(
+        /* [in] */ index As DWord,
+        /* [out] */ ByRef pTInfo As *ITypeInfo) As HRESULT
+    Function GetTypeInfoType(
+        /* [in] */ index As DWord,
+        /* [out] */ ByRef TKind As TYPEKIND) As HRESULT
+    Function GetTypeInfoOfGuid(
+        /* [in] */ ByRef guid As GUID,
+        /* [out] */ ByRef pTInfo As *ITypeInfo) As HRESULT
+    Function /* [local] */ GetLibAttr(
+        /* [out] */ ByRef pTLibAttr As *TLIBATTR) As HRESULT
+    Function GetTypeComp(
+        /* [out] */ ByRef ppTComp As *ITypeComp) As HRESULT
+    Function /* [local] */ GetDocumentation(
+        /* [in] */ index As Long,
+        /* [out] */ ByRef BstrName As BSTR,
+        /* [out] */ ByRef BstrDocString As BSTR,
+        /* [out] */ ByRef dwHelpContext As DWord,
+        /* [out] */ ByRef BstrHelpFile As BSTR) As HRESULT
+    Function /* [local] */ IsName(
+        /* [out][in] */ szNameBuf As LPOLESTR,
+        /* [in] */ lHashVal As DWord,
+        /* [out] */ ByRef pfName As BOOL) As HRESULT
+    Function /* [local] */ FindName(
+        /* [out][in] */ szNameBuf As LPOLESTR,
+        /* [in] */ lHashVal As DWord,
+        /* [length_is][size_is][out] */ ppTInfo As **ITypeInfo,
+        /* [length_is][size_is][out] */ rgMemId As *MEMBERID,
+        /* [out][in] */ ByRef cFound As Word) As HRESULT
+    Sub /* [local] */ ReleaseTLibAttr(
+        /* [in] */ ByRef TLibAttr As TLIBATTR) 
+End Interface
 
 #endif  /* __ITypeLib_INTERFACE_DEFINED__ */
 
+
+#ifdef __UNDECLARED__
 
 #ifndef __ITypeLib2_INTERFACE_DEFINED__

Include/OleAuto.ab

@@ -24 +24 @@
 #include <oaidl.ab>
 'Dummy
-Interface ITypeLib
-    Inherits IUnknown
-End Interface
-
 Interface IErrorInfo
     Inherits IUnknown

Include/com/currency.ab

@@ -1 +1 @@
 ' com/currency.ab
+
+#require <com/variant.ab>
+
+#ifndef _COM_CURRENCY_AB
+#define _COM_CURRENCY_AB
 
 Class Currency
 Public
+/*
+    Sub Currency(x As CY)
+        cy = x
+    End Sub
+*/
+    Sub Currency(x As Double)
+        VarCyFromR8(x, cy)
+    End Sub
+/*
+    Sub Currency(x As Int64)
+        VarCyFromI8(x, cy)
+    End Sub
+*/
     Const Function Operator +() As Currency
         Return New Currency(This)
@@ -68 +86 @@
         VarCyRound(This.cy, c, Round.cy)
     End Function
+
+    Const Function Cy() As CY
+        Return cy
+    End Function
+
+    Sub Cy(c As CY)
+        cy = c
+    End Sub
+
+    Const Function ToDouble() As Double
+        VarR8FromCy(cy, ToDouble)
+    End Function
+
+    Const Function ToInt64() As Int64
+        VarI8FromCy(cy, ToInt64)
+    End Function
+
+    Const Function ToVariant() As Variant
+        Return New Variant(This)
+    End Function
+
+    Override Function ToString() As String
+        Dim bs As BSTR
+        VarBstrFromCy(cy, LOCALE_USER_DEFAULT, LOCALE_USE_NLS, bs)
+        ToString = New String(bs As PCWSTR, SysStringLen(bs) As Long)
+        SysFreeString(bs)
+    End Function
+
+    Override Function GetHashCode() As Long
+        Return HIDWORD(cy) Xor LODWORD(cy)
+    End Function
 Private
     cy As CY
 End Class
+
+#endif '_COM_CURRENCY_AB

Include/com/index.ab

@@ -3 +3 @@
 #require <com/bstring.ab>
 #require <com/variant.ab>
-#require <com/vbojbect.ab>
+#require <com/vbobject.ab>
 #require <com/currency.ab>

Include/com/variant.ab

@@ -6 +6 @@
 #require <oaidl.ab>
 #require <oleauto.ab>
-#require <com/bstring.ab>
-#include <com/vbobject.ab>
+#require <com/index.ab>
 
 Class Variant
@@ -111 +110 @@
     End Sub
 
+    Sub Variant(n As Currency)
+        v.vt = VT_CY
+        SetQWord(VarPtr(v.val), n.Cy As QWord)
+    End Sub
+
+
     Sub ~Variant()
         Clear()
@@ -504 +509 @@
     End Sub
 
-    'ValCy
-
+    Const Function ValCy() As Currency
+    End Function
+
+    Sub ValCy(x As Currency)
+    End Sub
+    
     'ValDate
 
@@ -557 +566 @@
     End Function
 
+    Static Function OptionalParam() As Variant
+'       If _System_VariantOptionalParam = Nothing Then
+'           'ToDo マルチスレッド対応
+            _System_VariantOptionalParam = New Variant
+            _System_VariantOptionalParam.ValError = DISP_E_PARAMNOTFOUND
+'       End If
+        Return _System_VariantOptionalParam
+    End Function
 Private
     v As VARIANT
@@ -570 +587 @@
     End Sub
 End Class
+
+Dim _System_VariantOptionalParam = Nothing As Variant
+
 /*
 Function Abs(v As Variant) As Variant

Include/com/vbobject.ab

@@ -34 +34 @@
         pdisp = obj.pdisp
         pdisp->AddRef()
-    End Sub
-
-    Sub Operator =(ByRef obj As VBObject)
-        ~VBObject()
-        VBObject(obj)
     End Sub
 
@@ -206 +201 @@
     End Function
 
-    Function Call(arg1 As Variant) As Variant
-        Return Call(1, arg1.PtrToVariant)
-    End Function
-
-    Function Call(ByRef arg1 As Variant, ByRef arg2 As Variant) As Variant
-        Dim arg[1] As VARIANT
-
-        Return Call(2, VarPtr(arg1) As *VARIANT)
-    End Function
-
+    Function Call(arg0 As Variant) As Variant
+        Return Call(1, arg0.PtrToVariant)
+    End Function
+
+    Function Call(arg0 As Variant, arg1 As Variant) As Variant
+        Dim arg[ELM(2)] As VARIANT
+        arg[0] = arg0.Copy()
+        arg[1] = arg1.Copy()
+        Return Call(2, arg)
+    End Function
+
+    Function Call(arg0 As Variant, arg1 As Variant, arg2 As Variant) As Variant
+        Dim arg[ELM(3)] As VARIANT
+        arg[0] = arg0.Copy()
+        arg[1] = arg1.Copy()
+        arg[2] = arg2.Copy()
+        Return Call(3, arg)
+    End Function
+
+    Function Call(arg0 As Variant, arg1 As Variant, arg2 As Variant, arg3 As Variant) As Variant
+        Dim arg[ELM(4)] As VARIANT
+        arg[0] = arg0.Copy()
+        arg[1] = arg1.Copy()
+        arg[2] = arg2.Copy()
+        arg[3] = arg3.Copy()
+        Return Call(4, arg)
+    End Function
+
+/*
+    Function Call(arg0 = Variant.OptionalParam As Variant, arg1 = Variant.OptionalParam As Variant,
+        arg2 = Variant.OptionalParam As Variant, arg3 = Variant.OptionalParam As Variant,
+        arg4 = Variant.OptionalParam As Variant, arg5 = Variant.OptionalParam As Variant,
+        arg6 = Variant.OptionalParam As Variant, arg7 = Variant.OptionalParam As Variant,
+        arg8 = Variant.OptionalParam As Variant, arg9 = Variant.OptionalParam As Variant) As Variant
+        Dim arg[ELM(10)] As VARIANT
+        arg[0] = arg0.Copy()
+        arg[1] = arg1.Copy()
+        arg[2] = arg2.Copy()
+        arg[3] = arg3.Copy()
+        arg[4] = arg3.Copy()
+        arg[5] = arg4.Copy()
+        arg[6] = arg5.Copy()
+        arg[7] = arg6.Copy()
+        arg[8] = arg7.Copy()
+        arg[9] = arg8.Copy()
+        Return Call(10, arg)
+    End Function
+*/
 Private
     Sub setProp(ByRef arg As VARIANT, callType As Word)