Changeset 629 for trunk

Timestamp:

Sep 21, 2008, 2:06:46 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

Console.Title（取得側）が正しく動かないバグを除去

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/System/Console.ab (modified) (1 diff)
• Classes/System/Text/StringBuilder.ab (modified) (4 diffs)
• api_console.sbp (modified) (2 diffs)

trunk/ab5.0/ablib/src/Classes/System/Console.ab

@@ -240 +240 @@
             Exit Sub
         Else
-            SetConsoleTitle(StrPtr(title))
+            SetConsoleTitle(ToTCStr(title))
         End If
     End Sub
     Static Function Title() As String
-        Dim sb = New Text.StringBuilder(24500*SizeOf(Char))
         If Console.hconsoleout =NULL Then
             Return ""
         Else
-            GetConsoleTitle(sb.__Chars(),sb.Length())
+            Dim sb = New Text.StringBuilder
+            sb.Length = 24500
+            Dim ret = GetConsoleTitle(StrPtr(sb),sb.Length())
+            If ret = 0 Then
+                Dim error = GetLastError()
+                If error <> ERROR_SUCSESS Then
+                    ActiveBasic.Windows.ThrowWithErrorCode(error, "Console.Title")
+                End If
+            End If
+            sb.Length = ret
+            Return sb.ToString()
         End If
     End Function

trunk/ab5.0/ablib/src/Classes/System/Text/StringBuilder.ab

@@ -456 +456 @@
     End Function
 
+    /*!
+    @brief 内部用
+    代わりにStrPtr使ってください。
+    */
     Function __Chars() As *Char
         Return chars
     End Function
 
+    /*!
+    @brief 内部用
+    使わないでください。
+    */
     Sub __Stringized()
         stringized = True
@@ -467 +475 @@
     Sub initialize(capacity As Long, maxCapacity = LONG_MAX As Long)
         If capacity < 0 Or maxCapacity < 1 Or maxCapacity < capacity Then
-            Throw New ArgumentOutOfRangeException("StringBuilder constructor: One or more arguments are out of range value.", "capacity or maxCapacity or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder constructor", "capacity or maxCapacity or both")
         End If
 
@@ -494 +502 @@
     Sub rangeCheck(index As Long)
         If index < 0 Or index > size Then
-            Throw New ArgumentOutOfRangeException("StringBuilder: Index argument is out of range value.")
+            Throw New ArgumentOutOfRangeException("StringBuilder")
         End If
     End Sub
@@ -505 +513 @@
         'length < 0は判定に入っていないことに注意
         If startIndex < 0 Or count < 0 Or startIndex + count > length Then
-            Throw New ArgumentOutOfRangeException("StringBuilder: One or more arguments are out of range value.", "startIndex or count or both")
+            Throw New ArgumentOutOfRangeException("StringBuilder", "startIndex or count or both")
         End If
     End Sub

trunk/ab5.0/ablib/src/api_console.sbp

@@ -210 +210 @@
 Declare Function AllocConsole Lib "kernel32" () As BOOL
 Declare Function FreeConsole Lib "kernel32" () As BOOL
-Declare Function GetConsoleTitle Lib "kernel32" Alias _FuncName_GetConsoleTitle (lpConsoleTitle As LPSTR, nSize As DWord) As DWord
-Declare Function SetConsoleTitle Lib "kernel32" Alias _FuncName_SetConsoleTitle (lpConsoleTitle As LPSTR) As BOOL
+Declare Function GetConsoleTitle Lib "kernel32" Alias _FuncName_GetConsoleTitle (lpConsoleTitle As LPTSTR, nSize As DWord) As DWord
+Declare Function SetConsoleTitle Lib "kernel32" Alias _FuncName_SetConsoleTitle (lpConsoleTitle As LPTSTR) As BOOL
 Declare Function ReadConsole Lib "kernel32" Alias _FuncName_ReadConsole (hConsoleInput As HANDLE, lpBuffer As VoidPtr, nNumberOfCharsToRead As DWord, ByRef lpNumberOfCharsRead As DWord, lpReserved As VoidPtr) As BOOL
 Declare Function WriteConsole Lib "kernel32" Alias _FuncName_WriteConsole (hConsoleOutput As HANDLE, lpBuffer As VoidPtr, nNumberOfCharsToWrite As DWord, ByRef lpNumberOfCharsWritten As DWord, lpReserved As VoidPtr) As BOOL
@@ -223 +223 @@
 Declare Function SetConsoleOutputCP Lib "kernel32" (wCodePageID As DWord) As BOOL
 
-Function COORDtoDWORD ( ByRef coord As COORD) As DWord
+Function COORDtoDWORD(ByRef coord As COORD) As DWord
     Return GetDWord(VarPtr(coord))
 End Function