|
80 | 80 | __declspec(noinline) |
81 | 81 | #endif |
82 | 82 | format_float( |
83 | | - TCHAR chr, |
| 83 | + _TCHAR chr, |
84 | 84 | unsigned int flags, |
85 | 85 | int precision, |
86 | | - TCHAR **string, |
87 | | - const TCHAR **prefix, |
| 86 | + _TCHAR **string, |
| 87 | + const _TCHAR **prefix, |
88 | 88 | va_list *argptr) |
89 | 89 | { |
90 | | - static const TCHAR digits_l[] = _T("0123456789abcdef0x"); |
91 | | - static const TCHAR digits_u[] = _T("0123456789ABCDEF0X"); |
92 | | - static const TCHAR _nan[] = _T("#QNAN"); |
93 | | - static const TCHAR _infinity[] = _T("#INF"); |
94 | | - const TCHAR *digits = digits_l; |
| 90 | + static const _TCHAR digits_l[] = _T("0123456789abcdef0x"); |
| 91 | + static const _TCHAR digits_u[] = _T("0123456789ABCDEF0X"); |
| 92 | + static const _TCHAR _nan[] = _T("#QNAN"); |
| 93 | + static const _TCHAR _infinity[] = _T("#INF"); |
| 94 | + const _TCHAR *digits = digits_l; |
95 | 95 | int exponent = 0, sign; |
96 | 96 | long double fpval, fpval2; |
97 | 97 | int padding = 0, num_digits, val32, base = 10; |
@@ -186,13 +186,13 @@ format_float( |
186 | 186 | /* Handle special cases first */ |
187 | 187 | if (_isnan(fpval)) |
188 | 188 | { |
189 | | - (*string) -= sizeof(_nan) / sizeof(TCHAR) - 1; |
| 189 | + (*string) -= sizeof(_nan) / sizeof(_TCHAR) - 1; |
190 | 190 | _tcscpy((*string), _nan); |
191 | 191 | fpval2 = 1; |
192 | 192 | } |
193 | 193 | else if (!_finite(fpval)) |
194 | 194 | { |
195 | | - (*string) -= sizeof(_infinity) / sizeof(TCHAR) - 1; |
| 195 | + (*string) -= sizeof(_infinity) / sizeof(_TCHAR) - 1; |
196 | 196 | _tcscpy((*string), _infinity); |
197 | 197 | fpval2 = 1; |
198 | 198 | } |
@@ -234,24 +234,24 @@ streamout_char(FILE *stream, int chr) |
234 | 234 | #endif |
235 | 235 | #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) |
236 | 236 | /* Check if the buffer is full */ |
237 | | - if (stream->_cnt < sizeof(TCHAR)) |
| 237 | + if (stream->_cnt < sizeof(_TCHAR)) |
238 | 238 | return 0; |
239 | 239 |
|
240 | | - *(TCHAR*)stream->_ptr = chr; |
241 | | - stream->_ptr += sizeof(TCHAR); |
242 | | - stream->_cnt -= sizeof(TCHAR); |
| 240 | + *(_TCHAR*)stream->_ptr = chr; |
| 241 | + stream->_ptr += sizeof(_TCHAR); |
| 242 | + stream->_cnt -= sizeof(_TCHAR); |
243 | 243 |
|
244 | 244 | return 1; |
245 | 245 | #else |
246 | | - return _fputtc((TCHAR)chr, stream) != _TEOF; |
| 246 | + return _fputtc((_TCHAR)chr, stream) != _TEOF; |
247 | 247 | #endif |
248 | 248 | } |
249 | 249 |
|
250 | 250 | static |
251 | 251 | int |
252 | 252 | streamout_astring(FILE *stream, const char *string, size_t count) |
253 | 253 | { |
254 | | - TCHAR chr; |
| 254 | + _TCHAR chr; |
255 | 255 | int written = 0; |
256 | 256 |
|
257 | 257 | #if !defined(_USER32_WSPRINTF) |
@@ -323,15 +323,15 @@ streamout_wstring(FILE *stream, const wchar_t *string, size_t count) |
323 | 323 |
|
324 | 324 | int |
325 | 325 | __cdecl |
326 | | -streamout(FILE *stream, const TCHAR *format, va_list argptr) |
| 326 | +streamout(FILE *stream, const _TCHAR *format, va_list argptr) |
327 | 327 | { |
328 | | - static const TCHAR digits_l[] = _T("0123456789abcdef0x"); |
329 | | - static const TCHAR digits_u[] = _T("0123456789ABCDEF0X"); |
| 328 | + static const _TCHAR digits_l[] = _T("0123456789abcdef0x"); |
| 329 | + static const _TCHAR digits_u[] = _T("0123456789ABCDEF0X"); |
330 | 330 | static const char *_nullstring = "(null)"; |
331 | | - TCHAR buffer[BUFFER_SIZE + 1]; |
332 | | - TCHAR chr, *string; |
| 331 | + _TCHAR buffer[BUFFER_SIZE + 1]; |
| 332 | + _TCHAR chr, *string; |
333 | 333 | STRING *nt_string; |
334 | | - const TCHAR *digits, *prefix; |
| 334 | + const _TCHAR *digits, *prefix; |
335 | 335 | int base, fieldwidth, precision, padding; |
336 | 336 | size_t prefixlen, len; |
337 | 337 | int written = 1, written_all = 0; |
@@ -534,7 +534,7 @@ streamout(FILE *stream, const TCHAR *format, va_list argptr) |
534 | 534 | case_string: |
535 | 535 | if (!string) |
536 | 536 | { |
537 | | - string = (TCHAR*)_nullstring; |
| 537 | + string = (_TCHAR*)_nullstring; |
538 | 538 | flags &= ~FLAG_WIDECHAR; |
539 | 539 | } |
540 | 540 |
|
|
0 commit comments