Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow load sceLibFont module #19115

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+11 −9
Open

Allow load sceLibFont module #19115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca9c17e
Allow load fontfuck module
sum2012 May 7, 2024
6d4e2b2
Remove zh_gb.pgf hack
sum2012 May 7, 2024
18d65e0
Should be sceLibfont
sum2012 May 7, 2024
90f9fc9
Forget make change in Unexport
sum2012 May 7, 2024
0558f4e
oop
sum2012 May 7, 2024
52ecf9d
Fix logic
sum2012 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Core/HLE/sceFont.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ struct FontRegistryEntry {
};

static const FontRegistryEntry fontRegistry[] = {
// This was added for Chinese translations and is not normally loaded on a PSP.
{ 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_DB, 0, FONT_LANGUAGE_CHINESE, 0, 1, "zh_gb.pgf", "FTT-NewRodin Pro DB", 0, 0, 1581700, 145844, true },
{ 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_DB, 0, FONT_LANGUAGE_JAPANESE, 0, 1, "jpn0.pgf", "FTT-NewRodin Pro DB", 0, 0, 1581700, 145844 },
{ 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SANS_SERIF, FONT_STYLE_REGULAR, 0, FONT_LANGUAGE_LATIN, 0, 1, "ltn0.pgf", "FTT-NewRodin Pro Latin", 0, 0, 69108, 16680 },
{ 0x288, 0x288, 0x2000, 0x2000, 0, 0, FONT_FAMILY_SERIF, FONT_STYLE_REGULAR, 0, FONT_LANGUAGE_LATIN, 0, 1, "ltn1.pgf", "FTT-Matisse Pro Latin", 0, 0, 65124, 16920 },
Expand Down
18 changes: 11 additions & 7 deletions Core/HLE/sceKernelModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,10 +810,12 @@ void ImportFuncSymbol(const FuncSymbolImport &func, bool reimporting, const char
}

void ExportFuncSymbol(const FuncSymbolExport &func) {
if (FuncImportIsSyscall(func.moduleName, func.nid)) {
// HLE covers this already - let's ignore the function.
WARN_LOG(LOADER, "Ignoring func export %s/%08x, already implemented in HLE.", func.moduleName, func.nid);
return;
if (strcmp(func.moduleName, "sceLibFont") != 0) {
if (FuncImportIsSyscall(func.moduleName, func.nid)) {
// HLE covers this already - let's ignore the function.
WARN_LOG(LOADER, "Ignoring func export %s/%08x, already implemented in HLE.", func.moduleName, func.nid);
return;
}
}

u32 error;
Expand All @@ -836,9 +838,11 @@ void ExportFuncSymbol(const FuncSymbolExport &func) {
}

void UnexportFuncSymbol(const FuncSymbolExport &func) {
if (FuncImportIsSyscall(func.moduleName, func.nid)) {
// Oops, HLE covers this.
return;
if (strcmp(func.moduleName, "sceLibFont") != 0) {
if (FuncImportIsSyscall(func.moduleName, func.nid)) {
// Oops, HLE covers this.
return;
}
}

u32 error;
Expand Down
Loading