aboutsummaryrefslogtreecommitdiff
path: root/std/os
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2018-08-27 19:25:18 -0400
committerAndrew Kelley <superjoe30@gmail.com>2018-08-27 19:25:40 -0400
commitfb6d3859e80faf98335c55414bb73490977d2089 (patch)
treecc55d12a0eccf5b632bb72899f324e6646ef32d6 /std/os
parent4f2d49fd138be67ad01d9c1b9086cb6a41530944 (diff)
downloadzig-fb6d3859e80faf98335c55414bb73490977d2089.tar.gz
zig-fb6d3859e80faf98335c55414bb73490977d2089.zip
zig fmt
Diffstat (limited to 'std/os')
-rw-r--r--std/os/windows/advapi32.zig21
-rw-r--r--std/os/windows/index.zig12
-rw-r--r--std/os/windows/ole32.zig1
-rw-r--r--std/os/zen.zig49
4 files changed, 46 insertions, 37 deletions
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig
index 2f3195475c..d0a3ec41e9 100644
--- a/std/os/windows/advapi32.zig
+++ b/std/os/windows/advapi32.zig
@@ -23,11 +23,22 @@ pub extern "advapi32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlag
pub extern "advapi32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: [*]BYTE) BOOL;
-pub extern "advapi32" stdcallcc fn RegOpenKeyExW(hKey: HKEY, lpSubKey: LPCWSTR, ulOptions: DWORD, samDesired: REGSAM,
- phkResult: &HKEY,) LSTATUS;
-
-pub extern "advapi32" stdcallcc fn RegQueryValueExW(hKey: HKEY, lpValueName: LPCWSTR, lpReserved: LPDWORD,
- lpType: LPDWORD, lpData: LPBYTE, lpcbData: LPDWORD,) LSTATUS;
+pub extern "advapi32" stdcallcc fn RegOpenKeyExW(
+ hKey: HKEY,
+ lpSubKey: LPCWSTR,
+ ulOptions: DWORD,
+ samDesired: REGSAM,
+ phkResult: &HKEY,
+) LSTATUS;
+
+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 */
diff --git a/std/os/windows/index.zig b/std/os/windows/index.zig
index bb055468a5..5c68176c5a 100644
--- a/std/os/windows/index.zig
+++ b/std/os/windows/index.zig
@@ -288,27 +288,27 @@ pub const GUID = extern struct {
assert(str[index] == '{');
index += 1;
- guid.Data1 = std.fmt.parseUnsigned(c_ulong, str[index..index + 8], 16) catch unreachable;
+ guid.Data1 = std.fmt.parseUnsigned(c_ulong, str[index .. index + 8], 16) catch unreachable;
index += 8;
assert(str[index] == '-');
index += 1;
- guid.Data2 = std.fmt.parseUnsigned(c_ushort, str[index..index + 4], 16) catch unreachable;
+ guid.Data2 = std.fmt.parseUnsigned(c_ushort, str[index .. index + 4], 16) catch unreachable;
index += 4;
assert(str[index] == '-');
index += 1;
- guid.Data3 = std.fmt.parseUnsigned(c_ushort, str[index..index + 4], 16) catch unreachable;
+ guid.Data3 = std.fmt.parseUnsigned(c_ushort, str[index .. index + 4], 16) catch unreachable;
index += 4;
assert(str[index] == '-');
index += 1;
- guid.Data4[0] = std.fmt.parseUnsigned(u8, str[index..index + 2], 16) catch unreachable;
+ guid.Data4[0] = std.fmt.parseUnsigned(u8, str[index .. index + 2], 16) catch unreachable;
index += 2;
- guid.Data4[1] = std.fmt.parseUnsigned(u8, str[index..index + 2], 16) catch unreachable;
+ guid.Data4[1] = std.fmt.parseUnsigned(u8, str[index .. index + 2], 16) catch unreachable;
index += 2;
assert(str[index] == '-');
@@ -316,7 +316,7 @@ pub const GUID = extern struct {
var i: usize = 2;
while (i < guid.Data4.len) : (i += 1) {
- guid.Data4[i] = std.fmt.parseUnsigned(u8, str[index..index + 2], 16) catch unreachable;
+ guid.Data4[i] = std.fmt.parseUnsigned(u8, str[index .. index + 2], 16) catch unreachable;
index += 2;
}
diff --git a/std/os/windows/ole32.zig b/std/os/windows/ole32.zig
index 84d8089d07..cc737e344c 100644
--- a/std/os/windows/ole32.zig
+++ b/std/os/windows/ole32.zig
@@ -5,7 +5,6 @@ pub extern "ole32.dll" stdcallcc fn CoUninitialize() void;
pub extern "ole32.dll" stdcallcc fn CoGetCurrentProcess() DWORD;
pub extern "ole32.dll" stdcallcc fn CoInitializeEx(pvReserved: LPVOID, dwCoInit: DWORD) HRESULT;
-
pub const COINIT_APARTMENTTHREADED = COINIT.COINIT_APARTMENTTHREADED;
pub const COINIT_MULTITHREADED = COINIT.COINIT_MULTITHREADED;
pub const COINIT_DISABLE_OLE1DDE = COINIT.COINIT_DISABLE_OLE1DDE;
diff --git a/std/os/zen.zig b/std/os/zen.zig
index 55b6d91128..6ac480b890 100644
--- a/std/os/zen.zig
+++ b/std/os/zen.zig
@@ -6,32 +6,32 @@ const assert = std.debug.assert;
//////////////////////////
pub const Message = struct {
-sender: MailboxId,
+ sender: MailboxId,
receiver: MailboxId,
- code: usize,
- args: [5]usize,
- payload: ?[]const u8,
+ code: usize,
+ args: [5]usize,
+ payload: ?[]const u8,
pub fn from(mailbox_id: *const MailboxId) Message {
- return Message {
- .sender = MailboxId.Undefined,
+ return Message{
+ .sender = MailboxId.Undefined,
.receiver = mailbox_id.*,
- .code = undefined,
- .args = undefined,
- .payload = null,
+ .code = undefined,
+ .args = undefined,
+ .payload = null,
};
}
pub fn to(mailbox_id: *const MailboxId, msg_code: usize, args: ...) Message {
- var message = Message {
- .sender = MailboxId.This,
+ var message = Message{
+ .sender = MailboxId.This,
.receiver = mailbox_id.*,
- .code = msg_code,
- .args = undefined,
- .payload = null,
+ .code = msg_code,
+ .args = undefined,
+ .payload = null,
};
- assert (args.len <= message.args.len);
+ assert(args.len <= message.args.len);
comptime var i = 0;
inline while (i < args.len) : (i += 1) {
message.args[i] = args[i];
@@ -111,8 +111,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
switch (fd) {
STDOUT_FILENO, STDERR_FILENO => {
- send(Message.to(Server.Terminal, 1)
- .withPayload(buf[0..count]));
+ send(Message.to(Server.Terminal, 1).withPayload(buf[0..count]));
},
else => unreachable,
}
@@ -124,14 +123,14 @@ pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
///////////////////////////
pub const Syscall = enum(usize) {
- exit = 0,
- send = 1,
- receive = 2,
- subscribeIRQ = 3,
- inb = 4,
- outb = 5,
- map = 6,
- createThread = 7,
+ exit = 0,
+ send = 1,
+ receive = 2,
+ subscribeIRQ = 3,
+ inb = 4,
+ outb = 5,
+ map = 6,
+ createThread = 7,
};
////////////////////