Changeset 175 for Include/com

Timestamp:

Mar 21, 2007, 7:06:34 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Variant, VBObjectの追加

Location:

Include/com

Files:

• bstring.ab (modified) (3 diffs)
• variant.ab (added)
• vbobject.ab (added)

Include/com/bstring.ab

@@ -66 +66 @@
     Sub AssignFromBStr(bstr As BSTR)
         Clear()
-        BString(bstr)
+        String.Copy(bs, bstr)
     End Sub
+
+    Const Function Copy() As BSTR
+        BString.Copy(Copy, bs)
+    End Function
 
     Sub Clear()
@@ -78 +82 @@
     Sub Attach(bstr As BSTR)
         Clear()
-        bs = bstr
+        BString.Move(bs, bstr)
     End Sub
 
     Function Detach() As BSTR
-        Detach = bs
-        bs = 0
+        BString.Move(Detach, bs)
     End Function
 
@@ -113 +116 @@
 
     Override Function ToString() As String
-        Dim s As String(bs, Length)
+        Dim s As String(bs As PCWSTR, Length As Long)
         Return s
+    End Function
+
+    Override Function GetHashCode() As Long
+        Return _System_GetHashFromWordArray(bs, Length)
     End Function
 
 Private
     bs As BSTR
+
+    Static Sub Copy(ByRef dst As BSTR, ByVal src As BSTR)
+        dst = SysAllocStringLen(src, SysStringLen(src))
+    End Sub
+
+    Static Sub Move(ByRef dst As BSTR, ByRef src As BSTR)
+        dst = src
+        src = 0
+    End Sub
 End Class