From 2cc2cc80ac710a0840bdc1e16c7481084ca6d9be Mon Sep 17 00:00:00 2001
From: wangdage12 <124357765+wangdage12@users.noreply.github.com>
Date: Wed, 26 Nov 2025 19:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DKeyPath=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Snap.Hutao.Installer/Package.wxs          | 110 +++++++++++-------
 1 file changed, 67 insertions(+), 43 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs b/src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs
index 86f76c2..6567b23 100644
--- a/src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs
+++ b/src/Snap.Hutao/Snap.Hutao.Installer/Package.wxs
@@ -1,55 +1,79 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Package Name="Snap.Hutao"
-			 Manufacturer="Millennium Science Technology R-D Inst"
-			 Version="1.0.0.0"
-			 UpgradeCode="121203be-60cb-408f-92cc-7080f6598e68"
-			 Scope="perMachine">
+    <Package
+        Name="Snap.Hutao"
+        Manufacturer="Millennium Science Technology R-D Inst"
+        Version="1.0.0.0"
+        UpgradeCode="121203be-60cb-408f-92cc-7080f6598e68"
+        Scope="perMachine">
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate EmbedCab="yes" />
+        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+        <MediaTemplate EmbedCab="yes" />
 
-		<Feature Id="ProductFeature" Title="Snap.Hutao" Level="1">
-			<ComponentGroupRef Id="MainAppComponents" />
-			<ComponentRef Id="ApplicationShortcut" />
-			<ComponentRef Id="DesktopShortcuts" />
-		</Feature>
-	</Package>
+        <Feature Id="ProductFeature" Title="Snap.Hutao" Level="1">
+            <ComponentGroupRef Id="MainAppComponents" />
 
-	<Fragment>
-		<StandardDirectory Id="ProgramFiles64Folder">
-			<Directory Id="INSTALLFOLDER" Name="Snap.Hutao" />
-		</StandardDirectory>
+            <!-- 快捷方式组件 -->
+            <ComponentRef Id="ApplicationShortcut" />
+            <ComponentRef Id="DesktopShortcut" />
+        </Feature>
+    </Package>
 
-		<StandardDirectory Id="ProgramMenuFolder">
-			<Directory Id="ApplicationProgramsFolder" Name="Snap Hutao" />
-		</StandardDirectory>
+    <!-- 安装目录 -->
+    <Fragment>
+        <StandardDirectory Id="ProgramFiles64Folder">
+            <Directory Id="INSTALLFOLDER" Name="Snap.Hutao" />
+        </StandardDirectory>
 
-		<StandardDirectory Id="DesktopFolder" />
-	</Fragment>
+        <StandardDirectory Id="ProgramMenuFolder">
+            <Directory Id="ApplicationProgramsFolder" Name="Snap Hutao" />
+        </StandardDirectory>
 
-	<Fragment>
-		<Component Id="DesktopShortcuts" Directory="DesktopFolder" Guid="*">
-			<Shortcut Id="DesktopShortcut_Normal"
-					  Name="Snap Hutao"
-					  Description="Snap Hutao Client"
-					  Target="[INSTALLFOLDER]Snap.Hutao.exe"
-					  WorkingDirectory="INSTALLFOLDER" />
+        <StandardDirectory Id="DesktopFolder" />
+    </Fragment>
 
-			<RegistryValue Root="HKLM" Key="Software\Snap.Hutao" Name="DesktopShortcutInstalled" Type="integer" Value="1" KeyPath="yes" />
-		</Component>
-	</Fragment>
+    <!-- 桌面快捷方式 -->
+    <Fragment>
+        <Component Id="DesktopShortcut" Directory="DesktopFolder" Guid="*">
 
-	<Fragment>
-		<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Guid="*">
-			<Shortcut Id="ApplicationStartMenuShortcut"
-					  Name="Snap Hutao"
-					  Description="Snap Hutao Client"
-					  Target="[INSTALLFOLDER]Snap.Hutao.exe"
-					  WorkingDirectory="INSTALLFOLDER" />
+            <Shortcut
+                Id="DesktopShortcut_Normal"
+                Name="Snap Hutao"
+                Description="Snap Hutao Client"
+                Target="[INSTALLFOLDER]Snap.Hutao.exe"
+                WorkingDirectory="INSTALLFOLDER" />
 
-			<RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall" />
+            <!-- KeyPath 必须是 HKCU，因为快捷方式安装到用户目录 -->
+            <RegistryValue
+                Root="HKCU"
+                Key="Software\Snap.Hutao"
+                Name="DesktopShortcutInstalled"
+                Type="integer"
+                Value="1"
+                KeyPath="yes" />
+        </Component>
+    </Fragment>
 
-			<RegistryValue Root="HKLM" Key="Software\Snap.Hutao" Name="StartMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes" />
-		</Component>
-	</Fragment>
+    <!-- 开始菜单快捷方式 -->
+    <Fragment>
+        <Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder" Guid="*">
+
+            <Shortcut
+                Id="ApplicationStartMenuShortcut"
+                Name="Snap Hutao"
+                Description="Snap Hutao Client"
+                Target="[INSTALLFOLDER]Snap.Hutao.exe"
+                WorkingDirectory="INSTALLFOLDER" />
+
+            <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall" />
+
+            <!-- KeyPath 依然必须改为 HKCU -->
+            <RegistryValue
+                Root="HKCU"
+                Key="Software\Snap.Hutao"
+                Name="StartMenuShortcutInstalled"
+                Type="integer"
+                Value="1"
+                KeyPath="yes" />
+        </Component>
+    </Fragment>
 </Wix>