ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error messages in firmware install

This commit is contained in:
MSuih 2020-07-28 21:17:11 +03:00 committed by Megamouse
parent e58e1ebfd9
commit 2ce49e3674
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/rpcs3qt/main_window.cpp
View File

@ -681,14 +681,14 @@ void main_window::HandlePupInstallation(QString file_path)
if (!pup_f) if (!pup_f)
{ {
gui_log.error("Error opening PUP file %s", path); gui_log.error("Error opening PUP file %s", path);
QMessageBox::critical(this, tr("Failure!"), tr("The selected firmware file couldn't be opened.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: The selected firmware file couldn't be opened."));
return; return;
} }
if (pup_f.size() < sizeof(PUPHeader)) if (pup_f.size() < sizeof(PUPHeader))
{ {
gui_log.error("Too small PUP file: %llu", pup_f.size()); gui_log.error("Too small PUP file: %llu", pup_f.size());
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: PUP file size is invalid.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: The provided file is empty."));
return; return;
} }
@ -698,8 +698,8 @@ void main_window::HandlePupInstallation(QString file_path)
if (header.header_length + header.data_length != pup_f.size()) if (header.header_length + header.data_length != pup_f.size())
{ {
gui_log.error("Firmware size mismatch, expected: %llu, actual: %llu + %llu", pup_f.size(), header.header_length, header.data_length); gui_log.error("Firmware size mismatch, expected: %llu + %llu, actual: %llu", header.header_length, header.data_length, pup_f.size());
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: PUP file is corrupted.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: The provided file is incomplete. Try redownloading it."));
return; return;
} }
@ -707,14 +707,14 @@ void main_window::HandlePupInstallation(QString file_path)
if (!pup) if (!pup)
{ {
gui_log.error("Error while installing firmware: PUP file is invalid."); gui_log.error("Error while installing firmware: PUP file is invalid.");
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: PUP file is invalid.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: The provided file is corrupted."));
return; return;
} }
if (!pup.validate_hashes()) if (!pup.validate_hashes())
{ {
gui_log.error("Error while installing firmware: Hash check failed."); gui_log.error("Error while installing firmware: Hash check failed.");
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: PUP file contents are invalid.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: The provided file's contents are corrupted."));
return; return;
} }
@ -766,7 +766,7 @@ void main_window::HandlePupInstallation(QString file_path)
if (dev_flash_tar_f.size() < 3) if (dev_flash_tar_f.size() < 3)
{ {
gui_log.error("Error while installing firmware: PUP contents are invalid."); gui_log.error("Error while installing firmware: PUP contents are invalid.");
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: PUP contents are invalid.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: Firmware could not be decompressed"));
progress = -1; progress = -1;
} }
@ -774,7 +774,7 @@ void main_window::HandlePupInstallation(QString file_path)
if (!dev_flash_tar.extract(g_cfg.vfs.get_dev_flash(), "dev_flash/")) if (!dev_flash_tar.extract(g_cfg.vfs.get_dev_flash(), "dev_flash/"))
{ {
gui_log.error("Error while installing firmware: TAR contents are invalid."); gui_log.error("Error while installing firmware: TAR contents are invalid.");
QMessageBox::critical(this, tr("Failure!"), tr("Error while installing firmware: TAR contents are invalid.")); QMessageBox::critical(this, tr("Firmware Installation Failed"), tr("Firmware installation failed: Firmware contents could not be extracted."));
progress = -1; progress = -1;
} }