hooklib: Split out of util

This is distinct from capnhook's hooklib, although the intent is
the same. Hopefully these two libraries sharing a name won't get
too confusing...

amex/ds.c

@@ -13,9 +13,10 @@
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
 
+#include "hooklib/setupapi.h"
+
 #include "util/crc.h"
 #include "util/dprintf.h"
-#include "util/setupapi.h"
 #include "util/str.h"
 
 #pragma pack(push, 1)

amex/eeprom.c

@@ -16,8 +16,9 @@
 
 #include "hook/iohook.h"
 
+#include "hooklib/setupapi.h"
+
 #include "util/dprintf.h"
-#include "util/setupapi.h"
 #include "util/str.h"
 
 static HRESULT eeprom_handle_irp(struct irp *irp);

amex/gpio.c

@@ -8,8 +8,9 @@
 
 #include "hook/iohook.h"
 
+#include "hooklib/setupapi.h"
+
 #include "util/dprintf.h"
-#include "util/setupapi.h"
 #include "util/str.h"
 
 enum {

amex/jvs.c

@@ -13,11 +13,12 @@
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
 
+#include "hooklib/setupapi.h"
+
 #include "jvs/jvs-bus.h"
 
 #include "util/dprintf.h"
 #include "util/dump.h"
-#include "util/setupapi.h"
 #include "util/str.h"
 
 enum {

amex/sram.c

@@ -15,8 +15,9 @@
 
 #include "hook/iohook.h"
 
+#include "hooklib/setupapi.h"
+
 #include "util/dprintf.h"
-#include "util/setupapi.h"
 #include "util/str.h"
 
 static HRESULT sram_handle_irp(struct irp *irp);

cardhook/dllmain.c

@@ -5,9 +5,9 @@
 #include "hook/process.h"
 
 #include "hooklib/serial.h"
+#include "hooklib/spike.h"
 
 #include "util/dprintf.h"
-#include "util/spike.h"
 
 static process_entry_t app_startup;
 

cardhook/meson.build

@@ -11,6 +11,7 @@ shared_library(
     link_with : [
         aimeio_dll,
         board_lib,
+        hooklib_lib,
         util_lib,
     ],
     sources : [

chunihook/dllmain.c

@@ -13,15 +13,15 @@
 
 #include "hook/process.h"
 
+#include "hooklib/clock.h"
+#include "hooklib/gfx.h"
 #include "hooklib/serial.h"
+#include "hooklib/spike.h"
 
 #include "platform/hwmon.h"
 #include "platform/nusec.h"
 
-#include "util/clock.h"
 #include "util/dprintf.h"
-#include "util/gfx.h"
-#include "util/spike.h"
 
 static process_entry_t chuni_startup;
 

chunihook/meson.build

@@ -12,6 +12,7 @@ shared_library(
         amex_lib,
         board_lib,
         chuniio_dll,
+        hooklib_lib,
         jvs_lib,
         platform_lib,
         util_lib,

divahook/dllmain.c

@@ -13,15 +13,15 @@
 
 #include "hook/process.h"
 
+#include "hooklib/clock.h"
+#include "hooklib/gfx.h"
 #include "hooklib/serial.h"
+#include "hooklib/spike.h"
 
 #include "platform/hwmon.h"
 #include "platform/nusec.h"
 
-#include "util/clock.h"
 #include "util/dprintf.h"
-#include "util/gfx.h"
-#include "util/spike.h"
 
 static process_entry_t diva_startup;
 

divahook/meson.build

@@ -14,6 +14,7 @@ shared_library(
         amex_lib,
         board_lib,
         divaio_dll,
+        hooklib_lib,
         jvs_lib,
         platform_lib,
         util_lib,

hooklib/fdshark.c

@@ -8,9 +8,10 @@
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
 
+#include "hooklib/fdshark.h"
+
 #include "util/dprintf.h"
 #include "util/dump.h"
-#include "util/fdshark.h"
 
 static const wchar_t *fdshark_path;
 static HANDLE fdshark_target_fd;

hooklib/gfx.c

@@ -7,6 +7,8 @@
 #include "hook/com-proxy.h"
 #include "hook/table.h"
 
+#include "hooklib/gfx.h"
+
 #include "util/dprintf.h"
 
 static HRESULT STDMETHODCALLTYPE my_CreateDevice(

hooklib/meson.build

@@ -0,0 +1,21 @@
+hooklib_lib = static_library(
+    'hooklib',
+    include_directories : inc,
+    implicit_include_directories : false,
+    c_pch : '../precompiled.h',
+    dependencies : [
+        capnhook.get_variable('hook_dep'),
+    ],
+    sources : [
+        'clock.c',
+        'clock.h',
+        'fdshark.c',
+        'fdshark.h',
+        'gfx.c',
+        'gfx.h',
+        'setupapi.c',
+        'setupapi.h',
+        'spike.c',
+        'spike.h',
+    ],
+)

hooklib/setupapi.c

@@ -9,8 +9,9 @@
 
 #include "hook/table.h"
 
+#include "hooklib/setupapi.h"
+
 #include "util/dprintf.h"
-#include "util/setupapi.h"
 
 struct setupapi_class {
     const GUID *guid;

hooklib/spike.c

@@ -7,8 +7,9 @@
 
 #include "hook/pe.h"
 
+#include "hooklib/spike.h"
+
 #include "util/dprintf.h"
-#include "util/spike.h"
 
 /* Spike functions. Their "style" is named after the libc function they bear
    the closest resemblance to. */

idzhook/dllmain.c

@@ -10,17 +10,17 @@
 
 #include "hook/process.h"
 
+#include "hooklib/clock.h"
+#include "hooklib/gfx.h"
 #include "hooklib/serial.h"
+#include "hooklib/spike.h"
 
 #include "idzhook/jvs.h"
 
 #include "platform/hwmon.h"
 #include "platform/nusec.h"
 
-#include "util/clock.h"
 #include "util/dprintf.h"
-#include "util/gfx.h"
-#include "util/spike.h"
 
 static process_entry_t idz_startup;
 

idzhook/meson.build

@@ -14,6 +14,7 @@ shared_library(
         aimeio_dll,
         amex_lib,
         board_lib,
+        hooklib_lib,
         idzio_dll,
         jvs_lib,
         platform_lib,

meson.build

@@ -32,6 +32,7 @@ capnhook = subproject('capnhook')
 
 subdir('amex')
 subdir('board')
+subdir('hooklib')
 subdir('jvs')
 subdir('platform')
 subdir('util')

minihook/dllmain.c

@@ -5,11 +5,12 @@
 
 #include "hook/process.h"
 
+#include "hooklib/clock.h"
+#include "hooklib/spike.h"
+
 #include "platform/nusec.h"
 
-#include "util/clock.h"
 #include "util/dprintf.h"
-#include "util/spike.h"
 
 static process_entry_t app_startup;
 

minihook/meson.build

@@ -9,6 +9,7 @@ shared_library(
     ],
     link_with : [
         amex_lib,
+        hooklib_lib,
         platform_lib,
         util_lib,
     ],

platform/hwmon.c

@@ -3,12 +3,11 @@
 #include <assert.h>
 #include <string.h>
 
-#include "util/dprintf.h"
-
 #include "hook/iohook.h"
 
 #include "platform/hwmon.h"
 
+#include "util/dprintf.h"
 #include "util/str.h"
 
 enum {

util/meson.build

@@ -9,22 +9,12 @@ util_lib = static_library(
     sources : [
         'async.c',
         'async.h',
-        'clock.c',
-        'clock.h',
         'crc.c',
         'crc.h',
         'dprintf.c',
         'dprintf.h',
         'dump.c',
         'dump.h',
-        'fdshark.c',
-        'fdshark.h',
-        'gfx.c',
-        'gfx.h',
-        'setupapi.c',
-        'setupapi.h',
-        'spike.c',
-        'spike.h',
         'str.c',
         'str.h',
     ],