From ae6df9e96749cdd7cd4f84245ce20cfb3d4d6354 Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Tue, 31 Oct 2023 02:15:16 -0700
Subject: [PATCH] start.zig: Replace kernel32 usage with ntdll

Co-authored-by: e4m2 <git@e4m2.com>
---
 lib/std/os/windows/ntdll.zig |  4 ++++
 lib/std/start.zig            | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/std/os/windows/ntdll.zig b/lib/std/os/windows/ntdll.zig
index 8c14f1fad9..cdcb66b8b0 100644
--- a/lib/std/os/windows/ntdll.zig
+++ b/lib/std/os/windows/ntdll.zig
@@ -330,3 +330,7 @@ pub extern "ntdll" fn NtProtectVirtualMemory(
     NewAccessProtection: ULONG,
     OldAccessProtection: *ULONG,
 ) callconv(WINAPI) NTSTATUS;
+
+pub extern "ntdll" fn RtlExitUserProcess(
+    ExitStatus: u32,
+) callconv(WINAPI) noreturn;
diff --git a/lib/std/start.zig b/lib/std/start.zig
index 7ed59a4675..7925ea9168 100644
--- a/lib/std/start.zig
+++ b/lib/std/start.zig
@@ -168,15 +168,13 @@ fn exit2(code: usize) noreturn {
         // exits(0)
         .plan9 => std.os.plan9.exits(null),
         .windows => {
-            ExitProcess(@as(u32, @truncate(code)));
+            std.os.windows.ntdll.RtlExitUserProcess(@as(u32, @truncate(code)));
         },
         else => @compileError("TODO"),
     }
     unreachable;
 }
 
-extern "kernel32" fn ExitProcess(exit_code: u32) callconv(.C) noreturn;
-
 ////////////////////////////////////////////////////////////////////////////////
 
 fn _DllMainCRTStartup(
@@ -345,7 +343,7 @@ fn WinStartup() callconv(std.os.windows.WINAPI) noreturn {
 
     std.debug.maybeEnableSegfaultHandler();
 
-    std.os.windows.kernel32.ExitProcess(initEventLoopAndCallMain());
+    std.os.windows.ntdll.RtlExitUserProcess(initEventLoopAndCallMain());
 }
 
 fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn {
@@ -357,7 +355,7 @@ fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn {
     std.debug.maybeEnableSegfaultHandler();
 
     const result: std.os.windows.INT = initEventLoopAndCallWinMain();
-    std.os.windows.kernel32.ExitProcess(@as(std.os.windows.UINT, @bitCast(result)));
+    std.os.windows.ntdll.RtlExitUserProcess(@as(std.os.windows.UINT, @bitCast(result)));
 }
 
 fn posixCallMainAndExit() callconv(.C) noreturn {
@@ -605,8 +603,8 @@ pub fn callMain() u8 {
 pub fn call_wWinMain() std.os.windows.INT {
     const peb = std.os.windows.peb();
     const MAIN_HINSTANCE = @typeInfo(@TypeOf(root.wWinMain)).Fn.params[0].type.?;
-    const hInstance = @as(MAIN_HINSTANCE, @ptrCast(std.os.windows.kernel32.GetModuleHandleW(null).?));
-    const lpCmdLine = std.os.windows.kernel32.GetCommandLineW();
+    const hInstance = @as(MAIN_HINSTANCE, @ptrCast(peb.ImageBaseAddress));
+    const lpCmdLine: [*:0]u16 = @ptrCast(peb.ProcessParameters.CommandLine.Buffer);
 
     // There are various types used for the 'show window' variable through the Win32 APIs:
     // - u16 in STARTUPINFOA.wShowWindow / STARTUPINFOW.wShowWindow