authorgravatar for lucascarvalhosantos91@gmail.comLucas Santos <lucascarvalhosantos91@gmail.com> 2024-07-15 14:49:51-03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-07-15 10:49:51-07:00
log89942ebd03b2943cbbe84b575a024e156ca5bf52
tree0892910484a47d30d4c5f2dccff9f16d0162687e
parentcf36d3fdd3674bfb95f22aa7bc7ff450ebdc1c08
signaturebadge-check Signed by PGP key B5690EEEBB952194

Better implementation of GetLastError. (#20623)

Instead of calling the dynamically loaded kernel32.GetLastError, we can extract it from the TEB. As shown by [Wine](https://github.com/wine-mirror/wine/blob/34b1606019982b71818780bc84b76460f650af31/include/winternl.h#L439), the last error lives at offset 0x34 of the TEB in 32-bit Windows and at offset 0x68 in 64-bit Windows.

9 files changed, 56 insertions(+), 47 deletions(-)

lib/std/Thread.zig+1-1
......@@ -554,7 +554,7 @@ const WindowsThreadImpl = struct {
554554 0,
555555 null,
556556 ) orelse {
557 const errno = windows.kernel32.GetLastError();
557 const errno = windows.GetLastError();
558558 return windows.unexpectedError(errno);
559559 };
560560
lib/std/Thread/Condition.zig+1-1
......@@ -178,7 +178,7 @@ const WindowsImpl = struct {
178178
179179 // Return error.Timeout if we know the timeout elapsed correctly.
180180 if (rc == os.windows.FALSE) {
181 assert(os.windows.kernel32.GetLastError() == .TIMEOUT);
181 assert(os.windows.GetLastError() == .TIMEOUT);
182182 if (!timeout_overflowed) return error.Timeout;
183183 }
184184 }
lib/std/crypto/Certificate/Bundle.zig+1-1
......@@ -132,7 +132,7 @@ fn rescanWindows(cb: *Bundle, gpa: Allocator) RescanWindowsError!void {
132132 cb.map.clearRetainingCapacity();
133133
134134 const w = std.os.windows;
135 const GetLastError = w.kernel32.GetLastError;
135 const GetLastError = w.GetLastError;
136136 const root = [4:0]u16{ 'R', 'O', 'O', 'T' };
137137 const store = w.crypt32.CertOpenSystemStoreW(null, &root) orelse switch (GetLastError()) {
138138 .FILE_NOT_FOUND => return error.FileNotFound,
lib/std/debug.zig+1-1
......@@ -1781,7 +1781,7 @@ pub const DebugInfo = struct {
17811781
17821782 const handle = windows.kernel32.CreateToolhelp32Snapshot(windows.TH32CS_SNAPMODULE | windows.TH32CS_SNAPMODULE32, 0);
17831783 if (handle == windows.INVALID_HANDLE_VALUE) {
1784 switch (windows.kernel32.GetLastError()) {
1784 switch (windows.GetLastError()) {
17851785 else => |err| return windows.unexpectedError(err),
17861786 }
17871787 }
lib/std/io.zig+3-3
......@@ -567,7 +567,7 @@ pub fn Poller(comptime StreamEnum: type) type {
567567 windows.INFINITE,
568568 );
569569 if (status == windows.WAIT_FAILED)
570 return windows.unexpectedError(windows.kernel32.GetLastError());
570 return windows.unexpectedError(windows.GetLastError());
571571 if (status == windows.WAIT_TIMEOUT)
572572 return true;
573573
......@@ -584,7 +584,7 @@ pub fn Poller(comptime StreamEnum: type) type {
584584 &self.windows.overlapped[stream_idx],
585585 &read_bytes,
586586 0,
587 )) switch (windows.kernel32.GetLastError()) {
587 )) switch (windows.GetLastError()) {
588588 .BROKEN_PIPE => {
589589 self.windows.active.removeAt(active_idx);
590590 continue;
......@@ -664,7 +664,7 @@ fn windowsAsyncRead(
664664 const buf = try fifo.writableWithSize(bump_amt);
665665 var read_bytes: u32 = undefined;
666666 const read_result = windows.kernel32.ReadFile(handle, buf.ptr, math.cast(u32, buf.len) orelse math.maxInt(u32), &read_bytes, overlapped);
667 if (read_result == 0) return switch (windows.kernel32.GetLastError()) {
667 if (read_result == 0) return switch (windows.GetLastError()) {
668668 .IO_PENDING => .pending,
669669 .BROKEN_PIPE => .closed,
670670 else => |err| windows.unexpectedError(err),
lib/std/os.zig+1-1
......@@ -61,7 +61,7 @@ pub fn accessW(path: [*:0]const u16) windows.GetFileAttributesError!void {
6161 if (ret != windows.INVALID_FILE_ATTRIBUTES) {
6262 return;
6363 }
64 switch (windows.kernel32.GetLastError()) {
64 switch (windows.GetLastError()) {
6565 .FILE_NOT_FOUND => return error.FileNotFound,
6666 .PATH_NOT_FOUND => return error.FileNotFound,
6767 .ACCESS_DENIED => return error.PermissionDenied,
lib/std/os/windows.zig+44-35
......@@ -172,6 +172,10 @@ pub fn GetCurrentThreadId() DWORD {
172172 return @truncate(@intFromPtr(teb().ClientId.UniqueThread));
173173}
174174
175pub fn GetLastError() Win32Error {
176 return @enumFromInt(teb().LastErrorValue);
177}
178
175179pub const CreatePipeError = error{ Unexpected, SystemResources };
176180
177181var npfs: ?HANDLE = null;
......@@ -309,7 +313,7 @@ pub fn CreateEventExW(attributes: ?*SECURITY_ATTRIBUTES, nameW: ?LPCWSTR, flags:
309313 if (handle) |h| {
310314 return h;
311315 } else {
312 switch (kernel32.GetLastError()) {
316 switch (GetLastError()) {
313317 else => |err| return unexpectedError(err),
314318 }
315319 }
......@@ -385,7 +389,7 @@ pub fn DeviceIoControl(
385389pub fn GetOverlappedResult(h: HANDLE, overlapped: *OVERLAPPED, wait: bool) !DWORD {
386390 var bytes: DWORD = undefined;
387391 if (kernel32.GetOverlappedResult(h, overlapped, &bytes, @intFromBool(wait)) == 0) {
388 switch (kernel32.GetLastError()) {
392 switch (GetLastError()) {
389393 .IO_INCOMPLETE => if (!wait) return error.WouldBlock else unreachable,
390394 else => |err| return unexpectedError(err),
391395 }
......@@ -397,7 +401,7 @@ pub const SetHandleInformationError = error{Unexpected};
397401
398402pub fn SetHandleInformation(h: HANDLE, mask: DWORD, flags: DWORD) SetHandleInformationError!void {
399403 if (kernel32.SetHandleInformation(h, mask, flags) == 0) {
400 switch (kernel32.GetLastError()) {
404 switch (GetLastError()) {
401405 else => |err| return unexpectedError(err),
402406 }
403407 }
......@@ -417,7 +421,7 @@ pub fn RtlGenRandom(output: []u8) RtlGenRandomError!void {
417421 const to_read: ULONG = @min(buff.len, max_read_size);
418422
419423 if (advapi32.RtlGenRandom(buff.ptr, to_read) == 0) {
420 return unexpectedError(kernel32.GetLastError());
424 return unexpectedError(GetLastError());
421425 }
422426
423427 total_read += to_read;
......@@ -440,7 +444,7 @@ pub fn WaitForSingleObjectEx(handle: HANDLE, milliseconds: DWORD, alertable: boo
440444 WAIT_ABANDONED => return error.WaitAbandoned,
441445 WAIT_OBJECT_0 => return,
442446 WAIT_TIMEOUT => return error.WaitTimeOut,
443 WAIT_FAILED => switch (kernel32.GetLastError()) {
447 WAIT_FAILED => switch (GetLastError()) {
444448 else => |err| return unexpectedError(err),
445449 },
446450 else => return error.Unexpected,
......@@ -468,7 +472,7 @@ pub fn WaitForMultipleObjectsEx(handles: []const HANDLE, waitAll: bool, millisec
468472 return error.WaitAbandoned;
469473 },
470474 WAIT_TIMEOUT => return error.WaitTimeOut,
471 WAIT_FAILED => switch (kernel32.GetLastError()) {
475 WAIT_FAILED => switch (GetLastError()) {
472476 else => |err| return unexpectedError(err),
473477 },
474478 else => return error.Unexpected,
......@@ -484,7 +488,7 @@ pub fn CreateIoCompletionPort(
484488 concurrent_thread_count: DWORD,
485489) CreateIoCompletionPortError!HANDLE {
486490 const handle = kernel32.CreateIoCompletionPort(file_handle, existing_completion_port, completion_key, concurrent_thread_count) orelse {
487 switch (kernel32.GetLastError()) {
491 switch (GetLastError()) {
488492 .INVALID_PARAMETER => unreachable,
489493 else => |err| return unexpectedError(err),
490494 }
......@@ -501,7 +505,7 @@ pub fn PostQueuedCompletionStatus(
501505 lpOverlapped: ?*OVERLAPPED,
502506) PostQueuedCompletionStatusError!void {
503507 if (kernel32.PostQueuedCompletionStatus(completion_port, bytes_transferred_count, completion_key, lpOverlapped) == 0) {
504 switch (kernel32.GetLastError()) {
508 switch (GetLastError()) {
505509 else => |err| return unexpectedError(err),
506510 }
507511 }
......@@ -528,7 +532,7 @@ pub fn GetQueuedCompletionStatus(
528532 lpOverlapped,
529533 dwMilliseconds,
530534 ) == FALSE) {
531 switch (kernel32.GetLastError()) {
535 switch (GetLastError()) {
532536 .ABANDONED_WAIT_0 => return GetQueuedCompletionStatusResult.Aborted,
533537 .OPERATION_ABORTED => return GetQueuedCompletionStatusResult.Cancelled,
534538 .HANDLE_EOF => return GetQueuedCompletionStatusResult.EOF,
......@@ -568,7 +572,7 @@ pub fn GetQueuedCompletionStatusEx(
568572 );
569573
570574 if (success == FALSE) {
571 return switch (kernel32.GetLastError()) {
575 return switch (GetLastError()) {
572576 .ABANDONED_WAIT_0 => error.Aborted,
573577 .OPERATION_ABORTED => error.Cancelled,
574578 .HANDLE_EOF => error.EOF,
......@@ -618,7 +622,7 @@ pub fn ReadFile(in_hFile: HANDLE, buffer: []u8, offset: ?u64) ReadFileError!usiz
618622 break :blk &overlapped_data;
619623 } else null;
620624 if (kernel32.ReadFile(in_hFile, buffer.ptr, want_read_count, &amt_read, overlapped) == 0) {
621 switch (kernel32.GetLastError()) {
625 switch (GetLastError()) {
622626 .IO_PENDING => unreachable,
623627 .OPERATION_ABORTED => continue,
624628 .BROKEN_PIPE => return 0,
......@@ -667,7 +671,7 @@ pub fn WriteFile(
667671 } else null;
668672 const adjusted_len = math.cast(u32, bytes.len) orelse maxInt(u32);
669673 if (kernel32.WriteFile(handle, bytes.ptr, adjusted_len, &bytes_written, overlapped) == 0) {
670 switch (kernel32.GetLastError()) {
674 switch (GetLastError()) {
671675 .INVALID_USER_BUFFER => return error.SystemResources,
672676 .NOT_ENOUGH_MEMORY => return error.SystemResources,
673677 .OPERATION_ABORTED => return error.OperationAborted,
......@@ -728,7 +732,7 @@ pub fn GetCurrentDirectory(buffer: []u8) GetCurrentDirectoryError![]u8 {
728732 var wtf16le_buf: [PATH_MAX_WIDE]u16 = undefined;
729733 const result = kernel32.GetCurrentDirectoryW(wtf16le_buf.len, &wtf16le_buf);
730734 if (result == 0) {
731 switch (kernel32.GetLastError()) {
735 switch (GetLastError()) {
732736 else => |err| return unexpectedError(err),
733737 }
734738 }
......@@ -1109,7 +1113,7 @@ pub fn MoveFileEx(old_path: []const u8, new_path: []const u8, flags: DWORD) Move
11091113
11101114pub fn MoveFileExW(old_path: [*:0]const u16, new_path: [*:0]const u16, flags: DWORD) MoveFileError!void {
11111115 if (kernel32.MoveFileExW(old_path, new_path, flags) == 0) {
1112 switch (kernel32.GetLastError()) {
1116 switch (GetLastError()) {
11131117 .FILE_NOT_FOUND => return error.FileNotFound,
11141118 .ACCESS_DENIED => return error.AccessDenied,
11151119 else => |err| return unexpectedError(err),
......@@ -1125,7 +1129,7 @@ pub const GetStdHandleError = error{
11251129pub fn GetStdHandle(handle_id: DWORD) GetStdHandleError!HANDLE {
11261130 const handle = kernel32.GetStdHandle(handle_id) orelse return error.NoStandardHandleAttached;
11271131 if (handle == INVALID_HANDLE_VALUE) {
1128 switch (kernel32.GetLastError()) {
1132 switch (GetLastError()) {
11291133 else => |err| return unexpectedError(err),
11301134 }
11311135 }
......@@ -1141,7 +1145,7 @@ pub fn SetFilePointerEx_BEGIN(handle: HANDLE, offset: u64) SetFilePointerError!v
11411145 // https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-setfilepointerex
11421146 const ipos = @as(LARGE_INTEGER, @bitCast(offset));
11431147 if (kernel32.SetFilePointerEx(handle, ipos, null, FILE_BEGIN) == 0) {
1144 switch (kernel32.GetLastError()) {
1148 switch (GetLastError()) {
11451149 .INVALID_PARAMETER => unreachable,
11461150 .INVALID_HANDLE => unreachable,
11471151 else => |err| return unexpectedError(err),
......@@ -1152,7 +1156,7 @@ pub fn SetFilePointerEx_BEGIN(handle: HANDLE, offset: u64) SetFilePointerError!v
11521156/// The SetFilePointerEx function with the `dwMoveMethod` parameter set to `FILE_CURRENT`.
11531157pub fn SetFilePointerEx_CURRENT(handle: HANDLE, offset: i64) SetFilePointerError!void {
11541158 if (kernel32.SetFilePointerEx(handle, offset, null, FILE_CURRENT) == 0) {
1155 switch (kernel32.GetLastError()) {
1159 switch (GetLastError()) {
11561160 .INVALID_PARAMETER => unreachable,
11571161 .INVALID_HANDLE => unreachable,
11581162 else => |err| return unexpectedError(err),
......@@ -1163,7 +1167,7 @@ pub fn SetFilePointerEx_CURRENT(handle: HANDLE, offset: i64) SetFilePointerError
11631167/// The SetFilePointerEx function with the `dwMoveMethod` parameter set to `FILE_END`.
11641168pub fn SetFilePointerEx_END(handle: HANDLE, offset: i64) SetFilePointerError!void {
11651169 if (kernel32.SetFilePointerEx(handle, offset, null, FILE_END) == 0) {
1166 switch (kernel32.GetLastError()) {
1170 switch (GetLastError()) {
11671171 .INVALID_PARAMETER => unreachable,
11681172 .INVALID_HANDLE => unreachable,
11691173 else => |err| return unexpectedError(err),
......@@ -1175,7 +1179,7 @@ pub fn SetFilePointerEx_END(handle: HANDLE, offset: i64) SetFilePointerError!voi
11751179pub fn SetFilePointerEx_CURRENT_get(handle: HANDLE) SetFilePointerError!u64 {
11761180 var result: LARGE_INTEGER = undefined;
11771181 if (kernel32.SetFilePointerEx(handle, 0, &result, FILE_CURRENT) == 0) {
1178 switch (kernel32.GetLastError()) {
1182 switch (GetLastError()) {
11791183 .INVALID_PARAMETER => unreachable,
11801184 .INVALID_HANDLE => unreachable,
11811185 else => |err| return unexpectedError(err),
......@@ -1489,7 +1493,7 @@ pub const GetFileSizeError = error{Unexpected};
14891493pub fn GetFileSizeEx(hFile: HANDLE) GetFileSizeError!u64 {
14901494 var file_size: LARGE_INTEGER = undefined;
14911495 if (kernel32.GetFileSizeEx(hFile, &file_size) == 0) {
1492 switch (kernel32.GetLastError()) {
1496 switch (GetLastError()) {
14931497 else => |err| return unexpectedError(err),
14941498 }
14951499 }
......@@ -1510,7 +1514,7 @@ pub fn GetFileAttributes(filename: []const u8) GetFileAttributesError!DWORD {
15101514pub fn GetFileAttributesW(lpFileName: [*:0]const u16) GetFileAttributesError!DWORD {
15111515 const rc = kernel32.GetFileAttributesW(lpFileName);
15121516 if (rc == INVALID_FILE_ATTRIBUTES) {
1513 switch (kernel32.GetLastError()) {
1517 switch (GetLastError()) {
15141518 .FILE_NOT_FOUND => return error.FileNotFound,
15151519 .PATH_NOT_FOUND => return error.FileNotFound,
15161520 .ACCESS_DENIED => return error.PermissionDenied,
......@@ -1721,7 +1725,7 @@ const GetModuleFileNameError = error{Unexpected};
17211725pub fn GetModuleFileNameW(hModule: ?HMODULE, buf_ptr: [*]u16, buf_len: DWORD) GetModuleFileNameError![:0]u16 {
17221726 const rc = kernel32.GetModuleFileNameW(hModule, buf_ptr, buf_len);
17231727 if (rc == 0) {
1724 switch (kernel32.GetLastError()) {
1728 switch (GetLastError()) {
17251729 else => |err| return unexpectedError(err),
17261730 }
17271731 }
......@@ -1732,7 +1736,7 @@ pub const TerminateProcessError = error{ PermissionDenied, Unexpected };
17321736
17331737pub fn TerminateProcess(hProcess: HANDLE, uExitCode: UINT) TerminateProcessError!void {
17341738 if (kernel32.TerminateProcess(hProcess, uExitCode) == 0) {
1735 switch (kernel32.GetLastError()) {
1739 switch (GetLastError()) {
17361740 Win32Error.ACCESS_DENIED => return error.PermissionDenied,
17371741 else => |err| return unexpectedError(err),
17381742 }
......@@ -1743,7 +1747,7 @@ pub const VirtualAllocError = error{Unexpected};
17431747
17441748pub fn VirtualAlloc(addr: ?LPVOID, size: usize, alloc_type: DWORD, flProtect: DWORD) VirtualAllocError!LPVOID {
17451749 return kernel32.VirtualAlloc(addr, size, alloc_type, flProtect) orelse {
1746 switch (kernel32.GetLastError()) {
1750 switch (GetLastError()) {
17471751 else => |err| return unexpectedError(err),
17481752 }
17491753 };
......@@ -1792,7 +1796,7 @@ pub const VirtualQueryError = error{Unexpected};
17921796pub fn VirtualQuery(lpAddress: ?LPVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T) VirtualQueryError!SIZE_T {
17931797 const rc = kernel32.VirtualQuery(lpAddress, lpBuffer, dwLength);
17941798 if (rc == 0) {
1795 switch (kernel32.GetLastError()) {
1799 switch (GetLastError()) {
17961800 else => |err| return unexpectedError(err),
17971801 }
17981802 }
......@@ -1804,7 +1808,7 @@ pub const SetConsoleTextAttributeError = error{Unexpected};
18041808
18051809pub fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) SetConsoleTextAttributeError!void {
18061810 if (kernel32.SetConsoleTextAttribute(hConsoleOutput, wAttributes) == 0) {
1807 switch (kernel32.GetLastError()) {
1811 switch (GetLastError()) {
18081812 else => |err| return unexpectedError(err),
18091813 }
18101814 }
......@@ -1817,7 +1821,7 @@ pub fn SetConsoleCtrlHandler(handler_routine: ?HANDLER_ROUTINE, add: bool) !void
18171821 );
18181822
18191823 if (success == FALSE) {
1820 return switch (kernel32.GetLastError()) {
1824 return switch (GetLastError()) {
18211825 else => |err| unexpectedError(err),
18221826 };
18231827 }
......@@ -1826,7 +1830,7 @@ pub fn SetConsoleCtrlHandler(handler_routine: ?HANDLER_ROUTINE, add: bool) !void
18261830pub fn SetFileCompletionNotificationModes(handle: HANDLE, flags: UCHAR) !void {
18271831 const success = kernel32.SetFileCompletionNotificationModes(handle, flags);
18281832 if (success == FALSE) {
1829 return switch (kernel32.GetLastError()) {
1833 return switch (GetLastError()) {
18301834 else => |err| unexpectedError(err),
18311835 };
18321836 }
......@@ -1850,7 +1854,7 @@ pub const GetEnvironmentVariableError = error{
18501854pub fn GetEnvironmentVariableW(lpName: LPWSTR, lpBuffer: [*]u16, nSize: DWORD) GetEnvironmentVariableError!DWORD {
18511855 const rc = kernel32.GetEnvironmentVariableW(lpName, lpBuffer, nSize);
18521856 if (rc == 0) {
1853 switch (kernel32.GetLastError()) {
1857 switch (GetLastError()) {
18541858 .ENVVAR_NOT_FOUND => return error.EnvironmentVariableNotFound,
18551859 else => |err| return unexpectedError(err),
18561860 }
......@@ -1891,7 +1895,7 @@ pub fn CreateProcessW(
18911895 lpStartupInfo,
18921896 lpProcessInformation,
18931897 ) == 0) {
1894 switch (kernel32.GetLastError()) {
1898 switch (GetLastError()) {
18951899 .FILE_NOT_FOUND => return error.FileNotFound,
18961900 .PATH_NOT_FOUND => return error.FileNotFound,
18971901 .ACCESS_DENIED => return error.AccessDenied,
......@@ -1934,7 +1938,7 @@ pub const LoadLibraryError = error{
19341938
19351939pub fn LoadLibraryW(lpLibFileName: [*:0]const u16) LoadLibraryError!HMODULE {
19361940 return kernel32.LoadLibraryW(lpLibFileName) orelse {
1937 switch (kernel32.GetLastError()) {
1941 switch (GetLastError()) {
19381942 .FILE_NOT_FOUND => return error.FileNotFound,
19391943 .PATH_NOT_FOUND => return error.FileNotFound,
19401944 .MOD_NOT_FOUND => return error.FileNotFound,
......@@ -1962,7 +1966,7 @@ pub const LoadLibraryFlags = enum(DWORD) {
19621966
19631967pub fn LoadLibraryExW(lpLibFileName: [*:0]const u16, dwFlags: LoadLibraryFlags) LoadLibraryError!HMODULE {
19641968 return kernel32.LoadLibraryExW(lpLibFileName, null, @intFromEnum(dwFlags)) orelse {
1965 switch (kernel32.GetLastError()) {
1969 switch (GetLastError()) {
19661970 .FILE_NOT_FOUND => return error.FileNotFound,
19671971 .PATH_NOT_FOUND => return error.FileNotFound,
19681972 .MOD_NOT_FOUND => return error.FileNotFound,
......@@ -2019,7 +2023,7 @@ pub fn SetFileTime(
20192023) SetFileTimeError!void {
20202024 const rc = kernel32.SetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime);
20212025 if (rc == 0) {
2022 switch (kernel32.GetLastError()) {
2026 switch (GetLastError()) {
20232027 else => |err| return unexpectedError(err),
20242028 }
20252029 }
......@@ -2709,7 +2713,7 @@ fn testNtToWin32Namespace(expected: []const u16, path: []const u16) !void {
27092713fn getFullPathNameW(path: [*:0]const u16, out: []u16) !usize {
27102714 const result = kernel32.GetFullPathNameW(path, @as(u32, @intCast(out.len)), out.ptr, null);
27112715 if (result == 0) {
2712 switch (kernel32.GetLastError()) {
2716 switch (GetLastError()) {
27132717 else => |err| return unexpectedError(err),
27142718 }
27152719 }
......@@ -4430,7 +4434,8 @@ pub const TEB = extern struct {
44304434 ActiveRpcHandle: PVOID,
44314435 ThreadLocalStoragePointer: PVOID,
44324436 ProcessEnvironmentBlock: *PEB,
4433 Reserved2: [399]PVOID,
4437 LastErrorValue: ULONG,
4438 Reserved2: [399 * @sizeOf(PVOID) - @sizeOf(ULONG)]u8,
44344439 Reserved3: [1952]u8,
44354440 TlsSlots: [64]PVOID,
44364441 Reserved4: [8]u8,
......@@ -4450,12 +4455,16 @@ comptime {
44504455 assert(@offsetOf(TEB, "ActiveRpcHandle") == 0x28);
44514456 assert(@offsetOf(TEB, "ThreadLocalStoragePointer") == 0x2C);
44524457 assert(@offsetOf(TEB, "ProcessEnvironmentBlock") == 0x30);
4458 assert(@offsetOf(TEB, "LastErrorValue") == 0x34);
4459 assert(@offsetOf(TEB, "TlsSlots") == 0xe10);
44534460 } else if (@sizeOf(usize) == 8) {
44544461 assert(@offsetOf(TEB, "EnvironmentPointer") == 0x38);
44554462 assert(@offsetOf(TEB, "ClientId") == 0x40);
44564463 assert(@offsetOf(TEB, "ActiveRpcHandle") == 0x50);
44574464 assert(@offsetOf(TEB, "ThreadLocalStoragePointer") == 0x58);
44584465 assert(@offsetOf(TEB, "ProcessEnvironmentBlock") == 0x60);
4466 assert(@offsetOf(TEB, "LastErrorValue") == 0x68);
4467 assert(@offsetOf(TEB, "TlsSlots") == 0x1480);
44594468 }
44604469}
44614470
lib/std/posix.zig+1-1
......@@ -6912,7 +6912,7 @@ pub fn fsync(fd: fd_t) SyncError!void {
69126912 if (native_os == .windows) {
69136913 if (windows.kernel32.FlushFileBuffers(fd) != 0)
69146914 return;
6915 switch (windows.kernel32.GetLastError()) {
6915 switch (windows.GetLastError()) {
69166916 .SUCCESS => return,
69176917 .INVALID_HANDLE => unreachable,
69186918 .ACCESS_DENIED => return error.AccessDenied, // a sync was performed but the system couldn't update the access time
lib/std/process/Child.zig+3-3
......@@ -1358,7 +1358,7 @@ fn windowsMakeAsyncPipe(rd: *?windows.HANDLE, wr: *?windows.HANDLE, sattr: *cons
13581358 sattr,
13591359 );
13601360 if (read_handle == windows.INVALID_HANDLE_VALUE) {
1361 switch (windows.kernel32.GetLastError()) {
1361 switch (windows.GetLastError()) {
13621362 else => |err| return windows.unexpectedError(err),
13631363 }
13641364 }
......@@ -1375,7 +1375,7 @@ fn windowsMakeAsyncPipe(rd: *?windows.HANDLE, wr: *?windows.HANDLE, sattr: *cons
13751375 null,
13761376 );
13771377 if (write_handle == windows.INVALID_HANDLE_VALUE) {
1378 switch (windows.kernel32.GetLastError()) {
1378 switch (windows.GetLastError()) {
13791379 else => |err| return windows.unexpectedError(err),
13801380 }
13811381 }
......@@ -1529,7 +1529,7 @@ fn windowsCmdExePath(allocator: mem.Allocator) error{ OutOfMemory, Unexpected }!
15291529 // TODO: Get the system directory from PEB.ReadOnlyStaticServerData
15301530 const len = windows.kernel32.GetSystemDirectoryW(@ptrCast(unused_slice), @intCast(unused_slice.len));
15311531 if (len == 0) {
1532 switch (windows.kernel32.GetLastError()) {
1532 switch (windows.GetLastError()) {
15331533 else => |err| return windows.unexpectedError(err),
15341534 }
15351535 }