Skip to content

Commit 3729569

Browse files
SzwagiVexu
authored andcommitted
std.os.windows additions and fixes
1 parent e7ead9c commit 3729569

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

lib/std/os/windows.zig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,6 +2631,7 @@ pub const HWND = *opaque {};
26312631
pub const HDC = *opaque {};
26322632
pub const HGLRC = *opaque {};
26332633
pub const FARPROC = *opaque {};
2634+
pub const PROC = *opaque {};
26342635
pub const INT = c_int;
26352636
pub const LPCSTR = [*:0]const CHAR;
26362637
pub const LPCVOID = *const anyopaque;
@@ -3433,6 +3434,10 @@ pub const E_HANDLE = @as(c_long, @bitCast(@as(c_ulong, 0x80070006)));
34333434
pub const E_OUTOFMEMORY = @as(c_long, @bitCast(@as(c_ulong, 0x8007000E)));
34343435
pub const E_INVALIDARG = @as(c_long, @bitCast(@as(c_ulong, 0x80070057)));
34353436

3437+
pub fn HRESULT_CODE(hr: HRESULT) Win32Error {
3438+
return @enumFromInt(hr & 0xFFFF);
3439+
}
3440+
34363441
pub const FILE_FLAG_BACKUP_SEMANTICS = 0x02000000;
34373442
pub const FILE_FLAG_DELETE_ON_CLOSE = 0x04000000;
34383443
pub const FILE_FLAG_NO_BUFFERING = 0x20000000;

lib/std/os/windows/kernel32.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub extern "kernel32" fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: *DWORD
193193

194194
pub extern "kernel32" fn GetFileSizeEx(hFile: HANDLE, lpFileSize: *LARGE_INTEGER) callconv(WINAPI) BOOL;
195195

196-
pub extern "kernel32" fn GetFileAttributesW(lpFileName: [*]const WCHAR) callconv(WINAPI) DWORD;
196+
pub extern "kernel32" fn GetFileAttributesW(lpFileName: [*:0]const WCHAR) callconv(WINAPI) DWORD;
197197

198198
pub extern "kernel32" fn GetModuleFileNameW(hModule: ?HMODULE, lpFilename: [*]u16, nSize: DWORD) callconv(WINAPI) DWORD;
199199

@@ -392,7 +392,7 @@ pub extern "kernel32" fn WriteFileEx(
392392

393393
pub extern "kernel32" fn LoadLibraryW(lpLibFileName: [*:0]const u16) callconv(WINAPI) ?HMODULE;
394394

395-
pub extern "kernel32" fn GetProcAddress(hModule: HMODULE, lpProcName: [*]const u8) callconv(WINAPI) ?FARPROC;
395+
pub extern "kernel32" fn GetProcAddress(hModule: HMODULE, lpProcName: [*:0]const u8) callconv(WINAPI) ?FARPROC;
396396

397397
pub extern "kernel32" fn FreeLibrary(hModule: HMODULE) callconv(WINAPI) BOOL;
398398

0 commit comments

Comments
 (0)