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
+2
View File
@@ -12,6 +12,8 @@ deplibs_iidxhook8 := \
avs \
libs_iidxhook8 := \
avs-util \
core \
iidxhook-d3d9 \
iidxhook-util \
acioemu \
+2 -2
View File
@@ -1,8 +1,8 @@
#include "cconfig/cconfig-util.h"
#include "iidxhook8/config-io.h"
#include "core/log.h"
#include "util/log.h"
#include "iidxhook8/config-io.h"
#define IIDXHOOK8_CONFIG_IO_DISABLE_CARD_READER_EMU_KEY \
"io.disable_card_reader_emu"
+16 -10
View File
@@ -5,11 +5,16 @@
#include <stdio.h>
#include <stdlib.h>
#include "avs-util/core-interop.h"
#include "bemanitools/eamio.h"
#include "bemanitools/iidxio.h"
#include "cconfig/cconfig-hook.h"
#include "core/log.h"
#include "core/thread.h"
#include "hook/d3d9.h"
#include "hooklib/acp.h"
@@ -34,9 +39,7 @@
#include "imports/avs.h"
#include "util/log.h"
#include "util/str.h"
#include "util/thread.h"
#define IIDXHOOK8_INFO_HEADER \
"iidxhook for Cannon Ballers/Rootage" \
@@ -131,11 +134,12 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
/* Start up IIDXIO.DLL */
if (!iidxhook8_config_io.disable_bio2_emu) {
log_info("Starting IIDX IO backend");
iidx_io_set_loggers(
log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
core_log_impl_assign(iidx_io_set_loggers);
if (!iidx_io_init(
avs_thread_create, avs_thread_join, avs_thread_destroy)) {
core_thread_create_impl_get(),
core_thread_join_impl_get(),
core_thread_destroy_impl_get())) {
log_fatal("Initializing IIDX IO backend failed");
}
}
@@ -143,11 +147,12 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
/* Start up EAMIO.DLL */
if (!iidxhook8_config_io.disable_card_reader_emu) {
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(
avs_thread_create, avs_thread_join, avs_thread_destroy)) {
core_thread_create_impl_get(),
core_thread_join_impl_get(),
core_thread_destroy_impl_get())) {
log_fatal("Initializing card reader backend failed");
}
}
@@ -217,8 +222,9 @@ BOOL WINAPI DllMain(HMODULE mod, DWORD reason, void *ctx)
goto end;
}
log_to_external(
log_body_misc, log_body_info, log_body_warning, log_body_fatal);
// Use AVS APIs
avs_util_core_interop_thread_avs_impl_set();
avs_util_core_interop_log_avs_impl_set();
app_hook_init(my_dll_entry_init, my_dll_entry_main);