authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-11-23 19:44:28-08:00
committergravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-11-23 23:38:01-08:00
log17ecc77fc46727f3979abe904ec00b79f036270e
treede4aafb5064202ed8bf6b0836d3f696e3615b51d
parent9082b004b68b0cc0afe6e24b9277b900362c560d

os.windows: Delete unused functions and kernel32 bindings

5 files changed, 3 insertions(+), 154 deletions(-)

lib/std/heap.zig+1-1
......@@ -46,7 +46,7 @@ pub var next_mmap_addr_hint: ?[*]align(page_size_min) u8 = null;
4646
4747/// comptime-known minimum page size of the target.
4848///
49/// All pointers from `mmap` or `VirtualAlloc` are aligned to at least
49/// All pointers from `mmap` or `NtAllocateVirtualMemory` are aligned to at least
5050/// `page_size_min`, but their actual alignment may be bigger.
5151///
5252/// This value can be overridden via `std.options.page_size_min`.
lib/std/os.zig-15
......@@ -56,21 +56,6 @@ pub var argv: [][*:0]u8 = if (builtin.link_libc) undefined else switch (native_o
5656 else => undefined,
5757};
5858
59/// Call from Windows-specific code if you already have a WTF-16LE encoded, null terminated string.
60/// Otherwise use `access`.
61pub fn accessW(path: [*:0]const u16) windows.GetFileAttributesError!void {
62 const ret = try windows.GetFileAttributesW(path);
63 if (ret != windows.INVALID_FILE_ATTRIBUTES) {
64 return;
65 }
66 switch (windows.GetLastError()) {
67 .FILE_NOT_FOUND => return error.FileNotFound,
68 .PATH_NOT_FOUND => return error.FileNotFound,
69 .ACCESS_DENIED => return error.AccessDenied,
70 else => |err| return windows.unexpectedError(err),
71 }
72}
73
7459pub fn isGetFdPathSupportedOnTarget(os: std.Target.Os) bool {
7560 return switch (os.tag) {
7661 .windows,
lib/std/os/windows.zig+1-81
......@@ -306,22 +306,6 @@ pub fn CreatePipe(rd: *HANDLE, wr: *HANDLE, sattr: *const SECURITY_ATTRIBUTES) C
306306 wr.* = write;
307307}
308308
309pub fn CreateEventEx(attributes: ?*SECURITY_ATTRIBUTES, name: []const u8, flags: DWORD, desired_access: DWORD) !HANDLE {
310 const nameW = try sliceToPrefixedFileW(null, name);
311 return CreateEventExW(attributes, nameW.span().ptr, flags, desired_access);
312}
313
314pub fn CreateEventExW(attributes: ?*SECURITY_ATTRIBUTES, nameW: ?LPCWSTR, flags: DWORD, desired_access: DWORD) !HANDLE {
315 const handle = kernel32.CreateEventExW(attributes, nameW, flags, desired_access);
316 if (handle) |h| {
317 return h;
318 } else {
319 switch (GetLastError()) {
320 else => |err| return unexpectedError(err),
321 }
322 }
323}
324
325309pub const DeviceIoControlError = error{
326310 AccessDenied,
327311 /// The volume does not contain a recognized file system. File system
......@@ -598,10 +582,6 @@ pub fn CloseHandle(hObject: HANDLE) void {
598582 assert(ntdll.NtClose(hObject) == .SUCCESS);
599583}
600584
601pub fn FindClose(hFindFile: HANDLE) void {
602 assert(kernel32.FindClose(hFindFile) != 0);
603}
604
605585pub const ReadFileError = error{
606586 BrokenPipe,
607587 /// The specified network name is no longer available.
......@@ -1515,30 +1495,6 @@ pub fn GetFileSizeEx(hFile: HANDLE) GetFileSizeError!u64 {
15151495 return @as(u64, @bitCast(file_size));
15161496}
15171497
1518pub const GetFileAttributesError = error{
1519 FileNotFound,
1520 AccessDenied,
1521 Unexpected,
1522};
1523
1524pub fn GetFileAttributes(filename: []const u8) (GetFileAttributesError || Wtf8ToPrefixedFileWError)!DWORD {
1525 const filename_w = try sliceToPrefixedFileW(null, filename);
1526 return GetFileAttributesW(filename_w.span().ptr);
1527}
1528
1529pub fn GetFileAttributesW(lpFileName: [*:0]const u16) GetFileAttributesError!DWORD {
1530 const rc = kernel32.GetFileAttributesW(lpFileName);
1531 if (rc == INVALID_FILE_ATTRIBUTES) {
1532 switch (GetLastError()) {
1533 .FILE_NOT_FOUND => return error.FileNotFound,
1534 .PATH_NOT_FOUND => return error.FileNotFound,
1535 .ACCESS_DENIED => return error.AccessDenied,
1536 else => |err| return unexpectedError(err),
1537 }
1538 }
1539 return rc;
1540}
1541
15421498pub fn getpeername(s: ws2_32.SOCKET, name: *ws2_32.sockaddr, namelen: *ws2_32.socklen_t) i32 {
15431499 return ws2_32.getpeername(s, name, @as(*i32, @ptrCast(namelen)));
15441500}
......@@ -1657,6 +1613,7 @@ pub const NtFreeVirtualMemoryError = error{
16571613};
16581614
16591615pub fn NtFreeVirtualMemory(hProcess: HANDLE, addr: ?*PVOID, size: *SIZE_T, free_type: ULONG) NtFreeVirtualMemoryError!void {
1616 // TODO: If the return value is .INVALID_PAGE_PROTECTION, call RtlFlushSecureMemoryCache and try again.
16601617 return switch (ntdll.NtFreeVirtualMemory(hProcess, addr, size, free_type)) {
16611618 .SUCCESS => return,
16621619 .ACCESS_DENIED => NtFreeVirtualMemoryError.AccessDenied,
......@@ -1665,20 +1622,6 @@ pub fn NtFreeVirtualMemory(hProcess: HANDLE, addr: ?*PVOID, size: *SIZE_T, free_
16651622 };
16661623}
16671624
1668pub const VirtualAllocError = error{Unexpected};
1669
1670pub fn VirtualAlloc(addr: ?LPVOID, size: usize, alloc_type: DWORD, flProtect: DWORD) VirtualAllocError!LPVOID {
1671 return kernel32.VirtualAlloc(addr, size, alloc_type, flProtect) orelse {
1672 switch (GetLastError()) {
1673 else => |err| return unexpectedError(err),
1674 }
1675 };
1676}
1677
1678pub fn VirtualFree(lpAddress: ?LPVOID, dwSize: usize, dwFreeType: DWORD) void {
1679 assert(kernel32.VirtualFree(lpAddress, dwSize, dwFreeType) != 0);
1680}
1681
16821625pub const VirtualProtectError = error{
16831626 InvalidAddress,
16841627 Unexpected,
......@@ -1713,19 +1656,6 @@ pub fn VirtualProtectEx(handle: HANDLE, addr: ?LPVOID, size: SIZE_T, new_prot: D
17131656 }
17141657}
17151658
1716pub const VirtualQueryError = error{Unexpected};
1717
1718pub fn VirtualQuery(lpAddress: ?LPVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T) VirtualQueryError!SIZE_T {
1719 const rc = kernel32.VirtualQuery(lpAddress, lpBuffer, dwLength);
1720 if (rc == 0) {
1721 switch (GetLastError()) {
1722 else => |err| return unexpectedError(err),
1723 }
1724 }
1725
1726 return rc;
1727}
1728
17291659pub const SetConsoleTextAttributeError = error{Unexpected};
17301660
17311661pub fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) SetConsoleTextAttributeError!void {
......@@ -2628,16 +2558,6 @@ test ntToWin32Namespace {
26282558 try std.testing.expectError(error.NameTooLong, ntToWin32Namespace(L("\\??\\C:\\test"), &too_small_buf));
26292559}
26302560
2631fn getFullPathNameW(path: [*:0]const u16, out: []u16) !usize {
2632 const result = kernel32.GetFullPathNameW(path, @as(u32, @intCast(out.len)), out.ptr, null);
2633 if (result == 0) {
2634 switch (GetLastError()) {
2635 else => |err| return unexpectedError(err),
2636 }
2637 }
2638 return result;
2639}
2640
26412561inline fn MAKELANGID(p: c_ushort, s: c_ushort) LANGID {
26422562 return (s << 10) | p;
26432563}
lib/std/os/windows/kernel32.zig-56
......@@ -86,23 +86,6 @@ pub extern "kernel32" fn CreateNamedPipeW(
8686 lpSecurityAttributes: ?*const SECURITY_ATTRIBUTES,
8787) callconv(.winapi) HANDLE;
8888
89pub extern "kernel32" fn FindFirstFileW(
90 lpFileName: LPCWSTR,
91 lpFindFileData: *WIN32_FIND_DATAW,
92) callconv(.winapi) HANDLE;
93
94pub extern "kernel32" fn FindClose(
95 hFindFile: HANDLE,
96) callconv(.winapi) BOOL;
97
98// TODO: Wrapper around RtlGetFullPathName_UEx
99pub extern "kernel32" fn GetFullPathNameW(
100 lpFileName: LPCWSTR,
101 nBufferLength: DWORD,
102 lpBuffer: LPWSTR,
103 lpFilePart: ?*?LPWSTR,
104) callconv(.winapi) DWORD;
105
10689// TODO: Matches `STD_*_HANDLE` to peb().ProcessParameters.Standard*
10790pub extern "kernel32" fn GetStdHandle(
10891 nStdHandle: DWORD,
......@@ -162,11 +145,6 @@ pub extern "kernel32" fn GetCurrentDirectoryW(
162145 lpBuffer: ?[*]WCHAR,
163146) callconv(.winapi) DWORD;
164147
165// TODO: RtlDosPathNameToNtPathNameU_WithStatus + NtQueryAttributesFile.
166pub extern "kernel32" fn GetFileAttributesW(
167 lpFileName: LPCWSTR,
168) callconv(.winapi) DWORD;
169
170148pub extern "kernel32" fn ReadFile(
171149 hFile: HANDLE,
172150 lpBuffer: LPVOID,
......@@ -182,14 +160,6 @@ pub extern "kernel32" fn GetSystemDirectoryW(
182160
183161// I/O - Kernel Objects
184162
185// TODO: Wrapper around NtCreateEvent.
186pub extern "kernel32" fn CreateEventExW(
187 lpEventAttributes: ?*SECURITY_ATTRIBUTES,
188 lpName: ?LPCWSTR,
189 dwFlags: DWORD,
190 dwDesiredAccess: DWORD,
191) callconv(.winapi) ?HANDLE;
192
193163// TODO: Wrapper around GetStdHandle + NtDuplicateObject.
194164pub extern "kernel32" fn DuplicateHandle(
195165 hSourceProcessHandle: HANDLE,
......@@ -318,9 +288,6 @@ pub extern "kernel32" fn GetExitCodeProcess(
318288 lpExitCode: *DWORD,
319289) callconv(.winapi) BOOL;
320290
321// TODO: Already a wrapper for this, see `windows.GetCurrentProcess`.
322pub extern "kernel32" fn GetCurrentProcess() callconv(.winapi) HANDLE;
323
324291// TODO: Wrapper around RtlSetEnvironmentVar.
325292pub extern "kernel32" fn SetEnvironmentVariableW(
326293 lpName: LPCWSTR,
......@@ -465,29 +432,6 @@ pub extern "kernel32" fn HeapValidate(
465432 lpMem: ?*const anyopaque,
466433) callconv(.winapi) BOOL;
467434
468// TODO: Wrapper around NtAllocateVirtualMemory.
469pub extern "kernel32" fn VirtualAlloc(
470 lpAddress: ?LPVOID,
471 dwSize: SIZE_T,
472 flAllocationType: DWORD,
473 flProtect: DWORD,
474) callconv(.winapi) ?LPVOID;
475
476// TODO: Wrapper around NtFreeVirtualMemory.
477// If the return value is .INVALID_PAGE_PROTECTION, calls RtlFlushSecureMemoryCache and try again.
478pub extern "kernel32" fn VirtualFree(
479 lpAddress: ?LPVOID,
480 dwSize: SIZE_T,
481 dwFreeType: DWORD,
482) callconv(.winapi) BOOL;
483
484// TODO: Wrapper around NtQueryVirtualMemory.
485pub extern "kernel32" fn VirtualQuery(
486 lpAddress: ?LPVOID,
487 lpBuffer: PMEMORY_BASIC_INFORMATION,
488 dwLength: SIZE_T,
489) callconv(.winapi) SIZE_T;
490
491435// TODO: Getter for peb.ProcessHeap
492436pub extern "kernel32" fn GetProcessHeap() callconv(.winapi) ?HANDLE;
493437
lib/std/posix.zig+1-1
......@@ -4409,7 +4409,7 @@ pub fn mmap(
44094409/// Note that while POSIX allows unmapping a region in the middle of an existing mapping,
44104410/// Zig's munmap function does not, for two reasons:
44114411/// * It violates the Zig principle that resource deallocation must succeed.
4412/// * The Windows function, VirtualFree, has this restriction.
4412/// * The Windows function, NtFreeVirtualMemory, has this restriction.
44134413pub fn munmap(memory: []align(page_size_min) const u8) void {
44144414 switch (errno(system.munmap(memory.ptr, memory.len))) {
44154415 .SUCCESS => return,