Merge pull request #1218 from DGP-Studio/feat/goodbye_pwsh

src/Snap.Hutao/Snap.Hutao.Win32/NativeMethods.txt

@@ -61,6 +61,7 @@ FileSaveDialog
 IFileOpenDialog
 IFileSaveDialog
 IPersistFile
+IShellLinkDataList
 IShellLinkW
 ShellLink
 SHELL_LINK_DATA_FLAGS

src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Service;
 using System.IO;
 using System.Runtime.InteropServices;
 using Windows.Storage;
@@ -19,7 +18,6 @@ namespace Snap.Hutao.Core.Shell;
 internal sealed partial class ShellLinkInterop : IShellLinkInterop
 {
     private readonly RuntimeOptions runtimeOptions;
-    private readonly AppOptions appOptions;
 
     public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
     {
@@ -45,12 +43,15 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
         HRESULT result = CoCreateInstance<ShellLink, IShellLinkW>(null, CLSCTX.CLSCTX_INPROC_SERVER, out IShellLinkW shellLink);
         Marshal.ThrowExceptionForHR(result);
 
-        shellLink.SetPath(appOptions.PowerShellPath);
-        shellLink.SetArguments($"""
-            -Command "Start-Process shell:AppsFolder\{runtimeOptions.FamilyName}!App -verb runas"
-            """);
-        shellLink.SetShowCmd(SHOW_WINDOW_CMD.SW_SHOWMINNOACTIVE);
+        shellLink.SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
+        shellLink.SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
         shellLink.SetIconLocation(targetLogoPath, 0);
+
+        IShellLinkDataList shellLinkDataList = (IShellLinkDataList)shellLink;
+        shellLinkDataList.GetFlags(out uint flags);
+        flags |= (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER;
+        shellLinkDataList.SetFlags(flags);
+
         string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
         string target = Path.Combine(desktop, $"{SH.FormatAppNameAndVersion(runtimeOptions.Version)}.lnk");
 

src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs

@@ -15,6 +15,7 @@ internal sealed partial class SettingEntry
 
     public const string GamePathEntries = "GamePathEntries";
 
+    [Obsolete("不再使用 PowerShell")]
     public const string PowerShellPath = "PowerShellPath";
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -186,9 +186,6 @@
   <data name="FilePickerImportCommit" xml:space="preserve">
     <value>导入</value>
   </data>
-  <data name="FilePickerPowerShellCommit" xml:space="preserve">
-    <value>选择 PowerShell</value>
-  </data>
   <data name="GuideWindowTitle" xml:space="preserve">
     <value>欢迎使用胡桃</value>
   </data>
@@ -932,9 +929,6 @@
   <data name="ServiceGameRegisteryInteropLongPathsDisabled" xml:space="preserve">
     <value>未开启长路径功能，无法设置注册表键值</value>
   </data>
-  <data name="ServiceGameRegisteryInteropPowershellNotFound" xml:space="preserve">
-    <value>找不到 PowerShell 的安装目录</value>
-  </data>
   <data name="ServiceGameSetMultiChannelConfigFileNotFound" xml:space="preserve">
     <value>无法读取游戏配置文件 {0}，可能是文件不存在</value>
   </data>
@@ -2435,12 +2429,6 @@
   <data name="ViewPageSettingSetGamePathHint" xml:space="preserve">
     <value>设置游戏路径时，请选择游戏本体（YuanShen.exe 或 GenshinImpact.exe）而不是启动器（launcher.exe）</value>
   </data>
-  <data name="ViewPageSettingSetPowerShellDescription" xml:space="preserve">
-    <value>在创建的快捷方式中启动胡桃需要使用 PowerShell</value>
-  </data>
-  <data name="ViewPageSettingSetPowerShellPathHeader" xml:space="preserve">
-    <value>PowerShell 路径</value>
-  </data>
   <data name="ViewPageSettingShellExperienceHeader" xml:space="preserve">
     <value>Shell 体验</value>
   </data>

src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs

@@ -16,42 +16,12 @@ namespace Snap.Hutao.Service;
 [Injection(InjectAs.Singleton)]
 internal sealed partial class AppOptions : DbStoreOptions
 {
-    private string? powerShellPath;
     private bool? isEmptyHistoryWishVisible;
     private BackdropType? backdropType;
     private CultureInfo? currentCulture;
     private Region? region;
     private string? geetestCustomCompositeUrl;
 
-    public string PowerShellPath
-    {
-        get
-        {
-            return GetOption(ref powerShellPath, SettingEntry.PowerShellPath, GetDefaultPowerShellLocationOrEmpty);
-
-            static string GetDefaultPowerShellLocationOrEmpty()
-            {
-                string? paths = Environment.GetEnvironmentVariable("Path");
-                if (!string.IsNullOrEmpty(paths))
-                {
-                    foreach (StringSegment path in new StringTokenizer(paths, [';']))
-                    {
-                        if (path is { HasValue: true, Length: > 0 })
-                        {
-                            if (path.Value.Contains("WindowsPowerShell", StringComparison.OrdinalIgnoreCase))
-                            {
-                                return Path.Combine(path.Value, "powershell.exe");
-                            }
-                        }
-                    }
-                }
-
-                return string.Empty;
-            }
-        }
-        set => SetOption(ref powerShellPath, SettingEntry.PowerShellPath, value);
-    }
-
     public bool IsEmptyHistoryWishVisible
     {
         get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible);

src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml

@@ -189,20 +189,7 @@
                     Header="{shcm:ResourceString Name=ViewPageSettingCreateDesktopShortcutHeader}"
                     HeaderIcon="{shcm:FontIcon Glyph=}"
                     IsClickEnabled="True"/>
-                <cwc:SettingsCard
-                    ActionIcon="{shcm:FontIcon Glyph=&#xE76C;}"
-                    ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingSetGamePathAction}"
-                    Command="{Binding SetPowerShellPathCommand}"
-                    Header="{shcm:ResourceString Name=ViewPageSettingSetPowerShellPathHeader}"
-                    HeaderIcon="{shcm:FontIcon Glyph=&#xE756;}"
-                    IsClickEnabled="True">
-                    <cwc:SettingsCard.Description>
-                        <StackPanel>
-                            <TextBlock Text="{shcm:ResourceString Name=ViewPageSettingSetPowerShellDescription}"/>
-                            <TextBlock Text="{Binding AppOptions.PowerShellPath}"/>
-                        </StackPanel>
-                    </cwc:SettingsCard.Description>
-                </cwc:SettingsCard>
+
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingApperanceHeader}"/>
                 <cwc:SettingsCard
                     Description="{shcm:ResourceString Name=ViewPageSettingApperanceLanguageDescription}"

src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/SettingViewModel.cs

@@ -174,18 +174,6 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
         await Launcher.LaunchUriAsync(new("ms-windows-store://pdp/?productid=9PH4NXJ2JN52"));
     }
 
-    [Command("SetPowerShellPathCommand")]
-    private async Task SetPowerShellPathAsync()
-    {
-        (bool isOk, ValueFile file) = fileSystemPickerInteraction.PickFile(SH.FilePickerPowerShellCommit, [("PowerShell", "powershell.exe;pwsh.exe")]);
-
-        if (isOk && Path.GetFileNameWithoutExtension(file).EqualsAny(["POWERSHELL", "PWSH"], StringComparison.OrdinalIgnoreCase))
-        {
-            await taskContext.SwitchToMainThreadAsync();
-            AppOptions.PowerShellPath = file;
-        }
-    }
-
     [Command("DeleteGameWebCacheCommand")]
     private void DeleteGameWebCache()
     {