C2D_FontLoadSystem: use libctru romfs API instead of winging it

Author: fincs

source/font.c

@@ -104,101 +104,94 @@ C2D_Font C2D_FontLoadFromHandle(FILE* handle)
 	return font;
 }
 
-static C2D_Font C2Di_FontLoadFromArchive(u64 binary_lowpath)
+static C2D_Font C2Di_FontLoadFromArchive(u64 tid, const char* path)
 {
-	C2D_Font font = C2Di_FontAlloc();
-	if (font)
+	void* fontLzData = NULL;
+	u32 fontLzSize = 0;
+
+	Result rc = romfsMountFromTitle(tid, MEDIATYPE_NAND, "font");
+	if (R_FAILED(rc))
+		return NULL;
+
+	FILE* f = fopen(path, "rb");
+	if (f)
 	{
-		int fontNum = (binary_lowpath & 0x300) >> 8;
-		const u8 sizeMod = fontNum == 0 ? 0xA0 : 0xB0;
-		u64 lowPath[] = { binary_lowpath, 0x00000001FFFFFE00 };
-		Handle romfs_handle;
-		u64	romfs_size = 0;
-		u32	romfs_bytes_read = 0;
-
-		FS_Path	savedatacheck_path = { PATH_BINARY, 16, (u8*)lowPath };
-		u8 file_binary_lowpath[20] = {};
-		FS_Path	romfs_path = { PATH_BINARY, 20, file_binary_lowpath };
-
-		if (R_FAILED(FSUSER_OpenFileDirectly(&romfs_handle, (FS_ArchiveID)0x2345678a, savedatacheck_path, romfs_path, FS_OPEN_READ, 0)))
-		{
-			free(font);
-			return NULL;
-		}
-		if (R_FAILED(FSFILE_GetSize(romfs_handle, &romfs_size)))
-		{
-			free(font);
-			FSFILE_Close(romfs_handle);
-			return NULL;
-		}
+		fseek(f, 0, SEEK_END);
+		fontLzSize = ftell(f);
+		rewind(f);
 
-		u8* romfs_data_buffer = malloc(romfs_size);
-		if (!romfs_data_buffer)
-		{
-			free(font);
-			FSFILE_Close(romfs_handle);
-			return NULL;
-		}
-		if (R_FAILED(FSFILE_Read(romfs_handle, &romfs_bytes_read, 0, romfs_data_buffer, romfs_size)))
-		{
-			free(romfs_data_buffer);
-			free(font);
-			FSFILE_Close(romfs_handle);
-			return NULL;
-		}
-		FSFILE_Close(romfs_handle);
+		fontLzData = malloc(fontLzSize);
+		if (fontLzData)
+			fread(fontLzData, 1, fontLzSize, f);
 
-		u8* compFontData = romfs_data_buffer + sizeMod;
+		fclose(f);
+	}
 
-		u32 fontSize = *(u32*)(compFontData) >> 8;
-		font->cfnt = linearAlloc(fontSize);
-		if (font->cfnt)
-		{
-			if (!decompress_LZ11(font->cfnt, fontSize, NULL, compFontData + 4, romfs_size - sizeMod - 4))
-			{
-				C2D_FontFree(font);
-				return NULL;
-			}
-		}
+	romfsUnmount("font");
 
-		free(romfs_data_buffer);
+	if (!fontLzData)
+		return NULL;
 
-		font = C2Di_PostLoadFont(font);
+	C2D_Font font = C2Di_FontAlloc();
+	if (!font)
+	{
+		free(fontLzData);
+		return NULL;
 	}
 
-	return font;
+	u32 fontSize = *(u32*)fontLzData >> 8;
+	font->cfnt = linearAlloc(fontSize);
+	if (font->cfnt && !decompress_LZ11(font->cfnt, fontSize, NULL, (u8*)fontLzData + 4, fontLzSize - 4))
+	{
+		linearFree(font->cfnt);
+		font->cfnt = NULL;
+	}
+	free(fontLzData);
+
+	return C2Di_PostLoadFont(font);
 }
 
+static unsigned C2Di_RegionToFontIndex(CFG_Region region)
+{
+	switch (region)
+	{
+		default:
+		case CFG_REGION_JPN:
+		case CFG_REGION_USA:
+		case CFG_REGION_EUR:
+		case CFG_REGION_AUS:
+			return 0;
+		case CFG_REGION_CHN:
+			return 1;
+		case CFG_REGION_KOR:
+			return 2;
+		case CFG_REGION_TWN:
+			return 3;
+	}
+}
+
+static const char* const C2Di_FontPaths[] =
+{
+	"font:/cbf_std.bcfnt.lz",
+	"font:/cbf_zh-Hans-CN.bcfnt.lz",
+	"font:/cbf_ko-Hang-KR.bcfnt.lz",
+	"font:/cbf_zh-Hant-TW.bcfnt.lz",
+};
+
 C2D_Font C2D_FontLoadSystem(CFG_Region region)
 {
-	u8 systemRegion;
-	if (R_FAILED(CFGU_SecureInfoGetRegion(&systemRegion)))
-		return NULL;
+	unsigned fontIdx = C2Di_RegionToFontIndex(region);
 
-	switch (region)
+	u8 systemRegion = 0;
+	Result rc = CFGU_SecureInfoGetRegion(&systemRegion);
+	if (R_FAILED(rc) || fontIdx == C2Di_RegionToFontIndex((CFG_Region)systemRegion))
 	{
-		case 0:
-		case 1:
-		case 2:
-		case 3:
-			if (systemRegion > 3)
-				return C2Di_FontLoadFromArchive(0x0004009b00014002);
-			break;
-		case 4:
-			if (systemRegion == 4)
-				break;
-			return C2Di_FontLoadFromArchive(0x0004009b00014102);
-		case 5:
-			if (systemRegion == 5)
-				break;
-			return C2Di_FontLoadFromArchive(0x0004009b00014202);
-		case 6:
-			if (systemRegion == 6)
-				break;
-			return C2Di_FontLoadFromArchive(0x0004009b00014302);
+		fontEnsureMapped();
+		return NULL;
 	}
-	fontEnsureMapped();
-	return NULL;
+
+	// Load the font
+	return C2Di_FontLoadFromArchive(0x0004009b00014002ULL | (fontIdx<<8), C2Di_FontPaths[fontIdx]);
 }
 
 void C2D_FontFree(C2D_Font font)