Changeset 285 for Include/Classes/System

Timestamp:

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

Author:

イグトランス (egtra)

Message:

wtypes.abを追加

Location:

Include/Classes/System

Files:

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

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