Merge pull request #51 from CodingWonders/dt_pre_23104

DISMTools 0.3.3 Preview 4

DISMTools.vbproj

@@ -262,6 +262,12 @@
     <Compile Include="Panels\Get_Ops\GetImgInfoDlg.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Panels\Get_Ops\InfoSave\ImgInfoSaveDlg.Designer.vb">
+      <DependentUpon>ImgInfoSaveDlg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\Get_Ops\InfoSave\ImgInfoSaveDlg.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Panels\Get_Ops\Pkgs\GetPkgInfo.Designer.vb">
       <DependentUpon>GetPkgInfo.vb</DependentUpon>
     </Compile>
@@ -694,6 +700,9 @@
     <EmbeddedResource Include="Panels\Get_Ops\GetImgInfoDlg.resx">
       <DependentUpon>GetImgInfoDlg.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Panels\Get_Ops\InfoSave\ImgInfoSaveDlg.resx">
+      <DependentUpon>ImgInfoSaveDlg.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Panels\Get_Ops\Pkgs\GetPkgInfo.resx">
       <DependentUpon>GetPkgInfo.vb</DependentUpon>
     </EmbeddedResource>

MainForm.resx

@@ -938,4 +938,7 @@ These options, and the program information, can be found by opening the Help men
   <metadata name="AppxRelatedLinksCMS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1205, 17</value>
   </metadata>
+  <metadata name="ImgInfoSFD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 41</value>
+  </metadata>
 </root>

MainForm.vb

@@ -11638,7 +11638,7 @@ Public Class MainForm
 
     Private Sub SaveResourceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaveResourceToolStripMenuItem.Click
         If OnlineManagement Then AppxResSFD.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures) Else AppxResSFD.InitialDirectory = projPath
-        AppxResSFD.FileName = GetAppxPkgInfoDlg.Label25.Text
+        AppxResSFD.FileName = If(GetAppxPkgInfoDlg.displayName <> "", GetAppxPkgInfoDlg.displayName, GetAppxPkgInfoDlg.Label25.Text)
         AppxResSFD.ShowDialog()
     End Sub
 
@@ -11767,4 +11767,21 @@ Public Class MainForm
     Private Sub MicrosoftStoreGenerationProjectToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MicrosoftStoreGenerationProjectToolStripMenuItem.Click
         Process.Start("https://store.rg-adguard.net")
     End Sub
+
+    Private Sub SaveImageInformationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaveImageInformationToolStripMenuItem.Click
+        If ImgInfoSFD.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            If Not ImgInfoSaveDlg.IsDisposed Then ImgInfoSaveDlg.Dispose()
+            ImgInfoSaveDlg.SaveTarget = ImgInfoSFD.FileName
+            For x = 0 To Array.LastIndexOf(MountedImageMountDirs, MountedImageMountDirs.Last)
+                If MountedImageMountDirs(x) = MountDir Then
+                    ImgInfoSaveDlg.SourceImage = MountedImageImgFiles(x)
+                    Exit For
+                End If
+            Next
+            ImgInfoSaveDlg.ImgMountDir = If(Not OnlineManagement, MountDir, "")
+            ImgInfoSaveDlg.OnlineMode = OnlineManagement
+            ImgInfoSaveDlg.SaveTask = 0
+            ImgInfoSaveDlg.ShowDialog()
+        End If
+    End Sub
 End Class

My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' mediante el asterisco ('*'), como se muestra a continuación:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.3.3.23103")> 
-<Assembly: AssemblyFileVersion("0.3.3.23103")> 
+<Assembly: AssemblyVersion("0.3.3.23104")> 
+<Assembly: AssemblyFileVersion("0.3.3.23104")> 

My Project/Resources.resx

@@ -1099,13 +1099,15 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   <data name="WhatsNew" xml:space="preserve">
     <value>Bugfixes
 
-- The program no longer outputs a success message if the Windows ADK isn't installed or if an error occurred while copying the ADK files
-- Enhanced the reliability of the App Installer downloader
+- Fixed a couple of issues of the AppX package information dialog:
+  - Fixed an issue where, if the install location, package manifest location, or store logo asset location couldn't be detected; they would not be updated and would show incorrect results
+  - Fixed an issue where the program threw an exception if the package display name returned nothing
+- The AppX resource save dialog no longer appends the friendly display name to the target file name
 
 New features
 
-- The program now gets feature update information for Windows 11 2023 Update Moment 5 (build 22635)
-- French translations are complete</value>
+- Feature update detection now detects Windows 11 builds greater than 25941 as Germanium
+- The program can now create image information reports</value>
   </data>
   <data name="split_img" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\split_img.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

Panels/Get_Ops/AppxPkgs/GetAppxPkgInfo.vb

@@ -9,6 +9,8 @@ Public Class GetAppxPkgInfoDlg
     Dim mainAsset As String = ""
     Dim assetDir As String = ""
 
+    Public displayName As String = ""
+
     Private Sub GetAppxPkgInfoDlg_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Select Case MainForm.Language
             Case 0
@@ -152,6 +154,11 @@ Public Class GetAppxPkgInfoDlg
         Label10.Visible = True
         mainAsset = ""
         assetDir = ""
+        ' Clear the values of Label7, Label5, and Label3; as the program can't update their text properties on some packages
+        Label7.Text = ""
+        Label5.Text = ""
+        Label3.Text = ""
+
         If ListBox1.SelectedItems.Count = 1 Then
             If MainForm.imgAppxPackageNames.Count > InstalledAppxPkgInfo.Count Then
                 Label23.Text = MainForm.imgAppxPackageNames(ListBox1.SelectedIndex)
@@ -167,7 +174,16 @@ Public Class GetAppxPkgInfoDlg
                 Label40.Text = InstalledAppxPkgInfo(ListBox1.SelectedIndex).Version.ToString()
             End If
 
-            Dim appDisplayName As String = If(Not MainForm.GetPackageDisplayName(Label23.Text, Label25.Text).ToString().StartsWith("ms-resource:", StringComparison.OrdinalIgnoreCase), MainForm.GetPackageDisplayName(Label23.Text, Label25.Text), "")
+            displayName = Label25.Text
+
+            Dim packageDispName As String = MainForm.GetPackageDisplayName(Label23.Text, Label25.Text)
+
+            Dim appDisplayName As String = ""
+
+            If packageDispName IsNot Nothing Then
+                appDisplayName = If(Not packageDispName.StartsWith("ms-resource:"), packageDispName, "")
+            End If
+
             If appDisplayName <> "" Then Label25.Text &= " (" & appDisplayName & ")"
 
             ' Get exclusive things that can't be obtained with the DISM API

Panels/Get_Ops/GetImgInfoDlg.vb

@@ -486,8 +486,10 @@ Public Class GetImgInfoDlg
                         FeatUpd = "23H1 (Copper)"
                     Case 25240 To 25400     ' 25400 is a relative number. 25398 is the final build of Zinc
                         FeatUpd = "23H2 (Zinc)"
-                    Case 25801 To 27000     ' 27000 is a relative number
+                    Case 25801 To 25941
                         FeatUpd = "24H1 (Gallium)"
+                    Case 25942 To 27000     ' 27000 is a relative number
+                        FeatUpd = "24H2 (Germanium)"
                 End Select
             Case Else
                 Exit Sub