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

Timestamp:

Nov 9, 2008, 2:21:49 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

#161完了。StreamReaderのUnicode対応。

File:

• trunk/ab5.0/ablib/src/Classes/System/Text/Encoding.ab (modified) (4 diffs)

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

@@ -353 +353 @@
         ByRef srcUsed As Long, ByRef dstUsed As Long, ByRef completed As Boolean)
 
-        If src = 0 Then
+        If src = 0 And srcCount > 0 Then
             Throw New ArgumentNullException("src")
         ElseIf srcCount < 0 Then
@@ -452 +452 @@
         ByRef srcUsed As Long, ByRef dstUsed As Long, ByRef completed As Boolean)
 
-        If src = 0 Then
+        If src = 0 And srcCount > 0 Then
             Throw New ArgumentNullException("src")
         ElseIf srcCount < 0 Then
@@ -641 +641 @@
 
     Override Function GetBytesCountCore(src As *WCHAR, srcCount As Long, flush As Boolean) As Long
+        GetBytesCountCore = srcCount * 2 + 1 '暫定
     End Function
 
@@ -658 +659 @@
     Override Sub ConvertCore(src As *Byte, srcCount As Long, dst As *WCHAR, dstCount As Long, flush As Boolean,
         ByRef srcUsed As Long, ByRef dstUsed As Long, ByRef completed As Boolean)
+
+        Dim srcPos = 0 As Long
+        Dim dstPos = 0 As Long
+        If dstCount > 0 And nextByte <> 0 Then
+            Dim buf[1] As CHAR
+            buf[0] = nextByte As CHAR
+            buf[1] = src[1] As CHAR
+            Dim len = MultiByteToWideChar(cp, 0, buf, Len(buf), VarPtr(dst[dstPos]), 10)
+            If len = 0 Then
+                ActiveBasic.Windows.ThrowWithLastError()
+            End If
+            srcPos++
+            dstPos++
+            nextByte = 0
+        End If
+        While srcPos < srcCount And dstPos < srcCount
+            Dim srcCharSize = 1 As Long
+            If IsDBCSLeadByteEx(cp, src[srcPos]) Then
+                srcCharSize = 2
+                If srcPos + 1 = srcCount Then
+                    nextByte = src[srcPos]
+                    Exit While
+                End If
+            End If
+            '将来的には行毎に変換しMB_USEGLYPHCHARSを使うようにしたい。
+            Dim len = MultiByteToWideChar(cp, 0, VarPtr(src[srcPos]) As *CHAR, srcCharSize, VarPtr(dst[dstPos]), 1)
+            If len = 0 Then
+                ActiveBasic.Windows.ThrowWithLastError()
+            End If
+            srcPos += srcCharSize
+            dstPos++
+        Wend
+        srcUsed = srcPos
+        dstUsed = dstPos
+        completed = (srcPos = srcCount And dstPos = srcCount And nextByte = 0)
     End Sub
 
     Override Function GetCharsCountCore(src As *Byte, srcCount As Long, flush As Boolean) As Long
+        GetCharsCountCore = srcCount + 1 '暫定
     End Function
 
 Private
     cp As DWord
+    nextByte As Byte
 End Class