Leahnaya/bemanitools
1
0
Fork 0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2026-08-17 05:56:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

jbhook2: Move hooking further back where possible

Browse Source 
This fixes a failure to boot (due to aciomgr hanging)
on jubeat knit append on my cab
This commit is contained in:
Will Toohey
2022-01-03 19:57:28 +10:00
parent 088d4bf338
commit ddfa814387
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/jbhook2/dllmain.c
View File

@@ -64,7 +64,11 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
}
if (!options.disable_p3ioemu) {
iohook_push_handler(p3io_emu_dispatch_irp);
p3io_setupapi_insert_hooks(NULL);
log_assert(sidcode != NULL);
// pcbid and eamid are only used here for sec check, the ones used for
// network access are taken from ea3-config.xml.
// When booting knit append (and on no other version), the code must
@@ -87,6 +91,8 @@ static bool my_dll_entry_init(char *sidcode, struct property_node *param)
}
if (!options.disable_cardemu) {
iohook_push_handler(jbhook_util_ac_io_port_dispatch_irp);
rs232_hook_init();
jbhook_util_ac_io_port_init(L"COM1");
jbhook_util_ac_io_set_iccb();
@@ -199,27 +205,15 @@ BOOL WINAPI DllMain(HMODULE mod, DWORD reason, void *ctx)
options_init_from_cmdline(&options);
hook_table_apply(
NULL, "mwindow.dll", init_hook_syms, lengthof(init_hook_syms));
hook_table_apply(
NULL, "mwindow.dll", init_hook_syms, lengthof(init_hook_syms));
app_hook_init(my_dll_entry_init, my_dll_entry_main);
iohook_push_handler(p3io_emu_dispatch_irp);
iohook_push_handler(jbhook_util_ac_io_port_dispatch_irp);
if (!options.disable_adapteremu) {
adapter_hook_init();
}
if (!options.disable_cardemu) {
rs232_hook_init();
}
if (!options.disable_p3ioemu) {
p3io_setupapi_insert_hooks(NULL);
}
jbhook_util_gfx_hook_init();
jbhook_util_eamuse_hook_init();