Overview
| Comment: | OFWin32ConsoleStdIOStream: Support for ANSI Win32 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
bcf421d8136bb91dd5a4dc1b30514691 |
| User & Date: | js on 2020-05-17 00:58:16 |
| Other Links: | manifest | tags |
Context
|
2020-05-17
| ||
| 10:32 | Add +[OFSystemInfo isWindowsNT] check-in: 793fdb6630 user: js tags: trunk | |
| 00:58 | OFWin32ConsoleStdIOStream: Support for ANSI Win32 check-in: bcf421d813 user: js tags: trunk | |
|
2020-05-16
| ||
| 22:00 | OFDate: Don't declare _mktime64() with WINAPI check-in: bce1118807 user: js tags: trunk | |
Changes
Modified src/OFWin32ConsoleStdIOStream.m from [f6d82fa9cc] to [2a51abc2a7].
| ︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidEncodingException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"
#include <windows.h>
@implementation OFWin32ConsoleStdIOStream
+ (void)load
{
int fd;
if (self != [OFWin32ConsoleStdIOStream class])
| > > > > > > > > > > > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidEncodingException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"
#include <windows.h>
static of_string_encoding_t
codepageToEncoding(UINT codepage)
{
switch (codepage) {
case 437:
return OF_STRING_ENCODING_CODEPAGE_437;
case 850:
return OF_STRING_ENCODING_CODEPAGE_850;
case 858:
return OF_STRING_ENCODING_CODEPAGE_858;
case 1251:
return OF_STRING_ENCODING_WINDOWS_1251;
case 1252:
return OF_STRING_ENCODING_WINDOWS_1252;
default:
@throw [OFInvalidEncodingException exception];
}
}
@implementation OFWin32ConsoleStdIOStream
+ (void)load
{
int fd;
if (self != [OFWin32ConsoleStdIOStream class])
|
| ︙ | ︙ | |||
105 106 107 108 109 110 111 |
length: (size_t)length
{
void *pool = objc_autoreleasePoolPush();
char *buffer = buffer_;
of_char16_t *UTF16;
size_t j = 0;
| | | > > > > > | | | | > > > > > > > > > > > > > > > > > > > > | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
length: (size_t)length
{
void *pool = objc_autoreleasePoolPush();
char *buffer = buffer_;
of_char16_t *UTF16;
size_t j = 0;
if (length > UINT32_MAX)
@throw [OFOutOfRangeException exception];
UTF16 = [self allocMemoryWithSize: sizeof(of_char16_t)
count: length];
@try {
DWORD UTF16Len;
OFMutableData *rest = nil;
size_t i = 0;
if (!ReadConsoleW(_handle, UTF16, (DWORD)length, &UTF16Len,
NULL)) {
of_string_encoding_t encoding;
OFString *string;
size_t stringLen;
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@throw [OFReadFailedException
exceptionWithObject: self
requestedLength: length * 2
errNo: EIO];
if (!ReadConsoleA(_handle, (char *)UTF16, (DWORD)length,
&UTF16Len, NULL))
@throw [OFReadFailedException
exceptionWithObject: self
requestedLength: length
errNo: EIO];
encoding = codepageToEncoding(GetConsoleCP());
string = [OFString stringWithCString: (char *)UTF16
encoding: encoding
length: UTF16Len];
stringLen = string.UTF16StringLength;
if (stringLen > length)
@throw [OFOutOfRangeException exception];
UTF16Len = (DWORD)stringLen;
memcpy(UTF16, string.UTF16String, stringLen);
}
if (UTF16Len > 0 && _incompleteUTF16Surrogate != 0) {
of_unichar_t c =
(((_incompleteUTF16Surrogate & 0x3FF) << 10) |
(UTF16[0] & 0x3FF)) + 0x10000;
char UTF8[4];
size_t UTF8Len;
|
| ︙ | ︙ | |||
268 269 270 271 272 273 274 |
} else {
UTF16[0] = c;
UTF16Len = 1;
}
}
if (!WriteConsoleW(_handle, UTF16, UTF16Len, &bytesWritten,
| | > > > > > > | | | | | > > > > > > > > > > > > > > > > > > > > > > | 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
} else {
UTF16[0] = c;
UTF16Len = 1;
}
}
if (!WriteConsoleW(_handle, UTF16, UTF16Len, &bytesWritten,
NULL)) {
void *pool;
OFString *string;
of_string_encoding_t encoding;
size_t nativeLen;
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: UTF16Len * 2
bytesWritten: bytesWritten * 2
errNo: EIO];
pool = objc_autoreleasePoolPush();
string = [OFString stringWithUTF16String: UTF16
length: UTF16Len];
encoding = codepageToEncoding(GetConsoleOutputCP());
nativeLen = [string
cStringLengthWithEncoding: encoding];
if (nativeLen > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if (!WriteConsoleA(_handle,
[string cStringWithEncoding: encoding],
(DWORD)nativeLen, &bytesWritten, NULL))
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: nativeLen
bytesWritten: bytesWritten
errNo: EIO];
objc_autoreleasePoolPop(pool);
}
if (bytesWritten != UTF16Len)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: UTF16Len * 2
bytesWritten: bytesWritten * 2
errNo: 0];
|
| ︙ | ︙ | |||
327 328 329 330 331 332 333 | i += UTF8Len; } if (j > UINT32_MAX) @throw [OFOutOfRangeException exception]; | | > > > > > > > | | | | | > > > > > > > > > > > > > > > > > > > > > > | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 |
i += UTF8Len;
}
if (j > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if (!WriteConsoleW(_handle, tmp, (DWORD)j, &bytesWritten,
NULL)) {
void *pool;
OFString *string;
of_string_encoding_t encoding;
size_t nativeLen;
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: j * 2
bytesWritten: bytesWritten * 2
errNo: EIO];
pool = objc_autoreleasePoolPush();
string = [OFString stringWithUTF16String: tmp
length: j];
encoding = codepageToEncoding(GetConsoleOutputCP());
nativeLen = [string
cStringLengthWithEncoding: encoding];
if (nativeLen > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if (!WriteConsoleA(_handle,
[string cStringWithEncoding: encoding],
(DWORD)nativeLen, &bytesWritten, NULL))
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: nativeLen
bytesWritten: bytesWritten
errNo: EIO];
objc_autoreleasePoolPop(pool);
}
if (bytesWritten != j)
@throw [OFWriteFailedException
exceptionWithObject: self
requestedLength: j * 2
bytesWritten: bytesWritten * 2
errNo: 0];
|
| ︙ | ︙ |