| author |  Reuben Dunnington <rdunnington@users.noreply.github.com> 2023-03-19 16:23:05-07:00 |
| committer |  GitHub <noreply@github.com> 2023-03-19 23:23:05+00:00 |
| log | 30427ff794514d51cb5066b9e50113da998e0fd0 |
| tree | 3661f1073d2dbfb705730b294432401171d32c09 |
| parent | 9a203fa7894cde183dc04bdfea63d9aea18c52da |
| signature |  Signed by PGP key 4AEE18F83AFDEB23 |
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 stdlib2 files changed, 0 insertions(+), 20 deletions(-)
lib- std
- os
- windows.zig
- windows
lib/std/os/windows.zig-15
| ... | @@ -1708,21 +1708,6 @@ pub fn LocalFree(hMem: HLOCAL) void { | ... | @@ -1708,21 +1708,6 @@ pub fn LocalFree(hMem: HLOCAL) void { |
| 1708 | assert(kernel32.LocalFree(hMem) == null); | 1708 | assert(kernel32.LocalFree(hMem) == null); |
| 1709 | } | 1709 | } |
| 1710 | 1710 | ||
| 1711 | pub const GetFileInformationByHandleError = error{Unexpected}; | ||
| 1712 | |||
| 1713 | pub fn GetFileInformationByHandle( | ||
| 1714 | hFile: HANDLE, | ||
| 1715 | ) GetFileInformationByHandleError!BY_HANDLE_FILE_INFORMATION { | ||
| 1716 | var info: BY_HANDLE_FILE_INFORMATION = undefined; | ||
| 1717 | const rc = ntdll.GetFileInformationByHandle(hFile, &info); | ||
| 1718 | if (rc == 0) { | ||
| 1719 | switch (kernel32.GetLastError()) { | ||
| 1720 | else => |err| return unexpectedError(err), | ||
| 1721 | } | ||
| 1722 | } | ||
| 1723 | return info; | ||
| 1724 | } | ||
| 1725 | |||
| 1726 | pub const SetFileTimeError = error{Unexpected}; | 1711 | pub const SetFileTimeError = error{Unexpected}; |
| 1727 | 1712 | ||
| 1728 | pub fn SetFileTime( | 1713 | pub fn SetFileTime( |
lib/std/os/windows/kernel32.zig-5
| ... | @@ -202,11 +202,6 @@ pub extern "kernel32" fn GetModuleHandleW(lpModuleName: ?[*:0]const WCHAR) callc | ... | @@ -202,11 +202,6 @@ pub extern "kernel32" fn GetModuleHandleW(lpModuleName: ?[*:0]const WCHAR) callc |
| 202 | pub extern "kernel32" fn GetLastError() callconv(WINAPI) Win32Error; | 202 | pub extern "kernel32" fn GetLastError() callconv(WINAPI) Win32Error; |
| 203 | pub extern "kernel32" fn SetLastError(dwErrCode: Win32Error) callconv(WINAPI) void; | 203 | pub extern "kernel32" fn SetLastError(dwErrCode: Win32Error) callconv(WINAPI) void; |
| 204 | 204 | ||
| 205 | pub extern "kernel32" fn GetFileInformationByHandle( | ||
| 206 | hFile: HANDLE, | ||
| 207 | lpFileInformation: *BY_HANDLE_FILE_INFORMATION, | ||
| 208 | ) callconv(WINAPI) BOOL; | ||
| 209 | |||
| 210 | pub extern "kernel32" fn GetFileInformationByHandleEx( | 205 | pub extern "kernel32" fn GetFileInformationByHandleEx( |
| 211 | in_hFile: HANDLE, | 206 | in_hFile: HANDLE, |
| 212 | in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, | 207 | in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, |