Respecc WOW6432Node

IntelOrca · Sep 16, 2020 · 3d757a3 · 3d757a3
1 parent e63baf2
commit 3d757a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/IntelOrca.PvZTools/PvZProcess.cs b/IntelOrca.PvZTools/PvZProcess.cs
@@ -11,10 +11,10 @@ class PvZProcess : AppProcess
 	{
 		internal PvZProcess()
         {
-			(string? path, bool goty) = GetInstallLocation(@"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"); //as 32bit
+			(string? path, bool goty) = GetInstallLocation(@"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall", wow6432node: true);
 			if (path is null)
 			{
-				(path, goty) = GetInstallLocation(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"); //as 64bit
+				(path, goty) = GetInstallLocation(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", wow6432node: false);
 				if (path is null) throw new NullReferenceException("Could not find a Plants vs. Zombies installation.");
 			}
 
@@ -23,19 +23,20 @@ internal PvZProcess()
 		}
 
         readonly string[] displayNames = new string[] { "Plants vs. Zombies", "Plants vs. Zombies SDR" };
-        readonly string goty = "Plants vs. Zombies: Game of the Year";
+        readonly string gotyName = "Plants vs. Zombies: Game of the Year";
 
-		private (string? path, bool goty) GetInstallLocation(string regkey)
+		private (string? path, bool goty) GetInstallLocation(string regkey, bool wow6432node)
         {
-            using RegistryKey installed = Registry.LocalMachine.OpenSubKey(regkey);
+			using RegistryKey hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, wow6432node ? RegistryView.Registry32 : RegistryView.Registry64);
+            using RegistryKey installed = hklm.OpenSubKey(regkey);
             foreach (string id in installed.GetSubKeyNames())
             {
                 using RegistryKey program = installed.OpenSubKey(id);
 				string displayName = (string)program.GetValue("DisplayName");
 
 				if (displayNames.Contains(displayName))
 					return ((string)program.GetValue("InstallLocation") ?? Path.GetDirectoryName((string)program.GetValue("DisplayIcon")), false);
-				else if (goty == (string)program.GetValue("DisplayName"))
+				else if (gotyName == (string)program.GetValue("DisplayName"))
 					return ((string)program.GetValue("InstallLocation") ?? Path.GetDirectoryName((string)program.GetValue("DisplayIcon")), true);
             }
 

diff --git a/IntelOrca.PvZTools/PvZTools.csproj b/IntelOrca.PvZTools/PvZTools.csproj
@@ -29,6 +29,7 @@
     <ErrorReport>prompt</ErrorReport>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +39,7 @@
     <ErrorReport>prompt</ErrorReport>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />