From 926e976c36d10fcf9eb335f26e931a8d9618afb0 Mon Sep 17 00:00:00 2001 From: 2d9f8a0741a7573b189035dcb819847ecb5d981d <2d9f8a0741a7573b189035dcb819847ecb5d981d@redacted> Date: Wed, 15 Jun 2022 21:29:15 +0000 Subject: [PATCH] iidxhook5-cn: Fix log messages, Delete unnecessary code The game doesn't have network nor uses card readers --- Module.mk | 1 - src/main/iidxhook5-cn/Module.mk | 2 -- src/main/iidxhook5-cn/dllmain.c | 21 ++------------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Module.mk b/Module.mk index 6220365..d602984 100644 --- a/Module.mk +++ b/Module.mk @@ -347,7 +347,6 @@ $(zipdir)/iidx-20.zip: \ $(zipdir)/iidx-20-cn.zip: \ build/bin/avs2_1304-32/iidxhook5-cn.dll \ build/bin/indep-32/config.exe \ - build/bin/indep-32/eamio.dll \ build/bin/indep-32/geninput.dll \ build/bin/indep-32/iidxio.dll \ build/bin/indep-32/vefxio.dll \ diff --git a/src/main/iidxhook5-cn/Module.mk b/src/main/iidxhook5-cn/Module.mk index 9d09b7f..c04087a 100644 --- a/src/main/iidxhook5-cn/Module.mk +++ b/src/main/iidxhook5-cn/Module.mk @@ -13,8 +13,6 @@ libs_iidxhook5-cn := \ ezusb2-iidx-emu \ ezusb-iidx-emu \ security \ - eamio \ - acioemu \ hook \ hooklib \ iidxio \ diff --git a/src/main/iidxhook5-cn/dllmain.c b/src/main/iidxhook5-cn/dllmain.c index fb0599f..e9dbd5a 100644 --- a/src/main/iidxhook5-cn/dllmain.c +++ b/src/main/iidxhook5-cn/dllmain.c @@ -5,7 +5,6 @@ #include #include -#include "bemanitools/eamio.h" #include "bemanitools/iidxio.h" #include "cconfig/cconfig-hook.h" @@ -26,7 +25,6 @@ #include "iidxhook5-cn/avs-boot.h" #include "iidxhook5-cn/path.h" -#include "iidxhook-util/acio.h" #include "iidxhook-util/config-eamuse.h" #include "iidxhook-util/config-gfx.h" #include "iidxhook-util/config-io.h" @@ -106,7 +104,7 @@ static ATOM WINAPI my_RegisterClassA(const WNDCLASSA *lpWndClass) iidxhook_init_check = true; log_info("-------------------------------------------------------------"); - log_info("--------------- Begin iidxhook RegisterClassA ---------------"); + log_info("------------- Begin iidxhook my_RegisterClassA --------------"); log_info("-------------------------------------------------------------"); config = cconfig_init(); @@ -164,24 +162,9 @@ static ATOM WINAPI my_RegisterClassA(const WNDCLASSA *lpWndClass) log_info("IIDX IO emulation backend disabled"); } - if (!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); - - if (!eam_io_init( - avs_thread_create, avs_thread_join, avs_thread_destroy)) { - log_fatal("Initializing card reader backend failed"); - } - } else { - log_info("Card reader emulation backend disabled"); - } - /* Set up IO emulation hooks _after_ IO API setup to allow API implementations with real IO devices */ iohook_push_handler(ezusb2_emu_device_dispatch_irp); - iohook_push_handler(iidxhook_util_acio_dispatch_irp); iohook_push_handler(settings_hook_dispatch_irp); if (!config_io.disable_io_emu) { @@ -190,7 +173,7 @@ static ATOM WINAPI my_RegisterClassA(const WNDCLASSA *lpWndClass) } log_info("-------------------------------------------------------------"); - log_info("---------------- End iidxhook RegisterClassA ----------------"); + log_info("-------------- End iidxhook my_RegisterClassA ---------------"); log_info("-------------------------------------------------------------"); return real_RegisterClassA(lpWndClass);