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

Merge pull request #4965 from leoetlino/delete-everything 

IOS/ES: Implement DeleteTitle
This commit is contained in:
Anthony 2017-02-27 12:18:47 -08:00 committed by GitHub
parent 7ac95c2673 ac43836714
commit c4137c2880
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -316,6 +316,8 @@ IPCCommandResult ES::IOCtlV(const IOCtlVRequest& request)
return GetTMDViews(request); return GetTMDViews(request);
case IOCTL_ES_GETCONSUMPTION: case IOCTL_ES_GETCONSUMPTION:
return GetConsumption(request); return GetConsumption(request);
case IOCTL_ES_DELETETITLE:
return DeleteTitle(request);
case IOCTL_ES_DELETETICKET: case IOCTL_ES_DELETETICKET:
return DeleteTicket(request); return DeleteTicket(request);
case IOCTL_ES_DELETETITLECONTENT: case IOCTL_ES_DELETETITLECONTENT:
@ -893,6 +895,40 @@ IPCCommandResult ES::GetConsumption(const IOCtlVRequest& request)
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);
} }
static bool CanDeleteTitle(u64 title_id)
{
// IOS only allows deleting non-system titles (or a system title higher than 00000001-00000101).
return static_cast<u32>(title_id >> 32) != 0x00000001 || static_cast<u32>(title_id) > 0x101;
}
IPCCommandResult ES::DeleteTitle(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(1, 0) || request.in_vectors[0].size != 8)
return GetDefaultReply(ES_PARAMETER_SIZE_OR_ALIGNMENT);
const u64 title_id = Memory::Read_U64(request.in_vectors[0].address);
if (!CanDeleteTitle(title_id))
return GetDefaultReply(ES_PARAMETER_SIZE_OR_ALIGNMENT);
const std::string title_dir =
StringFromFormat("%s/title/%08x/%08x/", RootUserPath(Common::FROM_SESSION_ROOT).c_str(),
static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
if (!File::IsDirectory(title_dir) ||
!DiscIO::CNANDContentManager::Access().RemoveTitle(title_id, Common::FROM_SESSION_ROOT))
{
return GetDefaultReply(FS_ENOENT);
}
if (!File::DeleteDirRecursively(title_dir))
{
ERROR_LOG(IOS_ES, "DeleteTitle: Failed to delete title directory: %s", title_dir.c_str());
return GetDefaultReply(FS_EACCESS);
}
return GetDefaultReply(IPC_SUCCESS);
}
IPCCommandResult ES::DeleteTicket(const IOCtlVRequest& request) IPCCommandResult ES::DeleteTicket(const IOCtlVRequest& request)
{ {
u64 TitleID = Memory::Read_U64(request.in_vectors[0].address); u64 TitleID = Memory::Read_U64(request.in_vectors[0].address);

1
Source/Core/Core/IOS/ES/ES.h
View File

@ -176,6 +176,7 @@ private:
IPCCommandResult GetTMDViewCount(const IOCtlVRequest& request); IPCCommandResult GetTMDViewCount(const IOCtlVRequest& request);
IPCCommandResult GetTMDViews(const IOCtlVRequest& request); IPCCommandResult GetTMDViews(const IOCtlVRequest& request);
IPCCommandResult GetConsumption(const IOCtlVRequest& request); IPCCommandResult GetConsumption(const IOCtlVRequest& request);
IPCCommandResult DeleteTitle(const IOCtlVRequest& request);
IPCCommandResult DeleteTicket(const IOCtlVRequest& request); IPCCommandResult DeleteTicket(const IOCtlVRequest& request);
IPCCommandResult DeleteTitleContent(const IOCtlVRequest& request); IPCCommandResult DeleteTitleContent(const IOCtlVRequest& request);
IPCCommandResult GetStoredTMDSize(const IOCtlVRequest& request); IPCCommandResult GetStoredTMDSize(const IOCtlVRequest& request);