Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Environment.SystemDirectory from GetFolderPath(System) on Windows #83593

Merged
merged 4 commits into from Mar 18, 2023
Merged

Use Environment.SystemDirectory from GetFolderPath(System) on Windows #83593

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7cc11e
Use Environment.SystemDirectory from GetFolderPath(System) on Windows
stephentoub Mar 17, 2023
2c65dc1
Address PR feedback and fix up a few other occurrences
stephentoub Mar 17, 2023
a049dd4
Merge branch 'main' into envsys
stephentoub Mar 17, 2023
6745602
Remove KnownFolders.System
stephentoub Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libraries/System.Private.CoreLib/src/System/Environment.Win32.cs
View file
Open in desktop
Expand Up @@ -220,6 +220,13 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio

switch (folder)
{
// Special-cased values to not use SHGetFolderPath when we have a more direct option available.
case SpecialFolder.System when option == SpecialFolderOption.None:
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
return SystemDirectory;
default:
return string.Empty;

// Map the SpecialFolder to the appropriate Guid
case SpecialFolder.ApplicationData:
folderGuid = Interop.Shell32.KnownFolders.RoamingAppData;
break;
Expand Down Expand Up @@ -271,7 +278,7 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio
case SpecialFolder.Startup:
folderGuid = Interop.Shell32.KnownFolders.Startup;
break;
case SpecialFolder.System:
case SpecialFolder.System when option != SpecialFolderOption.None:
folderGuid = Interop.Shell32.KnownFolders.System;
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
break;
case SpecialFolder.Templates:
Expand Down Expand Up @@ -360,15 +367,8 @@ private static string GetFolderPathCore(SpecialFolder folder, SpecialFolderOptio
case SpecialFolder.Windows:
folderGuid = Interop.Shell32.KnownFolders.Windows;
break;
default:
return string.Empty;
}

return GetKnownFolderPath(folderGuid, option);
}

private static string GetKnownFolderPath(string folderGuid, SpecialFolderOption option)
{
Guid folderId = new Guid(folderGuid);

int hr = Interop.Shell32.SHGetKnownFolderPath(folderId, (uint)option, IntPtr.Zero, out string path);
Expand Down