diff --git a/games/mercuryhook/config.c b/games/mercuryhook/config.c index d15c305..e781273 100644 --- a/games/mercuryhook/config.c +++ b/games/mercuryhook/config.c @@ -42,15 +42,15 @@ void touch_config_load( filename); } -void elisabeth_config_load( - struct elisabeth_config *cfg, +void elizabeth_config_load( + struct elizabeth_config *cfg, const wchar_t *filename) { assert(cfg != NULL); assert(filename != NULL); cfg->enable = GetPrivateProfileIntW( - L"elisabeth", + L"elizabeth", L"enable", 1, filename); @@ -72,5 +72,5 @@ void mercury_hook_config_load( vfd_config_load(&cfg->vfd, filename); mercury_dll_config_load(&cfg->dll, filename); touch_config_load(&cfg->touch, filename); - elisabeth_config_load(&cfg->elisabeth, filename); + elizabeth_config_load(&cfg->elizabeth, filename); } diff --git a/games/mercuryhook/config.h b/games/mercuryhook/config.h index 2105704..c80b318 100644 --- a/games/mercuryhook/config.h +++ b/games/mercuryhook/config.h @@ -9,7 +9,7 @@ #include "mercuryhook/mercury-dll.h" #include "mercuryhook/touch.h" -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" #include "platform/config.h" @@ -22,7 +22,7 @@ struct mercury_hook_config { struct vfd_config vfd; struct mercury_dll_config dll; struct touch_config touch; - struct elisabeth_config elisabeth; + struct elizabeth_config elizabeth; }; void mercury_dll_config_load( diff --git a/games/mercuryhook/dllmain.c b/games/mercuryhook/dllmain.c index 745b420..11a5527 100644 --- a/games/mercuryhook/dllmain.c +++ b/games/mercuryhook/dllmain.c @@ -30,7 +30,7 @@ #include "mercuryhook/config.h" #include "mercuryhook/io4.h" #include "mercuryhook/mercury-dll.h" -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" #include "mercuryhook/touch.h" #include "platform/platform.h" @@ -107,7 +107,7 @@ static DWORD CALLBACK mercury_pre_startup(void) } /* Start elisabeth Hooks for the LED and IO Board DLLs */ - elisabeth_hook_init(&mercury_hook_cfg.elisabeth); + elizabeth_hook_init(&mercury_hook_cfg.elizabeth); touch_hook_init(&mercury_hook_cfg.touch); diff --git a/games/mercuryhook/elisabeth.c b/games/mercuryhook/elizabeth.c similarity index 88% rename from games/mercuryhook/elisabeth.c rename to games/mercuryhook/elizabeth.c index dad8f9b..9fd4aaa 100644 --- a/games/mercuryhook/elisabeth.c +++ b/games/mercuryhook/elizabeth.c @@ -5,7 +5,7 @@ #include #include -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" #include "mercuryhook/mercury-dll.h" #include "hook/table.h" @@ -17,7 +17,7 @@ #include "util/dprintf.h" -/* Hooks targeted DLLs dynamically loaded by elisabeth. */ +/* Hooks targeted DLLs dynamically loaded by elizabeth. */ static void dll_hook_insert_hooks(HMODULE target); static FARPROC WINAPI my_GetProcAddress(HMODULE hModule, const char *name); @@ -33,13 +33,13 @@ static const struct hook_symbol win32_hooks[] = { } }; -HRESULT elisabeth_hook_init(struct elisabeth_config *cfg) +HRESULT elizabeth_hook_init(struct elizabeth_config *cfg) { if (!cfg->enable) { return S_OK; } dll_hook_insert_hooks(NULL); - dprintf("Elisabeth: Init\n"); + dprintf("elizabeth: Init\n"); return S_OK; } @@ -75,7 +75,7 @@ FARPROC WINAPI my_GetProcAddress(HMODULE hModule, const char *name) /* Intercept the call to initialize the LED board. */ static int my_USBIntLED_Init() { - dprintf("Elisabeth: my_USBIntLED_Init hit!\n"); + dprintf("elizabeth: my_USBIntLED_Init hit!\n"); return 1; } diff --git a/games/mercuryhook/elisabeth.h b/games/mercuryhook/elizabeth.h similarity index 63% rename from games/mercuryhook/elisabeth.h rename to games/mercuryhook/elizabeth.h index 32512f3..f31e249 100644 --- a/games/mercuryhook/elisabeth.h +++ b/games/mercuryhook/elizabeth.h @@ -8,8 +8,8 @@ struct led_data { uint8_t rgba[480 * 4]; }; -struct elisabeth_config { +struct elizabeth_config { bool enable; }; -HRESULT elisabeth_hook_init(struct elisabeth_config *cfg); +HRESULT elizabeth_hook_init(struct elizabeth_config *cfg); diff --git a/games/mercuryhook/mercury-dll.h b/games/mercuryhook/mercury-dll.h index fa27edb..77c5bc6 100644 --- a/games/mercuryhook/mercury-dll.h +++ b/games/mercuryhook/mercury-dll.h @@ -3,7 +3,7 @@ #include #include "mercuryio/mercuryio.h" -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" struct mercury_dll { uint16_t api_version; diff --git a/games/mercuryhook/meson.build b/games/mercuryhook/meson.build index fd6f46a..f11ba29 100644 --- a/games/mercuryhook/meson.build +++ b/games/mercuryhook/meson.build @@ -25,8 +25,8 @@ shared_library( 'io4.h', 'mercury-dll.c', 'mercury-dll.h', - 'elisabeth.h', - 'elisabeth.c', + 'elizabeth.h', + 'elizabeth.c', 'touch.h', 'touch.c' ], diff --git a/games/mercuryio/mercuryio.c b/games/mercuryio/mercuryio.c index 880349c..2191650 100644 --- a/games/mercuryio/mercuryio.c +++ b/games/mercuryio/mercuryio.c @@ -7,7 +7,8 @@ #include "mercuryio/mercuryio.h" #include "mercuryio/config.h" -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" + #include "util/env.h" static unsigned int __stdcall mercury_io_touch_thread_proc(void *ctx); diff --git a/games/mercuryio/mercuryio.h b/games/mercuryio/mercuryio.h index 4d029ca..e869bea 100644 --- a/games/mercuryio/mercuryio.h +++ b/games/mercuryio/mercuryio.h @@ -5,7 +5,7 @@ #include #include -#include "mercuryhook/elisabeth.h" +#include "mercuryhook/elizabeth.h" enum { MERCURY_IO_OPBTN_TEST = 0x01,