From 30427ff794514d51cb5066b9e50113da998e0fd0 Mon Sep 17 00:00:00 2001 From: Reuben Dunnington Date: Sun, 19 Mar 2023 16:23:05 -0700 Subject: [PATCH] Fix GetFileInformationByHandle compile error (#14829) * Fix GetFileInformationByHandle compile error The wrapper function was mistakenly referencing ntdll.zig when the actual function is declared in kernel32.zig. * delete GetFileInformationByHandle since it's not used by the stdlib --- lib/std/os/windows.zig | 15 --------------- lib/std/os/windows/kernel32.zig | 5 ----- 2 files changed, 20 deletions(-) diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index 28dac40c9a33d29cf913350ff361b4d2b1e776ee..36b84d657b872f7fd289fc4b95c02e2bfcec7f3f 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -1708,21 +1708,6 @@ pub fn LocalFree(hMem: HLOCAL) void { assert(kernel32.LocalFree(hMem) == null); } -pub const GetFileInformationByHandleError = error{Unexpected}; - -pub fn GetFileInformationByHandle( - hFile: HANDLE, -) GetFileInformationByHandleError!BY_HANDLE_FILE_INFORMATION { - var info: BY_HANDLE_FILE_INFORMATION = undefined; - const rc = ntdll.GetFileInformationByHandle(hFile, &info); - if (rc == 0) { - switch (kernel32.GetLastError()) { - else => |err| return unexpectedError(err), - } - } - return info; -} - pub const SetFileTimeError = error{Unexpected}; pub fn SetFileTime( diff --git a/lib/std/os/windows/kernel32.zig b/lib/std/os/windows/kernel32.zig index 1fd8a406d5c4c7c42c150cf2d48ff6e7611e1e86..942d7ddba791f31c93d647bf07832f8508f5f8f0 100644 --- a/lib/std/os/windows/kernel32.zig +++ b/lib/std/os/windows/kernel32.zig @@ -202,11 +202,6 @@ pub extern "kernel32" fn GetModuleHandleW(lpModuleName: ?[*:0]const WCHAR) callc pub extern "kernel32" fn GetLastError() callconv(WINAPI) Win32Error; pub extern "kernel32" fn SetLastError(dwErrCode: Win32Error) callconv(WINAPI) void; -pub extern "kernel32" fn GetFileInformationByHandle( - hFile: HANDLE, - lpFileInformation: *BY_HANDLE_FILE_INFORMATION, -) callconv(WINAPI) BOOL; - pub extern "kernel32" fn GetFileInformationByHandleEx( in_hFile: HANDLE, in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, -- 2.54.0