From 8709326088b71246bb4825c5a883bccef552f3a8 Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Sun, 1 Jun 2025 18:56:48 -0700
Subject: [PATCH] windows: Delete obsolete environment variable kernel32
 wrappers and bindings

These functions have been unused for a long time (since cfffb9c5e96eeeae43cd724e2d02ec8c2b7714e0; the PEB is used for this stuff now), and the GetEnvironmentVariableW wrapper's parameter types don't make much sense to boot.

Contributes towards:
- https://github.com/ziglang/zig/issues/4426
- https://github.com/ziglang/zig/issues/1840
---
 lib/std/os/windows.zig          | 26 --------------------------
 lib/std/os/windows/kernel32.zig | 15 ---------------
 2 files changed, 41 deletions(-)

diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig
index 73722b308d..3aaff1d60a 100644
--- a/lib/std/os/windows.zig
+++ b/lib/std/os/windows.zig
@@ -1905,32 +1905,6 @@ pub fn SetFileCompletionNotificationModes(handle: HANDLE, flags: UCHAR) !void {
     }
 }
 
-pub const GetEnvironmentStringsError = error{OutOfMemory};
-
-pub fn GetEnvironmentStringsW() GetEnvironmentStringsError![*:0]u16 {
-    return kernel32.GetEnvironmentStringsW() orelse return error.OutOfMemory;
-}
-
-pub fn FreeEnvironmentStringsW(penv: [*:0]u16) void {
-    assert(kernel32.FreeEnvironmentStringsW(penv) != 0);
-}
-
-pub const GetEnvironmentVariableError = error{
-    EnvironmentVariableNotFound,
-    Unexpected,
-};
-
-pub fn GetEnvironmentVariableW(lpName: LPWSTR, lpBuffer: [*]u16, nSize: DWORD) GetEnvironmentVariableError!DWORD {
-    const rc = kernel32.GetEnvironmentVariableW(lpName, lpBuffer, nSize);
-    if (rc == 0) {
-        switch (GetLastError()) {
-            .ENVVAR_NOT_FOUND => return error.EnvironmentVariableNotFound,
-            else => |err| return unexpectedError(err),
-        }
-    }
-    return rc;
-}
-
 pub const CreateProcessError = error{
     FileNotFound,
     AccessDenied,
diff --git a/lib/std/os/windows/kernel32.zig b/lib/std/os/windows/kernel32.zig
index d23fd6b326..2ef08dd97a 100644
--- a/lib/std/os/windows/kernel32.zig
+++ b/lib/std/os/windows/kernel32.zig
@@ -340,21 +340,6 @@ pub extern "kernel32" fn GetExitCodeProcess(
 // TODO: Already a wrapper for this, see `windows.GetCurrentProcess`.
 pub extern "kernel32" fn GetCurrentProcess() callconv(.winapi) HANDLE;
 
-// TODO: memcpy peb().ProcessParameters.Environment, mem.span(0). Requires locking the PEB.
-pub extern "kernel32" fn GetEnvironmentStringsW() callconv(.winapi) ?LPWSTR;
-
-// TODO: RtlFreeHeap on the output of GetEnvironmentStringsW.
-pub extern "kernel32" fn FreeEnvironmentStringsW(
-    penv: LPWSTR,
-) callconv(.winapi) BOOL;
-
-// TODO: Wrapper around RtlQueryEnvironmentVariable.
-pub extern "kernel32" fn GetEnvironmentVariableW(
-    lpName: ?LPCWSTR,
-    lpBuffer: ?[*]WCHAR,
-    nSize: DWORD,
-) callconv(.winapi) DWORD;
-
 // TODO: Wrapper around RtlSetEnvironmentVar.
 pub extern "kernel32" fn SetEnvironmentVariableW(
     lpName: LPCWSTR,