Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions lib/std/fs/File.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1206,12 +1206,35 @@ pub const Reader = struct {
return r.size orelse {
if (r.size_err) |err| return err;
if (is_windows) {
if (windows.GetFileSizeEx(r.file.handle)) |size| {
r.size = size;
return size;
} else |err| {
r.size_err = err;
return err;
const device_type = blk: {
var io_status: windows.IO_STATUS_BLOCK = undefined;
var device_info: windows.FILE_FS_DEVICE_INFORMATION = undefined;
const rc = windows.ntdll.NtQueryVolumeInformationFile(
r.file.handle,
&io_status,
&device_info,
@sizeOf(windows.FILE_FS_DEVICE_INFORMATION),
.FileFsDeviceInformation,
);
break :blk switch (rc) {
.SUCCESS => device_info.DeviceType,
else => return windows.unexpectedStatus(rc),
};
};
switch (device_type) {
windows.FILE_DEVICE_NAMED_PIPE,
windows.FILE_DEVICE_CONSOLE,
=> {
r.size_err = error.Streaming;
return error.Streaming;
},
else => if (windows.GetFileSizeEx(r.file.handle)) |size| {
r.size = size;
return size;
} else |err| {
r.size_err = err;
return err;
},
}
}
if (posix.Stat == void) {
Expand Down
5 changes: 1 addition & 4 deletions test/standalone/test_obj_link_run/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ pub fn build(b: *std.Build) void {
b.default_step = test_step;

const test_run = b.addRunArtifact(test_exe);
if (!is_windows) {
// https://github.com/ziglang/zig/issues/24867
test_run.addCheck(.{ .expect_stderr_match = "All 3 tests passed." });
}
test_run.addCheck(.{ .expect_stderr_match = "All 3 tests passed." });
test_step.dependOn(&test_run.step);
}

Expand Down