Changeset 666

Timestamp:

2008/12/28 17:44:40 (3 years ago)

Author:

egtra

Message:

マルチバイト文字列の先行バイトの扱いを忘れていたことを修正
(#235)

File:

• trunk/ab5.0/ablib/src/Classes/System/IO/StreamReader.ab (modified) (1 diff)

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

@@ -60 +60 @@
         Dim wcBuf[4095] As WCHAR
         Dim mbBuf[4095] As SByte
-        Dim mbLen = s.Read(mbBuf As *Byte, 0, Len(buf))
+        Dim pNext = mbBuf As PSTR
+        Dim mbBufSize = Len(buf)
+        If leadByte <> 0 Then
+            pNext[0] = leadByte
+            leadByte = 0
+            pNext++
+            mbBufSize--
+        End If
+        Dim mbLen = s.Read(pNext As *Byte, 0, mbBufSize)
         If mbLen = 0 Then
             Underflow = False
             Exit Function
         End If
-        Dim pNext = mbBuf As PSTR
         Do
             Dim q = CharNextExA(cp, pNext, 0)