authorgravatar for 89187439+qilme@users.noreply.github.comqilme <89187439+qilme@users.noreply.github.com> 2025-10-31 21:54:50+08:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-10-31 13:54:50+00:00
log8347791ce3e3ffc82d95c09ccc036e8e47c1ed0c
treeccd73698764a6d6b8f2b5884c2fea48667a8c356
parent62de7a2efd760bec85a41d52eca641fd61cd4a5d
signaturebadge-check Signed by PGP key B5690EEEBB952194

std.os.windows: eliminate forwarder function in kernel32 (#25766)

#1840 kernel32.AddVectoredExceptionHandler -> ntdll.RtlAddVectoredExceptionHandler kernel32.RemoveVectoredExceptionHandler -> ntdll.RtlRemoveVectoredExceptionHandler kernel32.ExitProcess -> ntdll.RtlExitUserProcess kernel32.InitializeCriticalSection -> ntdll.RtlInitializeCriticalSection kernel32.EnterCriticalSection -> ntdll.RtlEnterCriticalSection kernel32.LeaveCriticalSection -> ntdll.RtlLeaveCriticalSection kernel32.DeleteCriticalSection -> ntdll.RtlDeleteCriticalSection kernel32.TryAcquireSRWLockExclusive -> ntdll.RtlTryAcquireSRWLockExclusive kernel32.AcquireSRWLockExclusive -> ntdll.RtlAcquireSRWLockExclusive kernel32.ReleaseSRWLockExclusive -> ntdll.RtlReleaseSRWLockExclusive kernel32.WakeConditionVariable -> ntdll.RtlWakeConditionVariable kernel32.WakeAllConditionVariable -> ntdll.RtlWakeAllConditionVariable kernel32.HeapReAlloc -> ntdll.RtlReAllocateHeap kernel32.HeapAlloc -> ntdll.RtlAllocateHeap

7 files changed, 77 insertions(+), 99 deletions(-)

lib/std/Thread.zig+1-1
......@@ -674,7 +674,7 @@ const WindowsThreadImpl = struct {
674674
675675 const heap_handle = windows.kernel32.GetProcessHeap() orelse return error.OutOfMemory;
676676 const alloc_bytes = @alignOf(Instance) + @sizeOf(Instance);
677 const alloc_ptr = windows.kernel32.HeapAlloc(heap_handle, 0, alloc_bytes) orelse return error.OutOfMemory;
677 const alloc_ptr = windows.ntdll.RtlAllocateHeap(heap_handle, 0, alloc_bytes) orelse return error.OutOfMemory;
678678 errdefer assert(windows.kernel32.HeapFree(heap_handle, 0, alloc_ptr) != 0);
679679
680680 const instance_bytes = @as([*]u8, @ptrCast(alloc_ptr))[0..alloc_bytes];
lib/std/Thread/Condition.zig+2-2
......@@ -180,8 +180,8 @@ const WindowsImpl = struct {
180180
181181 fn wake(self: *Impl, comptime notify: Notify) void {
182182 switch (notify) {
183 .one => os.windows.kernel32.WakeConditionVariable(&self.condition),
184 .all => os.windows.kernel32.WakeAllConditionVariable(&self.condition),
183 .one => os.windows.ntdll.RtlWakeConditionVariable(&self.condition),
184 .all => os.windows.ntdll.RtlWakeAllConditionVariable(&self.condition),
185185 }
186186 }
187187};
lib/std/Thread/Mutex.zig+3-3
......@@ -109,15 +109,15 @@ const WindowsImpl = struct {
109109 srwlock: windows.SRWLOCK = .{},
110110
111111 fn tryLock(self: *@This()) bool {
112 return windows.kernel32.TryAcquireSRWLockExclusive(&self.srwlock) != windows.FALSE;
112 return windows.ntdll.RtlTryAcquireSRWLockExclusive(&self.srwlock) != windows.FALSE;
113113 }
114114
115115 fn lock(self: *@This()) void {
116 windows.kernel32.AcquireSRWLockExclusive(&self.srwlock);
116 windows.ntdll.RtlAcquireSRWLockExclusive(&self.srwlock);
117117 }
118118
119119 fn unlock(self: *@This()) void {
120 windows.kernel32.ReleaseSRWLockExclusive(&self.srwlock);
120 windows.ntdll.RtlReleaseSRWLockExclusive(&self.srwlock);
121121 }
122122
123123 const windows = std.os.windows;
lib/std/debug.zig+2-2
......@@ -1433,7 +1433,7 @@ pub fn attachSegfaultHandler() void {
14331433 @compileError("segfault handler not supported for this target");
14341434 }
14351435 if (native_os == .windows) {
1436 windows_segfault_handle = windows.kernel32.AddVectoredExceptionHandler(0, handleSegfaultWindows);
1436 windows_segfault_handle = windows.ntdll.RtlAddVectoredExceptionHandler(0, handleSegfaultWindows);
14371437 return;
14381438 }
14391439 const act = posix.Sigaction{
......@@ -1447,7 +1447,7 @@ pub fn attachSegfaultHandler() void {
14471447fn resetSegfaultHandler() void {
14481448 if (native_os == .windows) {
14491449 if (windows_segfault_handle) |handle| {
1450 assert(windows.kernel32.RemoveVectoredExceptionHandler(handle) != 0);
1450 assert(windows.ntdll.RtlRemoveVectoredExceptionHandler(handle) != 0);
14511451 windows_segfault_handle = null;
14521452 }
14531453 return;
lib/std/os/windows/kernel32.zig+13-89
......@@ -2,17 +2,14 @@ const std = @import("../../std.zig");
22const windows = std.os.windows;
33
44const BOOL = windows.BOOL;
5const BOOLEAN = windows.BOOLEAN;
65const CONDITION_VARIABLE = windows.CONDITION_VARIABLE;
76const CONSOLE_SCREEN_BUFFER_INFO = windows.CONSOLE_SCREEN_BUFFER_INFO;
87const COORD = windows.COORD;
9const CRITICAL_SECTION = windows.CRITICAL_SECTION;
108const DWORD = windows.DWORD;
119const FARPROC = windows.FARPROC;
1210const FILETIME = windows.FILETIME;
1311const HANDLE = windows.HANDLE;
1412const HANDLER_ROUTINE = windows.HANDLER_ROUTINE;
15const HLOCAL = windows.HLOCAL;
1613const HMODULE = windows.HMODULE;
1714const INIT_ONCE = windows.INIT_ONCE;
1815const INIT_ONCE_FN = windows.INIT_ONCE_FN;
......@@ -32,30 +29,29 @@ const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES;
3229const SIZE_T = windows.SIZE_T;
3330const SRWLOCK = windows.SRWLOCK;
3431const STARTUPINFOW = windows.STARTUPINFOW;
32const SYSTEM_INFO = windows.SYSTEM_INFO;
3533const UCHAR = windows.UCHAR;
3634const UINT = windows.UINT;
3735const ULONG = windows.ULONG;
3836const ULONG_PTR = windows.ULONG_PTR;
3937const va_list = windows.va_list;
40const VECTORED_EXCEPTION_HANDLER = windows.VECTORED_EXCEPTION_HANDLER;
4138const WCHAR = windows.WCHAR;
4239const WIN32_FIND_DATAW = windows.WIN32_FIND_DATAW;
4340const Win32Error = windows.Win32Error;
4441const WORD = windows.WORD;
45const SYSTEM_INFO = windows.SYSTEM_INFO;
4642
4743// I/O - Filesystem
4844
4945pub extern "kernel32" fn ReadDirectoryChangesW(
50 hDirectory: windows.HANDLE,
46 hDirectory: HANDLE,
5147 lpBuffer: [*]align(@alignOf(windows.FILE_NOTIFY_INFORMATION)) u8,
52 nBufferLength: windows.DWORD,
53 bWatchSubtree: windows.BOOL,
48 nBufferLength: DWORD,
49 bWatchSubtree: BOOL,
5450 dwNotifyFilter: windows.FileNotifyChangeFilter,
55 lpBytesReturned: ?*windows.DWORD,
56 lpOverlapped: ?*windows.OVERLAPPED,
51 lpBytesReturned: ?*DWORD,
52 lpOverlapped: ?*OVERLAPPED,
5753 lpCompletionRoutine: windows.LPOVERLAPPED_COMPLETION_ROUTINE,
58) callconv(.winapi) windows.BOOL;
54) callconv(.winapi) BOOL;
5955
6056// TODO: Wrapper around NtCancelIoFile.
6157pub extern "kernel32" fn CancelIo(
......@@ -258,17 +254,6 @@ pub extern "kernel32" fn CreateIoCompletionPort(
258254 NumberOfConcurrentThreads: DWORD,
259255) callconv(.winapi) ?HANDLE;
260256
261// TODO: Forwarder to NtAddVectoredExceptionHandler.
262pub extern "kernel32" fn AddVectoredExceptionHandler(
263 First: ULONG,
264 Handler: ?VECTORED_EXCEPTION_HANDLER,
265) callconv(.winapi) ?LPVOID;
266
267// TODO: Forwarder to NtRemoveVectoredExceptionHandler.
268pub extern "kernel32" fn RemoveVectoredExceptionHandler(
269 Handle: HANDLE,
270) callconv(.winapi) ULONG;
271
272257// TODO: Wrapper around RtlReportSilentProcessExit + NtTerminateProcess.
273258pub extern "kernel32" fn TerminateProcess(
274259 hProcess: HANDLE,
......@@ -321,11 +306,6 @@ pub extern "kernel32" fn CreateProcessW(
321306 lpProcessInformation: *PROCESS_INFORMATION,
322307) callconv(.winapi) BOOL;
323308
324// TODO: Fowarder to RtlExitUserProcess.
325pub extern "kernel32" fn ExitProcess(
326 exit_code: UINT,
327) callconv(.winapi) noreturn;
328
329309// TODO: implement via ntdll instead
330310pub extern "kernel32" fn SleepEx(
331311 dwMilliseconds: DWORD,
......@@ -372,41 +352,6 @@ pub extern "kernel32" fn SwitchToThread() callconv(.winapi) BOOL;
372352
373353// Locks, critical sections, initializers
374354
375// TODO: Forwarder to RtlInitializeCriticalSection
376pub extern "kernel32" fn InitializeCriticalSection(
377 lpCriticalSection: *CRITICAL_SECTION,
378) callconv(.winapi) void;
379
380// TODO: Forwarder to RtlEnterCriticalSection
381pub extern "kernel32" fn EnterCriticalSection(
382 lpCriticalSection: *CRITICAL_SECTION,
383) callconv(.winapi) void;
384
385// TODO: Forwarder to RtlLeaveCriticalSection
386pub extern "kernel32" fn LeaveCriticalSection(
387 lpCriticalSection: *CRITICAL_SECTION,
388) callconv(.winapi) void;
389
390// TODO: Forwarder to RtlDeleteCriticalSection
391pub extern "kernel32" fn DeleteCriticalSection(
392 lpCriticalSection: *CRITICAL_SECTION,
393) callconv(.winapi) void;
394
395// TODO: Forwarder to RtlTryAcquireSRWLockExclusive
396pub extern "kernel32" fn TryAcquireSRWLockExclusive(
397 SRWLock: *SRWLOCK,
398) callconv(.winapi) BOOLEAN;
399
400// TODO: Forwarder to RtlAcquireSRWLockExclusive
401pub extern "kernel32" fn AcquireSRWLockExclusive(
402 SRWLock: *SRWLOCK,
403) callconv(.winapi) void;
404
405// TODO: Forwarder to RtlReleaseSRWLockExclusive
406pub extern "kernel32" fn ReleaseSRWLockExclusive(
407 SRWLock: *SRWLOCK,
408) callconv(.winapi) void;
409
410355pub extern "kernel32" fn InitOnceExecuteOnce(
411356 InitOnce: *INIT_ONCE,
412357 InitFn: INIT_ONCE_FN,
......@@ -414,16 +359,6 @@ pub extern "kernel32" fn InitOnceExecuteOnce(
414359 Context: ?*anyopaque,
415360) callconv(.winapi) BOOL;
416361
417// TODO: Forwarder to RtlWakeConditionVariable
418pub extern "kernel32" fn WakeConditionVariable(
419 ConditionVariable: *CONDITION_VARIABLE,
420) callconv(.winapi) void;
421
422// TODO: Forwarder to RtlWakeAllConditionVariable
423pub extern "kernel32" fn WakeAllConditionVariable(
424 ConditionVariable: *CONDITION_VARIABLE,
425) callconv(.winapi) void;
426
427362// TODO:
428363// - dwMilliseconds -> LARGE_INTEGER.
429364// - RtlSleepConditionVariableSRW
......@@ -514,22 +449,9 @@ pub extern "kernel32" fn HeapCreate(
514449 dwMaximumSize: SIZE_T,
515450) callconv(.winapi) ?HANDLE;
516451
517// TODO: Forwarder to RtlReAllocateHeap.
518pub extern "kernel32" fn HeapReAlloc(
519 hHeap: HANDLE,
520 dwFlags: DWORD,
521 lpMem: *anyopaque,
522 dwBytes: SIZE_T,
523) callconv(.winapi) ?*anyopaque;
524
525// TODO: Fowrarder to RtlAllocateHeap.
526pub extern "kernel32" fn HeapAlloc(
527 hHeap: HANDLE,
528 dwFlags: DWORD,
529 dwBytes: SIZE_T,
530) callconv(.winapi) ?*anyopaque;
531
532// TODO: Fowrarder to RtlFreeHeap.
452// TODO: Fowrarder to RtlFreeHeap before win11_zn.
453// Since win11_zn this function points to unexported symbol RtlFreeHeapFast.
454// See https://github.com/ziglang/zig/pull/25766#discussion_r2479727640
533455pub extern "kernel32" fn HeapFree(
534456 hHeap: HANDLE,
535457 dwFlags: DWORD,
......@@ -642,4 +564,6 @@ pub extern "kernel32" fn SetLastError(
642564
643565// Everything Else
644566
645pub extern "kernel32" fn GetSystemInfo(lpSystemInfo: *SYSTEM_INFO) callconv(.winapi) void;
567pub extern "kernel32" fn GetSystemInfo(
568 lpSystemInfo: *SYSTEM_INFO,
569) callconv(.winapi) void;
lib/std/os/windows/ntdll.zig+54
......@@ -37,6 +37,10 @@ const PROCESSINFOCLASS = windows.PROCESSINFOCLASS;
3737const LPVOID = windows.LPVOID;
3838const LPCVOID = windows.LPCVOID;
3939const SECTION_INHERIT = windows.SECTION_INHERIT;
40const VECTORED_EXCEPTION_HANDLER = windows.VECTORED_EXCEPTION_HANDLER;
41const CRITICAL_SECTION = windows.CRITICAL_SECTION;
42const SRWLOCK = windows.SRWLOCK;
43const CONDITION_VARIABLE = windows.CONDITION_VARIABLE;
4044
4145pub extern "ntdll" fn NtQueryInformationProcess(
4246 ProcessHandle: HANDLE,
......@@ -375,3 +379,53 @@ pub extern "ntdll" fn NtFreeVirtualMemory(
375379 RegionSize: *SIZE_T,
376380 FreeType: ULONG,
377381) callconv(.winapi) NTSTATUS;
382
383pub extern "ntdll" fn RtlAddVectoredExceptionHandler(
384 First: ULONG,
385 Handler: ?VECTORED_EXCEPTION_HANDLER,
386) callconv(.winapi) ?LPVOID;
387pub extern "ntdll" fn RtlRemoveVectoredExceptionHandler(
388 Handle: HANDLE,
389) callconv(.winapi) ULONG;
390
391pub extern "ntdll" fn RtlInitializeCriticalSection(
392 lpCriticalSection: *CRITICAL_SECTION,
393) callconv(.winapi) NTSTATUS;
394pub extern "ntdll" fn RtlEnterCriticalSection(
395 lpCriticalSection: *CRITICAL_SECTION,
396) callconv(.winapi) NTSTATUS;
397pub extern "ntdll" fn RtlLeaveCriticalSection(
398 lpCriticalSection: *CRITICAL_SECTION,
399) callconv(.winapi) NTSTATUS;
400pub extern "ntdll" fn RtlDeleteCriticalSection(
401 lpCriticalSection: *CRITICAL_SECTION,
402) callconv(.winapi) NTSTATUS;
403
404pub extern "ntdll" fn RtlTryAcquireSRWLockExclusive(
405 SRWLock: *SRWLOCK,
406) callconv(.winapi) BOOLEAN;
407pub extern "ntdll" fn RtlAcquireSRWLockExclusive(
408 SRWLock: *SRWLOCK,
409) callconv(.winapi) void;
410pub extern "ntdll" fn RtlReleaseSRWLockExclusive(
411 SRWLock: *SRWLOCK,
412) callconv(.winapi) void;
413
414pub extern "ntdll" fn RtlWakeConditionVariable(
415 ConditionVariable: *CONDITION_VARIABLE,
416) callconv(.winapi) void;
417pub extern "ntdll" fn RtlWakeAllConditionVariable(
418 ConditionVariable: *CONDITION_VARIABLE,
419) callconv(.winapi) void;
420
421pub extern "ntdll" fn RtlReAllocateHeap(
422 HeapHandle: HANDLE,
423 Flags: ULONG,
424 BaseAddress: PVOID,
425 Size: SIZE_T,
426) callconv(.winapi) ?PVOID;
427pub extern "ntdll" fn RtlAllocateHeap(
428 HeapHandle: HANDLE,
429 Flags: ULONG,
430 Size: SIZE_T,
431) callconv(.winapi) ?PVOID;
lib/std/posix.zig+2-2
......@@ -701,7 +701,7 @@ pub fn abort() noreturn {
701701 if (builtin.mode == .Debug and windows.peb().BeingDebugged != 0) {
702702 @breakpoint();
703703 }
704 windows.kernel32.ExitProcess(3);
704 windows.ntdll.RtlExitUserProcess(3);
705705 }
706706 if (!builtin.link_libc and native_os == .linux) {
707707 // The Linux man page says that the libc abort() function
......@@ -794,7 +794,7 @@ pub fn exit(status: u8) noreturn {
794794 std.c.exit(status);
795795 }
796796 if (native_os == .windows) {
797 windows.kernel32.ExitProcess(status);
797 windows.ntdll.RtlExitUserProcess(status);
798798 }
799799 if (native_os == .wasi) {
800800 wasi.proc_exit(status);