Changeset 581 for trunk/ab5.0/ablib/src/Classes/System

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

trunk/ab5.0/ablib/src/Classes/System

Files:

• IO/BinaryWriter.ab (modified) (2 diffs)
• Text/DecoderFallback.ab (modified) (1 diff)
• Text/Encoding.ab (modified) (1 diff)
• Threading/WaitHandle.ab (modified) (1 diff)

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.")