motiejus/zig
1
Fork 0
Code Releases Activity

Better implementation of GetLastError. (#20623)

Browse Source 
Instead of calling the dynamically loaded kernel32.GetLastError, we can extract it from the TEB.
As shown by [Wine](34b1606019/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.
This commit is contained in:
Lucas Santos
2024-07-15 14:49:51 -03:00
committed by GitHub
parent cf36d3fdd3
commit 89942ebd03
9 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/process/Child.zig
View File

@@ -1358,7 +1358,7 @@ fn windowsMakeAsyncPipe(rd: *?windows.HANDLE, wr: *?windows.HANDLE, sattr: *cons
sattr,
);
if (read_handle == windows.INVALID_HANDLE_VALUE) {
switch (windows.kernel32.GetLastError()) {
switch (windows.GetLastError()) {
else => |err| return windows.unexpectedError(err),
}
}
@@ -1375,7 +1375,7 @@ fn windowsMakeAsyncPipe(rd: *?windows.HANDLE, wr: *?windows.HANDLE, sattr: *cons
null,
);
if (write_handle == windows.INVALID_HANDLE_VALUE) {
switch (windows.kernel32.GetLastError()) {
switch (windows.GetLastError()) {
else => |err| return windows.unexpectedError(err),
}
}
@@ -1529,7 +1529,7 @@ fn windowsCmdExePath(allocator: mem.Allocator) error{ OutOfMemory, Unexpected }!
// TODO: Get the system directory from PEB.ReadOnlyStaticServerData
const len = windows.kernel32.GetSystemDirectoryW(@ptrCast(unused_slice), @intCast(unused_slice.len));
if (len == 0) {
switch (windows.kernel32.GetLastError()) {
switch (windows.GetLastError()) {
else => |err| return windows.unexpectedError(err),
}
}