Changes in / [20:30]

Location:

/Include

Files:

• Classes/System/Drawing/Color.ab (modified) (5 diffs)
• Classes/System/Drawing/Point.ab (modified) (4 diffs)
• Classes/System/Drawing/PointF.ab (modified) (2 diffs)
• Classes/System/Drawing/Rectangle.ab (modified) (9 diffs)
• Classes/System/Math.ab (modified) (1 diff)
• Classes/System/String.ab (modified) (27 diffs)
• api_winsock2.sbp (modified) (1 diff)
• basic/command.sbp (modified) (22 diffs)
• basic/function.sbp (modified) (2 diffs)
• system/enum.sbp (modified) (1 diff)

/Include/Classes/System/Drawing/Color.ab

@@ -18 +18 @@
 Public
     Sub Color()
-        Argb = 0 ' Black
+        argb = MakeARGB(255, 0, 0, 0) ' Black
+    End Sub
+
+    Sub Color(ByRef c As Color)
+        argb = c.argb
     End Sub
 
@@ -26 +30 @@
 
     Sub Color(a As Byte, r As Byte, g As Byte, b As Byte)
-        Argb = MakeARGB(a, r, g, b)
-    End Sub
-
-    Sub Color(argb As ARGB)
-        Argb = argb
+        argb = MakeARGB(a, r, g, b)
+    End Sub
+
+    Sub Color(newArgb As ARGB)
+        argb = newArgb
     End Sub
 
     Sub Operator =(c As Color)
-        SetValue(c)
+        argb = c.argb
     End Sub
 
@@ -61 +65 @@
     End Function
 
-    Function GetValue() As ARGB
-        GetValue = argb
-    End Function
-
-    Sub SetValue(value As ARGB)
+    Function Value() As ARGB
+        Return argb
+    End Function
+
+    Sub Value(value As ARGB)
         argb = value
     End Sub
 
     Sub SetFromCOLORREF(rgb As COLORREF)
-        argb = Color_MakeARGB(255, GetRValue(rgb), GetGValue(rgb), GetBValue(rgb))
+        If (rgb And &hff000000) = &h01000000 Then
+            Exit Sub ' インデックス指定は無効
+        Else
+            argb = Color_MakeARGB(255, GetRValue(rgb), GetGValue(rgb), GetBValue(rgb))
+        End If
     End Sub
 
@@ -91 +99 @@
     End Function
 
-    Static Function FromArgb(r As Byte, g As Byte, b As Byte)
+    Static Function FromArgb(r As Byte, g As Byte, b As Byte) As Color
         Dim c As Color(r, g, b)
         Return c
     End Function
 
-    Static Function FromArgb(a As Byte, r As Byte, g As Byte, b As Byte)
+    Static Function FromArgb(a As Byte, r As Byte, g As Byte, b As Byte) As Color
         Dim c As Color(a, r, g, b)
         Return c
@@ -297 +305 @@
     End Enum
 */
-    ' Assemble A, R, G, B values into a 32-bit integer
-Private
-    Static Function MakeARGB(/*IN*/ a As Byte,
-                             /*IN*/ r As Byte,
-                             /*IN*/ g As Byte,
-                             /*IN*/ b As Byte) As ARGB
+    Static Function MakeARGB(a As Byte, r As Byte, g As Byte, b As Byte) As ARGB
         MakeARGB = (((b As ARGB) <<  Color_BlueShift) Or _
                     ((g As ARGB) << Color_GreenShift) Or _

/Include/Classes/System/Drawing/Point.ab

@@ -4 +4 @@
 #define __SYSTEM_DRAWING_POINT_AB__
 
+#include <Classes/System/Drawing/PointF.ab>
 #include <Classes/System/Drawing/Size.ab>
 #include <Classes/System/Drawing/SizeF.ab>
@@ -64 +65 @@
 
     Function Operator + (pt As Point) As Point
-        Return Add(pt)
+        Return Add(This, pt)
     End Function
 
     Function Operator + (sz As Size) As Point
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator - (pt As Point) As Point
-        Return Substract(pt)
+        Return Substract(This, pt)
     End Function
 
     Function Operator - (sz As Size) As Point
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
@@ -87 +88 @@
     End Function
 
-    Function Add(pt As Point) As Point
-        Dim ret As Point(x + pt.x, y + pt.y)
+    Static Function Add(pt1 As Point, pt2 As Point) As Point
+        Dim ret As Point(pt1.x + pt2.x, pt1.y + pt2.y)
         Return ret
     End Function
 
-    Function Add(sz As Size) As Point
-        Dim ret As Point(x + sz.width, y + sz.height)
+    Static Function Add(pt As Point, sz As Size) As Point
+        Dim ret As Point(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
@@ -99 +100 @@
     Function Offset(pt As Point) As Point
         Dim ret As Point(x + pt.x, y + pt.y)
-    End Function
-
-    Function Offset(dx As Long, dy As Long) As Point
-        Dim ret As Point(x + dx, y + dy)
-    End Function
-
-    Function Substract(pt As Point) As Point
-        Dim ret As Point(x - pt.x, y - pt.y)
         Return ret
     End Function
 
-    Function Substract(sz As Size) As Point
-        Dim ret As Point(x - sz.width, y - sz.height)
+    Sub Offset(dx As Long, dy As Long)
+        x += dx
+        y += dy
+    End Sub
+
+    Static Function Substract(pt1 As Point, pt2 As Point) As Point
+        Dim ret As Point(pt1.x - pt2.x, pt1.y - pt2.y)
+        Return ret
+    End Function
+
+    Static Function Substract(pt As Point, sz As Size) As Point
+        Dim ret As Point(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function

/Include/Classes/System/Drawing/PointF.ab

@@ -58 +58 @@
     End Sub
 
+    Function Operator () As PointF
+        Dim ptf As PointF(X, Y)
+        Return ptf
+    End Function
+
     Function Operator + (pt As PointF) As PointF
-        Return Add(pt)
+        Return Add(This, pt)
     End Function
 
     Function Operator + (sz As Size) As PointF
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator + (sz As SizeF) As PointF
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator - (pt As PointF) As PointF
-        Return Substract(pt)
+        Return Substract(This, pt)
     End Function
 
     Function Operator - (sz As Size) As PointF
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
     Function Operator - (sz As SizeF) As PointF
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
@@ -90 +95 @@
     End Function
 
-    Function Add(pt As PointF) As PointF
-        Dim ret As PointF(x + pt.x, y + pt.y)
+    Static Function Add(pt1 As PointF, pt2 As PointF) As PointF
+        Dim ret As PointF(pt1.x + pt2.x, pt1.y + pt2.y)
         Return ret
     End Function
 
-    Function Add(sz As Size) As PointF
-        Dim ret As PointF(x + sz.width, y + sz.height)
+    Static Function Add(pt As PointF, sz As Size) As PointF
+        Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
 
-    Function Add(sz As SizeF) As PointF
-        Dim ret As PointF(x + sz.width, y + sz.height)
+    Static Function Add(pt As PointF, sz As SizeF) As PointF
+        Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
 
-    Function Substract(pt As PointF) As PointF
-        Dim ret As PointF(x - pt.x, y - pt.y)
+    Static Function Substract((pt1 As PointF, pt2 As PointF) As PointF
+        Dim ret As PointF(pt1.x - pt2.x, pt1.y - pt2.y)
         Return ret
     End Function
 
-    Function Substract(sz As Size) As PointF
-        Dim ret As PointF(x - sz.width, y - sz.height)
+    Static Function Substract(pt As PointF, sz As Size) As PointF
+        Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function
 
-    Function Substract(sz As SizeF) As PointF
-        Dim ret As PointF(x - sz.width, y - sz.height)
+    Static Function Substract(pt As PointF, sz As SizeF) As PointF
+        Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function

/Include/Classes/System/Drawing/Rectangle.ab

@@ -27 +27 @@
     Sub Rectangle(location As Point, size As Size)
         x = location.X
-        y = lccation.Y
+        y = location.Y
         width = size.Height
-        hegiht = size.Height
+        height = size.Height
     End Sub
 
@@ -35 +35 @@
         x = rc.x
         y = rc.y
-        widht = rc.width
+        width = rc.width
         height = rc.height
     End Sub
@@ -107 +107 @@
 
     Function IsEmpty() As BOOL
-        If Width <= Single_EPSILON Or Height <= Single_EPSILON Then
-            IsEmptyArea = _System_TRUE
-        Else
-            IsEmptyArea = _System_FALSE
+        If Width <= 0 Or Height <= 0 Then
+            IsEmpty = _System_TRUE
+        Else
+            IsEmpty = _System_FALSE
         End If
     End Function
@@ -145 +145 @@
 
     Static Function FromLTRB(l As Single, t As Single, r As Single, b As Single) As Rectangle
-        Dim r As Rectangle(left, top, right - left, bottom - top)
-        return r
+        Dim rect As Rectangle(l, t, r - l, r - b)
+        return rect
     End Function
 
@@ -162 +162 @@
 
     Function Contains(ByRef rc As Rectangle) As BOOL
-        If X <= rc.X && rc.Right <= Right && Y <= rc.Y && rc.Bottom <= Bottom Then
+        If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
             ContainsRCF = _System_TRUE
         Else
@@ -172 +172 @@
         X -= dx
         Y -= dy
-        Width = dx + dx
-        Height = dy + dy
+        Width += dx + dx
+        Height += dy + dy
     End Sub
 
     Sub Inflate(sz As Size)
         Inflate(sz.Width, sz.Height)
-    End Sub
-
-    Sub Inflate(pt As Point)
-        Inflate(pt.X, pt.Y)
     End Sub
 
@@ -189 +185 @@
     End Function
 
-    Function Intersect(ByRef rect As Rectangle) As BOOL
-        Intersect = Intersect(This, This, rect)
-    End Function
+    Sub Intersect(ByRef rect As Rectangle)
+        This = Rectangle.Intersect(This, rect)
+    End Sub
 
     Static Function Intersect(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
@@ -199 +195 @@
         left = Math.Min(a.Left, b.Left)
         top = Math.Min(a.Top, b.Top)
-        Return FromLTRB(left, top, right, bottom)
+        Return Rectangle.FromLTRB(left, top, right, bottom)
     End Function
 
@@ -215 +211 @@
     Static Function Union(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
         Dim right As Single, bottom As Single, left As Single, top As Single
-        right = Math.Max(a.GetRight(), b.GetRight())
-        bottom = Math.Max(a.GetBottom(), b.GetBottom())
-        left = Math.Max(a.GetLeft(), b.GetLeft())
-        top = Math.Max(a.GetTop(), b.GetTop())
+        right = Math.Max(a.Right(), b.Right())
+        bottom = Math.Max(a.Bottom(), b.Bottom())
+        left = Math.Max(a.Left(), b.Left())
+        top = Math.Max(a.Top(), b.Top())
         Return FromLTRB(left, top, right, bottom)
     End Function

/Include/Classes/System/Math.ab

@@ -546 +546 @@
                     last = Sqrt
                     Sqrt = (x /Sqrt + Sqrt) * 0.5
-                Loop While s <> last
+                Loop While Sqrt <> last
             End If
         ElseIf x < 0 Then
-            Sqr = _System_GetNaN()
+            Sqrt = _System_GetNaN()
         Else
             'x = 0 Or NaN

/Include/Classes/System/String.ab

@@ -1 +1 @@
 Class String
+    m_Chars As LPSTR
+    m_Length As Long
 Public
-    Chars As LPSTR
-    Length As Long
 
     Sub String()
-        Chars = _System_calloc(1)
-        Length = 0
+        m_Chars = _System_calloc(1)
+        m_Length = 0
     End Sub
 
@@ -13 +13 @@
         Assign(initStr)
     End Sub
-/*
-    Sub String(ByRef initStr As String)
+
+/*  Sub String(ByRef initStr As String)
         String()
         Assign(initStr)
@@ -29 +29 @@
 
     Sub ~String()
-        _System_free(Chars)
-        Chars = 0
+        _System_free(m_Chars)
+        m_Chars = 0
 #ifdef _DEBUG
-        Length = 0
+        m_Length = 0
 #endif
     End Sub
 
+    Function Chars() As LPSTR
+        Return m_Chars
+    End Function
+
+    Function Length() As Long
+        Return m_Length
+    End Function
+
     Function Operator() As LPSTR
-        Return Chars
+        Return m_Chars
     End Function
 
     Sub Operator = (ByRef objString As String)
-        Assign(objString.Chars, objString.Length)
+        Assign(objString.m_Chars, objString.m_Length)
     End Sub
 
@@ -49 +57 @@
 
     Function Operator[] (n As Long) As Byte
-        Return Chars[n]
+        Return m_Chars[n]
     End Function
 
     Sub Operator[]= (n As Long, c As Byte)
-        Chars[n] = c
+        m_Chars[n] = c
     End Sub
 
@@ -61 +69 @@
 
     Function Operator+ (ByRef objString As String) As String
-        Return Concat(objString, objString.Length)
+        Return Concat(objString, objString.m_Length)
     End Function
 
@@ -165 +173 @@
 
     Function StrPtr() As LPSTR
-        Return Chars
+        Return m_Chars
     End Function
 
     Sub ReSize(allocLength As Long)
         If allocLength < 0 Then Exit Sub
-        If allocLength > Length Then
+        If allocLength > m_Length Then
             Dim oldLength As Long
-            oldLength = Length
+            oldLength = m_Length
             If AllocStringBuffer(allocLength) <> 0 Then
-                ZeroMemory(Chars + oldLength, Length - oldLength + 1)
+                ZeroMemory(m_Chars + oldLength, m_Length - oldLength + 1)
             End If
         Else
-            Length = allocLength
-            Chars[Length] = 0
+            m_Length = allocLength
+            m_Chars[m_Length] = 0
         End If
     End Sub
@@ -185 +193 @@
         If allocLength < 0 Then
             Exit Sub
-        ElseIf allocLength > Length Then
+        ElseIf allocLength > m_Length Then
             Dim oldLength As Long
-            oldLength = Length
+            oldLength = m_Length
             If AllocStringBuffer(allocLength) <> 0 Then
-                FillMemory(Chars + oldLength, Length - oldLength, c)
+                FillMemory(m_Chars + oldLength, m_Length - oldLength, c)
             End If
         Else
-            Length = allocLength
-        End If
-        Chars[Length] = 0
+            m_Length = allocLength
+        End If
+        m_Chars[m_Length] = 0
     End Sub
 
     Sub Assign(lpszText As LPSTR, textLength As Long)
-        If lpszText = Chars Then Exit Sub
+        If lpszText = m_Chars Then Exit Sub
         If AllocStringBuffer(textLength) <> 0 Then
-            memcpy(Chars, lpszText, textLength)
-            Chars[Length] = 0
+            memcpy(m_Chars, lpszText, textLength)
+            m_Chars[m_Length] = 0
         End If      
     End Sub
 
     Sub Assign(ByRef objString As String)
-        Assign(objString.Chars, objString.Length)
+        Assign(objString.m_Chars, objString.m_Length)
     End Sub
 
@@ -213 +221 @@
             Assign(lpszText, lstrlen(lpszText))
         Else
-            'Chars=_System_realloc(Chars,1)
-            Chars[0] = 0
-            Length = 0
+            'm_Chars=_System_realloc(m_Chars,1)
+            m_Chars[0] = 0
+            m_Length = 0
         End If
     End Sub
@@ -221 +229 @@
     Sub Append(lpszText As LPSTR, textLength As Long)
         Dim prevLen As Long
-        prevLen = Length
-        If AllocStringBuffer(Length + textLength) <> 0 Then
-            memcpy(Chars + prevLen, lpszText, textLength)
-            Chars[Length] = 0
+        prevLen = m_Length
+        If AllocStringBuffer(m_Length + textLength) <> 0 Then
+            memcpy(m_Chars + prevLen, lpszText, textLength)
+            m_Chars[m_Length] = 0
         End If
     End Sub
@@ -233 +241 @@
 
     Sub Append(ByRef str As String)
-        Append(str.Chars, str.Length)
+        Append(str.m_Chars, str.m_Length)
     End Sub
 
@@ -239 +247 @@
         Dim tempString As String
         With tempString
-            .AllocStringBuffer(This.Length + textLength)
-            memcpy(.Chars, This.Chars, This.Length)
-            memcpy(.Chars + This.Length, lpszText, textLength)
-            .Chars[.Length] = 0
+            .AllocStringBuffer(This.m_Length + textLength)
+            memcpy(.m_Chars, This.m_Chars, This.m_Length)
+            memcpy(.m_Chars + This.m_Length, lpszText, textLength)
+            .m_Chars[.m_Length] = 0
         End With
         Return tempString
@@ -248 +256 @@
 
     Function Contains(ByRef objString As String) As BOOL
-        If IndexOf(objString, 0, Length) >= 0 Then
+        If IndexOf(objString, 0, m_Length) >= 0 Then
             Return _System_TRUE
         Else
@@ -256 +264 @@
 
     Function Contains(lpszText As LPSTR) As BOOL
-        If IndexOf(lpszText, 0, Length) >= 0 Then
+        If IndexOf(lpszText, 0, m_Length) >= 0 Then
             Return _System_TRUE
         Else
@@ -264 +272 @@
 
     Function IndexOf(lpszText As LPSTR) As Long
-        Return IndexOf(lpszText, 0, Length)
+        Return IndexOf(lpszText, 0, m_Length)
     End Function
 
     Function IndexOf(lpszText As LPSTR, startIndex As Long) As Long
-        Return IndexOf(lpszText, startIndex, Length - startIndex)
+        Return IndexOf(lpszText, startIndex, m_Length - startIndex)
     End Function
 
@@ -276 +284 @@
 
         If startIndex < 0 Then Return -1
-        If count < 1 Or count + startIndex > Length Then Return -1
-        If length > Length Then Return -1
+        If count < 1 Or count + startIndex > m_Length Then Return -1
+        If length > m_Length Then Return -1
 
         If length = 0 Then Return startIndex
@@ -284 +292 @@
         For i = startIndex To startIndex + count - 1
             For j = 0 To length - 1
-                If Chars[i + j] = lpszText[j] Then
+                If m_Chars[i + j] = lpszText[j] Then
                     If j = length - 1 Then Return i
                 Else
@@ -295 +303 @@
 
     Function LastIndexOf(lpszText As LPSTR) As Long
-        Return LastIndexOf(lpszText, Length - 1, Length)
+        Return LastIndexOf(lpszText, m_Length - 1, m_Length)
     End Function
 
@@ -306 +314 @@
         length = lstrlen(lpszText)
 
-        If startIndex < 0 Or startIndex > Length - 1 Then Return -1
+        If startIndex < 0 Or startIndex > m_Length - 1 Then Return -1
         If count < 1 Or count > startIndex + 2 Then Return -1
-        If length > Length Then Return -1
+        If length > m_Length Then Return -1
 
         If length = 0 Then Return startIndex
@@ -315 +323 @@
         For i = startIndex To  startIndex - count + 1 Step -1
             For j = length - 1 To 0 Step -1
-                If Chars[i + j] = lpszText[j] Then
+                If m_Chars[i + j] = lpszText[j] Then
                     If j = 0 Then Return i
                 Else
@@ -334 +342 @@
 
     Function EndsWith(lpszText As LPSTR) As BOOL
-        If LastIndexOf(lpszText) = Length - lstrlen(lpszText) Then
+        If LastIndexOf(lpszText) = m_Length - lstrlen(lpszText) Then
             Return _System_TRUE
         Else
@@ -345 +353 @@
         length = lstrlen(lpszText)
 
-        If startIndex < 0 Or startIndex > Length Then Return -1
+        If startIndex < 0 Or startIndex > m_Length Then Return -1
 
         Dim newChars As LPSTR
-        newChars = _System_malloc(length + Length + 1)
+        newChars = _System_malloc(length + m_Length + 1)
         If newChars = 0 Then Return -1
 
-        memcpy(newChars, Chars, startIndex)
+        memcpy(newChars, m_Chars, startIndex)
         memcpy(newChars + startIndex, lpszText, length)
-        memcpy(newChars + startIndex + length, Chars + startIndex, Length - startIndex + 1)
-
-        _System_free(Chars)
-        Chars = newChars
-        Length = length + Length
-        Return Length
+        memcpy(newChars + startIndex + length, m_Chars + startIndex, m_Length - startIndex + 1)
+
+        _System_free(m_Chars)
+        m_Chars = newChars
+        m_Length = length + m_Length
+        Return m_Length
     End Function
 
     Function SubString(startIndex As Long) As String
-        Return SubString(startIndex, Length - startIndex)
+        Return SubString(startIndex, m_Length - startIndex)
     End Function
 
     Function SubString(startIndex As Long, length As Long) As String
         If startIndex < 0 Or length <= 0 Then Return ""
-        If startIndex + length > Length Then Return ""
+        If startIndex + length > m_Length Then Return ""
 
         Dim temp As String
         temp.AllocStringBuffer(length)
-        memcpy(temp.Chars, VarPtr(Chars[startIndex]), length)
-        Chars[Length] = 0
+        memcpy(temp.m_Chars, VarPtr(m_Chars[startIndex]), length)
+        m_Chars[m_Length] = 0
         Return temp
     End Function
 
     Function Remove(startIndex As Long) As Long
-        If startIndex < 0 Or startIndex > Length Then Return -1
-        Chars[startIndex] = 0
-        Length = startIndex
-        Return Length
+        If startIndex < 0 Or startIndex > m_Length Then Return -1
+        m_Chars[startIndex] = 0
+        m_Length = startIndex
+        Return m_Length
     End Function
 
     Function Remove(startIndex As Long, count As Long) As Long
         If startIndex < 0 Or count < 0 Then Return -1
-        If startIndex + count > Length Then Return -1
+        If startIndex + count > m_Length Then Return -1
 
         Dim newChars As LPSTR
-        newChars = _System_malloc(Length - count + 1)
+        newChars = _System_malloc(m_Length - count + 1)
         If newChars = 0 Then Return -1
 
-        memcpy(newChars, Chars, startIndex)
-        memcpy(newChars + startIndex, Chars + startIndex + count, Length - startIndex - count)
-        newChars[Length - count] = 0
-
-        _System_free(Chars)
-        Chars = newChars
-        Length = Length - count
-        Return Length
+        memcpy(newChars, m_Chars, startIndex)
+        memcpy(newChars + startIndex, m_Chars + startIndex + count, m_Length - startIndex - count)
+        newChars[m_Length - count] = 0
+
+        _System_free(m_Chars)
+        m_Chars = newChars
+        m_Length = m_Length - count
+        Return m_Length
     End Function
 
     Function IsNullOrEmpty() As BOOL
-        If Length = 0 Then
+        If m_Length = 0 Then
             Return _System_TRUE
         Else
@@ -411 +419 @@
     Sub Replace(oldChar As Byte, newChar As Byte)
         Dim i As Long
-        For i = 0 To ELM(Length)
-            If Chars[i] = oldChar Then
-                Chars[i] = newChar
+        For i = 0 To ELM(m_Length)
+            If m_Chars[i] = oldChar Then
+                m_Chars[i] = newChar
             End If
         Next
@@ -419 +427 @@
 
     Sub Replace(ByRef oldStr As String, ByRef newStr As String)
-        Replace(oldStr, oldStr.Length, newStr, newStr.Length)
+        Replace(oldStr, oldStr.m_Length, newStr, newStr.m_Length)
     End Sub
 
@@ -436 +444 @@
                     Exit Do
                 End If
-                .Append(Chars + current, pos - current)
+                .Append(m_Chars + current, pos - current)
                 .Append(newStr, newLen)
                 current = pos + oldLen
             Loop
-            .Append(Chars + current, Length - current)
+            .Append(m_Chars + current, m_Length - current)
         End With
         Swap(tempString)
@@ -446 +454 @@
 
     Sub ToLower()
-        CharLower(Chars)
+        CharLower(m_Chars)
     End Sub
 
     Sub ToUpper()
-        CharUpper(Chars)
+        CharUpper(m_Chars)
     End Sub
 
@@ -456 +464 @@
         Dim tempLen As Long
         Dim tempChars As PSTR
-        tempLen = x.Length
-        tempChars = x.Chars
-        x.Length = This.Length
-        x.Chars = This.Chars
-        This.Length = tempLen
-        This.Chars = tempChars
+        tempLen = x.m_Length
+        tempChars = x.m_Chars
+        x.m_Length = This.m_Length
+        x.m_Chars = This.m_Chars
+        This.m_Length = tempLen
+        This.m_Chars = tempChars
     End Sub
 
@@ -469 +477 @@
         If textLength < 0 Then
             Return 0
-        ElseIf textLength > Length Then
-            AllocStringBuffer = _System_realloc(Chars, textLength + 1)
+        ElseIf textLength > m_Length Then
+            AllocStringBuffer = _System_realloc(m_Chars, textLength + 1)
             If AllocStringBuffer <> 0 Then
-                Length = textLength
-                Chars = AllocStringBuffer
+                m_Length = textLength
+                m_Chars = AllocStringBuffer
             End If
         Else
-            Length = textLength
-            AllocStringBuffer = Chars
+            m_Length = textLength
+            AllocStringBuffer = m_Chars
         End If
     End Function

/Include/api_winsock2.sbp

@@ -238 +238 @@
 Const INADDR_ANY = &h0
 
+Declare Function htons Lib "ws2_32.dll" (netshort As Word) As Word 
+Declare Function htonl Lib "ws2_32.dll" (netshort As DWord)  As DWord 
+Declare Function ntohs Lib "ws2_32.dll" (netshort As Word) As Word 
+Declare Function ntohl Lib "ws2_32.dll" (netshort As DWord)  As DWord
 
 #endif '_INC_WINSOCK2

/Include/basic/command.sbp

@@ -35 +35 @@
 
 Macro EXEC(lpFilePath As *Byte)(lpCmdLine As *Byte)
-    ShellExecute(0, "open", lpFilePath, lpCmdLine, 0, SW_SHOWNORMAL)
+    ShellExecute(0,"open",lpFilePath,lpCmdLine,0,SW_SHOWNORMAL)
 End Macro
 
@@ -56 +56 @@
 '----------------
 
-Macro MSGBOX(hWnd As HWND, ByRef str As String)(ByRef title As String, boxType As DWord, ByRef retAns As DWord)
+Macro MSGBOX(hWnd As HWND, lpStr As String)(lpTitle As String, BoxType As DWord, ByRef retAns As DWord)
     If VarPtr(retAns) Then
-        retAns = MessageBox(hWnd, str, title, boxType)
+        retAns=MessageBox(hWnd,lpStr,lpTitle,BoxType)
     Else
-        MessageBox(hWnd, str, title, boxType)
+        MessageBox(hWnd,lpStr,lpTitle,BoxType)
     End If
 End Macro
 
-Macro WINDOW(ByRef hWnd As Long, hOwner As HWND, x As Long, y As Long, nWidth As Long, nHeight As Long, ByRef title As String, dwStyle As DWord)(ByRef className As String, id As DWord, lpFunc As DWord, dwExStyle As DWord)
+Macro WINDOW(ByRef hWnd As Long, hOwner As Long, x As Long, y As Long, nWidth As Long, nHeight As Long, lpTitle As String, dwStyle As DWord)(lpClass As String, id As DWord, lpFunc As DWord, dwExStyle As DWord)
     If VarPtr(hWnd) Then
-        hWnd = CreateWindowEx(dwExStyle, className.Chars, title, dwStyle, x, y, nWidth, nHeight, hOwner, id, GetModuleHandle(0), NULL)
+        hWnd=CreateWindowEx(dwExStyle,lpClass,lpTitle,dwStyle,x,y,nWidth,nHeight,hOwner,id,GetModuleHandle(0),NULL)
     Else
-        CreateWindowEx(dwExStyle, className.Chars, title, dwStyle, x, y, nWidth, nHeight, hOwner, id, GetModuleHandle(0), NULL)
+        CreateWindowEx(dwExStyle,lpClass,lpTitle,dwStyle,x,y,nWidth,nHeight,hOwner,id,GetModuleHandle(0),NULL)
     End If
 End Macro
@@ -76 +76 @@
 End Macro
 
-Macro INSMENU(hMenu As HMENU, PosID As Long, flag As Long)(ByRef str As String, id As Long, hSubMenu As HMENU, state As Long)
+Macro INSMENU(hMenu As HMENU, PosID As Long, flag As Long)(lpString As String, id As Long, hSubMenu As HMENU, state As Long)
     Dim mii As MENUITEMINFO
 
-    ZeroMemory(VarPtr(mii), Len(mii))
-    With mii
-        .cbSize = Len(mii)
-        .fMask = IIM_TYPE
-
-        If str.Length = 0 Then
-            .fType = MFT_SEPARATOR
-        Else
-            .fType  = MFT_STRING
-            .fMask = .fMask or MIIM_STATE or MIIM_ID
-            .dwTypeData = str.Chars
-            .wID = id
-            If hSubMenu Then
-                .fMask = .fMask or MIIM_SUBMENU
-                .hSubMenu = hSubMenu
-            End If
-            .fState = state
+    FillMemory(VarPtr(mii),Len(mii),0)
+    mii.cbSize=Len(mii)
+    mii.fMask=MIIM_TYPE
+
+    If lpString.Length=0 Then
+        mii.fType=MFT_SEPARATOR
+    Else
+        mii.fType=MFT_STRING
+        mii.fMask=mii.fMask or MIIM_STATE or MIIM_ID
+        mii.dwTypeData=StrPtr(lpString)
+        mii.wID=id
+        If hSubMenu Then
+            mii.fMask=mii.fMask or MIIM_SUBMENU
+            mii.hSubMenu=hSubMenu
         End If
-    End With
-
-    InsertMenuItem(hMenu, PosID, flag, mii)
+        mii.fState=state
+    End If
+
+    InsertMenuItem(hMenu,PosID,flag,mii)
 End Macro
 
@@ -107 +105 @@
 '--------------
 
-Dim _System_hFile[255] As HANDLE
-
-Macro OPEN(ByRef fileName As String, AccessFor As Long, FileNumber As Long)
+Dim _System_hFile(255) As Long
+Macro OPEN(lpFileName As String, AccessFor As Long, FileNumber As Long)
     Dim dwAccess As Long
     Dim bAppend As Long
     Dim dwCreationDisposition As Long
 
-    FileNumber--
+    FileNumber=FileNumber-1
 
     bAppend=0
@@ -133 +130 @@
     End Select
 
-    _System_hFile[FileNumber] = CreateFile(fileName, dwAccess, 0, ByVal 0, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, 0)
-
-    If bAppend Then SetFilePointer(_System_hFile[FileNumber], 0, 0, FILE_END)
-End Macro
-
+    _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)
+End Macro
 Macro CLOSE()(FileNumber As Long)
-    FileNumber--
+    FileNumber=FileNumber-1
 
     If _System_hFile(FileNumber) Then
-        CloseHandle(_System_hFile[FileNumber])
-        _System_hFile(FileNumber) = 0
+        CloseHandle(_System_hFile(FileNumber))
+        _System_hFile(FileNumber)=0
     End If
 End Macro
@@ -151 +147 @@
 Dim _System_InputDataType[_System_MAX_PARMSNUM] As DWord
 Sub INPUT_FromFile(FileNumber As Long)
-    Dim i As Long, i2 As Long, i3 As Long
+    Dim i As Long ,i2 As Long, i3 As Long
     Dim buffer As String
     Dim temp[1] As Byte
@@ -157 +153 @@
     Dim IsStr As Long
 
-    FileNumber--
+    FileNumber=FileNumber-1
 
     buffer=ZeroString(GetFileSize(_System_hFile[FileNumber],0))
@@ -177 +173 @@
         IsStr=0
         While 1
-            i3++
+            i3=i3+1
 
             i2=ReadFile(_System_hFile[FileNumber],temp,1,VarPtr(dwAccessBytes),ByVal 0)
@@ -201 +197 @@
                         If dwAccessBytes=0 Then Exit While
                         If temp[0]=Asc(",") Then Exit While
-                        If temp[0] <> 32 And temp[0] <> 9 Then
+                        If Not(temp[0]=32 or temp[0]=9) Then
                             SetFilePointer(_System_hFile[FileNumber],-1,0,FILE_CURRENT)
                             Exit While
@@ -231 +227 @@
                 Dim pTempStr As *String
                 pTempStr=_System_InputDataPtr[i] As *String
-                pTempStr->Assign(buffer.Chars, i3)
+
+                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=i+1
         If _System_InputDataPtr[i]=0 Then Exit While
     Wend
@@ -241 +241 @@
 Sub PRINT_ToFile(FileNumber As Long, buf As String)
     Dim dwAccessByte As DWord
-    FileNumber--
+    FileNumber=FileNumber-1
 
     WriteFile(_System_hFile(FileNumber),buf,Len(buf),VarPtr(dwAccessByte),ByVal NULL)
@@ -263 +263 @@
             buffer[i3]=UsingStr[i2]
             If UsingStr[i2]=0 Then Exit While
-            i2++
-            i3++
+            i2=i2+1
+            i3=i3+1
         Wend
 
@@ -274 +274 @@
 
             Dim length_num As Long, length_buf As Long
-            Dim dblRoundOff = 0 As Double
+            Dim dblRoundOff=0 As Double
 
 
@@ -283 +283 @@
             i4=i2
             While UsingStr[i4]=Asc("#")
-                i4++
+                i4=i4+1
             Wend
             If UsingStr[i4]=Asc(".") Then
-                i4++
+                i4=i4+1
 
                 dblRoundOff=0.5
                 While UsingStr[i4]=Asc("#")
-                    i4++
+                    i4=i4+1
                     dblRoundOff=dblRoundOff/10
                 Wend
@@ -304 +304 @@
 
             '符号が有る場合は、一文字分のスペースを考慮する
-            If sign Then length_num++
+            If sign Then length_num=length_num+1
 
             length_buf=0
             Do
-                i2++
-                length_buf++
+                i2=i2+1
+                length_buf=length_buf+1
             Loop While UsingStr[i2]=Asc("#")
 
@@ -315 +315 @@
                 '通常時
                 FillMemory(StrPtr(buffer)+i3,length_buf-length_num,Asc(" "))
-                i3 += length_buf - length_num
+                i3=i3+(length_buf-length_num)
 
                 If sign Then
                     buffer[i3]=Asc("-")
-                    i3++
-
-                    length_num--
+                    i3=i3+1
+
+                    length_num=length_num-1
                 End If
 
@@ -330 +330 @@
                 End If
 
-                i3 += length_num
+                i3=i3+length_num
             Else
                 '表示桁が足りないとき
                 FillMemory(StrPtr(buffer)+i3,length_buf,Asc("#"))
-                i3 += length_buf
+                i3=i3+length_buf
             End If
 
             If UsingStr[i2]=Asc(".") Then
                 buffer[i3]=UsingStr[i2]
-                i2++
-                i3++
+                i2=i2+1
+                i3=i3+1
 
                 i4=dec
@@ -349 +349 @@
                         buffer[i3]=temp2[i4]
                     End If
-                    i3++
-                    i4++
-
-                    i2++
+                    i3=i3+1
+                    i4=i4+1
+
+                    i2=i2+1
                 Wend
             End If
         ElseIf UsingStr[i2]=Asc("@") Then
-            i2++1
+            i2=i2+1
 
             lstrcat(StrPtr(buffer)+i3,_System_UsingStrData[ParmNum])
-            i3 += lstrlen(_System_UsingStrData[ParmNum])
+            i3=i3+lstrlen(_System_UsingStrData[ParmNum])
         ElseIf UsingStr[i2]=Asc("&") Then
             i4=0
             Do
-                i4++
-                i2++
+                i4=i4+1
+                i2=i2+1
             Loop While UsingStr[i2]=Asc(" ")
 
             If UsingStr[i2]=Asc("&") Then
-                i4++
-                i2++
+                i4=i4+1
+                i2=i2+1
                 i5=lstrlen(_System_UsingStrData[ParmNum])
                 If i4<=i5 Then
@@ -377 +377 @@
                 End If
                 memcpy(StrPtr(buffer)+i3,_System_UsingStrData[ParmNum],i5)
-                i3 += i4
+                i3=i3+i4
             Else
-                i2 -= i4
+                i2=i2-i4
                 buffer[i3]=Asc("&")
-                i2++
-                i3++
+                i2=i2+1
+                i3=i3+1
                 Continue
             End If
         End If
 
-        ParmNum++
+        ParmNum=ParmNum+1
     Wend
 
     _System_GetUsingFormat=Left$(buffer,lstrlen(buffer))
 End Function
-
 Sub PRINTUSING_ToFile(FileNumber As Long, UsingStr As String)
     Dim dwAccessByte As DWord
     Dim buf As String
 
-    FileNumber--
+    FileNumber=FileNumber-1
     buf=_System_GetUsingFormat(UsingStr)
 
@@ -404 +403 @@
 
 Dim _System_FieldSize(255) As Long
-
 Macro FIELD(FileNumber As Long, FieldSize As Long)
-    FileNumber--
+    FileNumber=FileNumber-1
 
     _System_FieldSize(FileNumber)=FieldSize
 End Macro
-
 Macro GET(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
     Dim dwAccessByte As Long
 
-    FileNumber--
-    RecodeNumber--
+    FileNumber=FileNumber-1
+    RecodeNumber=RecodeNumber-1
 
     SetFilePointer(_System_hFile(FileNumber),RecodeNumber*_System_FieldSize(FileNumber),NULL,FILE_BEGIN)
@@ -424 +421 @@
     End If
 End Macro
-
 Macro PUT(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
     Dim dwAccessByte As Long
 
-    FileNumber--
-    RecodeNumber--
+    FileNumber=FileNumber-1
+    RecodeNumber=RecodeNumber-1
 
     SetFilePointer(_System_hFile(FileNumber),RecodeNumber*_System_FieldSize(FileNumber),NULL,FILE_BEGIN)
@@ -435 +431 @@
 End Macro
 
-Macro CHDIR(ByRef path As String)
+Macro CHDIR(path As String)
     SetCurrentDirectory(path)
 End Macro
-
-Macro MKDIR(ByRef path As String)
+Macro MKDIR(path As String)
     CreateDirectory(path,ByVal 0)
 End Macro
-
-Macro KILL(ByRef path As String)
+Macro KILL(path As String)
     DeleteFile(path)
 End Macro

/Include/basic/function.sbp

@@ -769 +769 @@
             i64data=1
             While i>=2
-                Val += i64data*TempPtr[i]
+                Val += (i64data*TempPtr[i]) As Double
 
                 i64data *= &H10
@@ -957 +957 @@
     Loop
     If dir Then dir[i3]=0
-    i3 += ii-i2
+    i3 += i-i2
 
     'ファイル名をコピー

/Include/system/enum.sbp

@@ -18 +18 @@
         Return m_Value
     End Function
+
+    Function Operator == (Value As Long) As Long
+        If m_Value = Value Then
+            Return _System_TRUE
+        Else
+            Return _System_FALSE
+        End If
+    End Function
 End Class