Changeset 288 for Include/Classes

Timestamp:

Aug 15, 2007, 3:22:33 AM (17 years ago)

Author:

dai

Message:

いくつかタイプミスを修正。
エラーになるコードを排除、
enumクラスのビット演算メソッドをコメントアウト（仕様未確定なため）。

Location:

Include/Classes

Files:

• ActiveBasic/Windows/CriticalSection.ab (modified) (1 diff)
• System/IO/DriveInfo.ab (modified) (2 diffs)
• System/Text/StringBuilder.ab (modified) (1 diff)

Include/Classes/ActiveBasic/Windows/CriticalSection.ab

@@ -53 +53 @@
 
     /*Override*/ Sub Dispose()
-        Dim p = InterlockedExchangeAnyPointer(pcs, 0)
+        Dim p = Detail.InterlockedExchangeAnyPointer(pcs, 0)
         If p <> 0 Then
             LeaveCriticalSection(ByVal p)

Include/Classes/System/IO/DriveInfo.ab

@@ -41 +41 @@
         Dim systemName[15] As TCHAR
         If GetVolumeInformation(m_DriveName, NULL, 0, NULL, NULL, NULL, systemName, Len (systemName)) Then
-            Return systemName
+            Dim resultStr = New String( systemName )
+            Return resultStr
         Else
             'IOException
@@ -85 +86 @@
 
     Function VolumeLabel() As String
-        Dim volumeName[63] As TCAHR
-        If GetVolumeInformation(m_DriveName, volumeName, 64, NULL, NULL, NULL, NULL, NULL) Then
-            Return volumeName
+        Dim volumeName[63] As TCHAR
+        If GetVolumeInformation(m_DriveName, volumeName, 64, NULL, NULL, NULL, NULL, 0) Then
+            Dim resultStr = New String( volumeName )
+            Return resultStr
         Else
             'IOException

Include/Classes/System/Text/StringBuilder.ab

@@ -308 +308 @@
         EnsureCapacity(newSize)
         separateBuffer()
-        ActiveBasic.Strings.ChrMove(VarPtr(chars[i + lenTotal]), VarPtr(chars[i]), (size - index) As SIZE_T)
+
+        ' TODO: fix me!（定義されていない変数iが使われています）
+        'ActiveBasic.Strings.ChrMove(VarPtr(chars[i + lenTotal]), VarPtr(chars[i]), (size - index) As SIZE_T)
+
         Dim i As Long
         For i = 0 To ELM(n)