authorgravatar for hi@viri.moeviri <hi@viri.moe> 2021-06-06 20:23:07-06:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2021-06-09 19:10:28+03:00
log610ce544d51ab0bc80c1882e4b923eda9bc0126c
tree54df39830561fc0bde575997f5cdf60d3b3eb2fa
parentc71e8a30cdf050e45c2ca2dc81e93b10cf00dc5f

windows: remove `TCHAR` idiom entirely

3 files changed, 7 insertions(+), 11 deletions(-)

lib/std/os/windows.zig+6-6
...@@ -1922,19 +1922,19 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:...@@ -1922,19 +1922,19 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:
1922pub fn unexpectedError(err: Win32Error) std.os.UnexpectedError {1922pub fn unexpectedError(err: Win32Error) std.os.UnexpectedError {
1923 if (std.os.unexpected_error_tracing) {1923 if (std.os.unexpected_error_tracing) {
1924 // 614 is the length of the longest windows error desciption1924 // 614 is the length of the longest windows error desciption
1925 var buf_u16: [614]u16 = undefined;1925 var buf_wstr: [614]WCHAR = undefined;
1926 var buf_u8: [614]u8 = undefined;1926 var buf_utf8: [614]u8 = undefined;
1927 const len = kernel32.FormatMessageW(1927 const len = kernel32.FormatMessageW(
1928 FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,1928 FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
1929 null,1929 null,
1930 err,1930 err,
1931 MAKELANGID(LANG.NEUTRAL, SUBLANG.DEFAULT),1931 MAKELANGID(LANG.NEUTRAL, SUBLANG.DEFAULT),
1932 &buf_u16,1932 &buf_wstr,
1933 buf_u16.len / @sizeOf(TCHAR),1933 buf_wstr.len,
1934 null,1934 null,
1935 );1935 );
1936 _ = std.unicode.utf16leToUtf8(&buf_u8, buf_u16[0..len]) catch unreachable;1936 _ = std.unicode.utf16leToUtf8(&buf_utf8, buf_wstr[0..len]) catch unreachable;
1937 std.debug.warn("error.Unexpected: GetLastError({}): {s}\n", .{ @enumToInt(err), buf_u8[0..len] });1937 std.debug.warn("error.Unexpected: GetLastError({}): {s}\n", .{ @enumToInt(err), buf_utf8[0..len] });
1938 std.debug.dumpCurrentStackTrace(null);1938 std.debug.dumpCurrentStackTrace(null);
1939 }1939 }
1940 return error.Unexpected;1940 return error.Unexpected;
lib/std/os/windows/bits.zig-4
...@@ -52,23 +52,19 @@ pub const INT = c_int;...@@ -52,23 +52,19 @@ pub const INT = c_int;
52pub const LPBYTE = *BYTE;52pub const LPBYTE = *BYTE;
53pub const LPCH = *CHAR;53pub const LPCH = *CHAR;
54pub const LPCSTR = [*:0]const CHAR;54pub const LPCSTR = [*:0]const CHAR;
55pub const LPCTSTR = [*:0]const TCHAR;
56pub const LPCVOID = *const c_void;55pub const LPCVOID = *const c_void;
57pub const LPDWORD = *DWORD;56pub const LPDWORD = *DWORD;
58pub const LPSTR = [*:0]CHAR;57pub const LPSTR = [*:0]CHAR;
59pub const LPTSTR = if (UNICODE) LPWSTR else LPSTR;
60pub const LPVOID = *c_void;58pub const LPVOID = *c_void;
61pub const LPWSTR = [*:0]WCHAR;59pub const LPWSTR = [*:0]WCHAR;
62pub const LPCWSTR = [*:0]const WCHAR;60pub const LPCWSTR = [*:0]const WCHAR;
63pub const PVOID = *c_void;61pub const PVOID = *c_void;
64pub const PWSTR = [*:0]WCHAR;62pub const PWSTR = [*:0]WCHAR;
65pub const SIZE_T = usize;63pub const SIZE_T = usize;
66pub const TCHAR = if (UNICODE) WCHAR else u8;
67pub const UINT = c_uint;64pub const UINT = c_uint;
68pub const ULONG_PTR = usize;65pub const ULONG_PTR = usize;
69pub const LONG_PTR = isize;66pub const LONG_PTR = isize;
70pub const DWORD_PTR = ULONG_PTR;67pub const DWORD_PTR = ULONG_PTR;
71pub const UNICODE = false;
72pub const WCHAR = u16;68pub const WCHAR = u16;
73pub const WORD = u16;69pub const WORD = u16;
74pub const DWORD = u32;70pub const DWORD = u32;
lib/std/os/windows/kernel32.zig+1-1
...@@ -89,7 +89,7 @@ pub extern "kernel32" fn GetCommandLineW() callconv(WINAPI) LPWSTR;...@@ -89,7 +89,7 @@ pub extern "kernel32" fn GetCommandLineW() callconv(WINAPI) LPWSTR;
89pub extern "kernel32" fn GetConsoleMode(in_hConsoleHandle: HANDLE, out_lpMode: *DWORD) callconv(WINAPI) BOOL;89pub extern "kernel32" fn GetConsoleMode(in_hConsoleHandle: HANDLE, out_lpMode: *DWORD) callconv(WINAPI) BOOL;
9090
91pub extern "kernel32" fn GetConsoleScreenBufferInfo(hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: *CONSOLE_SCREEN_BUFFER_INFO) callconv(WINAPI) BOOL;91pub extern "kernel32" fn GetConsoleScreenBufferInfo(hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: *CONSOLE_SCREEN_BUFFER_INFO) callconv(WINAPI) BOOL;
92pub extern "kernel32" fn FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: TCHAR, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfCharsWritten: LPDWORD) callconv(WINAPI) BOOL;92pub extern "kernel32" fn FillConsoleOutputCharacterA(hConsoleOutput: HANDLE, cCharacter: CHAR, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfCharsWritten: LPDWORD) callconv(WINAPI) BOOL;
93pub extern "kernel32" fn FillConsoleOutputAttribute(hConsoleOutput: HANDLE, wAttribute: WORD, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfAttrsWritten: LPDWORD) callconv(WINAPI) BOOL;93pub extern "kernel32" fn FillConsoleOutputAttribute(hConsoleOutput: HANDLE, wAttribute: WORD, nLength: DWORD, dwWriteCoord: COORD, lpNumberOfAttrsWritten: LPDWORD) callconv(WINAPI) BOOL;
94pub extern "kernel32" fn SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) callconv(WINAPI) BOOL;94pub extern "kernel32" fn SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) callconv(WINAPI) BOOL;
9595