Skip to content

Commit 4d175f7

Browse files
SvenGDKSvenGDK
committed
.NET Changes, updated Downloads & more
- Moved from .NET Framework 4.9 to .NET 9 - Replaced nQuant with SixLabors.ImageSharp (.Processing.Processors.Quantization) for PSX project images - Updated GoldHEN download & included one for PPPwn (v2.4b18.3) - Updated all PS5 downloads - Local PS5 backups will now load differently which should decrease the loading time - Fixed crashes on opening directories - Icon update Not all features have been tested again after switching to .NET 9, please report any issues on GitHub.
1 parent 5717d07 commit 4d175f7

File tree

318 files changed

+1837
-141807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+1837
-141807
lines changed

‎PS Multi Tools.sln‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.5.33530.505
4+
VisualStudioVersion = 17.13.35828.75
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PS Multi Tools", "PS Multi Tools\PS Multi Tools.vbproj", "{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}"
6+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PS Multi Tools", "PS Multi Tools\PS Multi Tools.vbproj", "{04675713-8EBB-43AA-933F-41A84004D2CD}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
11-
Debug|x64 = Debug|x64
1211
Release|Any CPU = Release|Any CPU
13-
Release|x64 = Release|x64
1412
EndGlobalSection
1513
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Debug|x64.ActiveCfg = Debug|x64
19-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Debug|x64.Build.0 = Debug|x64
20-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Release|Any CPU.Build.0 = Release|Any CPU
22-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Release|x64.ActiveCfg = Release|x64
23-
{FD8063C6-8D12-49C2-990E-9FDA4B38DC3B}.Release|x64.Build.0 = Release|x64
14+
{04675713-8EBB-43AA-933F-41A84004D2CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{04675713-8EBB-43AA-933F-41A84004D2CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{04675713-8EBB-43AA-933F-41A84004D2CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{04675713-8EBB-43AA-933F-41A84004D2CD}.Release|Any CPU.Build.0 = Release|Any CPU
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) = preSolution
2620
HideSolutionNode = FALSE
2721
EndGlobalSection
2822
GlobalSection(ExtensibilityGlobals) = postSolution
29-
SolutionGuid = {18F98658-8276-4979-B5C4-8E99E01005BE}
23+
SolutionGuid = {5C906BB1-38F1-4894-8ED7-E645E64C8B36}
3024
EndGlobalSection
3125
EndGlobal

‎PS Multi Tools/Application.xaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Application x:Class="Application"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:PS_Multi_Tools"
5-
StartupUri="HomeWindow.xaml"
6-
ShutdownMode="OnMainWindowClose">
7-
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:local="clr-namespace:PS_Multi_Tools"
5+
StartupUri="MainWindow.xaml"
6+
ShutdownMode="OnMainWindowClose">
87
<Application.Resources>
9-
8+
109
</Application.Resources>
1110
</Application>

‎PS Multi Tools/AssemblyInfo.vb‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Imports System.Windows
2+
3+
'The ThemeInfo attribute describes where any theme specific and generic resource dictionaries can be found.
4+
'1st parameter: where theme specific resource dictionaries are located
5+
'(used if a resource is not found in the page,
6+
' or application resource dictionaries)
7+
8+
'2nd parameter: where the generic resource dictionary is located
9+
'(used if a resource is not found in the page,
10+
'app, and any theme specific resource dictionaries)
11+
<Assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)>

‎PS Multi Tools/Classes/PKGDecryptor.vb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Public Class PKGDecryptor
244244
Array.Copy(PKGFileKey, IncPKGFileKey, PKGFileKey.Length)
245245

246246
EncryptedPKGReadStream.Seek(DataRelativeOffset + PKGEncryptedFileStartOffset, SeekOrigin.Begin)
247-
EncryptedPKGStream.Read(EncryptedData, 0, InputSize)
247+
EncryptedPKGStream.ReadExactly(EncryptedData, 0, InputSize)
248248

249249
For Position As Integer = 0 To CInt(DataRelativeOffset - 1) Step 16
250250
Utils.IncrementArray(IncPKGFileKey, PKGFileKey.Length - 1)
@@ -426,7 +426,7 @@ Public Class PKGDecryptor
426426

427427
Using FileStream As New FileStream(FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)
428428
ByteArray = New Byte(CInt(1048576 - 1L) + 1 - 1) {}
429-
FileStream.Read(ByteArray, 0, ByteArray.Length)
429+
FileStream.ReadExactly(ByteArray, 0, ByteArray.Length)
430430
End Using
431431

432432
BytesFromFile = ByteArray
@@ -671,8 +671,8 @@ Public Class PKGDecryptor
671671
File.Delete(DecryptedPKGFileName)
672672
End If
673673

674-
If MsgBox("Pkg extracted successfully." + vbNewLine + "Open folder?", MsgBoxStyle.OkCancel, "Done") = MsgBoxResult.Ok Then
675-
Process.Start(".\")
674+
If MsgBox("Pkg extracted successfully." + vbCrLf + "Open folder?", MsgBoxStyle.OkCancel, "Done") = MsgBoxResult.Ok Then
675+
Process.Start("explorer", ".\")
676676
End If
677677

678678
Return True

‎PS Multi Tools/Classes/PS1Game.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Public Class PS1Game
148148
Public Shared Function GetPS1GameTitleFromDatabaseList(GameID As String) As String
149149
Dim FoundGameTitle As String = ""
150150

151-
For Each GameTitle As String In File.ReadLines(My.Computer.FileSystem.CurrentDirectory + "\Tools\ps1ids.txt")
151+
For Each GameTitle As String In File.ReadLines(Environment.CurrentDirectory + "\Tools\ps1ids.txt")
152152
If GameTitle.Contains(GameID) Then
153153
FoundGameTitle = GameTitle.Split(";"c)(1)
154154
Exit For
@@ -165,7 +165,7 @@ Public Class PS1Game
165165
Public Shared Function IsGameProtected(GameID As String) As String
166166
Dim FoundValue As String = ""
167167

168-
For Each GameIDInFile As String In File.ReadLines(My.Computer.FileSystem.CurrentDirectory + "\Tools\libcrypt.txt")
168+
For Each GameIDInFile As String In File.ReadLines(Environment.CurrentDirectory + "\Tools\libcrypt.txt")
169169
If GameIDInFile.Contains(GameID) Then
170170
FoundValue = GameIDInFile.Split(" "c)(1)
171171
Exit For

‎PS Multi Tools/Classes/PS2Game.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Public Class PS2Game
206206
Dim GameID As String = ""
207207

208208
Using SevenZip As New Process()
209-
SevenZip.StartInfo.FileName = My.Computer.FileSystem.CurrentDirectory + "\Tools\7z.exe"
209+
SevenZip.StartInfo.FileName = Environment.CurrentDirectory + "\Tools\7z.exe"
210210
SevenZip.StartInfo.Arguments = "l -ba """ + GameISO + """"
211211
SevenZip.StartInfo.RedirectStandardOutput = True
212212
SevenZip.StartInfo.UseShellExecute = False
@@ -244,7 +244,7 @@ Public Class PS2Game
244244
Dim FoundGameTitle As String = ""
245245
GameID = GameID.Replace("-", "")
246246

247-
For Each GameTitle As String In File.ReadLines(My.Computer.FileSystem.CurrentDirectory + "\Tools\ps2ids.txt")
247+
For Each GameTitle As String In File.ReadLines(Environment.CurrentDirectory + "\Tools\ps2ids.txt")
248248
If GameTitle.Contains(GameID) Then
249249
FoundGameTitle = GameTitle.Split(";"c)(1)
250250
Exit For

‎PS Multi Tools/Classes/SFONew.vb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,37 +67,37 @@ Public Class SFONew
6767

6868
Public Shared Function ReadUInt32(Str As Stream) As UInteger
6969
Dim IntBytes As Byte() = New Byte(3) {}
70-
Str.Read(IntBytes, &H0, IntBytes.Length)
70+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
7171
Return BitConverter.ToUInt32(IntBytes, &H0)
7272
End Function
7373

7474
Public Shared Function ReadInt32(Str As Stream) As UInteger
7575
Dim IntBytes As Byte() = New Byte(3) {}
76-
Str.Read(IntBytes, &H0, IntBytes.Length)
76+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
7777
Return BitConverter.ToUInt32(IntBytes, &H0)
7878
End Function
7979

8080
Public Shared Function ReadUInt64(Str As Stream) As ULong
8181
Dim IntBytes As Byte() = New Byte(7) {}
82-
Str.Read(IntBytes, &H0, IntBytes.Length)
82+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
8383
Return BitConverter.ToUInt64(IntBytes, &H0)
8484
End Function
8585

8686
Public Shared Function ReadInt64(Str As Stream) As Long
8787
Dim IntBytes As Byte() = New Byte(7) {}
88-
Str.Read(IntBytes, &H0, IntBytes.Length)
88+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
8989
Return BitConverter.ToInt64(IntBytes, &H0)
9090
End Function
9191

9292
Public Shared Function ReadUInt16(Str As Stream) As UShort
9393
Dim IntBytes As Byte() = New Byte(1) {}
94-
Str.Read(IntBytes, &H0, IntBytes.Length)
94+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
9595
Return BitConverter.ToUInt16(IntBytes, &H0)
9696
End Function
9797

9898
Public Shared Function ReadInt16(Str As Stream) As Short
9999
Dim IntBytes As Byte() = New Byte(1) {}
100-
Str.Read(IntBytes, &H0, IntBytes.Length)
100+
Str.ReadExactly(IntBytes, &H0, IntBytes.Length)
101101
Return BitConverter.ToInt16(IntBytes, &H0)
102102
End Function
103103

@@ -113,7 +113,7 @@ Public Class SFONew
113113
Dim oldPos As Long = Str.Position
114114
Str.Seek(location, SeekOrigin.Begin)
115115
Dim work_buf As Byte() = New Byte(length - 1) {}
116-
Str.Read(work_buf, &H0, work_buf.Length)
116+
Str.ReadExactly(work_buf, &H0, work_buf.Length)
117117
Str.Seek(oldPos, SeekOrigin.Begin)
118118
Return work_buf
119119
End Function

‎PS Multi Tools/Classes/Structures.vb‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,6 +1426,71 @@ Public Class Structures
14261426
End Property
14271427
End Structure
14281428

1429+
Public Structure DLPackage
1430+
1431+
Private _PackageName As String
1432+
Private _PackageIcon As Image
1433+
Private _PackageDescription As String
1434+
Private _PackageRegion As String
1435+
Private _PackageConsole As String
1436+
Private _PackageFormat As String
1437+
1438+
Public Property PackageIcon As Image
1439+
Get
1440+
Return _PackageIcon
1441+
End Get
1442+
Set
1443+
_PackageIcon = Value
1444+
End Set
1445+
End Property
1446+
1447+
Public Property PackageName As String
1448+
Get
1449+
Return _PackageName
1450+
End Get
1451+
Set
1452+
_PackageName = Value
1453+
End Set
1454+
End Property
1455+
1456+
Public Property PackageDescription As String
1457+
Get
1458+
Return _PackageDescription
1459+
End Get
1460+
Set
1461+
_PackageDescription = Value
1462+
End Set
1463+
End Property
1464+
1465+
Public Property PackageRegion As String
1466+
Get
1467+
Return _PackageRegion
1468+
End Get
1469+
Set
1470+
_PackageRegion = Value
1471+
End Set
1472+
End Property
1473+
1474+
Public Property PackageConsole As String
1475+
Get
1476+
Return _PackageConsole
1477+
End Get
1478+
Set
1479+
_PackageConsole = Value
1480+
End Set
1481+
End Property
1482+
1483+
Public Property PackageFormat As String
1484+
Get
1485+
Return _PackageFormat
1486+
End Get
1487+
Set
1488+
_PackageFormat = Value
1489+
End Set
1490+
End Property
1491+
1492+
End Structure
1493+
14291494
End Class
14301495

14311496
Public Class PS5ParamClass

0 commit comments

Comments
 (0)