Compare commits

..

5 Commits

Author SHA1 Message Date
coah
eb7fe46fec match(CDBDatabase): convert CreateRecordImAtOnce_ to C
Exact match (84/84, diffs 0). Closed/readonly checks via instance flags,
OSTime to CDBDate via OS_BUS_CLOCK/4, then CDBRecordCreateAtOnce.
2026-10-01 17:27:43 -05:00
coah
2aab31c1f9 match(NHTTP_thread): NHTTPi_RecvProxyConnectHeader init order (#513)
Set cursor/index before ended so MWCC emits li r4 then li r5.
2026-10-01 17:18:22 -05:00
coah
24c84f5bfc cleanup: rename NandSDWorker SD app title check helpers (#496)
Rename iplNandSD_81348EA8/do_unk_8134C838 to
check_sd_app_titles_async/do_check_sd_app_titles. DOL sha1 unchanged.
2026-10-01 17:17:04 -05:00
coah
73de5786da cleanup(www_surface): rename CreateManager params to match cpp (#512)
param_10 → arcPath; rectW0/H0/W1/H1 → surfaceW/H, browserW/H.
Header-only rename aligned with www_surface.cpp.
2026-10-01 17:16:25 -05:00
coah
3abcd34252 cleanup(iplCalendar): name month/pos pane arrays and day-grid locals (#517)
Replace Matching-only lbl_* pane name tables and Ghidra locals in
the day layout path; update symbols.txt for the arrays.
2026-10-01 17:16:04 -05:00
8 changed files with 78 additions and 149 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
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
check_sd_app_titles_async__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_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
do_check_sd_app_titles__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
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
scPaneName_T_CalMonth = .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
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
scPaneName_N_Cal = .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
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
scPaneName_N_CalPos = .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

View File

@@ -35,8 +35,8 @@ namespace ext_ead {
class SurfaceManager {
public:
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 CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* arcPath);
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 iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
void check_sd_app_titles_async(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_unk_8134C838();
void do_check_sd_app_titles();
void do_move_nand_app_to_sd();
void do_move_sd_app_to_nand();

View File

@@ -9,7 +9,7 @@ extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
@@ -95,7 +95,7 @@ extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseFindByKey();
typedef struct {
CDBDate beginDate;
@@ -396,101 +396,30 @@ asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
#endif
}
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_24
lwz r11, 0x8(r3)
mr r24, r3
lwz r30, 0x48(r1)
mr r25, r4
cmpwi r11, 0x0
lwz r31, 0x4c(r1)
mr r26, r5
mr r27, r6
mr r28, r9
mr r29, r10
bne L_81487974
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148796C
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_8148796C:
li r3, 0x1b
b L_81487A3C
L_81487974:
addis r3, r11, 0x1
lwz r3, -0x3ff0(r3)
rlwinm. r0, r3, 0, 30, 30
bne L_814879EC
cmpwi r3, 0x0
bne L_814879BC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879B4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_814879B4:
li r3, 0x1b
b L_81487A3C
L_814879BC:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879E4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B57C@ha
addi r3, r3, lbl_8166B57C@l
crclr 4*cr1+eq
bl OSReport
L_814879E4:
li r3, 0x1a
b L_81487A3C
L_814879EC:
lis r4, 0x8000
mr r3, r7
lwz r0, 0xf8(r4)
mr r4, r8
li r5, 0x0
srwi r6, r0, 2
bl __div2i
stw r4, 0x10(r1)
addi r3, r1, 0x10
bl CDBClampCDBDate
stw r31, 0x8(r1)
mr r3, r25
mr r4, r24
mr r5, r26
lwz r7, 0x10(r1)
mr r6, r27
mr r8, r28
mr r9, r29
mr r10, r30
bl CDBRecordCreateAtOnce
L_81487A3C:
addi r11, r1, 0x40
bl _restgpr_24
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
CDBDatabaseState* instance;
int flags;
CDBDate date;
instance = database->instance;
if (instance == NULL) {
CDBReportError(lbl_8166B550);
return CDB_ERROR_27;
}
flags = instance->flags;
if ((flags & 2) == 0) {
if (flags == 0) {
CDBReportError(lbl_8166B550);
return CDB_ERROR_27;
}
CDBReportError(lbl_8166B57C);
return CDB_ERROR_26;
}
date = time / (OS_BUS_CLOCK / 4);
CDBClampCDBDate(&date);
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
}
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {

View File

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

View File

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