refactor: Entire code base, thread and log usage

Boils down to:
- Include headers
- Reduce boiler plate with helpers
- Swap out explicit usages with core API layer
  and ensure the right API is configured beforehand
This commit is contained in:
icex2
2024-02-25 09:30:53 +01:00
parent ea835b32ee
commit e4a221e15b
338 changed files with 1307 additions and 640 deletions
+1
View File
@@ -8,6 +8,7 @@ ldflags_popnhook1 := \
-liphlpapi \
libs_popnhook1 := \
core \
iidxhook-util \
ezusb-emu \
ezusb2-popn-emu \
+2 -2
View File
@@ -5,14 +5,14 @@
#include <stdio.h>
#include <string.h>
#include "core/log.h"
#include "hook/table.h"
#include "imports/avs.h"
#include "popnhook1/avs-boot.h"
#include "util/log.h"
static int (*real_ea3_boot_avs)(struct property_node *config);
static int (*real_ea3_boot)(struct property_node *config);
+2 -2
View File
@@ -2,12 +2,12 @@
#include "cconfig/cconfig-util.h"
#include "core/log.h"
#include "popnhook1/config-eamuse.h"
#include "security/mcode.h"
#include "util/log.h"
#define POPNHOOK1_CONFIG_EAMUSE_SERVER_KEY "eamuse.server"
#define POPNHOOK1_CONFIG_EAMUSE_PCBID_KEY "eamuse.pcbid"
#define POPNHOOK1_CONFIG_EAMUSE_EAMID_KEY "eamuse.eamid"
+2 -2
View File
@@ -2,9 +2,9 @@
#include "cconfig/cconfig-util.h"
#include "popnhook1/config-gfx.h"
#include "core/log.h"
#include "util/log.h"
#include "popnhook1/config-gfx.h"
#define POPNHOOK1_CONFIG_GFX_WINDOWED_KEY "gfx.windowed"
#define POPNHOOK1_CONFIG_GFX_FRAMED_KEY "gfx.framed"
+2 -1
View File
@@ -3,12 +3,13 @@
#include "cconfig/cconfig-util.h"
#include "core/log.h"
#include "popnhook1/config-sec.h"
#include "security/mcode.h"
#include "security/rp.h"
#include "util/log.h"
#include "util/mem.h"
#define POPNHOOK1_CONFIG_SEC_BLACK_PLUG_MCODE_KEY "sec.black_plug_mcode"
+2 -1
View File
@@ -5,6 +5,8 @@
#include <stdbool.h>
#include "core/log.h"
#include "hook/com-proxy.h"
#include "hook/pe.h"
#include "hook/table.h"
@@ -12,7 +14,6 @@
#include "popnhook1/d3d9.h"
#include "util/defs.h"
#include "util/log.h"
#include "hook/d3d9.h"
+29 -9
View File
@@ -10,6 +10,14 @@
#include "cconfig/cconfig-hook.h"
#include "core/log-bt-ext.h"
#include "core/log-bt.h"
#include "core/log-sink-debug.h"
#include "core/log.h"
#include "core/thread-crt-ext.h"
#include "core/thread-crt.h"
#include "core/thread.h"
#include "ezusb-emu/node-security-plug.h"
#include "hook/d3d9.h"
@@ -29,8 +37,6 @@
#include "util/cmdline.h"
#include "util/defs.h"
#include "util/log.h"
#include "util/thread.h"
#include "ezusb2-emu/desc.h"
#include "ezusb2-emu/device.h"
@@ -62,6 +68,14 @@ static const struct hook_symbol init_hook_syms[] = {
},
};
static void _popnhook1_log_init()
{
core_log_bt_ext_impl_set();
core_log_bt_ext_init_with_debug();
// TODO change log level support
core_log_bt_level_set(CORE_LOG_BT_LOG_LEVEL_MISC);
}
static void popnhook_setup_d3d9_hooks(
const struct popnhook1_config_gfx *config_gfx, const bool texture_usage_fix)
{
@@ -145,20 +159,24 @@ static DWORD STDCALL my_GetStartupInfoA(LPSTARTUPINFOA lpStartupInfo)
/* Start up POPNIO.DLL */
log_info("Starting pop'n IO backend");
popn_io_set_loggers(
log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
core_log_impl_assign(popn_io_set_loggers);
if (!popn_io_init(thread_create, thread_join, thread_destroy)) {
if (!popn_io_init(
core_thread_create_impl_get(),
core_thread_join_impl_get(),
core_thread_destroy_impl_get())) {
log_fatal("Initializing pop'n IO backend failed");
}
/* Start up EAMIO.DLL */
log_misc("Initializing card reader backend");
eam_io_set_loggers(
log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
core_log_impl_assign(eam_io_set_loggers);
if (!eam_io_init(thread_create, thread_join, thread_destroy)) {
if (!eam_io_init(
core_thread_create_impl_get(),
core_thread_join_impl_get(),
core_thread_destroy_impl_get())) {
log_fatal("Initializing card reader backend failed");
}
@@ -190,7 +208,9 @@ BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *ctx)
return TRUE;
}
log_to_writer(log_writer_debug, NULL);
core_thread_crt_ext_impl_set();
_popnhook1_log_init();
hook_table_apply(
NULL, "kernel32.dll", init_hook_syms, lengthof(init_hook_syms));
+2 -1
View File
@@ -7,10 +7,11 @@
#include <stdio.h>
#include <string.h>
#include "core/log.h"
#include "hook/table.h"
#include "util/defs.h"
#include "util/log.h"
#include "util/mem.h"
#include "util/str.h"