Compare commits

...

9 Commits

Author SHA1 Message Date
coah
da1841cd58 Improve DeleteUnauthorizedData match 2026-09-21 19:17:28 +00:00
coah
24d8f831e4 Match ESMisc savedata deletion 2026-09-21 19:15:41 +00:00
coah
66b6ec9c03 Match ESMisc meta content deletion 2026-09-21 19:15:41 +00:00
coah
bac7a5c92d Match DeleteEmptyTitles 2026-09-21 19:15:41 +00:00
coah
9ecac6927a Match CheckSafeDeleteTitle 2026-09-21 19:15:41 +00:00
coah
db7f0284f0 Match NumInodesSaveDirRoot 2026-09-21 19:15:41 +00:00
coah
781261efd4 Match GetValidTicketIndex 2026-09-21 19:15:41 +00:00
coah
7b835b31af Match ESMisc NumPrivateContents 2026-09-21 19:15:41 +00:00
coah
50385ab24c Match ESMisc checkContentsNum 2026-09-21 19:15:41 +00:00

View File

@@ -198,7 +198,6 @@ namespace ipl {
}
ESError ESMisc::checkContentsNum(ESTitleId titleId, ESTmdView* tmdView) {
s32 result = 0;
u32 numContents = 0;
ESContentId contentIds[ES_MAX_CONTENT] ALIGN32;
@@ -209,49 +208,50 @@ namespace ipl {
return 1;
} else {
u16 num = tmdView->head.numContents;
u32 i;
s32 count = 0;
u32 count = 0;
for (i = 0; i < num; i++) {
for (u32 i = 0; i < num; i++) {
if ((tmdView->contents[i].type & 0x8000) == 0) {
count++;
}
}
if (privateCount == count) {
result = 0;
return 0;
} else {
ESError err = ES_ListTitleContentsOnCard(titleId, NULL, &numContents);
result = err;
if (err != ES_ERR_OK) {
OSReport("ESMisc::checkContentsNum: ES_ListTitleContentsOnCard err %d\n", err);
return err;
} else if (numContents == 0) {
OSReport("ESMisc::checkContentsNum: no content for 0x%016llx.\n", titleId);
result = 1;
return 1;
} else {
err = ES_ListTitleContentsOnCard(titleId, contentIds, &numContents);
result = err;
if (err == ES_ERR_OK) {
bool found = false;
for (i = 0; i < numContents && !found; i++) {
for (u32 j = 0; j < num; j++) {
for (u32 i = 0; i < numContents && !found; i++) {
u32 j = 0;
while (j < tmdView->head.numContents) {
if (contentIds[i] == tmdView->contents[j].cid && (tmdView->contents[j].type & 0x8000) == 0) {
found = true;
break;
}
j++;
}
}
if (!found) {
OSReport("ESMisc::checkContentsNum: 0x%016llx is already deleted.\n", titleId);
result = 1;
return 1;
} else {
u32 k;
for (u32 j = 0; j < num; j++) {
u32 k = 0;
for (i = 0; i < numContents; i++) {
k = 0;
for (u32 i = 0; i < numContents; i++) {
if (contentIds[i] == tmdView->contents[j].cid) {
break;
}
@@ -260,29 +260,26 @@ namespace ipl {
if (k == numContents && (tmdView->contents[j].type & 0x4000) == 0) {
OSReport("ESMisc::checkContentsNum: not complete: non-optional cidx %d missing for 0x%016llx.\n",
tmdView->contents[j].index, titleId);
result = 2;
goto out;
return 2;
}
}
OSReport("ESMisc::checkContentsNum: complete: only missing non-optional contents for 0x%016llx.\n", titleId);
result = 0;
return 0;
}
} else {
OSReport("ESMisc::checkContentsNum: ES_ListTitleContentsOnCard failed.[%d]\n", err);
return err;
}
}
}
}
out:
return result;
}
ESError ESMisc::GetValidTicketIndex(EGG::Heap* heap, ESTitleId titleId, ESTicketView* ticket, u32 ticketLength) {
s32 index;
bool allocated = false;
bool found = false;
ESTicketView* ticketView;
s32 index;
if (ticket == NULL) {
if (GetTicketViewList(heap, titleId, &ticket, &ticketLength) < 0) {
@@ -318,8 +315,8 @@ namespace ipl {
if (fd < 0) {
OSReport("ESMisc::GetValidTicketIndex: ES_OpenTitleContentFile fd %d\n", fd);
} else {
u8* buf = (u8*)heap->alloc(0x40, 32);
s32 numRead = ES_ReadContentFile(fd, buf, 0x40);
char* buf = (char*)heap->alloc(0x40, -32);
u32 numRead = ES_ReadContentFile(fd, buf, 0x40);
if (numRead != 0x40) {
OSReport("ESMisc::GetValidTicketIndex: ES_ReadContentFile err %d\n", numRead);
@@ -466,12 +463,13 @@ namespace ipl {
}
ESError ESMisc::NumPrivateContents(EGG::Heap* heap, ESTitleId titleId) {
ESTmdView* tmdView = NULL;
ESError ret;
ESContentId* contentIds = NULL;
ESTmdView* tmdView = NULL;
u32 numContents;
u32 tmdViewSize;
ESError ret = ES_GetTmdView(titleId, NULL, &tmdViewSize);
ret = ES_GetTmdView(titleId, NULL, &tmdViewSize);
if (ret == ES_ERR_DONT_EXISTS) {
return ES_ERR_OK;
}
@@ -507,10 +505,12 @@ namespace ipl {
}
ret = 0;
u32 i = 0;
u32 j = 0;
for (u32 i = 0; i < tmdView->head.numContents && j < numContents; i++) {
if (tmdView->contents[i].cid == contentIds[j]) {
if (!(tmdView->contents[i].type & 0x8000)) {
ESCmdView* content = tmdView->contents;
for (; i < tmdView->head.numContents && j < numContents; i++, content++) {
if (content->cid == contentIds[j]) {
if (!(content->type & 0x8000)) {
ret++;
}
j++;
@@ -543,6 +543,7 @@ namespace ipl {
}
u32 ESMisc::NumInodesSaveDirRoot(ESTitleId titleId) {
s32 ret;
s32 result = -1;
bool changedUid = false;
@@ -553,7 +554,7 @@ namespace ipl {
snprintf(path, sizeof(path), "/title/%08x/%08x/data", NANDTitleIdHi(titleId), NANDTitleIdLo(titleId));
u32 nodes;
s32 ret = NANDPrivateReadDir(path, NULL, &nodes);
ret = NANDPrivateReadDir(path, NULL, &nodes);
if (ret != NAND_RESULT_OK) {
ES_ERR_REPORT("NANDReadDir failed: %d", ret);
@@ -586,13 +587,12 @@ namespace ipl {
} else if (result > 0) {
result = 0;
} else {
ESError err = ES_GetTmdView(titleId, NULL, &tmdViewSize);
result = err;
result = ES_GetTmdView(titleId, NULL, &tmdViewSize);
if (err == ES_ERR_DONT_EXISTS) {
if (result == ES_ERR_DONT_EXISTS) {
result = ES_ERR_OK;
} else if (err != ES_ERR_OK) {
ES_ERR_REPORT("ES_GetTmdView1 failed: %d", err);
} else if (result != ES_ERR_OK) {
ES_ERR_REPORT("ES_GetTmdView1 failed: %d", result);
} else {
tmdView = (ESTmdView*)heap->alloc(OSRoundUp32B(tmdViewSize), -DEFAULT_ALIGN);
result = ES_GetTmdView(titleId, tmdView, &tmdViewSize);
@@ -607,7 +607,7 @@ namespace ipl {
if (result < 0) {
ES_ERR_REPORT("NumInodesSaveDirRoot failed: %d", result);
} else {
result = (result == 0);
result = __rlwnm(1, __cntlzw(result), 31, 31);
}
}
}
@@ -645,7 +645,7 @@ namespace ipl {
}
s32 ESMisc::DeleteEmptyTitles(EGG::Heap* heap) {
u32 titleCount = 0;
u32 titleCount;
ESTitleId* titleIds = NULL;
s32 ret = ES_ListTitlesOnCard(NULL, &titleCount);
@@ -658,18 +658,18 @@ namespace ipl {
if (ret != ES_ERR_OK) {
ES_ERR_REPORT("ES_ListTitlesOnCard2 failed: %d", ret);
} else {
ESTitleId titleId;
for (u32 i = 0; i < titleCount; i++) {
u32 titleIdHi = ((u32*)titleIds)[i * 2];
u32 titleIdLo = ((u32*)titleIds)[i * 2 + 1];
titleId = titleIds[i];
if (titleIdHi != 1) {
ret = CheckSafeDeleteTitle(heap, ((ESTitleId)titleIdHi << 32) | titleIdLo);
if (NANDTitleIdHi(titleId) != 1) {
ret = CheckSafeDeleteTitle(heap, titleId);
if (ret < 0) {
ES_ERR_REPORT("CheckSafeDeleteTitle failed: %d", ret);
}
if (ret > 0) {
ret = DeleteTitle(heap, ((ESTitleId)titleIdHi << 32) | titleIdLo);
ret = DeleteTitle(heap, titleId);
if (ret < 0) {
ES_ERR_REPORT("DeleteTitle failed: %d", ret);
}
@@ -694,8 +694,10 @@ namespace ipl {
}
s32 ESMisc::DeleteMetaContent(ESTitleId titleId) {
char metaPath[64] = "";
snprintf(metaPath, sizeof(metaPath), "/meta/%08x/%08x/title.met", NANDTitleIdHi(titleId), NANDTitleIdLo(titleId));
char metaPath[0x41] = "";
u32 titleIdHi = NANDTitleIdHi(titleId);
u32 titleIdLo = NANDTitleIdLo(titleId);
snprintf(metaPath, 0x40, "/meta/%08x/%08x/title.met", titleIdHi, titleIdLo);
return NANDPrivateDelete(metaPath);
}
@@ -834,13 +836,13 @@ namespace ipl {
}
ESError ESMisc::DeleteSavedata(ESTitleId titleId, EGG::Heap* heap) {
s32 ret;
char dirPath[0x80] ALIGN32;
char filePath[0x41];
char* entries = NULL;
u32 entryCount = 0;
char* entry;
u32 i;
s32 ret;
sprintf(dirPath + 0x20, "/title/%08x/%08x/data/", NANDTitleIdHi(titleId), NANDTitleIdLo(titleId));
ret = NANDReadDir(dirPath + 0x20, NULL, &entryCount);
@@ -864,13 +866,14 @@ namespace ipl {
}
entry = entries;
for (i = 0; i < entryCount; i++) {
for (i = 0; i < entryCount;) {
snprintf(filePath + 0x1c, 0x40, "%s%s", dirPath + 0x20, entry);
(filePath + 0x1c)[0x40] = 0;
ret = NANDPrivateDelete(filePath + 0x1c);
if (ret != ES_ERR_OK) {
ES_ERR_REPORT("Failed to delete %s: %d", filePath + 0x1c, ret);
}
i++;
entry += strlen(entry) + 1;
}
@@ -884,6 +887,11 @@ namespace ipl {
void ESMisc::DeleteUnauthorizedData(EGG::Heap* heap) {
u32 titleCount = 0;
ESTitleId* titleIds = NULL;
char path[88];
NANDFileInfo fileInfo ALIGN32;
u8 ticketViews[0xe0] ALIGN32;
u32 ticketViewCount;
ESTicketView* ticketViewList;
s32 ret = ES_ListTitlesOnCard(NULL, &titleCount);
if (ret != ES_ERR_OK) {
@@ -904,22 +912,20 @@ namespace ipl {
return;
}
u32 titleIdOffset = 0;
for (u32 i = 0; i < titleCount; i++) {
u32 titleIdHi = ((u32*)titleIds)[i * 2];
u32 titleIdLo = ((u32*)titleIds)[i * 2 + 1];
ESTitleId titleId = ((ESTitleId)titleIdHi << 32) | titleIdLo;
u32 titleIdHi = *(u32*)((u8*)titleIds + titleIdOffset);
u32 titleIdLo = *(u32*)((u8*)titleIds + titleIdOffset + 4);
if (titleIdHi == 0x10000 && (titleIdLo & 0xffffff00) == 0x525a4400) {
char path[88];
NANDFileInfo fileInfo ALIGN32;
if ((titleIdLo & 0xffffff00) == 0x525a4400 && titleIdHi == 0x10000) {
u8* saveData = NULL;
BOOL fileOpen = FALSE;
BOOL deleteSaveData = FALSE;
sprintf(path - 8, "/title/%08x/%08x/data/%s", titleIdHi & 0xffffff, titleIdLo, "zeldaTp.dat");
if (!ChangeUid(titleId)) {
if (!ChangeUid(((ESTitleId)titleIdHi << 32) | titleIdLo)) {
OSReport("%s::%s: ChangeUid failed\n", __FILE__, "verifySavedataZD");
DeleteTitle(heap, titleId);
DeleteTitle(heap, ((ESTitleId)titleIdHi << 32) | titleIdLo);
} else {
ret = NANDPrivateOpen(path - 8, (NANDFileInfo*)((u8*)&fileInfo - 0x20), NAND_ACCESS_READ);
if (ret == NAND_RESULT_NOEXISTS) {
@@ -977,7 +983,8 @@ namespace ipl {
verify_failed:
if (!valid) {
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, "verifySavedataZD", titleId);
OSReport("%s::%s: Verify failed for %016llx\n", __FILE__, "verifySavedataZD",
((ESTitleId)titleIdHi << 32) | titleIdLo);
deleteSaveData = TRUE;
}
}
@@ -985,7 +992,7 @@ namespace ipl {
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
fileOpen = FALSE;
if (deleteSaveData) {
DeleteSavedata(titleId, heap);
DeleteSavedata(((ESTitleId)titleIdHi << 32) | titleIdLo, heap);
}
}
}
@@ -998,19 +1005,20 @@ namespace ipl {
NANDClose((NANDFileInfo*)((u8*)&fileInfo - 0x20));
}
ChangeUid(SYSMENU_TITLE_ID);
} else if (titleId == 0x0001000844495343ULL ||
(titleId < 0x0001000844495343ULL &&
(titleId == 0x000100014a4f4449ULL ||
(titleId > 0x000100014a4f4449ULL && titleId == 0x0001000148415858ULL))) ||
(titleId > 0x0001000844495343ULL &&
(titleId == 0x0001000844564458ULL ||
(titleId > 0x0001000844564458ULL && titleId == 0x000100084449534bULL)))) {
} else if ((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000844495343ULL ||
((((ESTitleId)titleIdHi << 32) | titleIdLo) < 0x0001000844495343ULL &&
((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x000100014a4f4449ULL ||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x000100014a4f4449ULL &&
(((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000148415858ULL))) ||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x0001000844495343ULL &&
((((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x0001000844564458ULL ||
((((ESTitleId)titleIdHi << 32) | titleIdLo) > 0x0001000844564458ULL &&
(((ESTitleId)titleIdHi << 32) | titleIdLo) == 0x000100084449534bULL)))) {
ESTitleId titleId = *(ESTitleId*)((u8*)titleIds + titleIdOffset);
ES_DeleteTitle(titleId);
u8 ticketViews[0xe0];
u32 ticketViewCount = 0;
ESTicketView* ticketViewList = NULL;
memset(ticketViews - 8, 0, sizeof(ticketViews));
ticketViewList = NULL;
memset(ticketViews, 0, sizeof(ticketViews));
ret = ES_GetTicketViews(titleId, NULL, &ticketViewCount);
if (ret != ES_ERR_OK) {
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
@@ -1021,12 +1029,11 @@ namespace ipl {
OSReport("%s::%s: ES_GetTicketViews failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, titleId);
} else {
for (u32 j = 0; j < ticketViewCount; j++) {
memcpy(ticketViews - 8, (u8*)ticketViewList + j * sizeof(ESTicketView), 0xd8);
ret = ES_DeleteTicket((ESTicketView*)(ticketViews - 8));
memcpy(ticketViews, (u8*)ticketViewList + j * sizeof(ESTicketView), 0xd8);
ret = ES_DeleteTicket((ESTicketView*)ticketViews);
if (ret != ES_ERR_OK) {
ESTitleId ticketTitleId;
memcpy(&ticketTitleId, (u8*)(ticketViews - 8) + 4, sizeof(ESTitleId));
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret, ticketTitleId);
OSReport("%s::%s: ES_DeleteTicket failed: %d for %016llx\n", __FILE__, "DeleteTicketsForce", ret,
((ESTicketView*)ticketViews)->ticketId);
}
}
}
@@ -1036,6 +1043,7 @@ namespace ipl {
heap->free(ticketViewList);
}
}
titleIdOffset += 8;
}
heap->free(titleIds);