Merge pull request #18091 from squeek502/no-shell32-no-ole32

Remove Zig's internal depedency on `shell32.dll` and `ole32.dll`

Author: andrewrk

lib/std/fs/get_app_data_dir.zig

@@ -15,27 +15,12 @@ pub const GetAppDataDirError = error{
 pub fn getAppDataDir(allocator: mem.Allocator, appname: []const u8) GetAppDataDirError![]u8 {
     switch (builtin.os.tag) {
         .windows => {
-            var dir_path_ptr: [*:0]u16 = undefined;
-            switch (os.windows.shell32.SHGetKnownFolderPath(
-                &os.windows.FOLDERID_LocalAppData,
-                os.windows.KF_FLAG_CREATE,
-                null,
-                &dir_path_ptr,
-            )) {
-                os.windows.S_OK => {
-                    defer os.windows.ole32.CoTaskMemFree(dir_path_ptr);
-                    const global_dir = unicode.utf16leToUtf8Alloc(allocator, mem.sliceTo(dir_path_ptr, 0)) catch |err| switch (err) {
-                        error.UnexpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
-                        error.ExpectedSecondSurrogateHalf => return error.AppDataDirUnavailable,
-                        error.DanglingSurrogateHalf => return error.AppDataDirUnavailable,
-                        error.OutOfMemory => return error.OutOfMemory,
-                    };
-                    defer allocator.free(global_dir);
-                    return fs.path.join(allocator, &[_][]const u8{ global_dir, appname });
-                },
-                os.windows.E_OUTOFMEMORY => return error.OutOfMemory,
+            const local_app_data_dir = std.process.getEnvVarOwned(allocator, "LOCALAPPDATA") catch |err| switch (err) {
+                error.OutOfMemory => |e| return e,
                 else => return error.AppDataDirUnavailable,
-            }
+            };
+            defer allocator.free(local_app_data_dir);
+            return fs.path.join(allocator, &[_][]const u8{ local_app_data_dir, appname });
         },
         .macos => {
             const home_dir = os.getenv("HOME") orelse {

lib/std/os/windows.zig

@@ -21,8 +21,6 @@ test {
 pub const advapi32 = @import("windows/advapi32.zig");
 pub const kernel32 = @import("windows/kernel32.zig");
 pub const ntdll = @import("windows/ntdll.zig");
-pub const ole32 = @import("windows/ole32.zig");
-pub const shell32 = @import("windows/shell32.zig");
 pub const ws2_32 = @import("windows/ws2_32.zig");
 pub const crypt32 = @import("windows/crypt32.zig");
 pub const nls = @import("windows/nls.zig");
@@ -3527,7 +3525,8 @@ pub const SEC_LARGE_PAGES = 0x80000000;
 
 pub const HKEY = *opaque {};
 
-pub const HKEY_LOCAL_MACHINE: HKEY = @as(HKEY, @ptrFromInt(0x80000002));
+pub const HKEY_CLASSES_ROOT: HKEY = @ptrFromInt(0x80000000);
+pub const HKEY_LOCAL_MACHINE: HKEY = @ptrFromInt(0x80000002);
 
 /// Combines the STANDARD_RIGHTS_REQUIRED, KEY_QUERY_VALUE, KEY_SET_VALUE, KEY_CREATE_SUB_KEY,
 /// KEY_ENUMERATE_SUB_KEYS, KEY_NOTIFY, and KEY_CREATE_LINK access rights.