Remove registry mount command

This command makes troubles because MSIX Hero needs access to registry.dat for certain packages. This functionality will soon become obsolete with the introduction of a new registry browser.
marcinotorowski · May 9, 2021 · 9eb4961 · 9eb4961
1 parent fed9870
commit 9eb4961
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/Otor.MsixHero.App/Controls/PackageExpert/Views/More/More.xaml b/src/Otor.MsixHero.App/Controls/PackageExpert/Views/More/More.xaml
@@ -82,7 +82,7 @@
 
         <Label Content="Other" />
 
-        <Button 
+        <!--<Button 
             Style="{StaticResource ActionButton}"
             CommandParameter="{x:Static commands1:DialogTarget.Selection}"
             CommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Popup}}"
@@ -102,7 +102,7 @@
             <b:Interaction.Behaviors>
                 <helpers:ButtonClosePopup />
             </b:Interaction.Behaviors>
-        </Button>
+        </Button>-->
 
         <Button 
             Style="{StaticResource ActionButton}"

diff --git a/src/Otor.MsixHero.Appx/Psf/PsfReader.cs b/src/Otor.MsixHero.Appx/Psf/PsfReader.cs
@@ -71,12 +71,10 @@ public PsfApplicationDescriptor Read(string applicationId, string originalEntryP
                             }
                             else
                             {
-                                using (var memoryStream = new MemoryStream())
-                                {
-                                    stream.CopyTo(memoryStream);
-                                    memoryStream.Flush();
-                                    reg = new RegistryHiveOnDemand(memoryStream.ToArray(), "Registry.dat");
-                                }
+                                using var memoryStream = new MemoryStream();
+                                stream.CopyTo(memoryStream);
+                                memoryStream.Flush();
+                                reg = new RegistryHiveOnDemand(memoryStream.ToArray(), "Registry.dat");
                             }
                         }
 

diff --git a/src/Otor.MsixHero.Lib/Proxy/Diagnostic/RegistryManagerElevationProxy.cs b/src/Otor.MsixHero.Lib/Proxy/Diagnostic/RegistryManagerElevationProxy.cs
@@ -40,7 +40,7 @@ public Task MountRegistry(InstalledPackage package, bool startRegedit = false, C
             var proxyObject = new MountRegistryDto
             {
                 PackageName = package.Name,
-                InstallLocation = package.ManifestLocation,
+                InstallLocation = package.InstallLocation,
                 StartRegedit = startRegedit
             };
 

diff --git a/src/Otor.MsixHero.Lib/Proxy/Diagnostic/RegistryManagerProxyReceiver.cs b/src/Otor.MsixHero.Lib/Proxy/Diagnostic/RegistryManagerProxyReceiver.cs
@@ -59,7 +59,7 @@ public override Task Invoke(IProxyObject command, CancellationToken cancellation
 
             if (command is MountRegistryDto mountRegistryDto)
             {
-                return this.SelfElevationAwareObject.DismountRegistry(mountRegistryDto.PackageName, cancellationToken, progress);
+                return this.SelfElevationAwareObject.MountRegistry(mountRegistryDto.PackageName, mountRegistryDto.InstallLocation, mountRegistryDto.StartRegedit, cancellationToken, progress);
             }
 
             throw new NotSupportedException();