Changeset 208 for Include/Classes

Timestamp:

Apr 7, 2007, 10:20:40 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

[207]参照型変数のNothing初期化に対応する修正

Location:

Include/Classes/System

Files:

• Environment.ab (modified) (3 diffs)
• Math.ab (modified) (3 diffs)
• OperatingSystem.ab (modified) (2 diffs)
• Runtime/InteropServices/GCHandle.ab (modified) (2 diffs)

Include/Classes/System/Environment.ab

@@ -21 +21 @@
         Dim size = GetCurrentDirectory(0, 0)
         Dim p = _System_malloc(SizeOf (TCHAR) * size) As PCTSTR
-        GetCurrentDirectory(size, p)
-        CurrentDirectory = p
-        _System_free(p)
+        Dim len = GetCurrentDirectory(size, p)
+        If len < size Then
+            CurrentDirectory = New String(p, size As Long)
+            _System_free(p)
+        End If
     End Function
 
@@ -72 +74 @@
             Dim size = GetSystemDirectory(0, 0)
             Dim p = _System_malloc(SizeOf (TCHAR) * size)
-            GetSystemDirectory(size, p)
-            sysDir = p
+            Dim len = GetSystemDirectory(size, p)
+            sysDir = New String(p, len As Long)
             _System_free(p)
         End IF
@@ -117 +119 @@
         Dim dst = _System_malloc(SizeOf (TCHAR) * size)
         ExpandEnvironmentStrings(src, dst, size)
-        ExpandEnvironmentVariables = dst
+        ExpandEnvironmentVariables = New String(dst, size - 1)
         _System_free(dst)
     End Function
 
     Static Sub FailFast(message As String)
-        OutputDebugString(ToTCStr(message))
-        ExitProcess(-1)
+        FatalAppExit(0, ToTCStr(message))
     End Sub
 

Include/Classes/System/Math.ab

@@ -17 +17 @@
 
     Static Function Abs(value As Double) As Double
-        If value<0 then
-            return -value
-        Else
-            return value
-        End If
+        SetQWord(VarPtr(value), GetQWord(VarPtr(value)) And &h7fffffffffffffff)
     End Function
 
     Static Function Abs(value As Single) As Single
-        If value<0 then
-            return -value
-        Else
-            return value
-        End If
+        SetDWord(VarPtr(value), GetDWord(VarPtr(value)) And &h7fffffff)
     End Function
 
@@ -209 +201 @@
     'GetType
 
-    Static Function IEEERemainder(value1 As Double,value2 As Double) As Double
+    Static Function IEEERemainder(value1 As Double, value2 As Double) As Double
         Dim q As Double
         If value2=0 then return _System_GetNaN()
@@ -616 +608 @@
 Const _System_Atan_N = 20
 Const _System_UrTan_N = 17
-Const _System_D  = 4.4544551033807686783083602485579e-6
+Const _System_D = 4.4544551033807686783083602485579e-6
 Const _System_HalfPI = (_System_PI * 0.5)
 Const _System_InverseHalfPI = (2 / _System_PI) '1 / (PI / 2)

Include/Classes/System/OperatingSystem.ab

@@ -1 @@
-' System/OperatingSystem.ab
+' Classes/System/OperatingSystem.ab
 
-#ifndef _SYSYTEM_OPERATINGSYSTEM_AB_
-#define _SYSYTEM_OPERATINGSYSTEM_AB_
+#ifndef __SYSYTEM_OPERATINGSYSTEM_AB__
+#define __SYSYTEM_OPERATINGSYSTEM_AB__
 
 #require <Classes/System/Version.ab>
@@ -83 +83 @@
 End Enum
 
-#endif '_SYSYTEM_OPERATINGSYSTEM_AB_
+#endif '__SYSYTEM_OPERATINGSYSTEM_AB__

Include/Classes/System/Runtime/InteropServices/GCHandle.ab

@@ -46 +46 @@
     End Function
 
-    Function Operator = (y As GCHandle) As Boolean
+    Function Operator == (y As GCHandle) As Boolean
         Return Equals(y)
     End Function
@@ -52 +52 @@
     Function Operator <> (y As GCHandle) As Boolean
         Return Not Equals(y)
+    End Function
+
+    Override Function ToString() As String
+        Return "System.Runtime.InteropServices.GCHandle"
     End Function