Changeset 142 for Include/basic

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

Include/basic

Files:

• command.sbp (modified) (22 diffs)
• dos_console.sbp (modified) (4 diffs)
• function.sbp (modified) (11 diffs)
• prompt.sbp (modified) (16 diffs)

Include/basic/command.sbp

@@ -5 +5 @@
 #define _INC_COMMAND
 
+#require <windows.sbp>
+#require <Classes/System/Environment.ab>
 
 Const _System_Type_SByte = 1
@@ -33 +35 @@
 Macro END()
     _System_Call_Destructor_of_GlobalObject()
-    ExitProcess(0)
-End Macro
-
-Macro EXEC(lpFilePath As *Byte)(lpCmdLine As *Byte)
-    ShellExecute(0,"open",lpFilePath,lpCmdLine,0,SW_SHOWNORMAL)
+    ExitProcess(Environment.ExitCode)
+End Macro
+
+Macro EXEC(filePath As String)(cmdLine As String)
+    ShellExecute(0, "open", ToTCStr(filePath), ToTCStr(cmdLine), 0, SW_SHOWNORMAL)
 End Macro
 
@@ -52 +54 @@
 Macro WRITE()   'dummy（PRINT_ToFile、PRINT_ToPromptを参照）
 End Macro
-
 
 '----------------
@@ -58 +59 @@
 '----------------
 
-Macro MSGBOX(hWnd As HWND, lpStr As String)(lpTitle As String, BoxType As DWord, ByRef retAns As DWord)
+Function _System_MessageBox(hw As HWND, s As PCSTR, t As PCSTR, b As DWord) As DWord
+    Return MessageBoxA(hw, s, t, b)
+End Function
+
+Function _System_MessageBox(hw As HWND, s As PCWSTR, t As PCWSTR, b As DWord) As DWord
+    Return MessageBoxW(hw, s, t, b)
+End Function
+
+Macro MSGBOX(hwnd As HWND, str As String)(title As String, boxType As DWord, ByRef retAns As DWord)
     If VarPtr(retAns) Then
-        retAns=MessageBox(hWnd,lpStr,lpTitle,BoxType)
+        retAns = _System_MessageBox(hwnd, str, title, boxType)
     Else
-        MessageBox(hWnd,lpStr,lpTitle,BoxType)
+        _System_MessageBox(hwnd, str, title, boxType)
     End If
 End Macro
 
-Macro WINDOW(ByRef hWnd As HWND, hOwner As HWND, x As Long, y As Long, nWidth As Long, nHeight As Long, lpTitle As String, dwStyle As DWord)(lpClass As String, id As HMENU, lpFunc As DWord, dwExStyle As DWord)
-    If VarPtr(hWnd) Then
-        hWnd=CreateWindowEx(dwExStyle,lpClass,lpTitle,dwStyle,x,y,nWidth,nHeight,hOwner,id,GetModuleHandle(0),NULL)
-    Else
-        CreateWindowEx(dwExStyle,lpClass,lpTitle,dwStyle,x,y,nWidth,nHeight,hOwner,id,GetModuleHandle(0),NULL)
+Macro WINDOW(ByRef hwndRet As HWND, hOwner As HWND, x As Long, y As Long, width As Long, height As Long, title As String, dwStyle As DWord)(className As String, id As HMENU, lpFunc As DWord, dwExStyle As DWord)
+    Dim hwnd = CreateWindowEx(dwExStyle, ToTCStr(className), ToTCStr(title), dwStyle, x, y, width, height, hOwner, id, GetModuleHandle(0), 0)
+    If VarPtr(hwndRet) Then
+        hwndRet = hwnd
     End If
 End Macro
@@ -78 +86 @@
 End Macro
 
-Macro INSMENU(hMenu As HMENU, PosID As Long, flag As Long)(lpString As String, id As Long, hSubMenu As HMENU, state As Long)
+Macro INSMENU(hMenu As HMENU, PosID As Long, flag As Long)(str As String, id As Long, hSubMenu As HMENU, state As Long)
     Dim mii As MENUITEMINFO
     ZeroMemory(VarPtr(mii), Len(mii))
@@ -90 +98 @@
             .fType = MFT_STRING
             .fMask = .fMask or MIIM_STATE or MIIM_ID
-            .dwTypeData = StrPtr(lpString)
+            .dwTypeData = ToTCStr(str)
             .wID = id
             If hSubMenu Then
@@ -96 +104 @@
                 .hSubMenu = hSubMenu
             End If
-            .fState=state
+            .fState = state
         End If
     End With
@@ -108 +116 @@
 
 Dim _System_hFile(255) As HANDLE
-Macro OPEN(lpFileName As String, AccessFor As Long, FileNumber As Long)
-    Dim dwAccess As Long
-    Dim bAppend = 0 As Long
-    Dim dwCreationDisposition As Long
+Macro OPEN(fileName As String, AccessFor As Long, FileNumber As Long)
+    Dim access As Long
+    Dim bAppend = False As Boolean
+    Dim creationDisposition As Long
 
     FileNumber--
@@ -117 +125 @@
     Select Case AccessFor
         Case 0
-            dwAccess=GENERIC_READ or GENERIC_WRITE
-            dwCreationDisposition=OPEN_ALWAYS
+            access = GENERIC_READ or GENERIC_WRITE
+            creationDisposition = OPEN_ALWAYS
         Case 1
-            dwAccess=GENERIC_READ
-            dwCreationDisposition=OPEN_EXISTING
+            access = GENERIC_READ
+            creationDisposition = OPEN_EXISTING
         Case 2
-            dwAccess=GENERIC_WRITE
-            dwCreationDisposition=CREATE_ALWAYS
+            access = GENERIC_WRITE
+            creationDisposition = CREATE_ALWAYS
         Case 3
-            dwAccess=GENERIC_WRITE
-            dwCreationDisposition=OPEN_ALWAYS
-            bAppend=1
+            access = GENERIC_WRITE
+            creationDisposition = OPEN_ALWAYS
+            bAppend = True
     End Select
 
-    _System_hFile(FileNumber)=CreateFile(lpFileName,dwAccess,0,ByVal NULL,dwCreationDisposition,FILE_ATTRIBUTE_NORMAL,NULL)
-
-    If bAppend Then SetFilePointer(_System_hFile(FileNumber),0,NULL,FILE_END)
+    _System_hFile(FileNumber) = CreateFile(ToTCStr(fileName), access, 0, ByVal 0, creationDisposition, FILE_ATTRIBUTE_NORMAL, 0)
+
+    If bAppend Then SetFilePointer(_System_hFile(FileNumber), 0, 0, FILE_END)
 End Macro
 
@@ -151 +159 @@
     Dim i As Long ,i2 As Long, i3 As Long
     Dim buffer As String
-    Dim temp[1] As Char
+    Dim temp[1] As StrChar
     Dim dwAccessBytes As DWord
     Dim IsStr As Long
@@ -163 +171 @@
         '次のデータをサーチ
         Do
-            i2=ReadFile(_System_hFile[FileNumber],temp,1,VarPtr(dwAccessBytes),ByVal 0)
+            i2=ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
             If i2=0 or dwAccessBytes=0 Then
                 'error
@@ -177 +185 @@
             i3++
 
-            i2=ReadFile(_System_hFile[FileNumber],temp,1,VarPtr(dwAccessBytes),ByVal 0)
+            i2=ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
             If i2=0 or (i3=0 and dwAccessBytes=0) Then
                 'error
@@ -187 +195 @@
             If dwAccessBytes=0 or temp[0]=0 or temp[0]=13 or temp[0]=10 or (IsStr=0 and temp[0]=Asc(",")) or (IsStr=0 and (temp[0]=32 or temp[0]=9) and _System_InputDataType[i]<>_System_Type_String) Then
                 If temp[0]=13 Then
-                    ReadFile(_System_hFile[FileNumber],temp,1,VarPtr(dwAccessBytes),ByVal 0)
+                    ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
                     If Not(dwAccessBytes<>0 And temp[0]=10) Then
                         SetFilePointer(_System_hFile[FileNumber],-1,0,FILE_CURRENT)
@@ -240 +248 @@
             pTempStr = arg As *String
             pTempStr->ReSize(bufLen)
-            memcpy(pTempStr->Chars, buf.Chars, SizeOf (Char) * pTempStr->Length)
+            memcpy(pTempStr->Chars, buf.Chars, SizeOf (StrChar) * pTempStr->Length)
             pTempStr->Chars[pTempStr->Length] = 0
     End Select
@@ -249 +257 @@
     FileNumber--
 
-    WriteFile(_System_hFile(FileNumber),buf,Len(buf),VarPtr(dwAccessByte),ByVal NULL)
+    WriteFile(_System_hFile(FileNumber), buf, Len(buf), VarPtr(dwAccessByte), ByVal 0)
 End Sub
 
@@ -257 +265 @@
 Function _System_GetUsingFormat(UsingStr As String) As String
     Dim i2 As Long, i3 As Long, i4 As Long, i5 As Long, ParmNum As Long
-    Dim temporary[255] As Char
+    Dim temporary[255] As StrChar
     Dim buffer As String
 
-    buffer=ZeroString(1024)
-
-    ParmNum=0
-    i2=0
+    buffer = ZeroString(1024)
+
+    ParmNum = 0
+    i2 = 0
     While 1
         While 1
@@ -277 +285 @@
         If UsingStr[i2]=Asc("#") Then
             Dim dec As Long, sign As Long
-            Dim temp2 As *Char
+            Dim temp2 As *StrChar
 
             Dim length_num As Long, length_buf As Long
@@ -332 +340 @@
 
                 If dec > 0 Then
-                    memcpy(VarPtr(buffer[i3]), temp2, SizeOf (Char) * length_num)
+                    memcpy(VarPtr(buffer[i3]), temp2, SizeOf (StrChar) * length_num)
                 Else
                     buffer[i3] = &H30
@@ -367 +375 @@
             'lstrcat(StrPtr(buffer)+i3,_System_UsingStrData[ParmNum])
             memcpy(VarPtr(buffer[i3 + lstrlen(VarPtr(buffer[i3]))]), _System_UsingStrData[ParmNum], _
-                SizeOf (Char) * lstrlen(_System_UsingStrData[ParmNum]))
+                SizeOf (StrChar) * lstrlen(_System_UsingStrData[ParmNum]))
             i3 += lstrlen(_System_UsingStrData[ParmNum])
         ElseIf UsingStr[i2]=Asc("&") Then
@@ -385 +393 @@
                     _System_FillChar(VarPtr(buffer[i3]), i4, &h20) 'Asc(" ")
                 End If
-                memcpy(VarPtr(buffer[i3]), _System_UsingStrData[ParmNum], SizeOf (Char) * i5)
+                memcpy(VarPtr(buffer[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
                 i3 += i4
             Else
@@ -423 +431 @@
     RecodeNumber--
 
-    SetFilePointer(_System_hFile(FileNumber),RecodeNumber*_System_FieldSize(FileNumber),NULL,FILE_BEGIN)
-    lpBuffer=ZeroString(_System_FieldSize(FileNumber))
-    ReadFile(_System_hFile(FileNumber),StrPtr(lpBuffer),_System_FieldSize(FileNumber),VarPtr(dwAccessByte),ByVal NULL)
+    SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
+    lpBuffer = ZeroString(_System_FieldSize(FileNumber))
+    ReadFile(_System_hFile(FileNumber), StrPtr(lpBuffer), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte),ByVal 0)
     If Not dwAccessByte=_System_FieldSize(FileNumber) Then
-        lpBuffer=Left$(lpBuffer,dwAccessByte)
+        lpBuffer = Left$(lpBuffer, dwAccessByte)
     End If
 End Macro
@@ -436 +444 @@
     RecodeNumber--
 
-    SetFilePointer(_System_hFile(FileNumber),RecodeNumber*_System_FieldSize(FileNumber),NULL,FILE_BEGIN)
-    WriteFile(_System_hFile(FileNumber),StrPtr(lpBuffer),_System_FieldSize(FileNumber),VarPtr(dwAccessByte),ByVal NULL)
+    SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
+    WriteFile(_System_hFile(FileNumber), StrPtr(lpBuffer),SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
 End Macro
 
 Macro CHDIR(path As String)
-    SetCurrentDirectory(path)
+    SetCurrentDirectory(ToTCStr(path))
 End Macro
 Macro MKDIR(path As String)
-    CreateDirectory(path, 0)
+    CreateDirectory(ToTCStr(path), 0)
 End Macro
 Macro KILL(path As String)
-    DeleteFile(path)
+    DeleteFile(ToTCStr(path))
 End Macro
 

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
 

Include/basic/function.sbp

@@ -344 +344 @@
 '------------
 
-Function Asc(buf As *Char) As Char
+Function Asc(buf As *StrChar) As StrChar
     Asc = buf[0]
 End Function
 
-Function Chr$(code As Char) As String
+Function Chr$(code As StrChar) As String
     Chr$ = ZeroString(1)
     Chr$[0] = code
 End Function
 
-#ifdef UNICODE
+#ifndef __STRING_IS_NOT_UNICODE
 Function AscW(s As *WCHAR) As UCSCHAR
     If s.Length = 0 Then
@@ -487 +487 @@
 
     Mid$=ZeroString(ReadLength)
-    memcpy(StrPtr(Mid$), VarPtr(buf[StartPos]), SizeOf (Char) * ReadLength)
+    memcpy(StrPtr(Mid$), VarPtr(buf.Chars[StartPos]), SizeOf (Char) * ReadLength)
 End Function
 
@@ -515 +515 @@
     If i>length Then
         Right$=ZeroString(length)
-        memcpy(StrPtr(Right$), VarPtr(buf[i-length]), SizeOf (Char) * length)
+        memcpy(StrPtr(Right$), VarPtr(buf.Chars[i-length]), SizeOf (Char) * length)
     Else
         Right$=buf
@@ -691 +691 @@
     Return MakeStr(buffer)
 End Function
-Function Str$(value As LONG_PTR) As String
+Function Str$(value As Int64) As String
     Dim temp[255] As Char
-#ifdef _WIN64
     _sntprintf(temp, Len (temp) \ SizeOf (Char), "%I64d", value)
-#else
-    _sntprintf(temp, Len (temp) \ SizeOf (Char), "%d", value)
-#endif
     Str$ = temp
 End Function
@@ -881 +877 @@
 
 Function Lof(FileNum As Long) As Long
-    Lof=GetFileSize(_System_hFile(FileNum-1),NULL)
+    Lof = GetFileSize(_System_hFile(FileNum-1), 0)
 End Function
 
@@ -1059 +1055 @@
 End Function
 
+'--------
+' 文字列関数その2
+'--------
 Function _System_IsSurrogatePair(wcHigh As WCHAR, wcLow As WCHAR) As Boolean
     If &hD800 <= wcHigh And wcHigh < &hDC00 Then
@@ -1068 +1067 @@
 End Function
 
-Function _System_IsDoubleUnitChar(lead As Char, trail As Char) As Boolean
-#ifdef UNICODE
+Function _System_IsDoubleUnitChar(lead As WCHAR, trail As WCHAR) As Boolean
     Return _System_IsSurrogatePair(lead, trail)
-#else
+End Function
+
+Function _System_IsDoubleUnitChar(lead As SByte, trail As SByte) As Boolean
     Return IsDBCSLeadByte(lead) <> FALSE
-#endif
-End Function
-
-Sub _System_FillChar(p As *Char, n As SIZE_T, c As Char)
+End Function
+
+Sub _System_FillChar(p As PWSTR, n As SIZE_T, c As WCHAR)
     Dim i As SIZE_T
     For i = 0 To ELM(n)
@@ -1083 +1082 @@
 End Sub
 
-Function _System_ASCII_IsUpper(c As Char) As Boolean
+Sub _System_FillChar(p As PSTR, n As SIZE_T, c As SByte)
+    Dim i As SIZE_T
+    For i = 0 To ELM(n)
+        p[i] = c
+    Next
+End Sub
+
+Function _System_ASCII_IsUpper(c As WCHAR) As Boolean
     Return c As DWord - &h41 < 26 ' &h41 = Asc("A")
 End Function
 
+Function _System_ASCII_IsUpper(c As SByte) As Boolean
+    Return _System_ASCII_IsUpper(c As Byte As WCHAR)
+End Function
+
+Function _System_ASCII_IsLower(c As WCHAR) As Boolean
+    Return c As DWord - &h61 < 26 ' &h61 = Asc("a")
+End Function
+
 Function _System_ASCII_IsLower(c As Char) As Boolean
-    Return c As DWord - &h61 < 26 ' &h61 = Asc("a")
-End Function
-
-Function _System_ASCII_ToLower(c As Char) As Char
+    Return _System_ASCII_IsLower(c As Byte As WCHAR)
+End Function
+
+Function _System_ASCII_ToLower(c As WCHAR) As WCHAR
     If _System_ASCII_IsUpper(c) Then
         Return c Or &h20
@@ -1097 +1111 @@
         Return c
     End If
+End Function
+
+Function _System_ASCII_ToLower(c As SByte) As SByte
+    Return _System_ASCII_ToLower(c As Byte As WCHAR) As Byte As SByte
 End Function
 
@@ -1107 +1125 @@
 End Function
 
-Function _System_WideCharToMultiByte(s As PCWSTR) As PSTR
-    Return _System_WideCharToMultiByte(s, lstrlenW(s) + 1, 0)
-End Function
-
-Function _System_WideCharToMultiByte(s As PCWSTR, size As Long) As PSTR
-    Return _System_WideCharToMultiByte(s, size, 0)
-End Function
-
-Function _System_WideCharToMultiByte(ws As PCWSTR, size As Long, flag As DWord) As PSTR
-    Dim sizeMBS = WideCharToMultiByte(CP_THREAD_ACP, flag, s, size, 0, 0, 0, 0)
-    Dim mbs = _System_malloc(sizeMBS) As PSTR
-    WideCharToMultiByte(CP_THREAD_ACP, flag, s, size, mbs, sizeMBS, 0, 0)
-    Return mbs
-End Function
-
-Function _System_MultiByteToWideChar(s As PCSTR) As PWSTR
-    Return _System_MultiByteToWideChar(s, lstrlenA(s) + 1, 0)
-End Function
-
-Function _System_MultiByteToWideChar(s As PCSTR, size As Long) As PWSTR
-    Return _System_MultiByteToWideChar(s, size, 0)
-End Function
-
-Function _System_MultiByteToWideChar(s As PCSTR, size As Long, flag As DWord) As PWSTR
-    Dim sizeMBS = MultiByteToWideChar(CP_THREAD_ACP, flag, s, size, 0, 0)
-    Dim mbs = _System_malloc(SizeOf (WCHAR) * sizeMBS) As PWSTR
-    MultiByteToWideChar(CP_THREAD_ACP, flag, s, size, mbs, sizeMBS)
-    Return mbs
-End Function
+Function _System_ASCII_ToUpper(c As SByte) As SByte
+    Return _System_ASCII_ToUpper(c As Byte As WCHAR) As Byte As SByte
+End Function
+
 
 Function _System_StrCmp(s1 As PCSTR, s2 As PCSTR) As Long
@@ -1158 +1151 @@
     _System_StrCmp = s1[i] - s2[i]
 End Function
+
 #endif '_INC_FUNCTION

Include/basic/prompt.sbp

@@ -8 +8 @@
 #require <api_imm.sbp>
 #require <Classes/System/Math.ab>
+
+Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCSTR, cb As Long, ByRef Size As SIZE) As Long
+    _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32A(hdc, psz, cb, Size)
+End Function
+
+Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCWSTR, cb As Long, ByRef Size As SIZE) As Long
+    _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32W(hdc, psz, cb, Size)
+End Function
+
+Function _PromptSys_TextOut(hdc As HDC, x As Long, y As Long, psz As PCSTR, cb As Long) As Long
+    _PromptSys_TextOut = TextOutA(hdc, x, y, psz, cb)
+End Function
+
+Function _PromptSys_TextOut(hdc As HDC, x As Long, y As Long, psz As PCWSTR, cb As Long) As Long
+    _PromptSys_TextOut = TextOutW(hdc, x, y, psz, cb)
+End Function
+
+Function _PromptSys_ImmGetCompositionString(himc As HIMC, index As DWord, pBuf As PSTR, bufLen As DWord) As Long
+    _PromptSys_ImmGetCompositionString = ImmGetCompositionStringA(himc, index, pBuf, bufLen)
+End Function
+
+Function _PromptSys_ImmGetCompositionString(himc As HIMC, index As DWord, pBuf As PWSTR, bufLen As DWord) As Long
+    _PromptSys_ImmGetCompositionString = ImmGetCompositionStringW(himc, index, pBuf, bufLen)
+End Function
 
 Dim _PromptSys_hWnd As HWND
@@ -22 +46 @@
 Type _PromptSys_LineInformation
     Length As Long
-    Text As *Char
+    Text As *StrChar
     CharInfo As *_PromptSys_CharacterInformation
 End Type
@@ -29 +53 @@
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
-Dim _PromptSys_InputStr[255] As Char
+Dim _PromptSys_InputStr[255] As StrChar
 Dim _PromptSys_InputLen As Long
 Dim _PromptSys_KeyChar As Byte
@@ -38 +62 @@
 Dim _PromptSys_SectionOfBufferAccess As CRITICAL_SECTION
 
+Dim _System_OSVersionInfo As OSVERSIONINFO
 
 _PromptSys_InputLen = -1
@@ -48 +73 @@
 
 _PromptSys_hInitFinish = CreateEvent(0, FALSE, FALSE, 0)
-CreateThread(0, 0, AddressOf(PromptMain) As LPTHREAD_START_ROUTINE, 0, 0, _PromptSys_dwThreadID)
+Dim _PromptSys_hThread As HANDLE
+_PromptSys_hThread = CreateThread(0, 0, AddressOf(PromptMain) As LPTHREAD_START_ROUTINE, 0, 0, _PromptSys_dwThreadID)
+If _PromptSys_hThread = 0 Then
+    Debug
+    ExitProcess(1)
+End If
 WaitForSingleObject(_PromptSys_hInitFinish, INFINITE)
 
@@ -68 +98 @@
         Next
         _PromptSys_TextLine[100].Length = 0
-        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (Char) * 255)
+        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (StrChar) * 255)
         _PromptSys_TextLine[100].CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         _PromptSys_CurPos.y--
@@ -83 +113 @@
             Dim sz As SIZE
             i3 = _PromptSys_TextLine[i].Length
-            GetTextExtentPoint32(hDC, _PromptSys_TextLine[i].Text, i3, sz)
+            _PromptSys_GetTextExtentPoint32(hDC, _PromptSys_TextLine[i].Text, i3, sz)
 
             BitBlt(hDC,_
@@ -106 +136 @@
                 End If
                 With _PromptSys_FontSize
-                    TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]), tempLen)
+                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *StrChar, tempLen)
                 End With
                 i2 += tempLen
@@ -127 +157 @@
         Dim doubleUnitChar = False As Boolean
         'Addition
-        Dim i2 = 0 As Long, i3 As Long' : Debug
+        Dim i2 = 0 As Long, i3 As Long
         For i2 = 0 To ELM(bufLen)
             If buf[i2] = &h0d Then 'CR \r
@@ -158 +188 @@
                             charLen = 1
                         EndIf
-                        GetTextExtentPoint32(hdc, VarPtr(buf.Chars[i2]), charLen, sz)
+                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(buf.Chars[i2]) As *StrChar, charLen, sz)
                         currentLineCharInfo[.x + 1].StartPos = currentLineCharInfo[.x].StartPos + sz.cx
 /*
@@ -305 +335 @@
             TempStr = Ex"\r\n"
         ElseIf wParam = &H16 Then
+/*
             'Paste Command(Use Clippboard)
             OpenClipboard(hwnd)
@@ -324 +355 @@
             GlobalUnlock(hGlobal)
             CloseClipboard()
+*/
         Else
             _PromptSys_InputStr[_PromptSys_InputLen] = wParam As Byte
@@ -337 +369 @@
     End If
 End Sub
+
+Function _PromptWnd_GetCompositionStringW(himc As HIMC, ByRef rpsz As PWSTR) As Long
+    Dim size = ImmGetCompositionStringW(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
+    rpsz = _System_malloc(size) As PTSTR
+    If rpsz = 0 Then
+        'Debug
+        Return 0
+    End If
+    Return ImmGetCompositionStringW(himc, GCS_RESULTSTR, rpsz, size)
+End Function
+
+Function _PromptWnd_GetCompositionStringA(himc As HIMC, ByRef rpsz As PSTR) As Long
+    Dim size = ImmGetCompositionStringA(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
+    rpsz = _System_malloc(size) As PTSTR
+    If rpsz = 0 Then
+        'Debug
+        Return 0
+    End If
+    Return ImmGetCompositionStringA(himc, GCS_RESULTSTR, rpsz, size)
+End Function
 
 Function _PromptWnd_OnImeCompostion(hwnd As HWND, wp As WPARAM, lp As LPARAM) As LRESULT
@@ -345 +397 @@
             Return 0
         End If
-        Dim size = ImmGetCompositionString(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
-        Dim str = _System_malloc(size) As PTSTR
-        If str = 0 Then
-            'Debug
-            Return 0
-        End If
-        ImmGetCompositionString(himc, GCS_RESULTSTR, str, size)
+        Dim tempStr As String
+        Dim str As *StrChar
+#ifdef __STIRNG_IS_NOT_UNICODE
+        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
+        tempStr.Assign(str, size)
+#else
+        With _System_OSVersionInfo
+            ' GetCompositionStringW is not implimented in Windows 95 
+            If .dwMajorVersion = 4 And .dwMinorVersion = 0 And .dwPlatformId = VER_PLATFORM_WIN32_WINDOWS Then
+                Dim strA As PCSTR
+                Dim sizeA = _PromptWnd_GetCompositionStringA(himc, strA)
+                tempStr.AssignFromMultiByte(strA, sizeA)
+            Else
+                Dim size = _PromptWnd_GetCompositionStringW(himc, str)
+                tempStr.Assign(str, size \ SizeOf (WCHAR))
+            End If
+        End With
+#endif
         ImmReleaseContext(hwnd, himc)
-
-        memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), str, size)
-        _PromptSys_InputLen += size \ SizeOf (Char)
-
-        Dim tempStr As String(str, size \ SizeOf (Char))
         _System_free(str)
 
-        SendMessage(hwnd, WM_KILLFOCUS, 0, 0)
+        memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), tempStr.Chars, SizeOf (StrChar) * tempStr.Length)
+        _PromptSys_InputLen += tempStr.Length
+
+        SendMessage(hwnd, WM_KILLFOCUS, 0, 0) : Debug
         PRINT_ToPrompt(tempStr)
         SendMessage(hwnd, WM_SETFOCUS, 0, 0)
@@ -371 +432 @@
 
 Function PromptMain(dwData As Long) As Long
+    GetVersionEx(_System_OSVersionInfo)
+
     Dim i As Long
-
     'Allocate
     For i = 0 To 100
         With _PromptSys_TextLine[i]
             .Length = 0
-            .Text = _System_calloc(SizeOf (Char) * 255)
+            .Text = _System_calloc(SizeOf (StrChar) * 255)
             .CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         End With
@@ -515 +577 @@
 '----------------------------------------------
 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