Changeset 598 for trunk/ab5.0

Timestamp:

Aug 20, 2008, 12:22:49 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

（[597]でのコミット漏れ）より簡単なGC避けとしてObjectHandleを追加。
GCHandleの内部実装もObjectHandleベースへ移行。

Location:

trunk/ab5.0/ablib/src/Classes

Files:

• ActiveBasic/ObjectHandle.ab (added)
• System/Runtime/InteropServices/GCHandle.ab (modified) (4 diffs)
• index.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/Runtime/InteropServices/GCHandle.ab

@@ -8 +8 @@
 Public
     Function Target() As Object
-        Target = _System_PtrObj(handle)
+        Target = ActiveBasic.GetObjectFromHandle(handle)
     End Function
 
     Sub Target(obj As Object)
         If handle <> 0 Then
-            Dim i = allocated.IndexOf(Target())
-            'assert(i <> -1)
-            allocated[i] = obj
+            ActiveBasic.ReleaseObjectHandle(handle)
         End If
-        allocated.Add(obj)
-        handle = ObjPtr(obj)
+        handle = ActiveBasic.AllocObjectHandle(obj)
     End Sub
 
@@ -31 +28 @@
 
     Sub Free()
-        allocated.Remove(Target)
+        If handle = 0 Then
+            Throw New InvalidOperationException
+        End If
+        ActiveBasic.ReleaseObjectHandle(handle)
         handle = 0
     End Sub
 
     Static Function ToIntPtr(h As GCHandle) As LONG_PTR
-        Return h.handle As LONG_PTR
+        Return h.handle
     End Function
 
@@ -44 +44 @@
         End If
         FromIntPtr = New GCHandle
-        FromIntPtr.handle = ip As VoidPtr
+        FromIntPtr.handle = ip
     End Function
 
     Override Function GetHashCode() As Long
-        Return _System_HashFromPtr(handle)
+        Return _System_HashFromPtr(handle As VoidPtr)
     End Function
 
@@ -67 +67 @@
     End Function
 
-'Private
+Private
     Sub GCHandle()
     End Sub
 
 Private
-    handle As VoidPtr
-
-    Static allocated = New System.Collections.Generic.List<Object>
+    handle As LONG_PTR
 End Class
 

trunk/ab5.0/ablib/src/Classes/index.ab

@@ -1 +1 @@
 #require "./ActiveBasic/misc.ab"
+#require "./ActiveBasic/ObjectHandle.ab"
 #require "./ActiveBasic/Core/InterfaceInfo.ab"
 #require "./ActiveBasic/Core/TypeInfo.ab"