Differences From Artifact [88dea4ced5]:
- File
src/OFStdIOStream_Win32Console.m
— part of check-in
[566d4df603]
at
2016-03-13 10:24:22
on branch trunk
— OFStdIOStream_Win32Console: Improve reading
On reads, surrogates that have been cut off are now properly handled. (user: js, size: 6260) [annotate] [blame] [check-ins using]
To Artifact [f55d77f8b8]:
- File
src/OFStdIOStream_Win32Console.m
— part of check-in
[5e2ef97c35]
at
2016-03-13 11:19:13
on branch trunk
— Change of_string_utf8_decode() API
It now returns <= 0 on error, with negative values being the number of
bytes it would have needed * -1.This can be used to detect cut off and how many bytes are missing. (user: js, size: 6293) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #define OF_STDIO_STREAM_WIN32_CONSOLE_M #include "config.h" #import "OFStdIOStream_Win32Console.h" #import "OFStdIOStream+Private.h" #import "OFDataArray.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" | > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | #define OF_STDIO_STREAM_WIN32_CONSOLE_M #include "config.h" #import "OFStdIOStream_Win32Console.h" #import "OFStdIOStream+Private.h" #import "OFString.h" #import "OFDataArray.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFWriteFailedException.h" |
| ︙ | ︙ | |||
219 220 221 222 223 224 225 |
count: length * 2];
@try {
size_t i = 0, j = 0;
DWORD written;
while (i < length) {
of_unichar_t c;
| | | | | | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
count: length * 2];
@try {
size_t i = 0, j = 0;
DWORD written;
while (i < length) {
of_unichar_t c;
size_t UTF8Len;
UTF8Len = of_string_utf8_decode(buffer + i, length - i,
&c);
if (UTF8Len <= 0 || c > 0x10FFFF)
@throw [OFInvalidEncodingException exception];
if (c > 0xFFFF) {
c -= 0x10000;
tmp[j++] = 0xD800 | (c >> 10);
tmp[j++] = 0xDC00 | (c & 0x3FF);
} else
tmp[j++] = c;
i += UTF8Len;
}
if (!WriteConsoleW(_handle, tmp, j, &written, NULL) ||
written != j)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: j];
} @finally {
[self freeMemory: tmp];
}
}
@end
|