Changeset 110 for Include/basic/dos_console.sbp

Timestamp:

Feb 18, 2007, 11:19:00 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

ByteからCharへの変更（不完全）ほか微修正

File:

• Include/basic/dos_console.sbp (modified) (6 diffs)

Include/basic/dos_console.sbp

@@ -10 +10 @@
 
 Dim _System_hConsoleOut As HANDLE, _System_hConsoleIn As HANDLE
-_System_hConsoleOut=GetStdHandle(STD_OUTPUT_HANDLE)
-_System_hConsoleIn=GetStdHandle(STD_INPUT_HANDLE)
+_System_hConsoleOut = GetStdHandle(STD_OUTPUT_HANDLE)
+_System_hConsoleIn = GetStdHandle(STD_INPUT_HANDLE)
 
 '---------- command.sbp内で定義済み ----------
@@ -18 +18 @@
 '---------------------------------------------
 Sub INPUT_FromPrompt(ShowStr As String)
-    Dim i As Long ,i2 As Long, i3 As Long
+    Dim i As Long, i2 As Long, i3 As Long
     Dim buf As String
     Dim InputStr[1023] As Byte
@@ -28 +28 @@
 
     '入力
-    ReadFile(_System_hConsoleIn,InputStr,1024,VarPtr(dwAccessBytes),ByVal 0)
-    InputStr[dwAccessBytes-2]=0
+    ReadConsole(_System_hConsoleIn, InputStr, Len(InputStr), dwAccessBytes, 0)
+    If InputStr[dwAccessBytes-2] = &h0d And InputStr[dwAccessBytes-1] = &h0a Then
+        InputStr[dwAccessBytes-2] = 0
+    End If
 
     'データを変数に格納
@@ -35 +37 @@
     i2=0
     buf.ReSize(lstrlen(InputStr) + 1, 0)
-    Dim comma As Byte
-    comma = Asc(",")
+    Dim comma As Char
+    comma = &h2c 'Asc(",")
     While 1
         i3=0
@@ -73 +75 @@
 
         i++
-        If _System_InputDataPtr[i]=0 and InputStr[i2]=comma Then
+        If _System_InputDataPtr[i]=0 And InputStr[i2]=comma Then
             PRINT_ToPrompt("入力データの個数が多すぎます"+Chr$(10))
             Goto *InputReStart
@@ -90 +92 @@
 
 Macro LOCATE(x As Long, y As Long)
-    SetConsoleCursorPosition(_System_hConsoleOut, MAKELONG(x ,y))
+    SetConsoleCursorPosition(_System_hConsoleOut, MAKELONG(x, y))
 End Macro
 
 Sub PRINT_ToPrompt(buf As String)
     Dim dwAccessBytes As DWord
-    WriteFile(_System_hConsoleOut, buf.Chars, buf.Length, VarPtr(dwAccessBytes), ByVal 0)
+    WriteConsole(_System_hConsoleOut, buf.Chars, buf.Length, dwAccessBytes, 0)
 End Sub