[v15.1] Important bug fixes & some Fluent themed windows

- Replaced URL availability checking method, broken after .NET9 upgrade
- Replaced file size checking method for URLs, broken after .NET9 upgrade
- The Home window now uses the 'Fluent' theme as well as some PS5 tools
  - All windows using the 'ListView' component will not receive the 'Fluent' theme (probably until .NET10)
- Downloads are now fully working again for every console & handheld
- Fixes and improvements in loading game backups for PS1, PS2, PS3, PSV, PS5

Author: SvenGDK

LatestBuild.txt

@@ -1 +1 @@
-15.0.1
+15.1.0

PS Multi Tools/Classes/DownloadQueueItem.vb

@@ -23,7 +23,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _GameID = Value
-            NotifyPropertyChanged("GameID")
+            NotifyPropertyChanged(NameOf(GameID))
         End Set
     End Property
 
@@ -33,7 +33,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _FileName = Value
-            NotifyPropertyChanged("FileName")
+            NotifyPropertyChanged(NameOf(FileName))
         End Set
     End Property
 
@@ -43,7 +43,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _PKGSize = Value
-            NotifyPropertyChanged("PKGSize")
+            NotifyPropertyChanged(NameOf(PKGSize))
         End Set
     End Property
 
@@ -53,7 +53,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _DownloadURL = Value
-            NotifyPropertyChanged("DownloadURL")
+            NotifyPropertyChanged(NameOf(DownloadURL))
         End Set
     End Property
 
@@ -63,7 +63,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _DownloadState = Value
-            NotifyPropertyChanged("DownloadState")
+            NotifyPropertyChanged(NameOf(DownloadState))
         End Set
     End Property
 
@@ -73,7 +73,7 @@ Public Class DownloadQueueItem
         End Get
         Set
             _MergeState = Value
-            NotifyPropertyChanged("MergeState")
+            NotifyPropertyChanged(NameOf(MergeState))
         End Set
     End Property
 

PS Multi Tools/Classes/MD5Hash.vb

@@ -5,14 +5,14 @@ Imports System.Text
 Public Class MD5Hash
 
     Public Shared Function MD5StringHash(Str As String) As String
-        Dim MD5 As New MD5CryptoServiceProvider
         Dim Data As Byte()
         Dim Result As Byte()
         Dim Res As String = ""
-        Dim Temp As String = ""
+        Dim Temp As String
 
         Data = Encoding.ASCII.GetBytes(Str)
-        Result = MD5.ComputeHash(Data)
+        Result = MD5.HashData(Data)
+
         For i As Integer = 0 To Result.Length - 1
             Temp = Hex(Result(i))
             If Len(Temp) = 1 Then Temp = "0" & Temp
@@ -25,7 +25,7 @@ Public Class MD5Hash
         Dim MD5 As New MD5CryptoServiceProvider
         Dim Hash As Byte()
         Dim Result As String = ""
-        Dim Temp As String = ""
+        Dim Temp As String
 
         Dim NewFileStream As New FileStream(SelFile, FileMode.Open, FileAccess.Read, FileShare.Read, 8192)
         MD5.ComputeHash(NewFileStream)

PS Multi Tools/Classes/NPSPKG.vb

@@ -159,7 +159,7 @@ Public Class NPSPKG
         End Get
         Set
             _GameCoverSource = Value
-            NotifyPropertyChanged("GameCoverSource")
+            NotifyPropertyChanged(NameOf(GameCoverSource))
         End Set
 
     End Property

PS Multi Tools/Classes/PKGDownloadListViewItem.vb

@@ -25,7 +25,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _AssociatedWebClient = Value
-            NotifyPropertyChanged("AssociatedWebClient")
+            NotifyPropertyChanged(NameOf(AssociatedWebClient))
         End Set
     End Property
 
@@ -35,7 +35,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageContentID = Value
-            NotifyPropertyChanged("PackageContentID")
+            NotifyPropertyChanged(NameOf(PackageContentID))
         End Set
     End Property
 
@@ -45,7 +45,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageTitleID = Value
-            NotifyPropertyChanged("PackageTitleID")
+            NotifyPropertyChanged(NameOf(PackageTitleID))
         End Set
     End Property
 
@@ -55,7 +55,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageName = Value
-            NotifyPropertyChanged("PackageName")
+            NotifyPropertyChanged(NameOf(PackageName))
         End Set
     End Property
 
@@ -65,7 +65,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageSize = Value
-            NotifyPropertyChanged("PackageSize")
+            NotifyPropertyChanged(NameOf(PackageSize))
         End Set
     End Property
 
@@ -75,7 +75,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageDownloadState = Value
-            NotifyPropertyChanged("PackageDownloadState")
+            NotifyPropertyChanged(NameOf(PackageDownloadState))
         End Set
     End Property
 
@@ -85,7 +85,7 @@ Public Class PKGDownloadListViewItem
         End Get
         Set
             _PackageDownloadDestination = Value
-            NotifyPropertyChanged("PackageDownloadDestination")
+            NotifyPropertyChanged(NameOf(PackageDownloadDestination))
         End Set
     End Property
 

PS Multi Tools/Classes/Utils.vb

@@ -5,8 +5,10 @@ Imports System.Drawing.Drawing2D
 Imports System.Globalization
 Imports System.IO
 Imports System.Net
+Imports System.Net.Http
 Imports System.Net.NetworkInformation
 Imports System.Runtime.InteropServices
+Imports System.Security.Policy
 Imports System.Security.Principal
 Imports System.Text
 Imports System.Text.RegularExpressions
@@ -16,8 +18,13 @@ Public Class Utils
 
     Public Shared ReadOnly ByBytes() As Byte = {&H62, &H79, &H20, &H53, &H76, &H65, &H6E, &H47, &H44, &H4B}
     Public Shared ConnectedPSXHDD As Structures.MountedPSXDrive
-    Public Declare Auto Function PlaySound Lib "winmm.dll" (pszSound As String, hmod As IntPtr, fdwSound As Integer) As Boolean
-    Public Declare Auto Function PlaySound Lib "winmm.dll" (pszSound As Byte(), hmod As IntPtr, fdwSound As PlaySoundFlags) As Boolean
+
+    <DllImport("winmm.dll", SetLastError:=True, CharSet:=CharSet.Auto)>
+    Private Shared Function PlaySound(<MarshalAs(UnmanagedType.LPWStr)> pszSound As String, hmod As IntPtr, fdwSound As Integer) As Boolean
+    End Function
+    <DllImport("winmm.dll", SetLastError:=True, CharSet:=CharSet.Auto)>
+    Private Shared Function PlaySound(<MarshalAs(UnmanagedType.LPArray)> pszSound As Byte(), hmod As IntPtr, fdwSound As PlaySoundFlags) As Boolean
+    End Function
 
     Public Enum PlaySoundFlags As Integer
         SND_SYNC = 0
@@ -286,38 +293,24 @@ Public Class Utils
         Return WinFound
     End Function
 
-    Public Shared Function IsURLValid(Url As String) As Boolean
+    Public Shared Async Function IsURLValid(Url As String) As Task(Of Boolean)
         If NetworkInterface.GetIsNetworkAvailable Then
             Try
-                Dim request As HttpWebRequest = CType(WebRequest.Create(Url), HttpWebRequest)
-                Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse)
-                    If response.StatusCode = HttpStatusCode.OK Then
-                        Return True
-                    ElseIf response.StatusCode = HttpStatusCode.Found Then
-                        Return True
-                    ElseIf response.StatusCode = HttpStatusCode.NotFound Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.Unauthorized Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.Forbidden Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.BadGateway Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.BadRequest Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.RequestTimeout Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.GatewayTimeout Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.InternalServerError Then
-                        Return False
-                    ElseIf response.StatusCode = HttpStatusCode.ServiceUnavailable Then
-                        Return False
-                    Else
-                        Return False
-                    End If
+                Using client As New HttpClient()
+                    Dim response As HttpResponseMessage = Await client.GetAsync(Url)
+
+                    Select Case response.StatusCode
+                        Case HttpStatusCode.OK, HttpStatusCode.Found
+                            Return True
+                        Case HttpStatusCode.NotFound, HttpStatusCode.Unauthorized, HttpStatusCode.Forbidden,
+                         HttpStatusCode.BadGateway, HttpStatusCode.BadRequest, HttpStatusCode.RequestTimeout,
+                         HttpStatusCode.GatewayTimeout, HttpStatusCode.InternalServerError, HttpStatusCode.ServiceUnavailable
+                            Return False
+                        Case Else
+                            Return False
+                    End Select
                 End Using
-            Catch Ex As WebException
+            Catch Ex As HttpRequestException
                 Return False
             End Try
         Else
@@ -403,9 +396,9 @@ Public Class Utils
         Next
     End Sub
 
-    Public Shared Sub CheckForMissingFiles()
+    Public Shared Async Sub CheckForMissingFiles()
         If Not File.Exists("strings.exe") Then
-            If IsURLValid("http://X.X.X.X/strings.exe") Then
+            If Await IsURLValid("http://X.X.X.X/strings.exe") Then
                 Dim NewWebCl As New WebClient()
                 NewWebCl.DownloadFile("http://X.X.X.X/strings.exe", "strings.exe")
             End If
@@ -416,30 +409,21 @@ Public Class Utils
         Return FileURL.Segments(FileURL.Segments.Length - 1)
     End Function
 
-    Public Shared Function WebFileSize(sURL As String) As Double
-        If sURL.StartsWith("ftp://") Then
-            Dim myRequest As FtpWebRequest
-
-            myRequest = CType(WebRequest.Create(sURL), FtpWebRequest)
-            myRequest.Method = WebRequestMethods.Ftp.GetFileSize
-            myRequest.Credentials = New NetworkCredential("anonymous", "")
-
-            Dim myResponse As FtpWebResponse = CType(myRequest.GetResponse(), FtpWebResponse)
-            Dim ResponseLenght As Long = myResponse.ContentLength
-            myResponse.Close()
-
-            Return Math.Round(ResponseLenght / 1024 / 1024, 2)
-        Else
-            Dim myRequest As HttpWebRequest = CType(WebRequest.Create(sURL), HttpWebRequest)
-            Dim myResponse As HttpWebResponse = CType(myRequest.GetResponse(), HttpWebResponse)
-            myResponse.Close()
-
-            Return Math.Round(myResponse.ContentLength / 1024 / 1024, 2)
-        End If
+    Public Shared Async Function WebFileSize(sURL As String) As Task(Of Double)
+        Dim client As New HttpClient()
+        Using request = New HttpRequestMessage(HttpMethod.Head, sURL)
+            Using response = Await client.SendAsync(request)
+                If response.IsSuccessStatusCode AndAlso response.Content.Headers.ContentLength.HasValue Then
+                    Return Math.Round(response.Content.Headers.ContentLength.Value / 1024 / 1024, 2)
+                Else
+                    Return 0
+                End If
+            End Using
+        End Using
     End Function
 
-    Public Shared Function IsPSMultiToolsUpdateAvailable() As Boolean
-        If IsURLValid("https://github.com/SvenGDK/PS-Multi-Tools/raw/main/LatestBuild.txt") Then
+    Public Shared Async Function IsPSMultiToolsUpdateAvailable() As Task(Of Boolean)
+        If Await IsURLValid("https://github.com/SvenGDK/PS-Multi-Tools/raw/main/LatestBuild.txt") Then
             Dim PSMTInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(Environment.CurrentDirectory + "\PS Multi Tools.exe")
             Dim CurrentOrbisProVersion As String = PSMTInfo.FileVersion
 

PS Multi Tools/Dialogs/CopyWindow.xaml

@@ -5,11 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PS_Multi_Tools"
         mc:Ignorable="d"
-        Title="Copying" Height="320" Width="560" ResizeMode="CanMinimize" Background="#2D2D30" WindowStartupLocation="CenterScreen">
+        Title="Copying" Height="330" Width="560" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" ThemeMode="System">
     <Grid>
-        <ProgressBar x:Name="CopyProgressBar" HorizontalAlignment="Left" Height="20" Margin="10,227,0,0" VerticalAlignment="Top" Width="520" Foreground="#FF00B8FF"/>
-        <TextBlock x:Name="StatusTextBlock" HorizontalAlignment="Left" Margin="10,203,0,0" TextWrapping="Wrap" Text="Please wait ..." VerticalAlignment="Top" Foreground="White" FontSize="14" Width="520"/>
+        <ProgressBar x:Name="CopyProgressBar" HorizontalAlignment="Left" Height="20" Margin="10,230,0,0" VerticalAlignment="Top" Width="520" />
+        <TextBlock x:Name="StatusTextBlock" HorizontalAlignment="Left" Margin="10,203,0,0" TextWrapping="Wrap" Text="Please wait ..." VerticalAlignment="Top"  FontSize="14" Width="520"/>
         <Image x:Name="GameIconImage" Height="176" VerticalAlignment="Top" Width="320" Margin="120,15,120,0"/>
-        <TextBlock x:Name="StatusTextBlock2" HorizontalAlignment="Left" Margin="10,252,0,0" TextWrapping="Wrap" Text="Please wait ..." VerticalAlignment="Top" Foreground="White" FontSize="14" Width="520"/>
+        <TextBlock x:Name="StatusTextBlock2" HorizontalAlignment="Left" Margin="10,260,0,0" TextWrapping="Wrap" Text="Please wait ..." VerticalAlignment="Top"  FontSize="14" Width="520"/>
     </Grid>
 </Window>

PS Multi Tools/Dialogs/CopyWindow.xaml.vb

@@ -56,7 +56,7 @@ Public Class CopyWindow
     End Sub
 
     Private Sub CountFiles(InFolder As String, ByRef Result As Integer)
-        Result += Directory.GetFiles(InFolder).Count
+        Result += Directory.GetFiles(InFolder).Length
         For Each f As String In Directory.GetDirectories(InFolder)
             CountFiles(f, Result)
         Next

PS Multi Tools/Dialogs/CustomDialog.xaml

@@ -5,19 +5,19 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PS_Multi_Tools"
         mc:Ignorable="d"
-        Title="Dialog Title" Height="125" Width="420" Background="#2D2D30" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize">
+        Title="Dialog Title" Height="135" Width="425" WindowStartupLocation="CenterScreen" ResizeMode="CanMinimize" ThemeMode="System">
     <Grid>
         <Grid x:Name="TextInputGrid" Visibility="Hidden">
-            <TextBlock x:Name="TextInputTitle" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Text" VerticalAlignment="Top" Foreground="White" FontFamily="Calibri" FontSize="14"/>
+            <TextBlock x:Name="TextInputTitle" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Text" VerticalAlignment="Top"  FontFamily="Calibri" FontSize="14"/>
             <TextBox x:Name="TextInputTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" VerticalAlignment="Top" Width="380" FontFamily="Calibri" FontSize="14" Margin="10,32,0,0"/>
-            <Button x:Name="TextInputCancelButton" Content="Cancel" HorizontalAlignment="Left" Margin="245,56,0,0" VerticalAlignment="Top" Width="70" FontFamily="Calibri" FontSize="14"/>
-            <Button x:Name="TextInputOKButton" Content="OK" HorizontalAlignment="Left" Margin="320,56,0,0" VerticalAlignment="Top" Width="70" FontWeight="Bold" FontFamily="Calibri" FontSize="14"/>
+            <Button x:Name="TextInputCancelButton" Content="Cancel" HorizontalAlignment="Left" Margin="245,66,0,0" VerticalAlignment="Top" Width="70" FontFamily="Calibri" FontSize="14"/>
+            <Button x:Name="TextInputOKButton" Content="OK" HorizontalAlignment="Left" Margin="320,66,0,0" VerticalAlignment="Top" Width="70" FontWeight="Bold" FontFamily="Calibri" FontSize="14"/>
         </Grid>
         <Grid x:Name="ButtonsGrid" Visibility="Hidden">
-            <Button x:Name="ButtonsAddButton" Content="Add another backup folder" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" Width="165" FontFamily="Calibri" FontSize="14"/>
-            <Button x:Name="ButtonsLoadNewButton" Content="Load a new folder" HorizontalAlignment="Left" Margin="180,35,0,0" VerticalAlignment="Top" Width="125" FontFamily="Calibri" FontSize="14"/>
-            <Button x:Name="ButtonsCancelButton" Content="Cancel" HorizontalAlignment="Left" Margin="310,35,0,0" VerticalAlignment="Top" Width="75" FontFamily="Calibri" FontSize="14"/>
-            <TextBlock x:Name="ButtonsTitleTextBlock" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Text" VerticalAlignment="Top" Foreground="White" FontFamily="Calibri" FontSize="14" Width="375"/>
+            <Button x:Name="ButtonsAddButton" Content="Add another backup folder" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" Width="175" FontFamily="Calibri" FontSize="14"/>
+            <Button x:Name="ButtonsLoadNewButton" Content="Load a new folder" HorizontalAlignment="Left" Margin="190,35,0,0" VerticalAlignment="Top" Width="124" FontFamily="Calibri" FontSize="14"/>
+            <Button x:Name="ButtonsCancelButton" Content="Cancel" HorizontalAlignment="Left" Margin="319,35,0,0" VerticalAlignment="Top" Width="75" FontFamily="Calibri" FontSize="14"/>
+            <TextBlock x:Name="ButtonsTitleTextBlock" HorizontalAlignment="Left" Margin="10,10,0,0" TextWrapping="Wrap" Text="Text" VerticalAlignment="Top"  FontFamily="Calibri" FontSize="14" Width="375" FontWeight="Bold"/>
         </Grid>
     </Grid>
 </Window>

PS Multi Tools/Dialogs/Downloader.xaml

@@ -5,15 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PS_Multi_Tools"
         mc:Ignorable="d"
-        Title="Downloader" Height="400" Width="700" ResizeMode="CanMinimize" Background="#2D2D30" WindowStartupLocation="CenterScreen">
+        Title="Downloader" Height="400" Width="700" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen" ThemeMode="System">
     <Grid>
         <ProgressBar x:Name="DownloadProgressBar" HorizontalAlignment="Center" Height="25" Margin="0,248,0,0" VerticalAlignment="Top" Width="520"/>
-        <TextBlock x:Name="FileToDownloadTB" HorizontalAlignment="Center" Margin="0,224,0,0" TextWrapping="Wrap" Text="Downloading ..." VerticalAlignment="Top" Foreground="White" FontSize="14" Width="520"/>
+        <TextBlock x:Name="FileToDownloadTB" HorizontalAlignment="Center" Margin="0,224,0,0" TextWrapping="Wrap" Text="Downloading ..." VerticalAlignment="Top"  FontSize="14" Width="520"/>
         <Grid HorizontalAlignment="Center" Height="68" Margin="0,277,0,0" VerticalAlignment="Top">
-            <TextBlock x:Name="DownloadETATB" HorizontalAlignment="Center" TextWrapping="Wrap" Text="Time elapsed:" VerticalAlignment="Center" Foreground="White" FontSize="14" Width="520"/>
-            <TextBlock x:Name="DownloadSpeedTB" Margin="260,0,0,0" TextWrapping="Wrap" Text="0 kb/s" VerticalAlignment="Top" Foreground="White" FontSize="14" TextAlignment="Right" HorizontalAlignment="Left" Width="260"/>
-            <TextBlock x:Name="DownloadETALeftTB" HorizontalAlignment="Center" Margin="0,48,0,0" TextWrapping="Wrap" Text="Time left:" VerticalAlignment="Top" Foreground="White" FontSize="14" Width="520"/>
-            <TextBlock x:Name="DownloadFileSizeTB" Margin="0,0,300,0" TextWrapping="Wrap" Text="File Size:" VerticalAlignment="Top" Foreground="White" FontSize="14"/>
+            <TextBlock x:Name="DownloadETATB" HorizontalAlignment="Center" TextWrapping="Wrap" Text="Time elapsed:" VerticalAlignment="Center"  FontSize="14" Width="520"/>
+            <TextBlock x:Name="DownloadSpeedTB" Margin="260,0,0,0" TextWrapping="Wrap" Text="0 kb/s" VerticalAlignment="Top"  FontSize="14" TextAlignment="Right" HorizontalAlignment="Left" Width="260"/>
+            <TextBlock x:Name="DownloadETALeftTB" HorizontalAlignment="Center" Margin="0,48,0,0" TextWrapping="Wrap" Text="Time left:" VerticalAlignment="Top"  FontSize="14" Width="520"/>
+            <TextBlock x:Name="DownloadFileSizeTB" Margin="0,0,300,0" TextWrapping="Wrap" Text="File Size:" VerticalAlignment="Top"  FontSize="14"/>
         </Grid>
         <Image x:Name="DownloadImage" HorizontalAlignment="Center" Height="128" Margin="0,40,0,0" VerticalAlignment="Top" Width="128"/>
     </Grid>