Changeset 400 for trunk/Include/Classes/System/IO/DriveInfo.ab

Timestamp:

Jan 22, 2008, 9:19:59 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

_System_CThreadCollectionでのクラスインスタンスへのポインタの使用を除去、参照変数構文へ。

File:

• trunk/Include/Classes/System/IO/DriveInfo.ab (modified) (5 diffs)

trunk/Include/Classes/System/IO/DriveInfo.ab

@@ -21 +21 @@
             debug
         End If
-        driveName.ToUpper()
-        m_DriveName = driveName + ":\"
+        m_DriveName = driveName.ToUpper() + ":\"
     End Sub
 
@@ -30 +29 @@
     'property
     Function AvailableFreeSpace() As QWord
-        Dim availableFreeSpace As ULARGE_INTEGER
-        If GetDiskFreeSpaceEx(m_DriveName, availableFreeSpace, ByVal 0, ByVal 0) Then
-            Return (availableFreeSpace.HighPart << 32) Or availableFreeSpace.LowPart
-        Else
-            'IOException
+        If GetDiskFreeSpaceEx(ToTCStr(m_DriveName), ByVal VarPtr(AvailableFreeSpace) As *ULARGE_INTEGER, ByVal 0, ByVal 0) = FALSE Then
+            Throw New IOException("DriveInfo.AvailableFreeSpace: Failed to GetDiskFreeSpaceEx.")
         End If
     End Function
@@ -40 +36 @@
     Function DriveFormat() As String
         Dim systemName[15] As TCHAR
-        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, systemName, Len (systemName)) Then
-            Dim resultStr = New String( systemName )
-            Return resultStr
+        If GetVolumeInformation(ToTCStr(m_DriveName), NULL, 0, NULL, NULL, NULL, systemName, Len (systemName) \ SizeOf (TCHAR)) Then
+            DriveFormat = New String( systemName )
         Else
-            'IOException
+            Throw New IOException("DriveInfo.DriveFormat: Failed to GetVolumeInformation.")
         End If
     End Function
 
     Function DriveType() As Long
-        Return GetDriveType(m_DriveName)
+        Return GetDriveType(ToTCStr(m_DriveName))
     End Function
 
     Function IsReady() As Boolean
-        If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, NULL, 0) Then
+        If GetVolumeInformation(ToTCStr(m_DriveName), NULL, 0, NULL, NULL, NULL, NULL, 0) Then
             Return True
         Else
@@ -68 +63 @@
 
     Function TotalFreeSpace() As QWord
-        Dim totalFreeSpace As ULARGE_INTEGER
-        If GetDiskFreeSpaceEx(m_DriveName, ByVal 0, ByVal 0, totalFreeSpace) Then
-            Return (totalFreeSpace.HighPart << 32) Or totalFreeSpace.LowPart
-        Else
-            'IOException
+        If GetDiskFreeSpaceEx(ToTCStr(m_DriveName), ByVal 0, ByVal 0, ByVal VarPtr(TotalFreeSpace) As *ULARGE_INTEGER) = FALSE Then
+            Throw New IOException("DriveInfo.TotalFreeSpace: Failed to GetDiskFreeSpaceEx.")
         End If
     End Function
 
     Function TotalSize() As QWord
-        Dim totalSize As ULARGE_INTEGER
-        If GetDiskFreeSpaceEx(m_DriveName, ByVal 0, totalSize, ByVal 0) Then
-            Return (totalSize.HighPart << 32) Or totalSize.LowPart
-        Else
-            'IOException
+        If GetDiskFreeSpaceEx(ToTCStr(m_DriveName), ByVal 0, ByVal VarPtr(TotalSize) As *ULARGE_INTEGER, ByVal 0) = FALSE Then
+            Throw New IOException("DriveInfo.TotalSize: Failed to GetDiskFreeSpaceEx.")
         End If
     End Function
@@ -87 +76 @@
     Function VolumeLabel() As String
         Dim volumeName[63] As TCHAR
-        If GetVolumeInformation(m_DriveName, volumeName, 64, NULL, NULL, NULL, NULL, 0) Then
-            Dim resultStr = New String( volumeName )
-            Return resultStr
+        If GetVolumeInformation(ToTCStr(m_DriveName), volumeName, Len (volumeName) \ SizeOf (TCHAR), NULL, NULL, NULL, NULL, 0) Then
+            VolumeLabel = New String( volumeName )
         Else
-            'IOException
+            Throw New IOException("DriveInfo.VolumeLabel: Failed to GetVolumeInformation.")
         End If
     End Function