fix x86 apps

1357310795 · Jul 9, 2022 · b4246ff · b4246ff
1 parent ab8c259
commit b4246ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/MyComputerManager/Helpers/NamespaceHelper.cs b/MyComputerManager/Helpers/NamespaceHelper.cs
@@ -66,14 +66,14 @@ public static List<NamespaceItem> GetItemsInternal(RegistryKey rootkey, bool dis
                 }
                 if (itemkey == null)
                 {
-                    clsidrootkey = Registry.CurrentUser;
-                    clsidkey = clsidrootkey.OpenSubKey(@"SOFTWARE\Classes\WOW6432Node\CLSID", false);
+                    clsidrootkey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32);
+                    clsidkey = clsidrootkey.OpenSubKey(@"SOFTWARE\Classes\CLSID", false);
                     itemkey = clsidkey.OpenSubKey(item, false);
                 }
                 if (itemkey == null)
                 {
-                    clsidrootkey = Registry.LocalMachine;
-                    clsidkey = clsidrootkey.OpenSubKey(@"SOFTWARE\Classes\WOW6432Node\CLSID", false);
+                    clsidrootkey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32);
+                    clsidkey = clsidrootkey.OpenSubKey(@"SOFTWARE\Classes\CLSID", false);
                     itemkey = clsidkey.OpenSubKey(item, false);
                 }
                 if (itemkey != null)
@@ -89,7 +89,7 @@ public static List<NamespaceItem> GetItemsInternal(RegistryKey rootkey, bool dis
                     string exepath = (string)(exekey?.GetValue("") ?? "");
 
                     if (name == "") continue;
-                    list.Add(new NamespaceItem(name, desc, tip, exepath, iconpath, rootkey, clsidkey, disabled, item));
+                    list.Add(new NamespaceItem(name, desc, tip, exepath, iconpath, rootkey, clsidrootkey, disabled, item));
                 }
             }
             return list;
@@ -105,7 +105,7 @@ public static CommonResult UpdateItem(NamespaceItem item)
                 var namespaceSubKey = namespaceKey.CreateSubKey(item.CLSID, true);
                 if (namespaceSubKey == null)
                     return new CommonResult(false, "找不到Namespace下的" + item.CLSID);
-                var clsidKey = item.RegKey1;
+                var clsidKey = item.RegKey1.CreateSubKey(@"SOFTWARE\Classes\CLSID", true);
                 if (clsidKey == null)
                     return new CommonResult(false, "找不到CLSID key");
                 var clsidSubKey = clsidKey.CreateSubKey(item.CLSID, true);
@@ -196,7 +196,7 @@ public static CommonResult DeleteItem(NamespaceItem item)
                     return new CommonResult(false, "找不到Namespace key");
                 namespaceKey.DeleteSubKeyTree(item.CLSID, false);
 
-                var clsidKey = item.RegKey1;
+                var clsidKey = item.RegKey1.OpenSubKey(@"SOFTWARE\Classes\CLSID", true); ;
                 if (clsidKey == null)
                     return new CommonResult(false, "找不到CLSID key");
                 clsidKey.DeleteSubKeyTree(item.CLSID, false);

diff --git a/MyComputerManager/MainWindow.xaml b/MyComputerManager/MainWindow.xaml
@@ -78,7 +78,7 @@
             </StackPanel>
         </Grid>
 
-        <ui:TitleBar Title="MyComputerManager - v1.01"
+        <ui:TitleBar Title="MyComputerManager - v1.02"
                      Padding="10,10,10,12"
                      Grid.Row="0"
                      Icon="/Resources/openbox.ico"

diff --git a/MyComputerManager/Models/NamespaceItem.cs b/MyComputerManager/Models/NamespaceItem.cs
@@ -34,7 +34,7 @@ public NamespaceItem(string name)
         {
             Name = name;
             RegKey = Registry.CurrentUser;
-            RegKey1 = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\Classes\CLSID", true);
+            RegKey1 = Registry.CurrentUser;
             isEnabled = true;
             CLSID = null;
             Desc = "";
@@ -148,7 +148,7 @@ public string RegKey_CLSID
         {
             get
             {
-                return RegKey1.Name + @"\" + CLSID;
+                return RegKey1.Name + (RegKey1.View == RegistryView.Default ? @"\SOFTWARE\Classes\CLSID\" : @"\SOFTWARE\Classes\WOW6432Node\CLSID\") + CLSID;
             }
         }
 

diff --git a/MyComputerManager/Views/AboutPage.xaml b/MyComputerManager/Views/AboutPage.xaml
@@ -45,7 +45,7 @@
                    FontSize="20" />
         <TextBlock HorizontalAlignment="Center"
                    Margin="0,6,0,0"
-                   Text="v1.01"
+                   Text="v1.02"
                    FontSize="16" />
         <TextBlock HorizontalAlignment="Center"
                    Margin="0,6,0,0"