Compare commits

..

1 Commits

Author SHA1 Message Date
Cursor Agent
4f654f72a9 data(NHTTP_request): match multipart boundary .rodata size
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 22:16:06 +00:00
8 changed files with 71 additions and 71 deletions

View File

@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
do_check_sd_app_titles__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string

View File

@@ -35,8 +35,8 @@ namespace ext_ead {
class SurfaceManager {
public:
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* arcPath);
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* param_10);
static void DisposeManager();
static void RegisterArcFile(void* fileBuf);

View File

@@ -92,7 +92,7 @@ namespace ipl {
void read_sd_app_location_async(ESTitleId32* titleIds);
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
void list_nand_apps_usage_async(void* ptrA, void* ptr);
@@ -514,7 +514,7 @@ namespace ipl {
void do_check_for_sd_app_to_nand();
void check_backup_fits();
void do_list_nand_apps_usage();
void do_check_sd_app_titles();
void do_unk_8134C838();
void do_move_nand_app_to_sd();
void do_move_sd_app_to_nand();

View File

@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
char scCntCacheStrs[0xd0] = {
char lbl_81693350[0xd0] = {
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
@@ -22,12 +22,12 @@ char scCntCacheStrs[0xd0] = {
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
};
char scCntCacheTitleDataFmt[0x16] = {
char lbl_81693420[0x16] = {
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
};
const char* __CNTCACHEVersion = scCntCacheStrs;
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
const char* __CNTCACHEVersion = lbl_81693350;
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
extern void _savegpr_23();
extern void _restgpr_23();
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
mr r11, r12
stw r0, 4(r12)
bl _savegpr_23
lis r30, scCntCacheStrs@ha
lis r30, lbl_81693350@ha
lis r3, _CNTCACHEMutex@ha
addi r30, r30, scCntCacheStrs@l
addi r30, r30, lbl_81693350@l
li r29, 0
addi r3, r3, _CNTCACHEMutex@l
bl OSLockMutex
@@ -146,7 +146,7 @@ L_184:
stb r31, 0(r4)
subf r23, r24, r4
mr r3, r24
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
cmpwi r3, 0
mr r29, r3
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
stwu r1, -0x20(r1)
mflr r0
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
@@ -284,7 +284,7 @@ L_350:
bl ES_DeleteTitleContent
L_364:
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
L_370:
cmpwi r3, 0
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
lis r5, scCntCacheTitleDataFmt@ha
lis r5, lbl_81693420@ha
stw r0, 4(r12)
li r0, 1
addi r5, r5, scCntCacheTitleDataFmt@l
addi r5, r5, lbl_81693420@l
stw r31, -4(r12)
stw r30, -8(r12)
mr r30, r3
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
stw r0, 4(r12)
bl _savegpr_26
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
li r31, 0
li r4, 0
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
rlwinm. r0, r3, 0, 0x1b, 0x1b
beq L_6f0
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
li r26, 1
lis r27, scCntCacheTitleDataFmt@ha
lis r27, lbl_81693420@ha
b L_6e8
L_5b0:
stw r31, errno(r0)
@@ -488,7 +488,7 @@ L_5e8:
li r0, -1
stw r26, 0x20(r1)
addi r3, r1, 0x40
addi r5, r27, scCntCacheTitleDataFmt@l
addi r5, r27, lbl_81693420@l
stw r26, 0x24(r1)
and r6, r30, r0
and r7, r29, r0
@@ -529,7 +529,7 @@ L_6d4:
bdnz L_5e8
L_6dc:
li r3, 0
la r4, scCntCacheSpaceNl
la r4, lbl_816985DC
bl strtok
L_6e8:
cmpwi r3, 0

View File

@@ -1,6 +1,6 @@
#include <private/nhttp.h>
const char NHTTPi_strMultipartBound[] = STR_POSTBOUND;
const char NHTTPi_strMultipartBound[24] = STR_POSTBOUND;
void* NHTTPi_alloc(u32 size, int align);
void NHTTPi_free(void* ptr);

View File

@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
&& response->httpStatus == 200) accepted = TRUE;
ended = FALSE;
cursor = header;
index = 0;
ended = FALSE;
while (index < used)
{
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;

View File

@@ -215,19 +215,19 @@ namespace ipl {
MESG_CALENDAR_DEC,
};
static const char* scPaneName_T_CalMonth[] = {
static const char* lbl_8164C458[] = {
"T_CalMonth_a",
"T_CalMonth_b",
"T_CalMonth_c",
};
static const char* scPaneName_N_Cal[] = {
static const char* lbl_8164C480[] = {
"N_Cal_a1",
"N_Cal_b1",
"N_Cal_c1",
};
static const char* scPaneName_N_CalPos[] = {
static const char* lbl_8164C4B0[] = {
"N_CalPos_a",
"N_CalPos_b",
"N_CalPos_c",
@@ -661,9 +661,9 @@ namespace ipl {
utility::Calendar::getLastMonth(*mpBoardDate, &last);
utility::Calendar::getNextMonth(*mpBoardDate, &next);
set_textbox_month(scPaneName_T_CalMonth[0], last);
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
set_textbox_month(scPaneName_T_CalMonth[2], next);
set_textbox_month(lbl_8164C458[0], last);
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
set_textbox_month(lbl_8164C458[2], next);
}
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
@@ -714,31 +714,31 @@ namespace ipl {
OSCalendarTime curTime = System::getCurrentTime();
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date lastMonth;
utility::Date nextMonth;
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date local_70;
utility::Date local_7c;
utility::Calendar::getLastMonth(date, &lastMonth);
utility::Calendar::getNextMonth(date, &nextMonth);
utility::Calendar::getLastMonth(date, &local_70);
utility::Calendar::getNextMonth(date, &local_7c);
int dateIndex;
int weekOffset;
int iVar10;
if (mbAsian || mbUSA) {
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
} else {
week--;
if (week < 0) {
week = 6;
}
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (weekOffset >= 7) {
weekOffset = 0;
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (iVar10 >= 7) {
iVar10 = 0;
}
}
dateIndex = unk == 1 ? 0 : DATE_COUNT;
utility::Date cellDate;
utility::Date local_88;
u32 attr;
int val2;
@@ -750,25 +750,25 @@ namespace ipl {
val = (maxDays + week);
attr = 0;
val2 = (weekOffset + val);
val2 = (iVar10 + val);
if ((week - i) > 0) {
cellDate.year = lastMonth.year;
cellDate.month = lastMonth.month;
cellDate.day = i + (lastMonth.day - week) + 1;
local_88.year = local_70.year;
local_88.month = local_70.month;
local_88.day = i + (local_70.day - week) + 1;
goto out;
}
if ((val - i) > 0) {
cellDate.year = date.year;
cellDate.month = date.month;
cellDate.day = (i - week) + 1;
local_88.year = date.year;
local_88.month = date.month;
local_88.day = (i - week) + 1;
attr |= 2;
if (cellDate == todayDate) {
if (local_88 == local_64) {
attr |= 1;
}
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
case 6: {
attr |= 8;
break;
@@ -782,9 +782,9 @@ namespace ipl {
}
if ((val2 - i) > 0) {
cellDate.year = nextMonth.year;
cellDate.month = nextMonth.month;
cellDate.day = ((i - maxDays) - week) + 1;
local_88.year = local_7c.year;
local_88.month = local_7c.month;
local_88.day = ((i - maxDays) - week) + 1;
goto out;
} else {
dateScn->setVisible(false);
@@ -792,14 +792,14 @@ namespace ipl {
}
out:
dateScn->setDate(cellDate);
dateScn->setDate(local_88);
dateScn->setAttribute(attr);
}
}
void Calendar::set_date_pos(int unk) {
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
@@ -807,14 +807,14 @@ namespace ipl {
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
dateIndex++;
nw4r::math::VEC3 cellPos;
cellPos.x = ((u16)i % 7) * 0x46;
cellPos.y = ((u16)i / 7) * -0x30;
cellPos.z = 0.0f;
nw4r::math::VEC3 local_68;
local_68.x = ((u16)i % 7) * 0x46;
local_68.y = ((u16)i / 7) * -0x30;
local_68.z = 0.0f;
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
dateScn->setTranslate(cellPos);
dateScn->setTranslate(local_68);
dateScn->setRotate(pane1->GetRotate());
}
}

View File

@@ -389,7 +389,7 @@ namespace ipl {
send_work(MESSAGE_CHECK_BACKUP_FITS);
}
void NandSDWorker::check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC) {
void NandSDWorker::iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC) {
myWork->paramA = ptrA;
myWork->paramB = ptrB;
myWork->paramC = ptrC;
@@ -797,7 +797,7 @@ namespace ipl {
break;
}
case MESSAGE_UNK_49: {
do_check_sd_app_titles();
do_unk_8134C838();
break;
}
case MESSAGE_GET_NAND_SAVE_SIZE: {
@@ -2179,7 +2179,7 @@ namespace ipl {
MEMFreeToExpHeap(myWork->mainHeap, titleIds);
}
void NandSDWorker::do_check_sd_app_titles() {
void NandSDWorker::do_unk_8134C838() {
SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner));
/* i guess */