Fixes based on PR feedback

src/main/ddrhook2/Module.mk

@@ -0,0 +1,20 @@
+avsdlls			+= ddrhook2
+
+deplibs_ddrhook2	:= \
+	avs \
+
+libs_ddrhook2		:= \
+	acioemu \
+	ddrhook-util \
+	p3ioemu \
+	p3io \
+	hook \
+	hooklib \
+	util \
+	eamio \
+	ddrio \
+
+src_ddrhook2		:= \
+	dllmain.c \
+	master.c \
+

src/main/ddrhook2/ddrhook2.def

@@ -0,0 +1,4 @@
+LIBRARY ddrhook2
+
+EXPORTS
+    DllMain@12 @1 NONAME

src/main/ddrhook2/dllmain.c

@@ -0,0 +1,168 @@
+#include <windows.h>
+
+#include <stdbool.h>
+
+#include "bemanitools/ddrio.h"
+#include "bemanitools/eamio.h"
+
+#include "ddrhook-util/_com4.h"
+#include "ddrhook-util/extio.h"
+#include "ddrhook-util/gfx.h"
+#include "ddrhook-util/p3io.h"
+#include "ddrhook-util/spike.h"
+#include "ddrhook-util/usbmem.h"
+
+#include "ddrhook2/master.h"
+
+#include "hook/iohook.h"
+
+#include "hooklib/app.h"
+#include "hooklib/rs232.h"
+
+#include "imports/avs.h"
+
+#include "p3ioemu/emu.h"
+
+#include "util/cmdline.h"
+#include "util/defs.h"
+#include "util/log.h"
+
+static bool my_dll_entry_init(char *sidcode, struct property_node *param);
+static bool my_dll_entry_main(void);
+
+bool standard_def;
+bool _15khz;
+
+static bool my_dll_entry_init(char *sidcode, struct property_node *param)
+{
+    int argc;
+    char **argv;
+    bool com4;
+    bool ok;
+    int i;
+    char usbmem_data_path[MAX_PATH] = "usbmem";
+
+    log_info("--- Begin ddrhook dll_entry_init ---");
+
+    com4 = true;
+    args_recover(&argc, &argv);
+
+    for (i = 1; i < argc; i++) {
+        if (argv[i][0] != '-') {
+            continue;
+        }
+
+        switch (argv[i][1]) {
+            case 'o':
+                standard_def = true;
+
+                break;
+
+            case 'w':
+                gfx_set_windowed();
+
+                break;
+
+            case 'u':
+                /* Don't emulate P3IO COM4 and its downstream devices, use the
+                   Windows COM4 port instead. */
+                com4 = false;
+
+                break;
+
+            case 'm':
+                /* Specify a USB memory path */
+                if (i + 1 < argc) {
+                    strcpy(usbmem_data_path, argv[i+1]);
+                    i++; // Move forward one to skip the path parameter
+                }
+
+                break;
+        }
+    }
+
+    args_free(argc, argv);
+
+    iohook_push_handler(p3io_emu_dispatch_irp);
+    iohook_push_handler(extio_dispatch_irp);
+    iohook_push_handler(spike_dispatch_irp);
+    iohook_push_handler(usbmem_dispatch_irp);
+
+    if (com4) {
+        /* See ddrhook2/p3io.c for details. */
+        iohook_push_handler(com4_dispatch_irp);
+    }
+
+    rs232_hook_init();
+
+    ddrhook2_master_insert_hooks(NULL);
+    p3io_ddr_init();
+    extio_init();
+    usbmem_init(usbmem_data_path);
+    spike_init();
+    com4_init();
+
+    log_info("Initializing DDR IO backend");
+
+    ddr_io_set_loggers(
+        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
+
+    ok = ddr_io_init(avs_thread_create, avs_thread_join, avs_thread_destroy);
+
+    if (!ok) {
+        return false;
+    }
+
+    if (com4) {
+        log_info("Initializing card reader backend");
+
+        eam_io_set_loggers(
+            log_body_misc, log_body_info, log_body_warning, log_body_fatal);
+
+        ok = eam_io_init(avs_thread_create, avs_thread_join, avs_thread_destroy);
+
+        if (!ok) {
+            return false;
+        }
+    }
+
+    log_info("--- End ddrhook dll_entry_init ---");
+
+    return app_hook_invoke_init(sidcode, param);
+}
+
+static bool my_dll_entry_main(void)
+{
+    bool result;
+
+    result = app_hook_invoke_main();
+
+    log_misc("Shutting down card reader backend");
+    eam_io_fini();
+
+    log_misc("Shutting down DDR IO backend");
+    ddr_io_fini();
+
+    com4_fini();
+    spike_fini();
+    usbmem_fini();
+    extio_fini();
+    p3io_emu_fini();
+
+    return result;
+}
+
+BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *ctx)
+{
+    if (reason != DLL_PROCESS_ATTACH) {
+        goto end;
+    }
+
+    log_to_external(
+        log_body_misc, log_body_info, log_body_warning, log_body_fatal);
+
+    app_hook_init(my_dll_entry_init, my_dll_entry_main);
+
+end:
+    return TRUE;
+}

src/main/ddrhook2/master.c

@@ -0,0 +1,70 @@
+#include "ddrhook2/master.h"
+
+#include "ddrhook-util/dinput.h"
+#include "ddrhook-util/gfx.h"
+#include "ddrhook-util/misc.h"
+#include "ddrhook-util/monitor.h"
+
+#include "hook/table.h"
+
+#include "p3ioemu/devmgr.h"
+
+#include "util/defs.h"
+#include "util/log.h"
+
+static HMODULE(STDCALL *real_LoadLibraryA)(const char *name);
+
+static HMODULE STDCALL my_LoadLibraryA(const char *name);
+
+static const struct hook_symbol master_kernel32_syms[] = {
+    {
+        .name = "LoadLibraryA",
+        .patch = my_LoadLibraryA,
+        .link = (void **) &real_LoadLibraryA,
+    },
+};
+
+static HMODULE STDCALL my_LoadLibraryA(const char *name)
+{
+    HMODULE result;
+
+    result = GetModuleHandleA(name);
+
+    if (result != NULL) {
+        log_misc("LoadLibraryA(%s) -> %p [already loaded]", name, result);
+
+        return result;
+    }
+
+    result = real_LoadLibraryA(name);
+    log_misc("LoadLibraryA(%s) -> %p [newly loaded]", name, result);
+
+    if (result == NULL) {
+        return result;
+    }
+
+    ddrhook2_master_insert_hooks(result);
+
+    return result;
+}
+
+void ddrhook2_master_insert_hooks(HMODULE target)
+{
+    /* Insert all other hooks here */
+
+    p3io_setupapi_insert_hooks(target);
+    monitor_setupapi_insert_hooks(target);
+    misc_insert_hooks(target);
+    dinput_init(target);
+    gfx_insert_hooks(target);
+
+    /* Insert dynamic loader hooks so that we can hook late-loaded modules */
+
+    hook_table_apply(
+        target,
+        "kernel32.dll",
+        master_kernel32_syms,
+        lengthof(master_kernel32_syms));
+
+    log_info("Inserted dynamic loader hooks into %p", target);
+}

src/main/ddrhook2/master.h

@@ -0,0 +1,8 @@
+#ifndef DDRHOOK2_MASTER_H
+#define DDRHOOK2_MASTER_H
+
+#include <windows.h>
+
+void ddrhook2_master_insert_hooks(HMODULE target);
+
+#endif