Changeset 142 for Include/basic/dos_console.sbp

Timestamp:

Mar 9, 2007, 10:15:34 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Environment, OperatingSystem, Versionの追加、Unicode対応修正ほか

File:

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

Include/basic/dos_console.sbp

@@ -20 +20 @@
     Dim i As Long, i2 As Long, i3 As Long
     Dim buf As String
-    Dim InputStr[1023] As Byte
+    Dim InputBuf[1023] As TCHAR
     Dim dwAccessBytes As DWord
 
@@ -28 +28 @@
 
     '入力
-    ReadConsole(_System_hConsoleIn, InputStr, Len(InputStr), dwAccessBytes, 0)
-    If InputStr[dwAccessBytes-2] = &h0d And InputStr[dwAccessBytes-1] = &h0a Then
-        InputStr[dwAccessBytes-2] = 0
+    ReadConsole(_System_hConsoleIn, InputBuf, Len(InputBuf), dwAccessBytes, 0)
+    If InputBuf[dwAccessBytes-2] = &h0d And InputBuf[dwAccessBytes-1] = &h0a Then
+        InputBuf[dwAccessBytes-2] = 0
     End If
+    Dim InputStr As String(InputBuf)
 
     'データを変数に格納
@@ -59 +60 @@
         i++
         If _System_InputDataPtr[i]=0 And InputStr[i2]=comma Then
-            PRINT_ToPrompt("入力データの個数が多すぎます"+Chr$(10))
+            PRINT_ToPrompt(Ex"入力データの個数が多すぎます\r\n")
             Goto *InputReStart
         ElseIf InputStr[i2]=0 Then
             If _System_InputDataPtr[i]<>0 Then
-                PRINT_ToPrompt("入力データの個数が足りません"+Chr$(10))
+                PRINT_ToPrompt(Ex"入力データの個数が足りません\r\n")
                 Goto *InputReStart
             Else
@@ -80 +81 @@
 Sub PRINT_ToPrompt(buf As String)
     Dim dwAccessBytes As DWord
+#ifdef __STRING_UNICODE_WINDOWS_ANSI
+'   Debug
+    Dim oldAlloc = _System_AllocForConvertedString
+    _System_AllocForConvertedString = AddressOf (_System_malloc)
+    Dim pszOut As PCSTR
+    Dim len = GetStr(buf, pszOut)
+    _System_AllocForConvertedString = oldAlloc
+    WriteConsole(_System_hConsoleOut, pszOut, len, dwAccessBytes, 0)
+    _System_free(pszOut)
+#else
     WriteConsole(_System_hConsoleOut, buf.Chars, buf.Length, dwAccessBytes, 0)
+#endif
 End Sub