Changeset 237 for Include/basic


Ignore:
Timestamp:
May 7, 2007, 4:22:52 PM (18 years ago)
Author:
イグトランス (egtra)
Message:

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

Location:
Include/basic
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Include/basic/command.sbp

    r214 r237  
    7474Macro MSGBOX(hwnd As HWND, str As String)(title As String, boxType As DWord, ByRef retAns As DWord)
    7575    If VarPtr(retAns) Then
    76         retAns = _System_MessageBox(hwnd, str, title, boxType)
     76        retAns = _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
    7777    Else
    78         _System_MessageBox(hwnd, str, title, boxType)
     78        _System_MessageBox(hwnd, ToSCStr(str), ToSCStr(title), boxType)
    7979    End If
    8080End Macro
     
    333333            If length_buf>=length_num Then
    334334                '通常時
    335                 _System_FillChar(VarPtr(buffer[i3]), length_buf - length_num, &h20) 'Asc(" ")
     335                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf - length_num, &h20) 'Asc(" ")
    336336
    337337                i3 += length_buf - length_num
     
    345345
    346346                If dec > 0 Then
    347                     memcpy(VarPtr(buffer[i3]), temp2, SizeOf (StrChar) * length_num)
     347                    memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (StrChar) * length_num)
    348348                Else
    349349                    buffer[i3] = &H30
     
    353353            Else
    354354                '表示桁が足りないとき
    355                 _System_FillChar(VarPtr(buffer[i3]), length_buf,&h23) 'Asc("#")
     355                _System_FillChar(VarPtr(buffer.Chars[i3]), length_buf, &h23) 'Asc("#")
    356356                i3 += length_buf
    357357            End If
     
    378378            i2++
    379379
    380             'lstrcat(StrPtr(buffer)+i3,_System_UsingStrData[ParmNum])
    381             memcpy(VarPtr(buffer[i3 + lstrlen(VarPtr(buffer[i3]))]), _System_UsingStrData[ParmNum], _
    382                 SizeOf (StrChar) * lstrlen(_System_UsingStrData[ParmNum]))
     380            lstrcat(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum])
    383381            i3 += lstrlen(_System_UsingStrData[ParmNum])
    384382        ElseIf UsingStr[i2]=Asc("&") Then
     
    396394                    i5=i4
    397395                Else
    398                     _System_FillChar(VarPtr(buffer[i3]), i4, &h20) 'Asc(" ")
     396                    _System_FillChar(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
    399397                End If
    400                 memcpy(VarPtr(buffer[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
     398                memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
    401399                i3 += i4
    402400            Else
     
    431429End Macro
    432430Macro GET(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
    433     Dim dwAccessByte As Long
     431    Dim dwAccessByte As DWord
    434432
    435433    FileNumber--
     
    444442End Macro
    445443Macro PUT(FileNumber As Long, RecodeNumber As Long, ByRef lpBuffer As String)
    446     Dim dwAccessByte As Long
     444    Dim dwAccessByte As DWord
    447445
    448446    FileNumber--
  • Include/basic/function.sbp

    r223 r237  
    508508    i2=0
    509509    Do
    510         Oct$[i2] = &h30 +((num \ CDWord(8 ^ i)) And &H07) ' &h30 = Asc("0")
     510        Oct$[i2] = &h30 +((num \ CDWord(8 ^ i)) And &H07) As StrChar ' &h30 = Asc("0")
    511511        If i=0 Then Exit Do
    512512        i--
     
    715715    Dim i As Long
    716716    For i=0 To num-1
    717         memcpy(VarPtr(String$[i*length]), StrPtr(buf), SizeOf (StrChar) * length)
     717        memcpy(VarPtr(String$.Chars[i*length]), StrPtr(buf), SizeOf (StrChar) * length)
    718718    Next
    719719End Function
     
    11941194    Dim i = 0 As SIZE_T
    11951195    For i = 0 To ELM(size)
    1196         _System_StrCmp = s1[i] - s2[i]
    1197         If _System_StrCmp <> 0 Then
     1196        _System_StrCmpN = s1[i] - s2[i]
     1197        If _System_StrCmpN <> 0 Then
    11981198            Exit Function
    11991199        End If
     
    12041204    Dim i = 0 As SIZE_T
    12051205    For i = 0 To ELM(size)
    1206         _System_StrCmp = s1[i] - s2[i]
    1207         If _System_StrCmp <> 0 Then
     1206        _System_StrCmpN = s1[i] - s2[i]
     1207        If _System_StrCmpN <> 0 Then
    12081208            Exit Function
    12091209        End If
Note: See TracChangeset for help on using the changeset viewer.