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...
This commit is contained in:
Tau 2019-05-14 11:15:20 -04:00
parent 07237730cd
commit 1b93551a41
29 changed files with 59 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

21
hooklib/meson.build Normal file
View File

@ -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',
],
)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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