Changeset 285 for Include/Classes

Timestamp:

Jul 26, 2007, 5:43:54 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

wtypes.abを追加

Location:

Include/Classes

Files:

• ActiveBasic/Math/Math.ab (modified) (6 diffs)
• System/IO/DirectoryInfo.ab (modified) (2 diffs)
• System/IO/DriveInfo.ab (modified) (2 diffs)
• System/IO/Path.ab (modified) (1 diff)
• System/Math.ab (modified) (2 diffs)
• System/String.ab (modified) (3 diffs)
• System/Windows/Forms/Control.ab (modified) (1 diff)

Include/Classes/ActiveBasic/Math/Math.ab

@@ -13 +13 @@
 Function CopySign(x As Single, y As Single) As Single
     SetDWord(VarPtr(CopySign), (GetDWord(VarPtr(x)) And &h7fffffff) Or (GetDWord(VarPtr(y)) And &h80000000))
+End Function
+
+Function Hypot(x As Double, y As Double) As Double
+    If x = 0 Then
+        Hypot = Abs(y)
+    Else If y = 0 Then
+        Hypot = Abs(x)
+    Else
+        Dim ax = Abs(x)
+        Dim ay = Abs(y)
+        If ay > ax Then
+            Dim t = x / y
+            Hypot = ay * Sqr(1 + t * t)
+        Else
+            Dim t = y / x
+            Hypot = ax * Sqr(1 + t * t)
+        End If
+    End If
 End Function
 
@@ -39 +57 @@
 
 Function IsInf(x As Double) As Boolean
-    Dim p As *DWord, nan As Double
-    p = VarPtr(x) As *DWord
+    Dim p = VarPtr(x) As *DWord
     p[1] And= &h7fffffff
-    nan = ActiveBasic.Math.Detail.GetInf(False)
-    IsInf = (memcmp(p As *Byte, VarPtr(nan), SizeOf (Double)) = 0)
+    Dim inf = ActiveBasic.Math.Detail.GetInf(False)
+    IsInf = (memcmp(p As *Byte, VarPtr(inf), SizeOf (Double)) = 0)
 End Function
 
 Function IsFinite(x As Double) As Boolean
-    Dim p As *DWord, nan As Double
-    p = VarPtr(x) As *DWord
-'   p[1] And= &h7ffe0000
+    Dim p = VarPtr(x) As *DWord
     p[1] And= &H7FF00000
-    p[0] = 0
-    nan = ActiveBasic.Math.Detail.GetInf(/*x,*/ False)
-    IsFinite = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
+    IsFinite = p[1] And &H7FF00000 = &H7FF00000
 End Function
 
@@ -82 +95 @@
 
 Function GetNaN() As Double
-    Dim p As *DWord
-    p = VarPtr(GetNaN) As *DWord
+    Dim p = VarPtr(GetNaN) As *DWord
     p[0] = 0
     p[1] = &H7FF80000
@@ -104 +116 @@
     While i >= 1
         Dim t = (i * x) As Double
-        s = t / (2 + t / (2 * i + 1 + s))
+        s = t * (2 * i + 1 + s) / (2 + t)
         i--
     Wend
@@ -111 +123 @@
 
 Function _Support_tan(x As Double, ByRef k As Long) As Double
-    Dim i As Long
-    Dim t As Double, x2 As Double
-
     If x>=0 Then
         k=Fix(x/(_System_PI/2)+0.5)
@@ -122 +131 @@
     x=(x-(CDbl(3217)/CDbl(2048))*k)+4.4544551033807686783083602485579e-6*k
 
-    x2=x*x
-    t=0
+    Dim x2 = x * x
+    Dim t = 0 As Double
 
+    Dim i As Long
     For i=19 To 3 Step -2
         t=x2/(i-t)

Include/Classes/System/IO/DirectoryInfo.ab

@@ -45 +45 @@
 
             ' 終端の '\' を除去
-            If dirPath[dirPath.Length-1] = Asc("\\") Then
-                dirPath = dirPath.SubString(0, dirPath.Length-1)
+            If dirPath[dirPath.Length-1] = Asc("\") Then
+                dirPath = dirPath.Substring(0, dirPath.Length-1)
             End If
 
@@ -55 +55 @@
             op.hwnd = NULL
             op.wFunc = FO_DELETE
-            op.pFrom = dirPath.Chars
+            op.pFrom = ToTCStr(dirPath)
             op.pTo = NULL
             op.fFlags = FOF_NOCONFIRMATION or FOF_NOERRORUI or FOF_SILENT

Include/Classes/System/IO/DriveInfo.ab

@@ -40 +40 @@
     Function DriveFormat() As String
         Dim systemName[15] As TCHAR
-        If GetVolumeInformation(m_DriveName, NULL, NULL, NULL, NULL, NULL, systemName, Len (systemName)) Then
+        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, systemName, Len (systemName)) Then
             Return systemName
         Else
@@ -52 +52 @@
 
     Function IsReady() As Boolean
-        If GetVolumeInformation(m_DriveName, NULL, NULL, NULL, NULL, NULL, NULL, NULL) Then
+        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, NULL, 0) Then
             Return True
         Else

Include/Classes/System/IO/Path.ab

@@ -72 +72 @@
 
         Dim tempFileName[ELM(MAX_PATH)] As TCHAR
-        __GetTempFileName(tempPath, "ABT", 0, tempFileName)
-        free(tempPath)
-        Return tempFileName
+        Dim len = __GetTempFileName(tempPath, "ABT", 0, tempFileName)
+        _System_free(tempPath)
+        Return New String(tempFileName, len As Long)
     End Function
 

Include/Classes/System/Math.ab

@@ -172 +172 @@
             End If
         End If
-        Dim i As Long, k As Long
-        Dim x2 As Double, w As Double
-
+        Dim k As Long
         If x >= 0 Then
             k = Fix(x / _System_LOG2 + 0.5)
@@ -183 +181 @@
         x -= k * _System_LOG2
 
-        x2 = x * x
-        w = x2 / 22
-
-        i = 18
+        Dim x2 = x * x
+        Dim w = x2 / 22
+
+        Dim i = 18
         While i >= 6
             w = x2 / (w + i)

Include/Classes/System/String.ab

@@ -506 +506 @@
             Clone = This
         End Function
+
         Static Function Copy(s As String) As String
             Copy = New String(s.Chars, s.m_Length)
@@ -520 +521 @@
             Dim size = m_Length
 #endif
-            Return _System_GetHashFromWordArray(Chars As *Word, size)
+            Return _System_GetHashFromWordArray(Chars As *Word, size) Xor size
         End Function
 
@@ -541 +542 @@
 
         Function PadRight(total As Long) As String
-            PadLeft(total, &h30 As StrChar)
+            PadRight(total, &h30 As StrChar)
         End Function
 

Include/Classes/System/Windows/Forms/Control.ab

@@ -309 +309 @@
         ' EndInvokeがDeleteする
         Dim asyncResult = New System.Windows.Forms.Detail.AsyncResultForInvoke(CreateEvent(0, FALSE, FALSE, 0))
-        ' OnControlBeginInvokeがDeleteする
         Dim asyncInvokeData = New System.Windows.Forms.Detail.AsyncInvokeData
         With asyncInvokeData