Commit 8f89056dc27a77e0e35739db5b4310e68a49d9d3 | zig

author	vnc5 <vnc5@users.noreply.github.com> 2021-10-09 14:04:16+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-02-02 21:59:47-07:00
log	8f89056dc27a77e0e35739db5b4310e68a49d9d3
tree	da11a8cf42b904ba1d38c1c184baf8b72925b877
parent	e8c4fec1b2ea676691aea89cdedd97ea17e26ed6

1 files changed, 11 insertions(+), 3 deletions(-)

lib/std/start.zig+11-3

 @@ -511,9 +511,9 @@ inline fn initEventLoopAndCallWinMain() std.os.windows.INT {
             };
             defer loop.deinit();
-            var result: u8 = undefined;
+            var result: std.os.windows.INT = undefined;
-            var frame: @Frame(callMainAsync) = undefined;
+            var frame: @Frame(callWinMainAsync) = undefined;
-            _ = @asyncCall(&frame, &result, callMainAsync, .{loop});
+            _ = @asyncCall(&frame, &result, callWinMainAsync, .{loop});
             loop.run();
             return result;
         }
 @@ -532,6 +532,14 @@ fn callMainAsync(loop: *std.event.Loop) callconv(.Async) u8 {
     return callMain();
 }
+fn callWinMainAsync(loop: *std.event.Loop) callconv(.Async) std.os.windows.INT {
+    // This prevents the event loop from terminating at least until main() has returned.
+    // TODO This shouldn't be needed here; it should be in the event loop code.
+    loop.beginOneEvent();
+    defer loop.finishOneEvent();
+    return call_wWinMain();
+}
 // This is not marked inline because it is called with @asyncCall when
 // there is an event loop.
 pub fn callMain() u8 {