mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 00:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

We now make a more correct conversion from windows LARGE_INTEGER type to usize

Browse Source
This commit is contained in:
Jimmi Holst Christensen 2018-01-19 22:05:56 +01:00
parent 61497893d3
commit a1a69f24c8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
std/io.zig
View File

@ -48,6 +48,7 @@ error PathNotFound;
error OutOfMemory;
error Unseekable;
error EndOfFile;
error FilePosLargerThanPointerRange;
pub fn getStdErr() -> %File {
const handle = if (is_windows)
@ -266,8 +267,8 @@ pub const File = struct {
return result;
},
Os.windows => {
var pos : usize = undefined;
if (system.SetFilePointerEx(self.handle, 0, @ptrCast(system.PLARGE_INTEGER, &pos), system.FILE_CURRENT) == 0) {
var pos : system.LARGE_INTEGER = undefined;
if (system.SetFilePointerEx(self.handle, 0, &pos, system.FILE_CURRENT) == 0) {
const err = system.GetLastError();
return switch (err) {
system.ERROR.INVALID_PARAMETER => error.BadFd,
@ -275,7 +276,12 @@ pub const File = struct {
};
}
return pos;
assert(pos >= 0);
if (pos > @maxValue(usize)) {
return error.FilePosLargerThanPointerRange;
}
return usize(pos);
},
else => @compileError("unsupported OS"),
}