Skip to content

Commit 610ce54

Browse files
0x08088405Vexu
authored andcommitted
windows: remove TCHAR idiom entirely
1 parent c71e8a3 commit 610ce54

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

lib/std/os/windows.zig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,19 +1922,19 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:
19221922
pub fn unexpectedError(err: Win32Error) std.os.UnexpectedError {
19231923
if (std.os.unexpected_error_tracing) {
19241924
// 614 is the length of the longest windows error desciption
1925-
var buf_u16: [614]u16 = undefined;
1926-
var buf_u8: [614]u8 = undefined;
1925+
var buf_wstr: [614]WCHAR = undefined;
1926+
var buf_utf8: [614]u8 = undefined;
19271927
const len = kernel32.FormatMessageW(
19281928
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
19291929
null,
19301930
err,
19311931
MAKELANGID(LANG.NEUTRAL, SUBLANG.DEFAULT),
1932-
&buf_u16,
1933-
buf_u16.len / @sizeOf(TCHAR),
1932+
&buf_wstr,
1933+
buf_wstr.len,
19341934
null,
19351935
);
1936-
_ = std.unicode.utf16leToUtf8(&buf_u8, buf_u16[0..len]) catch unreachable;
1937-
std.debug.warn("error.Unexpected: GetLastError({}): {s}\n", .{ @enumToInt(err), buf_u8[0..len] });
1936+
_ = std.unicode.utf16leToUtf8(&buf_utf8, buf_wstr[0..len]) catch unreachable;
1937+
std.debug.warn("error.Unexpected: GetLastError({}): {s}\n", .{ @enumToInt(err), buf_utf8[0..len] });
19381938
std.debug.dumpCurrentStackTrace(null);
19391939
}
19401940
return error.Unexpected;

lib/std/os/windows/bits.zig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,19 @@ pub const INT = c_int;
5252
pub const LPBYTE = *BYTE;
5353
pub const LPCH = *CHAR;
5454
pub const LPCSTR = [*:0]const CHAR;
55-
pub const LPCTSTR = [*:0]const TCHAR;
5655
pub const LPCVOID = *const c_void;
5756
pub const LPDWORD = *DWORD;
5857
pub const LPSTR = [*:0]CHAR;
59-
pub const LPTSTR = if (UNICODE) LPWSTR else LPSTR;
6058
pub const LPVOID = *c_void;
6159
pub const LPWSTR = [*:0]WCHAR;
6260
pub const LPCWSTR = [*:0]const WCHAR;
6361
pub const PVOID = *c_void;
6462
pub const PWSTR = [*:0]WCHAR;
6563
pub const SIZE_T = usize;
66-
pub const TCHAR = if (UNICODE) WCHAR else u8;
6764
pub const UINT = c_uint;
6865
pub const ULONG_PTR = usize;
6966
pub const LONG_PTR = isize;
7067
pub const DWORD_PTR = ULONG_PTR;
71-
pub const UNICODE = false;
7268
pub const WCHAR = u16;
7369
pub const WORD = u16;
7470
pub const DWORD = u32;

lib/std/os/windows/kernel32.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub extern "kernel32" fn GetCommandLineW() callconv(WINAPI) LPWSTR;
8989
pub extern "kernel32" fn GetConsoleMode(in_hConsoleHandle: HANDLE, out_lpMode: *DWORD) callconv(WINAPI) BOOL;
9090

9191
pub extern "kernel32" fn GetConsoleScreenBufferInfo(hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: *CONSOLE_SCREEN_BUFFER_INFO) callconv(WINAPI) BOOL;
92-
pub extern "kernel32" fn FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: TCHAR, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfCharsWritten: LPDWORD) callconv(WINAPI) BOOL;
92+
pub extern "kernel32" fn FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: CHAR, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfCharsWritten: LPDWORD) callconv(WINAPI) BOOL;
9393
pub extern "kernel32" fn FillConsoleOutputAttribute(hConsoleOutput: HANDLE, wAttribute: WORD, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfAttrsWritten: LPDWORD) callconv(WINAPI) BOOL;
9494
pub extern "kernel32" fn SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) callconv(WINAPI) BOOL;
9595

0 commit comments

Comments
 (0)