Changeset 335 for trunk/Include/com/variant.ab

Timestamp:

Sep 18, 2007, 12:10:41 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

SPrintF関連の追加。関数FloatToChars, FormatFloatE, FormatIntegerUと列挙体FormatFlags。

File:

• trunk/Include/com/variant.ab (modified) (12 diffs)

trunk/Include/com/variant.ab

@@ -4 +4 @@
 #define _COM_VARIANT_AB
 
-#require <oaidl.ab>
-#require <oleauto.ab>
+'#require <oaidl.ab>
+'#require <oleauto.ab>
 #require <com/index.ab>
 
@@ -127 +127 @@
         v.vt = VT_EMPTY
     End Sub
-
+/*
     Sub Operator =(y As Variant)
         Assign(y.v)
@@ -135 +135 @@
         Assign(y)
     End Sub
-
+*/
     Sub Assign(from As Variant)
         Assign(from.v)
@@ -202 +202 @@
     Const Function Operator \(y As Variant) As Variant
         Dim ret = New Variant
-        VarIDiv(This.v, y.v, ret.v)
+        VarIdiv(This.v, y.v, ret.v)
         Return ret
     End Function
@@ -340 +340 @@
     Const Function Operator <=(y As Variant) As Boolean
         Dim c = Compare(This, y)
-        If result = VARCMP_LT Or result = VARCMP_EQ Then
+        If c = VARCMP_LT Or c = VARCMP_EQ Then
             Return True
         Else
@@ -349 +349 @@
     Const Function Operator >=(y As Variant) As Boolean
         Dim c = Compare(This, y)
-        If result = VARCMP_GT Or result = VARCMP_EQ Then
+        If c = VARCMP_GT Or c = VARCMP_EQ Then
             Return True
         Else
@@ -391 +391 @@
     Const Function ValUI1() As Byte
         Dim r = ChangeType(VT_UI1)
-        Return GetByte(VarPtr(r.val))
+        Return GetByte(VarPtr(r.v.val))
     End Function
 
@@ -402 +402 @@
     Const Function ValUI2() As Word
         Dim r = ChangeType(VT_UI2)
-        Return GetWord(VarPtr(r.val))
+        Return GetWord(VarPtr(r.v.val))
     End Function
 
@@ -413 +413 @@
     Const Function ValUI4() As DWord
         Dim r = ChangeType(VT_UI4)
-        Return GetDWord(VarPtr(r.val))
+        Return GetDWord(VarPtr(r.v.val))
     End Function
 
@@ -424 +424 @@
     Const Function ValUI8() As QWord
         Dim r = ChangeType(VT_UI8)
-        Return GetQWord(VarPtr(r.val))
+        Return GetQWord(VarPtr(r.v.val))
     End Function
 
@@ -501 +501 @@
     Const Function ValBool() As VARIANT_BOOL
         Dim r = ChangeType(VT_BOOL)
-        Return GetWord(VarPtr(r.val))
+        Return GetWord(VarPtr(r.v.val))
     End Function
 
@@ -557 +557 @@
     Sub ValUnknown(x As *IUnknown)
         Clear()
-        SetPointer(VarPtr(v.val), x.Copy())
+        SetPointer(VarPtr(v.val), x)
         x->AddRef()
         v.vt = VT_UNKNOWN