From 7213d27ea31c7bd8e535297744457cdd6433e8f4 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sat, 5 Oct 2013 07:37:51 +0800 Subject: [PATCH 1/3] Increase log level in sceUtilityLoadModule Some modules need return error as dissus in https://github.com/hrydgard/ppsspp/issues/860#issuecomment-25675539 --- Core/HLE/sceUtility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index a67d5a81fa..fd823c7297 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -206,7 +206,7 @@ u32 sceUtilityLoadModule(u32 module) } currentlyLoadedModules.insert(module); - DEBUG_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); + INFO_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); // TODO: Each module has its own timing, technically, but this is a low-end. // Note: Some modules have dependencies, but they still resched. if (module == 0x3FF) From 2815cb281a3df8b5e60372a0e2fd0c18a04877b8 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sat, 5 Oct 2013 20:15:44 +0800 Subject: [PATCH 2/3] Fix Kamen Rider Climax Heroes OOO - ULJS00331 loading thanks @unknownbrackets --- Core/HLE/sceUtility.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index fd823c7297..b983b7ec5b 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -35,10 +35,13 @@ #include "../native/file/ini_file.h" +bool Loaded_httpmodule = false; const int SCE_ERROR_MODULE_BAD_ID = 0x80111101; const int SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102; const int SCE_ERROR_MODULE_NOT_LOADED = 0x80111103; const int SCE_ERROR_AV_MODULE_BAD_ID = 0x80110F01; +const int PSP_MODULE_NET_HTTP = 261; +const int PSP_MODULE_NET_HTTPSTORAGE = 264; enum UtilityDialogType { UTILITY_DIALOG_NONE, @@ -207,6 +210,10 @@ u32 sceUtilityLoadModule(u32 module) currentlyLoadedModules.insert(module); INFO_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); + if (module == PSP_MODULE_NET_HTTP) //Fix Kamen Rider Climax Heroes OOO - ULJS00331 + Loaded_httpmodule = true; + if (module == PSP_MODULE_NET_HTTPSTORAGE && !Loaded_httpmodule) + return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND; // TODO: Each module has its own timing, technically, but this is a low-end. // Note: Some modules have dependencies, but they still resched. if (module == 0x3FF) From 1a7da15491d8a8b21ce703044a049341768eb448 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 6 Oct 2013 01:19:52 +0800 Subject: [PATCH 3/3] Use better method to trace PSP_MODULE_NET_HTTP --- Core/HLE/sceUtility.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index b983b7ec5b..54a24f48cc 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -35,7 +35,6 @@ #include "../native/file/ini_file.h" -bool Loaded_httpmodule = false; const int SCE_ERROR_MODULE_BAD_ID = 0x80111101; const int SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102; const int SCE_ERROR_MODULE_NOT_LOADED = 0x80111103; @@ -210,9 +209,7 @@ u32 sceUtilityLoadModule(u32 module) currentlyLoadedModules.insert(module); INFO_LOG(SCEUTILITY, "sceUtilityLoadModule(%i)", module); - if (module == PSP_MODULE_NET_HTTP) //Fix Kamen Rider Climax Heroes OOO - ULJS00331 - Loaded_httpmodule = true; - if (module == PSP_MODULE_NET_HTTPSTORAGE && !Loaded_httpmodule) + if (module == PSP_MODULE_NET_HTTPSTORAGE && !(currentlyLoadedModules.find(PSP_MODULE_NET_HTTP) != currentlyLoadedModules.end())) //Fix Kamen Rider Climax Heroes OOO - ULJS00331 return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND; // TODO: Each module has its own timing, technically, but this is a low-end. // Note: Some modules have dependencies, but they still resched.