Changeset 123 for Include/basic/function.sbp

Timestamp:

Mar 1, 2007, 12:31:13 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

(拡張)メタファイル関数（全部）・構造体（一部）、BITMAPV4HEADERとそれに関連する型などの宣言

File:

• Include/basic/function.sbp (modified) (14 diffs)

Include/basic/function.sbp

@@ -502 +502 @@
     i2=0
     Do
-        Oct$[i2]=Asc("0")+((num\CDWord(8^i)) And &H07)
+        Oct$[i2] = &h30 +((num \ CDWord(8 ^ i)) And &H07) ' &h30 = Asc("0")
         If i=0 Then Exit Do
         i--
@@ -522 +522 @@
 
 Function Space$(length As Long) As String
-    Space$=ZeroString(length)
-    FillMemory(StrPtr(Space$),length,&H20)
+    Space$.ReSize(length, &H20 As Char)
 End Function
 
@@ -540 +539 @@
         End If
     Else
-        _System_ecvt_buffer[count]=_System_ecvt_buffer[count]+1 As Char
+        _System_ecvt_buffer[count]++
     End If
 End Sub
@@ -551 +550 @@
     '値が0の場合
     If value=0 Then
-        FillMemory(_System_ecvt_buffer,count,&H30)
-        _System_ecvt_buffer[count]=0
-        dec=0
-        sign=0
+        _System_FillChar(_System_ecvt_buffer, count, &H30)
+        _System_ecvt_buffer[count] = 0
+        dec = 0
+        sign = 0
         Exit Function
     End If
@@ -627 +626 @@
         buffer[i]=Asc(".")
         i++
-        memcpy(buffer+i,temp+1,14)
+        memcpy(VarPtr(buffer[i]), VarPtr(temp[1]), SizeOf (Char) * 14)
         i+=14
         buffer[i]=Asc("e")
         i++
-        wsprintf(buffer+i,"+%03d",dec-1)
+        _stprintf(VarPtr(buffer[i]), "+%03d", dec-1)
 
         Return MakeStr(buffer)
@@ -642 +641 @@
         buffer[i]=Asc(".")
         i++
-        memcpy(buffer+i,temp+1,14)
+        memcpy(VarPtr(buffer[i]), VarPtr(temp[1]), SizeOf (Char) * 14)
         i+=14
         buffer[i]=Asc("e")
         i++
-        wsprintf(buffer+i,"%03d",dec-1)
+        _stprintf(VarPtr(buffer[i]), "+%03d", dec-1)
 
         Return MakeStr(buffer)
@@ -714 +713 @@
     Dim i As Long
     For i=0 To num-1
-        memcpy(VarPtr(String$[i*length]),StrPtr(buf),SizeOf (Char) * length)
+        memcpy(VarPtr(String$[i*length]), StrPtr(buf), SizeOf (Char) * length)
     Next
 End Function
@@ -760 +759 @@
 
     If buf[0]=Asc("&") Then
-        temporary=buf
-        TempPtr=StrPtr(temporary)
-        CharUpper(TempPtr)
+        temporary = buf
+        temporary.ToUpper()
+        TempPtr = StrPtr(temporary)
         If TempPtr(1)=Asc("O") Then
             '8進数
@@ -778 +777 @@
             i64data=1
             While i>=2
-                Val=Val+i64data*TempPtr[i]
-
-                i64data=i64data*&O10
+                Val += i64data * TempPtr[i]
+
+                i64data *= &O10
                 i--
             Wend
@@ -948 +947 @@
 '--------
 
-Sub _splitpath(path As BytePtr, drive As BytePtr, dir As BytePtr, fname As BytePtr, ext As BytePtr)
+Sub _splitpath(path As PCSTR, drive As PSTR, dir As PSTR, fname As PSTR, ext As PSTR)
     Dim i As Long, i2 As Long, i3 As Long, length As Long
     Dim buffer[MAX_PATH] As Char
@@ -966 +965 @@
     i2=0
     Do
-#ifdef UNICODE
-' ToDo: サロゲートペアの認識
-#else
-        If IsDBCSLeadByte(path[i])=TRUE and path[i+1]<>0 Then
+'#ifdef UNICODE
+'       If _System_IsSurrogatePair(path[i], path[i + 1]) Then
+'#else
+        If IsDBCSLeadByte(path[i]) <> FALSE and path[i + 1] <> 0 Then
+'#endif
             If dir Then
                 dir[i2]=path[i]
@@ -979 +979 @@
             Continue
         End If
-#endif
 
         If path[i]=0 Then Exit Do
@@ -1000 +999 @@
     i3=-1
     Do
-        If IsDBCSLeadByte(path[i])=TRUE and path[i+1]<>0 Then
+'#ifdef UNICODE
+'       If _System_IsSurrogatePair(path[i], path[i + 1]) Then
+'#else
+        If IsDBCSLeadByte(path[i]) <> FALSE and path[i + 1] <> 0 Then
+'#endif
             If fname Then
                 fname[i2]=path[i]
@@ -1065 +1068 @@
 End Function
 
+Function _System_FillChar(p As *Char, n As SIZE_T, c As Char)
+    Dim i As SIZE_T
+    For i = 0 To ELM(n)
+        p[i] = c
+    Next
+End Function
+
 #endif '_INC_FUNCTION