Changeset 121

Timestamp:

Feb 25, 2007, 12:56:09 AM (18 years ago)

Author:

イグトランス (egtra)

Message:

続#51対応

Location:

Include

Files:

• Classes/System/String.ab (modified) (16 diffs)
• api_gdi.sbp (modified) (1 diff)
• api_system.sbp (modified) (4 diffs)
• basic.sbp (modified) (2 diffs)
• basic/command.sbp (modified) (1 diff)
• basic/function.sbp (modified) (13 diffs)
• basic/prompt.sbp (modified) (22 diffs)

Include/Classes/System/String.ab

@@ -5 +5 @@
 
     Sub String()
-        Chars = _System_calloc(1)
+        Chars = _System_calloc(SizeOf (Char) * 1)
         m_Length = 0
     End Sub
@@ -19 +19 @@
     End Sub
 
-/*
     Sub String(length As Long)
+        String()
         ReSize(length)
     End Sub
-*/
+
     Sub String(initChar As Char, length As Long)
         ReSize(length, initChar)
@@ -29 +29 @@
 
     Sub ~String()
-        _System_free(Chars)
+'       _System_free(Chars)
         Chars = 0
 #ifdef _DEBUG
@@ -36 +36 @@
     End Sub
 
-    Function Length() As Long
+    Const Function Length() As Long
         Return m_Length
     End Function
@@ -52 +52 @@
     End Sub
 
-    Function Operator[] (n As Long) As Char
+    Const Function Operator[] (n As Long) As Char
         Return Chars[n]
     End Function
@@ -60 +60 @@
     End Sub
 
-    Function Operator+ (lpszText As *Char) As String
+    Const Function Operator + (lpszText As *Char) As String
         Return Concat(lpszText, lstrlen(lpszText))
     End Function
 
-    Function Operator+ (ByRef objString As String) As String
+    Const Function Operator + (ByRef objString As String) As String
         Return Concat(objString, objString.m_Length)
     End Function
 
-    Function Operator& (lpszText As *Char) As String
-        Dim tempString As String
-        tempString=This+lpszText
+    Const Function Operator & (lpszText As *Char) As String
+        Dim tempString = This + lpszText
         Return tempString
     End Function
 
-    Function Operator& (ByRef objString As String) As String
-        Dim tempString As String
-        tempString=This+objString
+    Const Function Operator & (ByRef objString As String) As String
+        Dim tempString = This + objString
         Return tempString
     End Function
@@ -178 +176 @@
             oldLength = m_Length
             If AllocStringBuffer(allocLength) <> 0 Then
-                ZeroMemory(Chars + oldLength, m_Length - oldLength + 1)
+                ZeroMemory(VarPtr(Chars[oldLength]), SizeOf (Char) * (m_Length - oldLength + 1))
             End If
         Else
@@ -193 +191 @@
             oldLength = m_Length
             If AllocStringBuffer(allocLength) <> 0 Then
-                FillMemory(Chars + oldLength, m_Length - oldLength, c)
+                Dim p = VarPtr(Chars[oldLength]) As *Char
+                Dim fillLen = m_Length - oldLength
+                Dim i As Long
+                For i = 0 To ELM(fillLen)
+                    p[i] = c
+                Next
             End If
         Else
@@ -201 +204 @@
     End Sub
 
-    Sub Assign(lpszText As *Char, textLength As Long)
-        If lpszText = Chars Then Exit Sub
+    Sub Assign(text As *Char, textLength As Long)
+        If text = Chars Then Exit Sub
         If AllocStringBuffer(textLength) <> 0 Then
-            memcpy(Chars, lpszText, textLength)
+            memcpy(Chars, text, SizeOf (Char) * textLength)
             Chars[m_Length] = 0
         End If      
@@ -213 +216 @@
     End Sub
 
-    Sub Assign(lpszText As *Char)
-        If lpszText Then
-            Assign(lpszText, lstrlen(lpszText))
+    Sub Assign(text As *Char)
+        If text Then
+            Assign(text, lstrlen(text))
         Else
             'Chars=_System_realloc(Chars,1)
@@ -223 +226 @@
     End Sub
 
-    Sub Append(lpszText As *Char, textLength As Long)
+    Sub Append(text As *Char, textLength As Long)
         Dim prevLen As Long
         prevLen = m_Length
         If AllocStringBuffer(m_Length + textLength) <> 0 Then
-            memcpy(Chars + prevLen, lpszText, textLength)
+            memcpy(VarPtr(Chars[prevLen]), text, SizeOf (Char) * textLength)
             Chars[m_Length] = 0
         End If
@@ -244 +247 @@
         With tempString
             .AllocStringBuffer(This.m_Length + textLength)
-            memcpy(.Chars, This.Chars, This.m_Length)
-            memcpy(.Chars + This.m_Length, lpszText, textLength)
+            memcpy(.Chars, This.Chars, SizeOf (Char) * This.m_Length)
+            memcpy(VarPtr(.Chars[This.m_Length]), lpszText, SizeOf (Char) * textLength)
             .Chars[.m_Length] = 0
         End With
@@ -345 +348 @@
     End Function
 
-    Function Insert(startIndex As Long, lpszText As *Char) As Long
+    Function Insert(startIndex As Long, text As *Char) As Long
         Dim length As Long
-        length = lstrlen(lpszText)
+        length = lstrlen(text)
 
         If startIndex < 0 Or startIndex > m_Length Then Return -1
 
         Dim newChars As *Char
-        newChars = _System_malloc(length + m_Length + 1)
+        newChars = _System_malloc(SizeOf (Char) * (length + m_Length + 1))
         If newChars = 0 Then Return -1
 
-        memcpy(newChars, Chars, startIndex)
-        memcpy(newChars + startIndex, lpszText, length)
-        memcpy(newChars + startIndex + length, Chars + startIndex, m_Length - startIndex + 1)
+        memcpy(newChars, Chars, SizeOf (Char) * startIndex)
+        memcpy(VarPtr(newChars[startIndex]), text, SizeOf (Char) * length)
+        memcpy(VarPtr(newChars[startIndex + length]), VarPtr(Chars[startIndex]), SizeOf (Char) * (m_Length - startIndex + 1))
 
         _System_free(Chars)
@@ -375 +378 @@
         Dim temp As String
         temp.AllocStringBuffer(length)
-        memcpy(temp.Chars, VarPtr(Chars[startIndex]), length)
+        memcpy(temp.Chars, VarPtr(Chars[startIndex]), SizeOf (Char) * length)
         Chars[m_Length] = 0
         Return temp
@@ -392 +395 @@
 
         Dim newChars As *Char
-        newChars = _System_malloc(m_Length - count + 1)
+        newChars = _System_malloc(SizeOf (Char) * (m_Length - count + 1))
         If newChars = 0 Then Return -1
 
-        memcpy(newChars, Chars, startIndex)
-        memcpy(newChars + startIndex, Chars + startIndex + count, m_Length - startIndex - count)
+        memcpy(newChars, Chars, SizeOf (Char) * startIndex)
+        memcpy(VarPtr(newChars[startIndex]), VarPtr(Chars[startIndex + count]), SizeOf (Char) * (m_Length - startIndex - count))
         newChars[m_Length - count] = 0
 
@@ -479 +482 @@
             Return 0
         ElseIf textLength > m_Length Then
-            AllocStringBuffer = _System_realloc(Chars, textLength + 1)
+            AllocStringBuffer = _System_realloc(Chars, SizeOf(Char) * (textLength + 1))
             If AllocStringBuffer <> 0 Then
                 m_Length = textLength

Include/api_gdi.sbp

@@ -542 +542 @@
 
 Declare Function ExtSelectClipRgn Lib "gdi32" (hdc As HDC, hRgn As HRGN, fnMode As Long) As Long
+Declare Function ExtTextOutA Lib "gdi32" (hdc As HDC, x As Long, y As Long, fuOptions As DWord, ByRef rc As RECT, lpString As PCSTR, cbCount As Long, pDx As *Long) As Long
+Declare Function ExtTextOutW Lib "gdi32" (hdc As HDC, x As Long, y As Long, fuOptions As DWord, ByRef rc As RECT, lpString As PCWSTR, cbCount As Long, pDx As *Long) As Long
+#ifdef UNICODE
+Declare Function ExtTextOut Lib "gdi32" Alias "ExtTextOutW" (hdc As HDC, x As Long, y As Long, fuOptions As DWord, ByRef rc As RECT, lpString As PCTSTR, cbCount As Long, pDx As *Long) As Long
+#else
+Declare Function ExtTextOut Lib "gdi32" Alias "ExtTextOutA" (hdc As HDC, x As Long, y As Long, fuOptions As DWord, ByRef rc As RECT, lpString As PCTSTR, cbCount As Long, pDx As *Long) As Long
+#endif
 Declare Function FillPath Lib "gdi32" (hdc As HDC) As Long
 Declare Function FillRgn Lib "gdi32" (hdc As HDC, hRgn As HRGN, hBrush As HBRUSH) As Long

Include/api_system.sbp

@@ -326 +326 @@
 Declare Function InterlockedDecrement Lib "kernel32" (ByRef lpAddend As Long) As Long
 Declare Function InterlockedExchange Lib "kernel32" (ByRef Target As Long, Value As Long) As Long
-Declare Function InterlockedCompareExchange Lib "kernel32" (Destination As *VoidPtr, Exchange As VoidPtr, Comperand As VoidPtr) As VoidPtr
+Declare Function InterlockedCompareExchange Lib "kernel32" (ByRef Destination As Long, Exchange As Long, Comperand As Long) As Long
 Declare Function InterlockedExchangeAdd Lib "kernel32" (ByRef Addend As Long, Value As Long) As Long
 #ifdef _WIN64
-Declare Function InterlockedCompareExchangePointer Lib "kernel32" (Destination As *VoidPtr, Exchange As VoidPtr, Comperand As VoidPtr) As VoidPtr
+Declare Function InterlockedCompareExchangePointer Lib "kernel32" (ByRef Destination As VoidPtr, Exchange As VoidPtr, Comperand As VoidPtr) As VoidPtr
+Declare Function InterlockedExchangePointer Lib "kernel32" (ByRef Target As VoidPtr, Value As VoidPtr) As VoidPtr
 #else
+Declare Function InterlockedCompareExchangePointer Lib "kernel32" Alias "InterlockedCompareExchange" (ByRef Destination As VoidPtr, Exchange As VoidPtr, Comperand As VoidPtr) As VoidPtr
 Declare Function InterlockedExchangePointer Lib "kernel32" Alias "InterlockedExchange" (ByRef Target As VoidPtr, Value As VoidPtr) As VoidPtr
 #endif
@@ -737 +739 @@
 Declare Sub InitializeCriticalSection Lib "kernel32" (ByRef lpCriticalSection As CRITICAL_SECTION)
 Declare Function IsBadReadPtr Lib "kernel32" (lp As VoidPtr, ucb As ULONG_PTR) As BOOL
-Declare Function IsBadWritePtr Lib "kernel32" (lp As VoidPtr, ucb As DWord) As BOOL
+Declare Function IsBadWritePtr Lib "kernel32" (lp As VoidPtr, ucb As ULONG_PTR) As BOOL
 Declare Function IsDBCSLeadByte Lib "kernel32" (TestChar As Byte) As BOOL
 
@@ -775 +777 @@
 Declare Function LoadLibraryEx Lib "kernel32" Alias "LoadLibraryExA" (pLibFileName As PCSTR, hFile As HANDLE, dwFlags As DWord) As HINSTANCE
 
-Declare Function lstrcat Lib "kernel32" Alias "lstrcatA" (lpString1 As BytePtr, lpString2 As BytePtr) As BytePtr
-Declare Function lstrcmp Lib "kernel32" Alias "lstrcmpA" (lpString1 As BytePtr, lpString2 As BytePtr) As Long
-Declare Function lstrcmpi Lib "kernel32" Alias "lstrcmpiA" (lpString1 As BytePtr, lpString2 As BytePtr) As Long
-Declare Function lstrcpy Lib "kernel32" Alias "lstrcpyA" (lpString1 As BytePtr, lpString2 As BytePtr) As BytePtr
-Declare Function lstrlenA Lib "kernel32" (lpString As LPSTR) As Long
-Declare Function lstrlenW Lib "kernel32" (lpString As LPWSTR) As Long
+Declare Function lstrcat Lib "kernel32" Alias "lstrcatA" (pString1 As PSTR, pString2 As PCSTR) As PSTR
+Declare Function lstrcmp Lib "kernel32" Alias "lstrcmpA" (pString1 As PCSTR, pString2 As PCSTR) As Long
+Declare Function lstrcmpi Lib "kernel32" Alias "lstrcmpiA" (pString1 As PCSTR, pString2 As PCSTR) As Long
+Declare Function lstrcpy Lib "kernel32" Alias "lstrcpyA" (pString1 As PSTR, pString2 As PCSTR) As PSTR
+Declare Function lstrlenA Lib "kernel32" (pString As PCSTR) As Long
+Declare Function lstrlenW Lib "kernel32" (pString As PCWSTR) As Long
 #ifdef UNICODE
-Declare Function lstrlen Lib "kernel32" Alias "lstrlenA" (lpString As *Char) As Long
+Declare Function lstrlen Lib "kernel32" Alias "lstrlenW" (lpString As PCTSTR) As Long
 #else
-Declare Function lstrlen Lib "kernel32" Alias "lstrlenA" (lpString As *Char) As Long
+Declare Function lstrlen Lib "kernel32" Alias "lstrlenA" (lpString As PCTSTR) As Long
 #endif
 Declare Sub memcpy Lib "kernel32" Alias "RtlMoveMemory" (pDest As VoidPtr, pSrc As VoidPtr, length As SIZE_T)
@@ -804 +806 @@
 Const CP_UTF8       = 65001  'UTF-8 translation
 
-Declare Function MultiByteToWideChar Lib "kernel32" (CodePage As DWord, dwFlags As DWord, lpMultiByteStr As BytePtr, cchMultiByte As Long, lpWideCharStr As WordPtr, cchWideChar As Long) As Long
+Declare Function MultiByteToWideChar Lib "kernel32" (CodePage As DWord, dwFlags As DWord, pMultiByteStr As PCSTR, cchMultiByte As Long, pWideCharStr As PWSTR, cchWideChar As Long) As Long
 
 Declare Function OpenEvent Lib "kernel32" Alias "OpenEventA" (dwDesiredAccess As DWord, bInheritHandle As BOOL, pName As PCSTR) As HANDLE

Include/basic.sbp

@@ -79 +79 @@
 End Function
 
+Sub SetChar(p As *Char, c As Char)
+    p[0] = c
+End Sub
+
+Function GetChar(p As *Char) As Char
+    GetChar = p[0]
+End Function
+
 TypeDef SIZE_T = ULONG_PTR
 TypeDef SSIZE_T = LONG_PTR
@@ -87 +95 @@
 ' Specify elements number
 '--------------------------
-Const ELM(n) = n - 1
+Const ELM(n) = (n - 1)
 
 #include <windows.sbp>

Include/basic/command.sbp

@@ -212 +212 @@
 
         'データを変数に格納
-        Select Case _System_InputDataType[i]
-            Case _System_Type_Double
-                SetDouble(_System_InputDataPtr[i],Val(buffer))
-            Case _System_Type_Single
-                SetSingle(_System_InputDataPtr[i],Val(buffer))
-            Case _System_Type_Int64,_System_Type_QWord
-                SetQWord(_System_InputDataPtr[i],Val(buffer))
-            Case _System_Type_Long,_System_Type_DWord
-                SetDWord(_System_InputDataPtr[i],Val(buffer))
-            Case _System_Type_Integer,_System_Type_Word
-                SetWord(_System_InputDataPtr[i],Val(buffer))
-            Case _System_Type_Char,_System_Type_Byte
-                SetByte(_System_InputDataPtr[i],Val(buffer))
-
-            Case _System_Type_String
-                Dim pTempStr As *String
-                pTempStr=_System_InputDataPtr[i] As *String
-
-                pTempStr->Length=i3
-                pTempStr->Chars=_System_realloc(pTempStr->Chars,pTempStr->Length+1)
-                memcpy(pTempStr->Chars,buffer.Chars,pTempStr->Length)
-                pTempStr->Chars[pTempStr->Length]=0
-        End Select
-
-        i=i+1
+        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], buffer, i3)
+
+
+        i++
         If _System_InputDataPtr[i]=0 Then Exit While
     Wend
 End Sub
+
+Function _System_Input_SetArgument(arg As VoidPtr, dataType As DWord, ByRef buf As String, bufLen As Long)
+    Select Case dataType
+        Case _System_Type_Double
+            SetDouble(arg, Val(buf))
+        Case _System_Type_Single
+            SetSingle(arg, Val(buf))
+        Case _System_Type_Int64,_System_Type_QWord
+            SetQWord(arg, Val(buf))
+        Case _System_Type_Long,_System_Type_DWord
+            SetDWord(arg, Val(buf))
+        Case _System_Type_Integer,_System_Type_Word
+            SetWord(arg, Val(buf))
+        Case _System_Type_SByte,_System_Type_Byte
+            SetByte(arg, Val(buf))
+        Case _System_Type_Char
+            SetChar(arg, buf[0])
+        Case _System_Type_String
+            Dim pTempStr As *String
+            pTempStr = arg As *String
+            pTempStr->ReSize(bufLen)
+            memcpy(pTempStr->Chars, buf.Chars, SizeOf (Char) * pTempStr->Length)
+            pTempStr->Chars[pTempStr->Length] = 0
+    End Select
+End Function
 
 Sub PRINT_ToFile(FileNumber As Long, buf As String)

Include/basic/function.sbp

@@ -290 +290 @@
 End Function
 
-Function IsNaN(ByVal x As Double) As BOOL
+Function IsNaN(ByVal x As Double) As Boolean
     Dim p As *DWord
     p = VarPtr(x) As *DWord
@@ -296 +296 @@
     If (p[1] And &H7FF00000) = &H7FF00000 Then
         If (p[0] <> 0) Or ((p[1] And &HFFFFF) <> 0) Then
-            IsNaN = TRUE
+            IsNaN = True
         End If
     End If
@@ -303 +303 @@
 End Function
 
-Function IsInf(x As Double) As BOOL
+Function IsInf(x As Double) As Boolean
     Dim p As *DWord, nan As Double
     p = VarPtr(x) As *DWord
@@ -311 +311 @@
 End Function
 
-Function IsNaNOrInf(x As Double) As BOOL
+Function IsNaNOrInf(x As Double) As Boolean
     IsNaNOrInf = IsFinite(x)
 End Function
 
-Function IsFinite(x As Double) As BOOL
+Function IsFinite(x As Double) As Boolean
     Dim p As *DWord, nan As Double
     p = VarPtr(x) As *DWord
@@ -322 +322 @@
     p[0] = 0
     nan = _System_GetInf(/*x,*/ FALSE)
-    IsNaNOrInf = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
+    IsFinite = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
 End Function
 
@@ -349 +349 @@
 
 Function Chr$(code As Char) As String
-    Chr$=ZeroString(1)
-    Chr$[0]=code
-End Function
+    Chr$ = ZeroString(1)
+    Chr$[0] = code
+End Function
+
+#ifdef UNICODE
+Function AscW(s As String) As UCSCHAR
+    If s.Length = 0 Then
+        AscW = 0
+    Else
+        If _System_IsSurrogatePair(s[0], s[1]) Then
+            AscW = ((s[0] And &h3FF) As DWord << 10) Or (s[1] And &h3FF)
+        Else
+            AscW = s[0]
+        End If
+    End If
+End Function
+
+Function ChrW(c As UCSCHAR) As String
+    If c <= &hFFFF Then
+        ChrW.ReSize(1)
+        ChrW[0] = c As WCHAR
+    ElseIf c < &h10FFFF Then
+        ChrW.ReSize(2)
+        ChrW[0] = &hD800 Or (c >> 10)
+        ChrW[1] = &hDC00 Or (c And &h3FF)
+    Else
+        ' OutOfRangeException
+    End If
+End Function
+#endif
 
 Function Date$() As String
     Dim st As SYSTEMTIME
-
     GetLocalTime(st)
 
@@ -378 +404 @@
 End Function
 
-Function Hex$(num As DWord) As String
-    Dim length As Long
-    Hex$=ZeroString(8)
-    length=wsprintf(Hex$, "%X", num)
-    Hex$=Left$(Hex$,length)
-End Function
-
-Function Hex$(num As QWord) As String
-    Dim length As Long
-    Hex$=ZeroString(16)
-    length=wsprintf(Hex$, "%X%X", num)
-    Hex$=Left$(Hex$,length)
+Dim _System_HexadecimalTable[&h10] = [&h30, &h31, &h32, &h33, &h34, &h35, &h36, &h37, &h38, &h39, &h41, &h42, &h43, &h44, &h45, &h46] As Byte
+
+Function Hex$(x As DWord) As String
+    Dim i = 0
+    Hex$ = ZeroString(8)
+    While (x And &hf0000000) = 0
+        x <<= 4
+    Wend
+    While x <> 0
+        Hex$[i] = _System_HexadecimalTable[(x And &hf0000000) >> 28] As Char
+        x <<= 4
+        i++
+    Wend
+    Hex$.ReSize(i)
+End Function
+
+Function Hex$(x As QWord) As String
+    Hex$ = Hex$((x >> 32) As DWord) + Hex$((x And &hffffffff) As DWord)
 End Function
 
@@ -429 +461 @@
 
 Function Left$(buf As String, length As Long) As String
-    Left$=ZeroString(length)
-    memcpy(
-        StrPtr(Left$),
-        StrPtr(buf),
-        length)
+    Left$ = ZeroString(length)
+    memcpy(StrPtr(Left$), StrPtr(buf), SizeOf (Char) * length)
 End Function
 
@@ -458 +487 @@
 
     Mid$=ZeroString(ReadLength)
-    memcpy(StrPtr(Mid$),StrPtr(buf)+StartPos,ReadLength)
+    memcpy(StrPtr(Mid$), VarPtr(buf[StartPos]), SizeOf (Char) * ReadLength)
 End Function
 
@@ -486 +515 @@
     If i>length Then
         Right$=ZeroString(length)
-        memcpy(StrPtr(Right$),StrPtr(buf)+i-length,length)
+        memcpy(StrPtr(Right$), VarPtr(buf[i-length]), SizeOf (Char) * length)
     Else
         Right$=buf
@@ -665 +694 @@
 Function Str$(value As LONG_PTR) As String
     Dim temp[255] As Char
-    wsprintf(temp,"%d",value)
-    Str$=MakeStr(temp)
+#ifdef _WIN64
+    _sntprintf(temp, Len (temp) / SizeOf (Char), "%I64d", value)
+#else
+    _sntprintf(temp, Len (temp) / SizeOf (Char), "%d", value)
+#endif
+    Str$ = temp
 End Function
 
@@ -681 +714 @@
     Dim i As Long
     For i=0 To num-1
-        memcpy(StrPtr(String$)+i*length,StrPtr(buf),length)
+        memcpy(VarPtr(String$[i*length]),StrPtr(buf),SizeOf (Char) * length)
     Next
 End Function
@@ -727 +760 @@
 
     If buf[0]=Asc("&") Then
-        temporary=ZeroString(lstrlen(buf))
-        lstrcpy(temporary,buf)
+        temporary=buf
         TempPtr=StrPtr(temporary)
         CharUpper(TempPtr)

Include/basic/prompt.sbp

@@ -13 +13 @@
 
 'text
-Dim _PromptSys_LogFont As LOGFONT
+Dim _PromptSys_LogFont As LOGFONTA 'LOGFONT
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
@@ -21 +21 @@
 Dim _PromptSys_CurPos As POINTAPI
 Dim _PromptSys_Buffer[100] As *Char
-Dim _PromptSys_TextColor[100] As DWordPtr
-Dim _PromptSys_BackColor[100] As DWordPtr
-Dim _PromptSys_NowTextColor As DWord
-Dim _PromptSys_NowBackColor As DWord
+Dim _PromptSys_TextColor[100] As *COLORREF
+Dim _PromptSys_BackColor[100] As *COLORREF
+Dim _PromptSys_NowTextColor As COLORREF
+Dim _PromptSys_NowBackColor As COLORREF
 Dim _PromptSys_SectionOfBufferAccess As CRITICAL_SECTION
 
@@ -38 +38 @@
 
 _PromptSys_bInitFinish=0
-CreateThread(
+CreateThread( _
     0,
     0,
@@ -51 +51 @@
 Sub DrawPromptBuffer(hDC As HDC, StartLine As Long, EndLine As Long)
     Dim i As Long, i2 As Long, i3 As Long
-    Dim hOldFont As HFONT
     Dim sz As SIZE
     Dim temporary[2] As Char
 
-    hOldFont=SelectObject(hDC,_PromptSys_hFont)
+    Dim hOldFont = SelectObject(hDC, _PromptSys_hFont) As HFONT
 
     'Scroll
     Dim rc As RECT
-    GetClientRect(_PromptSys_hWnd,rc)
+    GetClientRect(_PromptSys_hWnd, rc)
     While (_PromptSys_CurPos.y+1)*_PromptSys_FontSize.cy>rc.bottom and _PromptSys_CurPos.y>0
-        HeapFree(_System_hProcessHeap,0,_PromptSys_Buffer[0])
-        HeapFree(_System_hProcessHeap,0,_PromptSys_TextColor[0])
-        HeapFree(_System_hProcessHeap,0,_PromptSys_BackColor[0])
+        _System_free(_PromptSys_Buffer[0])
+        _System_free(_PromptSys_TextColor[0])
+        _System_free(_PromptSys_BackColor[0])
         For i=0 To 100-1
-            _PromptSys_Buffer[i]=_PromptSys_Buffer[i+1]
-            _PromptSys_TextColor[i]=_PromptSys_TextColor[i+1]
-            _PromptSys_BackColor[i]=_PromptSys_BackColor[i+1]
+            _PromptSys_Buffer[i] = _PromptSys_Buffer[i+1]
+            _PromptSys_TextColor[i] = _PromptSys_TextColor[i+1]
+            _PromptSys_BackColor[i] = _PromptSys_BackColor[i+1]
         Next
-        _PromptSys_Buffer[100]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255)
-        _PromptSys_TextColor[100]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255*SizeOf(LONG_PTR))
-        _PromptSys_BackColor[100]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255*SizeOf(LONG_PTR))
+        _PromptSys_Buffer[100] = _System_calloc(SizeOf (Char) * 255)
+        _PromptSys_TextColor[100] = _System_calloc(SizeOf(COLORREF) * 255)
+        _PromptSys_BackColor[100] = _System_calloc(SizeOf(COLORREF) * 255)
 
         _PromptSys_CurPos.y--
@@ -82 +81 @@
     While i*_PromptSys_FontSize.cy<rc.bottom and i<=100
         If StartLine=-1 or (StartLine<=i and i<=EndLine) Then
-            GetTextExtentPoint32(hDC,_PromptSys_Buffer[i],lstrlen(_PromptSys_Buffer[i]),sz)
+            i3 = lstrlen(_PromptSys_Buffer[i])
+            GetTextExtentPoint32(hDC, _PromptSys_Buffer[i], i3, sz)
+
             BitBlt(hDC,_
                 sz.cx, i*_PromptSys_FontSize.cy, _
@@ -88 +89 @@
                 _PromptSys_hMemDC,sz.cx,i*_PromptSys_FontSize.cy,SRCCOPY)
 
-            i3=lstrlen(_PromptSys_Buffer[i])
-            For i2=0 To i3-1
-                SetTextColor(hDC,_PromptSys_TextColor[i][i2])
-                If _PromptSys_BackColor[i][i2]=-1 Then
-                    SetBkMode(hDC,TRANSPARENT)
+            For i2 = 0 To i3-1
+                SetTextColor(hDC, _PromptSys_TextColor[i][i2])
+                If _PromptSys_BackColor[i][i2] = -1 Then
+                    SetBkMode(hDC, TRANSPARENT)
                 Else
-                    SetBkMode(hDC,OPAQUE)
-                    SetBkColor(hDC,_PromptSys_BackColor[i][i2])
+                    SetBkMode(hDC, OPAQUE)
+                    SetBkColor(hDC, _PromptSys_BackColor[i][i2])
                 End If
 
+                Dim tempLen As Long
                 temporary[0]=_PromptSys_Buffer[i][i2]
 #ifdef UNICODE
@@ -104 +105 @@
                 If IsDBCSLeadByte(temporary[0]) Then
 #endif
-                    temporary[1]=_PromptSys_Buffer[i][i2+1]
-                    temporary[2]=0
+                    temporary[1] = _PromptSys_Buffer[i][i2+1]
+                    temporary[2] = 0
                     i2++
+                    tempLen = 2
                 Else
-                    temporary[1]=0
+                    temporary[1] = 0
+                    tempLen = 1
                 End If
-                TextOut(hDC,i2*_PromptSys_FontSize.cx,i*_PromptSys_FontSize.cy,_
-                    temporary,lstrlen(temporary))
+                With _PromptSys_FontSize
+                    TextOut(hDC, i2 * .cx, i * .cy, temporary, tempLen)
+                End With
             Next
         End If
@@ -118 +122 @@
     Wend
 
-    SelectObject(hDC,hOldFont)
+    SelectObject(hDC, hOldFont)
 End Sub
 
 Sub PRINT_ToPrompt(buf As String)
     EnterCriticalSection(_PromptSys_SectionOfBufferAccess)
-
-        Dim hDC As HDC
+    With _PromptSys_CurPos
         Dim StartLine As Long
-        Dim i2 As Long, i3 As Long
-
-        StartLine=_PromptSys_CurPos.y
-
+        StartLine = .y
         'Addition
-        i2=0
+        Dim i2 = 0 As Long, i3 As Long
         Do
-            If buf[i2]=9 Then   'tab
-                i3=8-(_PromptSys_CurPos.x mod 8)
-
-                FillMemory(_PromptSys_Buffer[_PromptSys_CurPos.y]+_PromptSys_CurPos.x,i3,Asc(" "))
-
+            If buf[i2] = 9 Then 'tab
+                i3 = 8 - (.x And 7) '(.x mod 8)
+                Dim j As Long
+                Dim p = VarPtr(_PromptSys_Buffer[.y][.x]) As *Char
+                ' FillMemory(_PromptSys_Buffer[.y]+.x, i3, Asc(" "))
+                For j = 0 To ELM(i3)
+                    p[j] = &h20 'Asc(" ")
+                Next
                 i2++
-                _PromptSys_CurPos.x += i3
+                .x += i3
                 Continue
             End If
 
-            If buf[i2]=13 and buf[i2+1]=10 Then '\r\n
+            If buf[i2] = 13 and buf[i2+1] = 10 Then '\r\n
                 i2 += 2
-                _PromptSys_CurPos.y++
-                _PromptSys_CurPos.x=0
+                .y++
+                .x = 0
                 Continue
             End If
 
-            If buf[i2]=0 Then Exit Do
-            _PromptSys_Buffer[_PromptSys_CurPos.y][_PromptSys_CurPos.x]=buf[i2]
-            _PromptSys_TextColor[_PromptSys_CurPos.y][_PromptSys_CurPos.x]=_PromptSys_NowTextColor
-            _PromptSys_BackColor[_PromptSys_CurPos.y][_PromptSys_CurPos.x]=_PromptSys_NowBackColor
+            If buf[i2] = 0 Then Exit Do
+            _PromptSys_Buffer[.y][.x] = buf[i2]
+            _PromptSys_TextColor[.y][.x] = _PromptSys_NowTextColor
+            _PromptSys_BackColor[.y][.x] = _PromptSys_NowBackColor
 
             i2++
-            _PromptSys_CurPos.x++
+            .x++
         Loop
-
         'Draw the text buffer added
-        hDC=GetDC(_PromptSys_hWnd)
-        DrawPromptBuffer(hDC,StartLine,_PromptSys_CurPos.y)
-        ReleaseDC(_PromptSys_hWnd,hDC)
-
+        Dim hDC = GetDC(_PromptSys_hWnd)
+        DrawPromptBuffer(hDC, StartLine, .y)
+        ReleaseDC(_PromptSys_hWnd, hDC)
+    End With
     LeaveCriticalSection(_PromptSys_SectionOfBufferAccess)
 End Sub
@@ -172 +174 @@
     Dim ps As PAINTSTRUCT
     Dim TempStr As String
-    Dim temporary[255] As Byte
     Dim CompForm As COMPOSITIONFORM
-    Dim hGlobal As HGLOBAL
 
     Select Case message
         Case WM_CREATE
-            hDC=GetDC(hWnd)
-            _PromptSys_hBitmap=CreateCompatibleBitmap(hDC,_PromptSys_ScreenSize.cx,_PromptSys_ScreenSize.cy)
-            _PromptSys_hMemDC=CreateCompatibleDC(hDC)
-            SelectObject(_PromptSys_hMemDC,_PromptSys_hBitmap)
+            hDC = GetDC(hWnd)
+            With _PromptSys_ScreenSize
+                _PromptSys_hBitmap = CreateCompatibleBitmap(hDC, .cx, .cy)
+            End With
+            _PromptSys_hMemDC = CreateCompatibleDC(hDC)
+            SelectObject(_PromptSys_hMemDC, _PromptSys_hBitmap)
 
             'Initialize for Win9x
-            Dim hOldBrush As HBRUSH
-            hOldBrush=SelectObject(_PromptSys_hMemDC,GetStockObject(BLACK_BRUSH))
-            PatBlt(_PromptSys_hMemDC,0,0,_PromptSys_ScreenSize.cx,_PromptSys_ScreenSize.cy,PATCOPY)
-            SelectObject(_PromptSys_hMemDC,hOldBrush)
-
-            Dim hOldFont As HFONT
+            Dim hOldBrush = SelectObject(_PromptSys_hMemDC, GetStockObject(BLACK_BRUSH)) As HBRUSH
+            With _PromptSys_ScreenSize
+                PatBlt(_PromptSys_hMemDC, 0, 0, .cx, .cy, PATCOPY)
+            End With
+            SelectObject(_PromptSys_hMemDC, hOldBrush)
+
             Dim tm As TEXTMETRIC
-            hOldFont=SelectObject(_PromptSys_hMemDC,_PromptSys_hFont)
-            GetTextExtentPoint32(_PromptSys_hMemDC," ",1,_PromptSys_FontSize)
-            GetTextMetrics(_PromptSys_hMemDC,tm)
-            SelectObject(_PromptSys_hMemDC,hOldFont)
-            _PromptSys_FontSize.cy=tm.tmHeight
+            Dim hOldFont=SelectObject(_PromptSys_hMemDC, _PromptSys_hFont) As HFONT
+            GetTextExtentPoint32(_PromptSys_hMemDC, Ex" " As PCTSTR, 1, _PromptSys_FontSize)
+            GetTextMetrics(_PromptSys_hMemDC, tm)
+            SelectObject(_PromptSys_hMemDC, hOldFont)
+            _PromptSys_FontSize.cy = tm.tmHeight
 
             ReleaseDC(hWnd,hDC)
         Case WM_PAINT
-            hDC=BeginPaint(hWnd,ps)
-            BitBlt(hDC,0,0,_PromptSys_ScreenSize.cx,_PromptSys_ScreenSize.cy,_PromptSys_hMemDC,0,0,SRCCOPY)
-            DrawPromptBuffer(hDC,-1,0)
-            EndPaint(hWnd,ps)
-
-            _PromptSys_bInitFinish=1
+            hDC = BeginPaint(hWnd,ps)
+            With _PromptSys_ScreenSize
+                BitBlt(hDC, 0, 0, .cx, .cy, _PromptSys_hMemDC, 0, 0, SRCCOPY)
+            End With
+            DrawPromptBuffer(hDC, -1, 0)
+            EndPaint(hWnd, ps)
+
+            _PromptSys_bInitFinish = TRUE
         Case WM_SETFOCUS
             If _PromptSys_InputLen<>-1 Then
-                hIMC=ImmGetContext(hWnd)
+                hIMC = ImmGetContext(hWnd)
                 If hIMC Then
-                    CompForm.dwStyle=CFS_POINT
-                    CompForm.ptCurrentPos.x=_PromptSys_CurPos.x*_PromptSys_FontSize.cx
-                    CompForm.ptCurrentPos.y=_PromptSys_CurPos.y*_PromptSys_FontSize.cy
-                    ImmSetCompositionWindow(hIMC,CompForm)
-                    ImmSetCompositionFont(hIMC,_PromptSys_LogFont)
+                    With CompForm
+                        .dwStyle = CFS_POINT
+                        .ptCurrentPos.x = _PromptSys_CurPos.x*_PromptSys_FontSize.cx
+                        .ptCurrentPos.y = _PromptSys_CurPos.y*_PromptSys_FontSize.cy
+                    End With
+                    ImmSetCompositionWindow(hIMC, CompForm)
+                    ImmSetCompositionFontA(hIMC, _PromptSys_LogFont)
                 End If
-                ImmReleaseContext(hWnd,hIMC)
+                ImmReleaseContext(hWnd, hIMC)
 
                 CreateCaret(hWnd,NULL,9,6)
@@ -230 +236 @@
             End If
         Case WM_CHAR
-            If _PromptSys_InputLen<>-1 Then
-                If wParam=VK_BACK Then
+            If _PromptSys_InputLen <> -1 Then
+                If wParam = VK_BACK Then
                     If _PromptSys_InputLen Then
-                        _PromptSys_InputLen=_PromptSys_InputLen-1
-                        _PromptSys_InputStr[_PromptSys_InputLen]=0
-
-                        _PromptSys_CurPos.x=_PromptSys_CurPos.x-1
-                        _PromptSys_Buffer[_PromptSys_CurPos.y][_PromptSys_CurPos.x]=0
+                        _PromptSys_InputLen--
+                        _PromptSys_InputStr[_PromptSys_InputLen] = 0
+
+                        _PromptSys_CurPos.x--
+                        _PromptSys_Buffer[_PromptSys_CurPos.y][_PromptSys_CurPos.x] = 0
                     End If
-                ElseIf wParam=VK_RETURN Then
-                    _PromptSys_InputStr[_PromptSys_InputLen]=0
-                    _PromptSys_InputLen=-1
-                    TempStr=Ex"\r\n"
-                ElseIf wParam=&H16 Then
+                ElseIf wParam = VK_RETURN Then
+                    _PromptSys_InputStr[_PromptSys_InputLen] = 0
+                    _PromptSys_InputLen = -1
+                    TempStr = Ex"\r\n"
+                ElseIf wParam = &H16 Then
                     'Paste Command(Use Clippboard)
                     OpenClipboard(hWnd)
-                    hGlobal=GetClipboardData(CF_TEXT)
-                    If hGlobal=0 Then PromptProc=0:Exit Function
-                    Dim pTemp=GlobalLock(hGlobal) As *Byte
-#ifdef UNICODE
+                    Dim hGlobal = GetClipboardData(CF_TEXT) As HGLOBAL
+                    If hGlobal = 0 Then Return 0
+                    Dim pTemp = GlobalLock(hGlobal) As PCSTR
+#ifdef UNICODE 'A版ウィンドウプロシージャ用
                     Dim tempSizeW = MultiByteToWideChar(CP_ACP, 0, pTemp, -1, 0, 0) + 1
-                    TempStr=ZeroString(tempSizeW)
+                    TempStr = ZeroString(tempSizeW)
                     MultiByteToWideChar(CP_ACP, 0, pTemp, -1, StrPtr(TempStr), tempSizeW)
 #else
-                    TempStr=ZeroString(lstrlen(pTemp)+1)
-                    lstrcpy(StrPtr(TempStr),pTemp)
+                    TempStr = ZeroString(lstrlen(pTemp) + 1)
+                    lstrcpy(StrPtr(TempStr), pTemp)
 #endif
-                    lstrcpy((VarPtr(_PromptSys_InputStr[0])+_PromptSys_InputLen) As *Byte,pTemp)
-                    _PromptSys_InputLen=_PromptSys_InputLen+lstrlen(pTemp)
+                    memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), TempStr.Chars, SizeOf (Char) * TempStr.Length)
+                    _PromptSys_InputLen += TempStr.Length
 
                     GlobalUnlock(hGlobal)
                     CloseClipboard()
                 Else
-                    _PromptSys_InputStr[_PromptSys_InputLen]=wParam As Byte
+                    _PromptSys_InputStr[_PromptSys_InputLen] = wParam As Byte
                     _PromptSys_InputLen++
 
-                    temporary[0]=wParam As Byte
-                    temporary[1]=0
-                    TempStr=temporary
+                    TempStr.ReSize(1)
+                    TempStr[0] = wParam As Char
                 End If
 
-                SendMessage(hWnd,WM_KILLFOCUS,0,0)
+                SendMessage(hWnd, WM_KILLFOCUS, 0, 0)
                 PRINT_ToPrompt(TempStr)
-                SendMessage(hWnd,WM_SETFOCUS,0,0)
+                SendMessage(hWnd, WM_SETFOCUS, 0, 0)
             End If
         Case WM_DESTROY
@@ -292 +297 @@
     'Allocate
     For i=0 To 100
-        _PromptSys_Buffer[i]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255)
-        _PromptSys_TextColor[i]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255*SizeOf(LONG_PTR))
-        _PromptSys_BackColor[i]=HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,255*SizeOf(LONG_PTR))
+        _PromptSys_Buffer[i] = _System_calloc(SizeOf (Char) * 255)
+        _PromptSys_TextColor[i] = _System_calloc(SizeOf(COLORREF) * 255)
+        _PromptSys_BackColor[i] = _System_calloc(SizeOf(COLORREF) * 255)
     Next
 
@@ -306 +311 @@
 
     'LogFont initialize
-    _PromptSys_LogFont.lfHeight=-16
-    _PromptSys_LogFont.lfWidth=0
-    _PromptSys_LogFont.lfEscapement=0
-    _PromptSys_LogFont.lfOrientation=0
-    _PromptSys_LogFont.lfWeight=0
-    _PromptSys_LogFont.lfItalic=0
-    _PromptSys_LogFont.lfUnderline=0
-    _PromptSys_LogFont.lfStrikeOut=0
-    _PromptSys_LogFont.lfCharSet=SHIFTJIS_CHARSET
-    _PromptSys_LogFont.lfOutPrecision=OUT_DEFAULT_PRECIS
-    _PromptSys_LogFont.lfClipPrecision=CLIP_DEFAULT_PRECIS
-    _PromptSys_LogFont.lfQuality=DEFAULT_QUALITY
-    _PromptSys_LogFont.lfPitchAndFamily=FIXED_PITCH
-    lstrcpy(_PromptSys_LogFont.lfFaceName,"ＭＳ 明朝")
-
-    _PromptSys_hFont=CreateFontIndirect(_PromptSys_LogFont)
+    With _PromptSys_LogFont
+        .lfHeight = -16
+        .lfWidth = 0
+        .lfEscapement = 0
+        .lfOrientation = 0
+        .lfWeight = 0
+        .lfItalic = 0
+        .lfUnderline = 0
+        .lfStrikeOut = 0
+        .lfCharSet = SHIFTJIS_CHARSET
+        .lfOutPrecision = OUT_DEFAULT_PRECIS
+        .lfClipPrecision = CLIP_DEFAULT_PRECIS
+        .lfQuality = DEFAULT_QUALITY
+        .lfPitchAndFamily = FIXED_PITCH
+        lstrcpy(.lfFaceName, "ＭＳ 明朝")
+    End With
+
+    _PromptSys_hFont = CreateFontIndirect(ByVal VarPtr(_PromptSys_LogFont))
 
     'Critical Section
@@ -338 +345 @@
     wcl.lpfnWndProc=AddressOf(PromptProc)
     wcl.hbrBackground=GetStockObject(BLACK_BRUSH)
-    RegisterClassEx(wcl)
+    Dim atom = RegisterClassEx(wcl)
 
     'Create Prompt Window
-    _PromptSys_hWnd=CreateWindowEx(WS_EX_CLIENTEDGE,"PROMPT","BASIC PROMPT",WS_OVERLAPPEDWINDOW,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,0,0,GetModuleHandle(0),0)
+    _PromptSys_hWnd=CreateWindowEx(WS_EX_CLIENTEDGE,atom As ULONG_PTR As PCSTR,"BASIC PROMPT",WS_OVERLAPPEDWINDOW,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,0,0,GetModuleHandle(0),0)
     ShowWindow(_PromptSys_hWnd,SW_SHOW)
     UpdateWindow(_PromptSys_hWnd)
@@ -353 +360 @@
     Loop
 
+    '強制的に終了する
+    ExitProcess(0)
+
     EnterCriticalSection(_PromptSys_SectionOfBufferAccess)
-        For i=0 to 100
-            HeapFree(_System_hProcessHeap,0,_PromptSys_Buffer[i])
-            HeapFree(_System_hProcessHeap,0,_PromptSys_TextColor[i])
-            HeapFree(_System_hProcessHeap,0,_PromptSys_BackColor[i])
-        Next
-
-        '強制的に終了する
-        ExitProcess(0)
+    
+    For i=0 to 100
+        _System_free(_PromptSys_Buffer[i])
+        _System_free(_PromptSys_TextColor[i])
+        _System_free(_PromptSys_BackColor[i])
+    Next
 
     LeaveCriticalSection(_PromptSys_SectionOfBufferAccess)
@@ -432 +440 @@
 
     'Set value to variable
-    i=0
-    i2=0
-    buf=ZeroString(lstrlen(_PromptSys_InputStr))
+    i = 0
+    i2 = 0
+    buf = ZeroString(lstrlen(_PromptSys_InputStr))
     While 1
-        i3=0
+        i3 = 0
         While 1
-            If _PromptSys_InputStr[i2]=Asc(",") Then
-                buf.Chars[i3]=0
+            If _PromptSys_InputStr[i2] = &h2c Then
+                buf.Chars[i3] = 0
                 Exit While
             End If
 
-            buf.Chars[i3]=_PromptSys_InputStr[i2]
-
-            If _PromptSys_InputStr[i2]=0 Then Exit While
+            buf.Chars[i3] = _PromptSys_InputStr[i2]
+
+            If _PromptSys_InputStr[i2] = 0 Then Exit While
 
             i2++
@@ -451 +459 @@
         Wend
 
-        Select Case _System_InputDataType[i]
-            Case _System_Type_Double
-                SetDouble(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Single
-                SetSingle(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Int64,_System_Type_QWord
-                SetQWord(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Long,_System_Type_DWord
-                SetDWord(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Integer,_System_Type_Word
-                SetWord(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_SByte,_System_Type_Byte
-                SetByte(_System_InputDataPtr[i],Val(buf))
-            Case _System_Type_Char
-#ifdef UNICODE
-                SetWord(_System_InputDataPtr[i], buf[0])
-#else
-                SetByte(_System_InputDataPtr[i], buf[0])
-#endif
-            Case _System_Type_String
-            *INPUT_FromPrompt_Type_String
-                Dim pTempStr As *String
-                pTempStr=_System_InputDataPtr[i] As *String
-                pTempStr->ReSize(i3)
-                memcpy(pTempStr->Chars, buf.Chars, pTempStr->Length)
-                pTempStr->Chars[pTempStr->Length] = 0
-            Case 13
-                Goto *INPUT_FromPrompt_Type_String
-        End Select
+        _System_Input_SetArgument(_System_InputDataPtr[i], _System_InputDataType[i], buf, i3)
 
         i++
-        If _System_InputDataPtr[i]=0 and _PromptSys_InputStr[i2]=Asc(",") Then
+        If _System_InputDataPtr[i]=0 and _PromptSys_InputStr[i2]=&h2c Then 'Asc(",")
             PRINT_ToPrompt(Ex"入力データの個数が多すぎます\r\n")
             Goto *InputReStart
@@ -494 +474 @@
         End If
 
-        i2=i2+1
+        i2++
     Wend
 End Sub
@@ -534 +514 @@
     'Circle (x, y), radius [, color] [, start] [, end] [, aspect] [, f] [, color2]
 
-    Dim hDC As HDC
-    Dim hPen As HPEN, hOldPen As VoidPtr
-    Dim hBrush As HBRUSH, hOldBrush As VoidPtr
+    Dim hBrush As HBRUSH
     Dim radi2 As Long
     Dim sw As Long
     Dim i1 As Long, i2 As Long, i3 As Long, i4 As Long
 
-    hPen=CreatePen(PS_SOLID,1,GetBasicColor(ColorCode))
+    Dim hPen = CreatePen(PS_SOLID,1,GetBasicColor(ColorCode))
     If bFill Then
         hBrush=CreateSolidBrush(GetBasicColor(BrushColor))
@@ -548 +526 @@
     End If
 
-    hDC=GetDC(_PromptSys_hWnd)
+    Dim hDC=GetDC(_PromptSys_hWnd)
     SelectObject(hDC,hPen)
     SelectObject(hDC,hBrush)
-    hOldPen=SelectObject(_PromptSys_hMemDC,hPen)
-    hOldBrush=SelectObject(_PromptSys_hMemDC,hBrush)
+    Dim hOldPen=SelectObject(_PromptSys_hMemDC,hPen)
+    Dim hOldBrush=SelectObject(_PromptSys_hMemDC,hBrush)
 
     If Aspect<1 Then
@@ -664 +642 @@
     End If
 
-    Dim hDC As HDC
-    Dim hPen As HPEN, hOldPen As VoidPtr
-    Dim hBrush As HBRUSH, hOldBrush As VoidPtr
-
-    hDC=GetDC(_PromptSys_hWnd)
-    hPen=CreatePen(PS_SOLID,1,GetBasicColor(ColorCode))
+    Dim hDC = GetDC(_PromptSys_hWnd)
+    Dim hPen = CreatePen(PS_SOLID, 1, GetBasicColor(ColorCode))
+    Dim hBrush As HBRUSH
     If fType=2 Then
         hBrush=CreateSolidBrush(GetBasicColor(BrushColor))
@@ -678 +653 @@
     SelectObject(hDC,hPen)
     SelectObject(hDC,hBrush)
-    hOldPen=SelectObject(_PromptSys_hMemDC,hPen)
-    hOldBrush=SelectObject(_PromptSys_hMemDC,hBrush)
+    Dim hOldPen = SelectObject(_PromptSys_hMemDC,hPen)
+    Dim hOldBrush = SelectObject(_PromptSys_hMemDC,hBrush)
 
     Select Case fType
@@ -710 +685 @@
     'PSet (x,y),ColorCode
 
-    Dim hDC As HDC
-
-    hDC=GetDC(_PromptSys_hWnd)
+    Dim hDC=GetDC(_PromptSys_hWnd)
     SetPixel(hDC,x,y,GetBasicColor(ColorCode))
     SetPixel(_PromptSys_hMemDC,x,y,GetBasicColor(ColorCode))