Skip to content
Merged
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
2 changes: 2 additions & 0 deletions lib/std/os/windows.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1912,6 +1912,7 @@ pub const CreateProcessError = error{
NameTooLong,
InvalidExe,
SystemResources,
FileBusy,
Unexpected,
};

Expand Down Expand Up @@ -1982,6 +1983,7 @@ pub fn CreateProcessW(
.INVALID_PARAMETER => unreachable,
.INVALID_NAME => return error.InvalidName,
.FILENAME_EXCED_RANGE => return error.NameTooLong,
.SHARING_VIOLATION => return error.FileBusy,
// These are all the system errors that are mapped to ENOEXEC by
// the undocumented _dosmaperr (old CRT) or __acrt_errno_map_os_error
// (newer CRT) functions. Their code can be found in crt/src/dosmap.c (old SDK)
Expand Down
14 changes: 12 additions & 2 deletions src/link.zig
Original file line number Diff line number Diff line change
Expand Up @@ -616,9 +616,19 @@ pub const File = struct {
&coff.mf
else
unreachable;
mf.file = try base.emit.root_dir.handle.openFile(base.emit.sub_path, .{
mf.file = for (0..2) |_| break base.emit.root_dir.handle.openFile(base.emit.sub_path, .{
.mode = .read_write,
});
}) catch |err| switch (err) {
error.AccessDenied => switch (builtin.os.tag) {
.windows => {
// give the kernel a chance to finish closing the executable handle
std.os.windows.kernel32.Sleep(0);
continue;
},
else => return error.AccessDenied,
},
else => |e| return e,
} else return error.AccessDenied;
base.file = mf.file;
try mf.ensureTotalCapacity(@intCast(mf.nodes.items[0].location().resolve(mf)[1]));
},
Expand Down
9 changes: 8 additions & 1 deletion test/standalone/windows_spawn/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,14 @@ pub fn main() anyerror!void {
try testExec(allocator, "heLLo", "hello from exe\n");

// now rename the exe to not have an extension
try tmp.dir.rename("hello.exe", "hello");
for (0..2) |_| break tmp.dir.rename("hello.exe", "hello") catch |err| switch (err) {
error.AccessDenied => {
// give the kernel a chance to finish closing the executable handle
std.os.windows.kernel32.Sleep(0);
continue;
},
else => |e| return e,
} else return error.AccessDenied;

// with extension should now fail
try testExecError(error.FileNotFound, allocator, "hello.exe");
Expand Down