zig

commit e6ef00233e77758fb0ae33a9ad52ed9011005e45 (tree)
parent 8621e3b5bd814005129b58469d93c2499e3d085e
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed,  7 Aug 2019 14:21:54 -0700

Merge pull request #3025 from euantorano/fix/3015-std-os-window-rtlgenrandom

Fix #3015 - fix RtlGenRandom function signature
Diffstat:
M
std/os/windows.zig
 | 
15
++++++++++++---
M
std/os/windows/advapi32.zig
 | 
2
+-

2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/std/os/windows.zig b/std/os/windows.zig
@@ -138,10 +138,19 @@ pub const RtlGenRandomError = error{Unexpected};
 /// https://github.com/rust-lang-nursery/rand/issues/111
 /// https://bugzilla.mozilla.org/show_bug.cgi?id=504270
 pub fn RtlGenRandom(output: []u8) RtlGenRandomError!void {
-    if (advapi32.RtlGenRandom(output.ptr, output.len) == 0) {
-        switch (kernel32.GetLastError()) {
-            else => |err| return unexpectedError(err),
+    var total_read: usize = 0;
+    var buff: []u8 = output[0..];
+    const max_read_size: ULONG = maxInt(ULONG);
+
+    while (total_read < output.len) {
+        const to_read: ULONG = math.min(buff.len, max_read_size);
+
+        if (advapi32.RtlGenRandom(buff.ptr, to_read) == 0) {
+            return unexpectedError(kernel32.GetLastError());
         }
+
+        total_read += to_read;
+        buff = buff[to_read..];
     }
 }
 
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig
@@ -19,5 +19,5 @@ pub extern "advapi32" stdcallcc fn RegQueryValueExW(
 
 // 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 extern "advapi32" stdcallcc fn SystemFunction036(output: [*]u8, length: ULONG) BOOL;
 pub const RtlGenRandom = SystemFunction036;