Changeset 581

Timestamp:

Aug 9, 2008, 1:32:26 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Unicodeコンパイルで問題になる部分を修正

Location:

trunk/ab5.0/ablib/src

Files:

• Classes/ActiveBasic/Strings/Strings.ab (modified) (2 diffs)
• Classes/System/IO/BinaryWriter.ab (modified) (2 diffs)
• Classes/System/Text/DecoderFallback.ab (modified) (1 diff)
• Classes/System/Text/Encoding.ab (modified) (1 diff)
• Classes/System/Threading/WaitHandle.ab (modified) (1 diff)
• basic/function.sbp (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Strings/Strings.ab

@@ -38 +38 @@
     MoveMemory(dst, src, size)
     Return dst
+End Function
+
+Function StrCpy(dst As PCSTR, src As PCSTR) As PCSTR
+    StrCpy = dst
+    Dim i As SIZE_T
+    Do
+        dst[i] = src[i]
+        If src[i] = 0 Then Exit Do
+        i++
+    Loop 
+End Function
+
+Function StrCpy(dst As PCWSTR, src As PCWSTR) As PCWSTR
+    StrCpy = dst
+    Dim i As SIZE_T
+    Do
+        dst[i] = src[i]
+        If src[i] = 0 Then Exit Do
+        i++
+    Loop 
 End Function
 
@@ -191 +211 @@
 
 Namespace Detail
-Function Split(s As String, c As Char) As System.Collections.Generic.List<String>
+Function Split(s As String, c As Char) As System.Collections.Generic.IList<String>
     Split = New System.Collections.Generic.List<String>
 

trunk/ab5.0/ablib/src/Classes/System/IO/BinaryWriter.ab

@@ -165 +165 @@
         This.OutStream.Write( ToTCStr(value) As *Byte, 0, value.Length()*SizeOf(TCHAR))
     End Sub
- 
+#ifndef UNICODE
     /*
         現在のストリームに2バイト符号なし整数を書き込み、ストリームの位置を 2バイトだけ進めます。
@@ -172 +172 @@
         This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Word))
     End Sub
- 
+#endif
     /*
         現在のストリームに4バイト符号なし整数を書き込み、ストリームの位置を 4バイトだけ進めます。

trunk/ab5.0/ablib/src/Classes/System/Text/DecoderFallback.ab

@@ -177 +177 @@
         End If
         With replacement
-            str = .StrPtr
-            len = .Length
+'           str = .StrPtr
+'           len = .Length
         End With
     End Sub

trunk/ab5.0/ablib/src/Classes/System/Text/Encoding.ab

@@ -151 +151 @@
     */
     Function GetBytes(s As String, index As Long, count As Long, bytes As *Byte, byteCount As Long) As Long
-        If chars = 0 Then
+        If ActiveBasic.IsNothing(s) Then
             Throw New ArgumentNullException("Encoding.GetBytes: An argument is null value.", "chars")
         ElseIf bytes = 0 Then

trunk/ab5.0/ablib/src/Classes/System/Threading/WaitHandle.ab

@@ -87 +87 @@
 
     Static Function SignalAndWait(toSignal As WaitHandle, toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As Boolean) As Boolean
-        Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") As Detail.PFNSignalObjectAndWait
+        Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), ToMBStr("SignalObjectAndWait")) As Detail.PFNSignalObjectAndWait
         If pSignalObjectAndWait = 0 Then
             Throw New PlatformNotSupportedException("WaitHandle.SignalAndWait: This platform doesn't supoort this operation.")

trunk/ab5.0/ablib/src/basic/function.sbp

@@ -886 +886 @@
     If ext Then
         If i3 Then
-            lstrcpy(ext,path+i3)
+            ActiveBasic.Strings.StrCpy(ext,path+i3)
         End If
         else ext[0]=0