Changeset 237 for Include/basic

Timestamp:

May 7, 2007, 4:22:52 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

#_fullcompileで検出されたエラーの修正（明らかに判るもののみ）

Location:

Include/basic

Files:

• command.sbp (modified) (8 diffs)
• function.sbp (modified) (4 diffs)

Include/basic/command.sbp

@@ -74 +74 @@
 Macro MSGBOX(hwnd As HWND, str As String)(title As String, boxType As DWord, ByRef retAns As DWord)
     If VarPtr(retAns) Then
-        retAns = _System_MessageBox(hwnd, str, title, boxType)
+        retAns = _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
     Else
-        _System_MessageBox(hwnd, str, title, boxType)
+        _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
     End If
 End Macro
@@ -333 +333 @@
             If length_buf>=length_num Then
                 '通常時
-                _System_FillChar(VarPtr(buffer[i3]), length_buf - length_num, &h20) 'Asc(" ")
+                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf - length_num, &h20) 'Asc(" ")
 
                 i3 += length_buf - length_num
@@ -345 +345 @@
 
                 If dec > 0 Then
-                    memcpy(VarPtr(buffer[i3]), temp2, SizeOf (StrChar) * length_num)
+                    memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (StrChar) * length_num)
                 Else
                     buffer[i3] = &H30
@@ -353 +353 @@
             Else
                 '表示桁が足りないとき
-                _System_FillChar(VarPtr(buffer[i3]), length_buf,&h23) 'Asc("#")
+                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf, &h23) 'Asc("#")
                 i3 += length_buf
             End If
@@ -378 +378 @@
             i2++
 
-            'lstrcat(StrPtr(buffer)+i3,_System_UsingStrData[ParmNum])
-            memcpy(VarPtr(buffer[i3 + lstrlen(VarPtr(buffer[i3]))]), _System_UsingStrData[ParmNum], _
-                SizeOf (StrChar) * lstrlen(_System_UsingStrData[ParmNum]))
+            lstrcat(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum])
             i3 += lstrlen(_System_UsingStrData[ParmNum])
         ElseIf UsingStr[i2]=Asc("&") Then
@@ -396 +394 @@
                     i5=i4
                 Else
-                    _System_FillChar(VarPtr(buffer[i3]), i4, &h20) 'Asc(" ")
+                    _System_FillChar(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
                 End If
-                memcpy(VarPtr(buffer[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
+                memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
                 i3 += i4
             Else
@@ -431 +429 @@
 End Macro
 Macro GET(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
-    Dim dwAccessByte As Long
+    Dim dwAccessByte As DWord
 
     FileNumber--
@@ -444 +442 @@
 End Macro
 Macro PUT(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
-    Dim dwAccessByte As Long
+    Dim dwAccessByte As DWord
 
     FileNumber--

Include/basic/function.sbp

@@ -508 +508 @@
     i2=0
     Do
-        Oct$[i2] = &h30 +((num \ CDWord(8 ^ i)) And &H07) ' &h30 = Asc("0")
+        Oct$[i2] = &h30 +((num \ CDWord(8 ^ i)) And &H07) As StrChar ' &h30 = Asc("0")
         If i=0 Then Exit Do
         i--
@@ -715 +715 @@
     Dim i As Long
     For i=0 To num-1
-        memcpy(VarPtr(String$[i*length]), StrPtr(buf), SizeOf (StrChar) * length)
+        memcpy(VarPtr(String$.Chars[i*length]), StrPtr(buf), SizeOf (StrChar) * length)
     Next
 End Function
@@ -1194 +1194 @@
     Dim i = 0 As SIZE_T
     For i = 0 To ELM(size)
-        _System_StrCmp = s1[i] - s2[i]
-        If _System_StrCmp <> 0 Then
+        _System_StrCmpN = s1[i] - s2[i]
+        If _System_StrCmpN <> 0 Then
             Exit Function
         End If
@@ -1204 +1204 @@
     Dim i = 0 As SIZE_T
     For i = 0 To ELM(size)
-        _System_StrCmp = s1[i] - s2[i]
-        If _System_StrCmp <> 0 Then
+        _System_StrCmpN = s1[i] - s2[i]
+        If _System_StrCmpN <> 0 Then
             Exit Function
         End If