mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.windows: fix OVERLAPPED, add OVERLAPPED_ENTRY

Browse Source
This commit is contained in:
viri 2021-06-12 18:36:22 -06:00 committed by Veikka Tuominen
parent a6d72fea06
commit b2879825d7
4 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/std/event/loop.zig
View File

@ -54,8 +54,12 @@ pub const Loop = struct {
.windows => windows.OVERLAPPED{
.Internal = 0,
.InternalHigh = 0,
.Offset = 0,
.OffsetHigh = 0,
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = 0,
.OffsetHigh = 0,
},
},
.hEvent = null,
},
else => {},

8
lib/std/fs/watch.zig
View File

@ -437,8 +437,12 @@ pub fn Watch(comptime V: type) type {
.overlapped = windows.OVERLAPPED{
.Internal = 0,
.InternalHigh = 0,
.Offset = 0,
.OffsetHigh = 0,
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = 0,
.OffsetHigh = 0,
},
},
.hEvent = null,
},
},

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

@ -455,8 +455,12 @@ pub fn ReadFile(in_hFile: HANDLE, buffer: []u8, offset: ?u64, io_mode: std.io.Mo
.overlapped = OVERLAPPED{
.Internal = 0,
.InternalHigh = 0,
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
},
},
.hEvent = null,
},
},
@ -491,8 +495,12 @@ pub fn ReadFile(in_hFile: HANDLE, buffer: []u8, offset: ?u64, io_mode: std.io.Mo
overlapped_data = .{
.Internal = 0,
.InternalHigh = 0,
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
},
},
.hEvent = null,
};
break :blk &overlapped_data;
@ -535,8 +543,12 @@ pub fn WriteFile(
.overlapped = OVERLAPPED{
.Internal = 0,
.InternalHigh = 0,
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
},
},
.hEvent = null,
},
},
@ -571,8 +583,12 @@ pub fn WriteFile(
overlapped_data = .{
.Internal = 0,
.InternalHigh = 0,
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
.DUMMYUNIONNAME = .{
.DUMMYSTRUCTNAME = .{
.Offset = @truncate(u32, off),
.OffsetHigh = @truncate(u32, off >> 32),
},
},
.hEvent = null,
};
break :blk &overlapped_data;

17
lib/std/os/windows/bits.zig
View File

@ -359,12 +359,25 @@ pub const FILE_INFORMATION_CLASS = enum(c_int) {
pub const OVERLAPPED = extern struct {
Internal: ULONG_PTR,
InternalHigh: ULONG_PTR,
Offset: DWORD,
OffsetHigh: DWORD,
DUMMYUNIONNAME: extern union {
DUMMYSTRUCTNAME: extern struct {
Offset: DWORD,
OffsetHigh: DWORD,
},
Pointer: ?PVOID,
},
hEvent: ?HANDLE,
};
pub const LPOVERLAPPED = *OVERLAPPED;
pub const OVERLAPPED_ENTRY = extern struct {
lpCompletionKey: ULONG_PTR,
lpOverlapped: LPOVERLAPPED,
Internal: ULONG_PTR,
dwNumberOfBytesTransferred: DWORD,
};
pub const LPOVERLAPPED_ENTRY = *OVERLAPPED_ENTRY;
pub const MAX_PATH = 260;
// TODO issue #305