From 35fb6d1a3fd45ed0fb9917df513da29872e408de Mon Sep 17 00:00:00 2001
From: Homes32 <firepark32@gmail.com>
Date: Tue, 29 Apr 2025 19:21:55 -0500
Subject: [PATCH] Fixed CrystalDiskInfo and CrystalDiskMark download URL's
 getting AD walled.

---
 .../Benchmarking/CrystalDiskMark.script         | 17 +++++++++--------
 .../Diagnostics & Repair/CrystalDiskInfo.script | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Projects/PhoenixPE/Applications/Benchmarking/CrystalDiskMark.script b/Projects/PhoenixPE/Applications/Benchmarking/CrystalDiskMark.script
index ca2656e..bec63e2 100644
--- a/Projects/PhoenixPE/Applications/Benchmarking/CrystalDiskMark.script
+++ b/Projects/PhoenixPE/Applications/Benchmarking/CrystalDiskMark.script
@@ -32,9 +32,9 @@
 Title=CrystalDiskMark
 Author=Homes32
 Level=5
-Version=1.0.1.0
+Version=1.0.2.0
 Description=CrystalDiskMark is a simple disk benchmark software.
-Date=2025-02-23
+Date=2025-04-29
 Selected=False
 Mandatory=False
 
@@ -42,8 +42,8 @@ Mandatory=False
 %ProgramFolder%="CrystalDiskMark"
 %ProgramExex86%="DiskMark32.exe"
 %ProgramExex64%="DiskMark64.exe"
-%DownloadURL%=https://crystalmark.info/redirect.php?product=CrystalDiskMark
-%SetupFile%="CrystalDiskMark.zip"
+%DownloadURL%=https://sourceforge.net/projects/crystaldiskmark/files/latest/download
+%SetupFile%="CrystalDiskMark.exe"
 // CrystalDiskMark v8.0.6 (and possibly earlier versions) does not correctly identify and process .ini files in the same
 // directory as the .exe and will always look in the %AppData% folder for the settings.
 %ConfigFilex86%="%TargetAppData%\%ProgramFolder%\DiskMark32.ini"
@@ -93,10 +93,11 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 [ExtractProgram]
 Echo,"Extracting files..."
 GetParam,1,%DestDir%
-Decompress,%ProgramsCache%\%ProgramFolder%\%SetupFile%,%DestDir%
-FileDeleteEx,"%DestDir%\DiskMarkA64.exe"
-If,%SourceArch%,Equal,x64,FileDeleteEx,%ProgramExex86%
-Else,FileDeleteEx,%ProgramExex64%
+InnoExtract,%ProgramsCache%\%ProgramFolder%\%SetupFile%,"%ProjectTemp%\%ProgramFolder%"
+FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\DiskMarkA64.exe"
+If,%SourceArch%,Equal,x64,FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\%ProgramExex86%"
+Else,FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\%ProgramExex64%"
+FileCopy,"%ProjectTemp%\%ProgramFolder%\{App}\*.*",%DestDir%
 
 [#DownloadProgram#]
 // ===============================================================================================================================
diff --git a/Projects/PhoenixPE/Applications/Diagnostics & Repair/CrystalDiskInfo.script b/Projects/PhoenixPE/Applications/Diagnostics & Repair/CrystalDiskInfo.script
index b7eb171..4d2e007 100644
--- a/Projects/PhoenixPE/Applications/Diagnostics & Repair/CrystalDiskInfo.script	
+++ b/Projects/PhoenixPE/Applications/Diagnostics & Repair/CrystalDiskInfo.script	
@@ -32,9 +32,9 @@
 Title=CrystalDiskInfo
 Author=Homes32
 Level=5
-Version=1.0.0.0
+Version=1.0.1.0
 Description=CrystalDiskInfo is an Open Source utility that monitors and displays the health of your hard drive, including basic information, S.M.A.R.T. values, and disk temperature.
-Date=2024-06-20
+Date=2025-04-29
 Selected=False
 Mandatory=False
 
@@ -42,8 +42,8 @@ Mandatory=False
 %ProgramFolder%="CrystalDiskInfo"
 %ProgramExex86%="DiskInfo32.exe"
 %ProgramExex64%="DiskInfo64.exe"
-%DownloadURL%=https://crystalmark.info/redirect.php?product=CrystalDiskInfo
-%SetupFile%="CrystalDiskInfo.zip"
+%DownloadURL%=https://sourceforge.net/projects/crystaldiskinfo/files/latest/download
+%SetupFile%="CrystalDiskInfo.exe"
 %ConfigFile%="%TargetPrograms%\%ProgramFolder%\DiskInfo.ini"
 
 [Process]
@@ -94,10 +94,11 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 [ExtractProgram]
 Echo,"Extracting files..."
 GetParam,1,%DestDir%
-Decompress,%ProgramsCache%\%ProgramFolder%\%SetupFile%,%DestDir%
-FileDeleteEx,"%DestDir%\DiskInfoA64.exe"
-If,%SourceArch%,Equal,x64,FileDeleteEx,%ProgramExex86%
-Else,FileDeleteEx,%ProgramExex64%
+InnoExtract,%ProgramsCache%\%ProgramFolder%\%SetupFile%,"%ProjectTemp%\%ProgramFolder%"
+FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\DiskInfoA64.exe"
+If,%SourceArch%,Equal,x64,FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\%ProgramExex86%"
+Else,FileDeleteEx,"%ProjectTemp%\%ProgramFolder%\{App}\%ProgramExex64%"
+FileCopy,"%ProjectTemp%\%ProgramFolder%\{App}\*.*",%DestDir%
 
 [#DownloadProgram#]
 // ===============================================================================================================================