diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-08-02 13:35:06 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-08-02 13:35:06 -0400 |
| commit | 9ecbabfc4ce857e43db2b056bc83272cb24b0bbd (patch) | |
| tree | 6f5e3a6c93f6e0859819f0866e7c37a7ea9a4637 /std/os/windows | |
| parent | 432b7685bfa840a459b492a37894f7ffed870c7e (diff) | |
| parent | 729f2aceb045e54b2b74a33fa5f64cb9802988c6 (diff) | |
| download | zig-9ecbabfc4ce857e43db2b056bc83272cb24b0bbd.tar.gz zig-9ecbabfc4ce857e43db2b056bc83272cb24b0bbd.zip | |
Merge branch 'pr-1319'
Diffstat (limited to 'std/os/windows')
| -rw-r--r-- | std/os/windows/advapi32.zig | 5 | ||||
| -rw-r--r-- | std/os/windows/util.zig | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig index dcb5a636ea..2f3195475c 100644 --- a/std/os/windows/advapi32.zig +++ b/std/os/windows/advapi32.zig @@ -28,3 +28,8 @@ pub extern "advapi32" stdcallcc fn RegOpenKeyExW(hKey: HKEY, lpSubKey: LPCWSTR, pub extern "advapi32" stdcallcc fn RegQueryValueExW(hKey: HKEY, lpValueName: LPCWSTR, lpReserved: LPDWORD, lpType: LPDWORD, lpData: LPBYTE, lpcbData: LPDWORD,) LSTATUS; + +// RtlGenRandom is known as SystemFunction036 under advapi32 +// http://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx */ +pub extern "advapi32" stdcallcc fn SystemFunction036(output: [*]u8, length: usize) BOOL; +pub const RtlGenRandom = SystemFunction036; diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig index dda9ce7a8b..c9d2c3c3e6 100644 --- a/std/os/windows/util.zig +++ b/std/os/windows/util.zig @@ -166,7 +166,7 @@ pub fn windowsUnloadDll(hModule: windows.HMODULE) void { } test "InvalidDll" { - if (builtin.os != builtin.Os.windows) return; + if (builtin.os != builtin.Os.windows) return error.SkipZigTest; const DllName = "asdf.dll"; const allocator = std.debug.global_allocator; |