Changeset 288

Timestamp:

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

Author:

dai

Message:

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

Location:

Include

Files:

• Classes/ActiveBasic/Windows/CriticalSection.ab (modified) (1 diff)
• Classes/System/IO/DriveInfo.ab (modified) (2 diffs)
• Classes/System/Text/StringBuilder.ab (modified) (1 diff)
• basic/command.sbp (modified) (2 diffs)
• basic/dos_console.sbp (modified) (1 diff)
• basic/prompt.sbp (modified) (1 diff)
• system/built_in.ab (added)
• system/enum.sbp (modified) (2 diffs)
• system/interface.ab (added)

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)

Include/basic/command.sbp

@@ -408 +408 @@
     _System_GetUsingFormat = buffer.ToString(0, lstrlen(StrBPtr(buffer)))
 End Function
-*/
+
+' TODO: _System_GetUsingFormatを用意して実装する
 Sub PRINTUSING_ToFile(FileNumber As Long, UsingStr As String)
     Dim dwAccessByte As DWord
@@ -418 +419 @@
     WriteFile(_System_hFile(FileNumber),buf,Len(buf),VarPtr(dwAccessByte),ByVal NULL)
 End Sub
+*/
 
 Dim _System_FieldSize(255) As Long

Include/basic/dos_console.sbp

@@ -71 +71 @@
 #endif
 End Sub
-
+/* TODO: _System_GetUsingFormatを用意して実装する
 Sub PRINTUSING_ToPrompt(UsingStr As String)
     PRINT_ToPrompt(_System_GetUsingFormat(UsingStr))
 End Sub
-
+*/
 
 #endif '_INC_DOS_CONSOLE

Include/basic/prompt.sbp

@@ -896 +896 @@
 End Sub
 
+/* TODO: _System_GetUsingFormatを用意して実装する
 Sub PRINTUSING_ToPrompt(UsingStr As String)
     ActiveBasic.Prompt.Detail.PRINT_ToPrompt(_System_GetUsingFormat(UsingStr))
 End Sub
+*/
 
 Macro LOCATE(x As Long, y As Long)

Include/system/enum.sbp

@@ -40 +40 @@
         End If
     End Function
-
+/*
     Function Operator or (enumBase As EnumBase) As EnumBase
         Return New EnumBase(This.value Or enumBase.value)
@@ -52 +52 @@
         Return New EnumBase(This.value Xor enumBase.value)
     End Function
+*/
 End Class