piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 18:19:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

IOS/ES: Implement DeleteTitleContent properly

Browse Source 
Just like DeleteTitle, Using CNANDContentManager is overkill,
inefficient and useless. And it results in a few failures in
situations where a delete should just always work.

But here it gets bonus points, because it manages to actually use
the TMD for deleting contents, when IOS does none of that and just
deletes files ending with .app in the title content directory. :)
This commit is contained in:
Léo Lam
2017-05-07 16:43:27 +02:00
parent 12801fd722
commit bacf52384f
6 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,8 @@ public:
ReturnCode Close(u32 fd) override;
IPCCommandResult IOCtlV(const IOCtlVRequest& request) override;
ReturnCode DeleteTitleContent(u64 title_id) const;
private:
enum
{

31
Source/Core/Core/IOS/ES/TitleManagement.cpp
View File

@ -376,20 +376,29 @@ IPCCommandResult ES::DeleteTicket(const IOCtlVRequest& request)
return GetDefaultReply(IPC_SUCCESS);
}
ReturnCode ES::DeleteTitleContent(u64 title_id) const
{
if (!CanDeleteTitle(title_id))
return ES_EINVAL;
const std::string content_dir = Common::GetTitleContentPath(title_id, Common::FROM_SESSION_ROOT);
if (!File::IsDirectory(content_dir))
return FS_ENOENT;
for (const auto& file : File::ScanDirectoryTree(content_dir, false).children)
{
if (file.virtualName.size() == 12 && file.virtualName.compare(8, 4, ".app") == 0)
File::Delete(file.physicalName);
}
return IPC_SUCCESS;
}
IPCCommandResult ES::DeleteTitleContent(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(1, 0))
if (!request.HasNumberOfValidVectors(1, 0) || request.in_vectors[0].size != sizeof(u64))
return GetDefaultReply(ES_EINVAL);
u64 TitleID = Memory::Read_U64(request.in_vectors[0].address);
INFO_LOG(IOS_ES, "IOCTL_ES_DELETETITLECONTENT: title: %08x/%08x", (u32)(TitleID >> 32),
(u32)TitleID);
// Presumably return -1017 when title not installed TODO verify
if (!DiscIO::CNANDContentManager::Access().RemoveTitle(TitleID, Common::FROM_SESSION_ROOT))
return GetDefaultReply(ES_EINVAL);
return GetDefaultReply(IPC_SUCCESS);
return GetDefaultReply(DeleteTitleContent(Memory::Read_U64(request.in_vectors[0].address)));
}
IPCCommandResult ES::ExportTitleInit(Context& context, const IOCtlVRequest& request)