Changeset 370 for trunk

Timestamp:

Nov 3, 2007, 5:18:30 PM (17 years ago)

Author:

dai

Message:

System.GCクラスを追加。
64ビットコンパイラで生じる警告を改修した。

Location:

trunk/Include

Files:

• Classes/ActiveBasic/Strings/Strings.ab (modified) (2 diffs)
• Classes/System/DateTime.ab (modified) (1 diff)
• Classes/System/Drawing/Color.ab (modified) (2 diffs)
• Classes/System/GC.ab (added)
• Classes/System/String.ab (modified) (1 diff)
• Classes/System/Text/StringBuilder.ab (modified) (1 diff)
• Classes/index.ab (modified) (1 diff)
• system/gc.sbp (modified) (1 diff)
• system/string.sbp (modified) (2 diffs)

trunk/Include/Classes/ActiveBasic/Strings/Strings.ab

@@ -93 +93 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = size1 - size2
+        ChrCmp = ( size1 - size2 ) As Long
     End If
 End Function
@@ -100 +100 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = size1 - size2
+        ChrCmp = ( size1 - size2 ) As Long
     End If
 End Function

trunk/Include/Classes/System/DateTime.ab

@@ -253 +253 @@
                 - Millisecond * TimeSpan.TicksPerMillisecond As Int64
         If IsLeapYear(Year + Int(value)) Then
-            ticks += (value - Int(value)) * 366 * TimeSpan.TicksPerDay
-        Else
-            ticks += (value - Int(value)) * 365 * TimeSpan.TicksPerDay
+            ticks += ( (value - Int(value)) * 366 * TimeSpan.TicksPerDay ) As Int64
+        Else
+            ticks += ( (value - Int(value)) * 365 * TimeSpan.TicksPerDay ) As Int64
         End If
         Return date.AddTicks(ticks)

trunk/Include/Classes/System/Drawing/Color.ab

@@ -131 +131 @@
         Dim max = System.Math.Max(System.Math.Max(r, g), b) As Long
         Dim min = System.Math.Min(System.Math.Min(r, g), b) As Long
-        Return (max - min) / max
+        Return ( (max - min) / max ) As Single
     End Function
 
@@ -139 +139 @@
         Dim b = B
         Dim max = System.Math.Max(System.Math.Max(r, g), b)
-        Return max * (1 / 255)
+        Return ( max * (1 / 255) ) As Single
     End Function
 

trunk/Include/Classes/System/String.ab

@@ -361 +361 @@
     Private
         Const Function indexOfCore(c As StrChar, start As Long, count As Long) As Long
-            indexOfCore = ActiveBasic.Strings.ChrFind(VarPtr(Chars[start]), count, c)
+            indexOfCore = ActiveBasic.Strings.ChrFind(VarPtr(Chars[start]), count, c) As Long
             If indexOfCore <> -1 Then
                 indexOfCore += start

trunk/Include/Classes/System/Text/StringBuilder.ab

@@ -407 +407 @@
         Dim curPos = 0 As Long
         Do
-            Dim nextPos = ActiveBasic.Strings.ChrFind(VarPtr(chars[curPos]) As *StrChar, size As SIZE_T, StrPtr(oldStr), oldStr.Length As SIZE_T)
+            Dim nextPos = ActiveBasic.Strings.ChrFind(VarPtr(chars[curPos]) As *StrChar, size As SIZE_T, StrPtr(oldStr), oldStr.Length As SIZE_T) As Long
             If nextPos = -1 As SIZE_T Then
                 Exit Sub

trunk/Include/Classes/index.ab

@@ -11 +11 @@
 #require "./System/Delegate.ab"
 #require "./System/Environment.ab"
+#require "./System/GC.ab"
 #require "./System/Math.ab"
 #require "./System/misc.ab"

trunk/Include/system/gc.sbp

@@ -25 +25 @@
 Type _System_MemoryObject
     ptr As VoidPtr
-    size As Long
+    size As SIZE_T
     flags As DWord
     generationCount As Long

trunk/Include/system/string.sbp

@@ -39 +39 @@
 Function GetStr(psz As PSTR, len As SIZE_T, ByRef wcs As PWSTR) As SIZE_T
     If psz = 0 Then Return 0
-    Dim lenWCS = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len, 0, 0)
+    Dim lenWCS = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len As Long, 0, 0)
     wcs = _System_AllocForConvertedString(SizeOf (WCHAR) * (lenWCS + 1)) As PWSTR
-    GetStr = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len, wcs, lenWCS)
+    GetStr = MultiByteToWideChar(CP_THREAD_ACP, 0, psz, len As Long, wcs, lenWCS)
     wcs[GetStr] = 0
 End Function
@@ -73 +73 @@
 Function GetStr(psz As PWSTR, len As SIZE_T, ByRef mbs As PSTR) As SIZE_T
     If psz = 0 Then Return 0
-    Dim lenMBS = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len, 0, 0, 0, 0)
+    Dim lenMBS = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len As Long, 0, 0, 0, 0)
     mbs = _System_AllocForConvertedString(SizeOf (SByte) * (lenMBS + 1)) As PSTR
-    GetStr = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len, mbs, lenMBS, 0, 0) As SIZE_T
+    GetStr = WideCharToMultiByte(CP_THREAD_ACP, 0, psz, len As Long, mbs, lenMBS, 0, 0) As SIZE_T
     mbs[GetStr] = 0
 End Function