Rename module_start to plugin_load

GoldHEN · Jun 24, 2023 · a5b1f1d · a5b1f1d
1 parent 9c71d2b
commit a5b1f1d
Show file tree

Hide file tree

Showing 13 changed files with 197 additions and 53 deletions.
diff --git a/plugin_src/afr/source/main.c b/plugin_src/afr/source/main.c
@@ -102,7 +102,7 @@ s32 sceKernelOpen_hook(const char *path, s32 flags, OrbisKernelMode mode)
  return fd;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args)
+s32 attr_public plugin_load(s32 argc, const char* argv[])
 {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
@@ -118,11 +118,21 @@ s32 attr_module_hidden module_start(s64 argc, const void *args)
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args)
+s32 attr_public plugin_unload(s32 argc, const char* argv[])
 {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceKernelOpen);
  UNHOOK(sceKernelStat);
  UNHOOK(fopen);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/aio_fix_505/source/main.c b/plugin_src/aio_fix_505/source/main.c
@@ -307,7 +307,7 @@ s32 sceKernelAioSubmitWriteCommandsMultiple_hook(SceKernelAioRWRequest req[], s3
  return 0;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void* args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
@@ -353,7 +353,7 @@ s32 attr_module_hidden module_start(s64 argc, const void* args) {
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void* args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceKernelAioInitializeImpl);
  UNHOOK(sceKernelAioDeleteRequest);
@@ -370,3 +370,13 @@ s32 attr_module_hidden module_stop(s64 argc, const void* args) {
  UNHOOK(sceKernelAioSubmitWriteCommandsMultiple);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/button_swap/source/main.c b/plugin_src/button_swap/source/main.c
@@ -23,7 +23,7 @@ s32 sceSystemServiceParamGetInt_hook(s32 paramId, s32 *value) {
  return ret;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
@@ -34,8 +34,18 @@ s32 attr_module_hidden module_start(s64 argc, const void *args) {
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceSystemServiceParamGetInt);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/fliprate_remover/source/main.c b/plugin_src/fliprate_remover/source/main.c
@@ -20,16 +20,26 @@ s32 sceVideoOutSetFlipRate_hook(s32 handle, s32 fliprate){
  return 0;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
  HOOK32(sceVideoOutSetFlipRate);
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceVideoOutSetFlipRate);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/force_1080p_display/source/main.c b/plugin_src/force_1080p_display/source/main.c
@@ -45,16 +45,26 @@ s32 sceVideoOutGetResolutionStatus_hook(int handle, OrbisVideoOutResolutionStatu
  return ret;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
  HOOK32(sceVideoOutGetResolutionStatus);
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceVideoOutGetResolutionStatus);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/force_30_fps/source/main.c b/plugin_src/force_30_fps/source/main.c
@@ -20,7 +20,7 @@ s32 sceVideoOutSetFlipRate_hook(s32 handle, s32 fliprate)
  handle, 1);
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args)
+s32 attr_public plugin_load(s32 argc, const char* argv[])
 {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
@@ -29,9 +29,19 @@ s32 attr_module_hidden module_start(s64 argc, const void *args)
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args)
+s32 attr_public plugin_unload(s32 argc, const char* argv[])
 {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceVideoOutSetFlipRate);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/game_call_example/source/main.c b/plugin_src/game_call_example/source/main.c
@@ -39,7 +39,7 @@ void* my_thread(void* args)
  return NULL;
 }
 
-int32_t attr_module_hidden module_start(size_t argc, const void *args)
+int32_t attr_public plugin_load(int32_t argc, const char* argv[])
 {
  if (sys_sdk_proc_info(&procInfo) == 0)
  {
@@ -58,9 +58,19 @@ int32_t attr_module_hidden module_start(size_t argc, const void *args)
  return 0;
 }
 
-int32_t attr_module_hidden module_stop(size_t argc, const void *args)
+int32_t attr_public plugin_unload(int32_t argc, const char* argv[])
 {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] %s Plugin Ended.\n", g_pluginName);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/game_patch/source/main.cpp b/plugin_src/game_patch/source/main.cpp
@@ -55,7 +55,8 @@ void get_key_init(void)
 
  if (res)
  {
- final_printf("file %s not found\nerror: 0x%08x", input_file, res);
+ final_printf("file %s not found\n", input_file);
+ final_printf("error: 0x%08x\n", res);
  return;
  }
 
@@ -86,7 +87,7 @@ void get_key_init(void)
  debug_printf("AppElf: \"%s\"\n", AppElfData);
 
  u64 hashout = patch_hash_calc(TitleData, NameData, AppVerData, input_file, AppElfData);
- char settings_path[MAX_PATH_];
+ char settings_path[MAX_PATH_] = {0};
  snprintf(settings_path, sizeof(settings_path), BASE_PATH_PATCH_SETTINGS "/0x%016lx.txt", hashout);
  final_printf("Settings path: %s\n", settings_path);
  s32 res = Read_File(settings_path, &buffer2, &size2, 0);
@@ -239,7 +240,7 @@ void make_folders(void)
 }
 
 extern "C" {
-s32 attr_module_hidden module_start(s64 argc, const void *args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
@@ -265,11 +266,19 @@ s32 attr_module_hidden module_start(s64 argc, const void *args) {
  NotifyStatic(TEX_ICON_SYSTEM, "Unable to get process info from sys_sdk_proc_info");
  return -1;
 }
-}
 
-extern "C" {
-s32 attr_module_hidden module_stop(s64 argc, const void *args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
 }
diff --git a/plugin_src/game_patch/source/patch.cpp b/plugin_src/game_patch/source/patch.cpp
@@ -25,7 +25,7 @@ char* unescape(const char *s) {
  break;
  case 'x':
  {
- char hex_string[3];
+ char hex_string[3] = {0};
  u32 val = 0;
  hex_string[0] = s[++i];
  hex_string[1] = s[++i];
@@ -134,7 +134,7 @@ constexpr u64 djb2_hash(const char *str) {
 u64 patch_hash_calc(const char *title, const char *name, const char *app_ver,
  const char *title_id, const char *elf) {
  u64 output_hash = 0;
- char hash_str[256];
+ char hash_str[256] = {0};
  snprintf(hash_str, sizeof(hash_str), "%s%s%s%s%s", title, name, app_ver,
  title_id, elf);
  output_hash = djb2_hash(hash_str);
@@ -273,7 +273,7 @@ void patch_data1(const char* patch_type_str, u64 addr, const char *value, uint32
  sys_proc_rw(addr + i, nop_byte, sizeof(nop_byte));
  }
  u8 jump_32[] = { 0xe9, 0x00, 0x00, 0x00, 0x00 };
- s32 target_jmp = (s32) (jump_target - addr - 5);
+ s32 target_jmp = (s32) (jump_target - addr - sizeof(jump_32));
  s32 target_return = (s32) (addr) - (code_cave_end);
  sys_proc_rw(jump_target, bytearray, bytearray_size);
  sys_proc_rw(addr, jump_32, sizeof(jump_32));

diff --git a/plugin_src/gamepad_helper/source/main.c b/plugin_src/gamepad_helper/source/main.c
@@ -209,7 +209,7 @@ int32_t load_config(ini_table_s* table, const char* section_name) {
  return 0;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void* args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
@@ -333,7 +333,7 @@ s32 attr_module_hidden module_start(s64 argc, const void* args) {
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void* args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(scePadRead);
  UNHOOK(scePadReadState);
@@ -350,3 +350,13 @@ s32 attr_module_hidden module_stop(s64 argc, const void* args) {
 
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}
diff --git a/plugin_src/no_share_watermark/source/main.c b/plugin_src/no_share_watermark/source/main.c
@@ -62,7 +62,7 @@ s32 sceScreenShotDisable_hook(void){
  return 0;
 }
 
-s32 attr_module_hidden module_start(s64 argc, const void *args) {
+s32 attr_public plugin_load(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  final_printf("[GoldHEN] Plugin Author(s): %s\n", g_pluginAuth);
  boot_ver();
@@ -78,7 +78,7 @@ s32 attr_module_hidden module_start(s64 argc, const void *args) {
  return 0;
 }
 
-s32 attr_module_hidden module_stop(s64 argc, const void *args) {
+s32 attr_public plugin_unload(s32 argc, const char* argv[]) {
  final_printf("[GoldHEN] <%s\\Ver.0x%08x> %s\n", g_pluginName, g_pluginVersion, __func__);
  UNHOOK(sceScreenShotSetOverlayImage);
  UNHOOK(sceScreenShotSetOverlayImageWithOrigin);
@@ -88,3 +88,13 @@ s32 attr_module_hidden module_stop(s64 argc, const void *args) {
  UNHOOK(sceRemoteplayProhibitStreaming);
  return 0;
 }
+
+s32 attr_module_hidden module_start(s64 argc, const void *args)
+{
+ return 0;
+}
+
+s32 attr_module_hidden module_stop(s64 argc, const void *args)
+{
+ return 0;
+}