From cc0f8dc595e7be77c002955fe0a8e7d03130b9f0 Mon Sep 17 00:00:00 2001 From: Hay1tsme Date: Thu, 30 Dec 2021 13:57:05 -0500 Subject: [PATCH] changed everything and nothing --- mercuryhook/elisabeth.c | 87 ++++++++++++++++++++++++++++++++++++- mercuryhook/elisabeth.h | 2 +- mercuryhook/mercury-dll.c | 3 ++ mercuryhook/mercury-dll.h | 1 + mercuryhook/mercuryhook.def | 3 +- mercuryio/mercuryio.c | 5 +++ mercuryio/mercuryio.h | 2 + 7 files changed, 99 insertions(+), 4 deletions(-) diff --git a/mercuryhook/elisabeth.c b/mercuryhook/elisabeth.c index 2de12dc..f2bfd38 100644 --- a/mercuryhook/elisabeth.c +++ b/mercuryhook/elisabeth.c @@ -6,9 +6,11 @@ #include #include "mercuryhook/elisabeth.h" +#include "mercuryhook/mercury-dll.h" #include "hook/table.h" +#include "hooklib/uart.h" #include "hooklib/dll.h" #include "hooklib/path.h" #include "hooklib/setupapi.h" @@ -22,6 +24,13 @@ static HMODULE WINAPI my_LoadLibraryW(const wchar_t *name); static HMODULE (WINAPI *next_LoadLibraryW)(const wchar_t *name); static FARPROC WINAPI my_GetProcAddress(HMODULE hModule, const char *name); static FARPROC (WINAPI *next_GetProcAddress)(HMODULE hModule, const char *name); +static HRESULT elisabeth_handle_irp(struct irp *irp); +static HRESULT elisabeth_handle_irp_locked(struct irp *irp); + +static CRITICAL_SECTION elisabeth_lock; +static struct uart elisabeth_uart; +static uint8_t elisabeth_written_bytes[520]; +static uint8_t elisabeth_readable_bytes[520]; static const struct hook_symbol win32_hooks[] = { { @@ -42,10 +51,84 @@ static const wchar_t *target_modules[] = { static const size_t target_modules_len = _countof(target_modules); -void elisabeth_hook_init() +HRESULT elisabeth_hook_init() { dll_hook_insert_hooks(NULL); - setupapi_add_phantom_dev(&elisabeth_guid, L"USB\\VID_0403&PID_6001"); + setupapi_add_phantom_dev(&elisabeth_guid, L"$ftdi"); + + InitializeCriticalSection(&elisabeth_lock); + + uart_init(&elisabeth_uart, 1); + elisabeth_uart.written.bytes = elisabeth_written_bytes; + elisabeth_uart.written.nbytes = sizeof(elisabeth_written_bytes); + elisabeth_uart.readable.bytes = elisabeth_readable_bytes; + elisabeth_uart.readable.nbytes = sizeof(elisabeth_readable_bytes); + + return iohook_push_handler(elisabeth_handle_irp); +} + +static HRESULT elisabeth_handle_irp(struct irp *irp) +{ + HRESULT hr; + + assert(irp != NULL); + + if (!uart_match_irp(&elisabeth_uart, irp)) { + return iohook_invoke_next(irp); + } + + EnterCriticalSection(&elisabeth_lock); + hr = elisabeth_handle_irp_locked(irp); + LeaveCriticalSection(&elisabeth_lock); + + return hr; +} + +static HRESULT elisabeth_handle_irp_locked(struct irp *irp) +{ + //union elisabeth_req_any req; + struct iobuf req_iobuf; + HRESULT hr; + + if (irp->op == IRP_OP_OPEN) { + dprintf("Elisabeth: Starting backend\n"); + hr = mercury_dll.elisabeth_init(); + + if (FAILED(hr)) { + dprintf("Elisabeth: Backend error: %x\n", (int) hr); + + return hr; + } + } + + hr = uart_handle_irp(&elisabeth_uart, irp); + + if (FAILED(hr) || irp->op != IRP_OP_WRITE) { + return hr; + } + + for (;;) { + + //req_iobuf.bytes = req.bytes; + //req_iobuf.nbytes = sizeof(req.bytes); + //req_iobuf.pos = 0; + + /*hr = elisabeth_frame_decode(&req_iobuf, &elisabeth_uart.written); + + if (hr != S_OK) { + if (FAILED(hr)) { + dprintf("Elisabeth: Deframe error: %x\n", (int) hr); + } + + return hr; + } + + hr = elisabeth_req_dispatch(&req); + + if (FAILED(hr)) { + dprintf("Elisabeth: Processing error: %x\n", (int) hr); + }*/ + } } static void dll_hook_insert_hooks(HMODULE target) diff --git a/mercuryhook/elisabeth.h b/mercuryhook/elisabeth.h index 2583742..d553ba8 100644 --- a/mercuryhook/elisabeth.h +++ b/mercuryhook/elisabeth.h @@ -8,4 +8,4 @@ DEFINE_GUID( 0x4FF5, 0x97, 0x0A1, 0x0BD, 0x86, 0x58, 0x7C, 0x6C, 0x7E); -void elisabeth_hook_init(); +HRESULT elisabeth_hook_init(); diff --git a/mercuryhook/mercury-dll.c b/mercuryhook/mercury-dll.c index 6873820..1962709 100644 --- a/mercuryhook/mercury-dll.c +++ b/mercuryhook/mercury-dll.c @@ -21,6 +21,9 @@ const struct dll_bind_sym mercury_dll_syms[] = { }, { .sym = "mercury_io_get_gamebtns", .off = offsetof(struct mercury_dll, get_gamebtns), + }, { + .sym = "mercury_io_elisabeth_init", + .off = offsetof(struct mercury_dll, elisabeth_init), } }; diff --git a/mercuryhook/mercury-dll.h b/mercuryhook/mercury-dll.h index 4e679a8..1942f0e 100644 --- a/mercuryhook/mercury-dll.h +++ b/mercuryhook/mercury-dll.h @@ -10,6 +10,7 @@ struct mercury_dll { HRESULT (*poll)(void); void (*get_opbtns)(uint8_t *opbtn); void (*get_gamebtns)(uint16_t *player1, uint16_t *player2); + HRESULT (*elisabeth_init)(void); }; struct mercury_dll_config { diff --git a/mercuryhook/mercuryhook.def b/mercuryhook/mercuryhook.def index 916d278..d331e90 100644 --- a/mercuryhook/mercuryhook.def +++ b/mercuryhook/mercuryhook.def @@ -15,5 +15,6 @@ EXPORTS mercury_io_get_api_version mercury_io_get_gamebtns mercury_io_get_opbtns + mercury_io_elisabeth_init mercury_io_init - mercury_io_poll \ No newline at end of file + mercury_io_poll diff --git a/mercuryio/mercuryio.c b/mercuryio/mercuryio.c index 6bd410f..4c0b2a5 100644 --- a/mercuryio/mercuryio.c +++ b/mercuryio/mercuryio.c @@ -47,3 +47,8 @@ void mercury_io_get_gamebtns(uint16_t *player1, uint16_t *player2) { } + +HRESULT mercury_io_elisabeth_init(void) +{ + return S_OK; +} diff --git a/mercuryio/mercuryio.h b/mercuryio/mercuryio.h index a447f20..827efb5 100644 --- a/mercuryio/mercuryio.h +++ b/mercuryio/mercuryio.h @@ -65,3 +65,5 @@ void mercury_io_get_opbtns(uint8_t *opbtn); Minimum API version: 0x0100 */ void mercury_io_get_gamebtns(uint16_t *player1, uint16_t *player2); + +HRESULT mercury_io_elisabeth_init(void);