mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-09 15:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19641 from The-King-of-Toasters/windows-api-refactor

Browse Source 
Windows: Rework kernel32 apis
This commit is contained in:
Andrew Kelley 2024-07-18 11:44:32 -07:00 committed by GitHub
commit e4f5dada61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 582 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/debug.zig
View File

@ -1987,7 +1987,7 @@ pub const DebugInfo = struct {
@memcpy(name_buffer[0..4], &[_]u16{ '\\', '?', '?', '\\' }); @memcpy(name_buffer[0..4], &[_]u16{ '\\', '?', '?', '\\' });
const process_handle = windows.kernel32.GetCurrentProcess(); const process_handle = windows.kernel32.GetCurrentProcess();
const len = windows.kernel32.K32GetModuleFileNameExW( const len = windows.kernel32.GetModuleFileNameExW(
process_handle, process_handle,
module.handle, module.handle,
@ptrCast(&name_buffer[4]), @ptrCast(&name_buffer[4]),

15
lib/std/os/windows.zig
View File

@ -729,8 +729,8 @@ pub const GetCurrentDirectoryError = error{
/// The result is a slice of `buffer`, indexed from 0. /// The result is a slice of `buffer`, indexed from 0.
/// The result is encoded as [WTF-8](https://simonsapin.github.io/wtf-8/). /// The result is encoded as [WTF-8](https://simonsapin.github.io/wtf-8/).
pub fn GetCurrentDirectory(buffer: []u8) GetCurrentDirectoryError![]u8 { pub fn GetCurrentDirectory(buffer: []u8) GetCurrentDirectoryError![]u8 {
var wtf16le_buf: [PATH_MAX_WIDE]u16 = undefined; var wtf16le_buf: [PATH_MAX_WIDE:0]u16 = undefined;
const result = kernel32.GetCurrentDirectoryW(wtf16le_buf.len, &wtf16le_buf); const result = kernel32.GetCurrentDirectoryW(wtf16le_buf.len + 1, &wtf16le_buf);
if (result == 0) { if (result == 0) {
switch (GetLastError()) { switch (GetLastError()) {
else => |err| return unexpectedError(err), else => |err| return unexpectedError(err),
@ -1190,7 +1190,14 @@ pub fn SetFilePointerEx_CURRENT_get(handle: HANDLE) SetFilePointerError!u64 {
return @as(u64, @bitCast(result)); return @as(u64, @bitCast(result));
} }
pub fn QueryObjectName(handle: HANDLE, out_buffer: []u16) ![]u16 { pub const QueryObjectNameError = error{
AccessDenied,
InvalidHandle,
NameTooLong,
Unexpected,
};
pub fn QueryObjectName(handle: HANDLE, out_buffer: []u16) QueryObjectNameError![]u16 {
const out_buffer_aligned = mem.alignInSlice(out_buffer, @alignOf(OBJECT_NAME_INFORMATION)) orelse return error.NameTooLong; const out_buffer_aligned = mem.alignInSlice(out_buffer, @alignOf(OBJECT_NAME_INFORMATION)) orelse return error.NameTooLong;
const info = @as(*OBJECT_NAME_INFORMATION, @ptrCast(out_buffer_aligned)); const info = @as(*OBJECT_NAME_INFORMATION, @ptrCast(out_buffer_aligned));
@ -2761,7 +2768,7 @@ pub fn loadWinsockExtensionFunction(comptime T: type, sock: ws2_32.SOCKET, guid:
pub fn unexpectedError(err: Win32Error) UnexpectedError { pub fn unexpectedError(err: Win32Error) UnexpectedError {
if (std.posix.unexpected_error_tracing) { if (std.posix.unexpected_error_tracing) {
// 614 is the length of the longest windows error description // 614 is the length of the longest windows error description
var buf_wstr: [614]WCHAR = undefined; var buf_wstr: [614:0]WCHAR = undefined;
const len = kernel32.FormatMessageW( const len = kernel32.FormatMessageW(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
null, null,

942
lib/std/os/windows/kernel32.zig
View File

File diff suppressed because it is too large Load Diff