archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 09:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missed files.

Browse source
This commit is contained in:
DH 2013-12-24 06:02:21 +02:00
parent b500fcbaed
commit 456374d487
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/Gui/MainFrame.cpp
View file

@ -218,7 +218,6 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event)) void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
{ {
//TODO: progress bar
bool stopped = false; bool stopped = false;
if(Emu.IsRunning()) if(Emu.IsRunning())
@ -227,7 +226,7 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
stopped = true; stopped = true;
} }
wxFileDialog ctrl (this, L"Select PKG", wxEmptyString, wxEmptyString, "*.pkg", wxFileDialog ctrl (this, L"Select PKG", wxEmptyString, wxEmptyString, "PKG files (*.pkg)|*.pkg|All files (*.*)|*.*",
wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if(ctrl.ShowModal() == wxID_CANCEL) if(ctrl.ShowModal() == wxID_CANCEL)
@ -241,7 +240,11 @@ void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
Emu.Stop(); Emu.Stop();
wxString fileName = ctrl.GetPath(); wxString fileName = ctrl.GetPath();
pkg_unpack((const char *)fileName.mb_str());
{
wxProgressDialog pdlg("Please wait", "Installing PKG...", 0, this, wxPD_APP_MODAL);
pkg_unpack((const char *)fileName.mb_str());
}
if (!wxRemoveFile(ctrl.GetPath()+".dec")) if (!wxRemoveFile(ctrl.GetPath()+".dec"))
ConLog.Warning("Could not delete the decoded DEC file"); ConLog.Warning("Could not delete the decoded DEC file");
@ -290,7 +293,13 @@ void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event))
stopped = true; stopped = true;
} }
wxFileDialog ctrl(this, L"Select (S)ELF", wxEmptyString, wxEmptyString, "*.*", wxFileDialog ctrl(this, L"Select (S)ELF", wxEmptyString, wxEmptyString,
"(S)ELF files (*BOOT.BIN;*.elf;*.self)|*BOOT.BIN;*.elf;*.self"
"|ELF files (BOOT.BIN;*.elf)|BOOT.BIN;*.elf"
"|SELF files (EBOOT.BIN;*.self)|EBOOT.BIN;*.self"
"|BOOT files (*BOOT.BIN)|*BOOT.BIN"
"|BIN files (*.bin)|*.bin"
"|All files (*.*)|*.*",
wxFD_OPEN | wxFD_FILE_MUST_EXIST); wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if(ctrl.ShowModal() == wxID_CANCEL) if(ctrl.ShowModal() == wxID_CANCEL)

15
rpcs3/Loader/ELF64.cpp
View file

@ -436,7 +436,7 @@ bool ELF64Loader::LoadShdrData(u64 offset)
if(size == 0 || !Memory.IsGoodAddr(offset + addr, size)) continue; if(size == 0 || !Memory.IsGoodAddr(offset + addr, size)) continue;
if(shdr.sh_addr < min_addr) if(shdr.sh_addr && shdr.sh_addr < min_addr)
{ {
min_addr = shdr.sh_addr; min_addr = shdr.sh_addr;
} }
@ -455,18 +455,13 @@ bool ELF64Loader::LoadShdrData(u64 offset)
switch(shdr.sh_type) switch(shdr.sh_type)
{ {
case SHT_NOBITS: case SHT_NOBITS:
memset(&Memory[offset + addr], 0, size); //ConLog.Warning("SHT_NOBITS: addr=0x%llx, size=0x%llx", offset + addr, size);
//memset(&Memory[offset + addr], 0, size);
break; break;
case SHT_PROGBITS: case SHT_PROGBITS:
/* //elf64_f.Seek(shdr.sh_offset);
elf64_f.Seek(shdr.sh_offset); //elf64_f.Read(&Memory[offset + addr], shdr.sh_size);
elf64_f.Read(&Memory[addr], shdr.sh_size);
*/
break;
case SHT_RELA:
ConLog.Warning("ELF64: RELA");
break; break;
} }
} }