Leahnaya/segatools
1
0
Fork 0
mirror of https://gitea.tendokyu.moe/Hay1tsme/segatools.git synced 2026-05-15 23:50:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiler errors for 64bit gcc (#87)

Browse Source 
Why would anyone detect ISA at runtime?

Reviewed-on: https://gitea.tendokyu.moe/TeamTofuShop/segatools/pulls/87
Co-authored-by: octocat <git.rascal570@passinbox.com>
Co-committed-by: octocat <git.rascal570@passinbox.com>
This commit is contained in:
octocat 2025-12-24 23:08:08 +00:00 committed by Dniel97
parent 60e7e1d432
commit 7c10698ca9
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/hooklib/spike.c
View File

@ -89,29 +89,6 @@ static void spike_fn_perror(
OutputDebugStringA(line);
}
BOOL is_current_module_x64()
{
HMODULE hModule = GetModuleHandleW(NULL);
MODULEINFO moduleInfo = {0};
if (!GetModuleInformation(GetCurrentProcess(), hModule, &moduleInfo,
sizeof(moduleInfo))) {
return FALSE;
}
PIMAGE_DOS_HEADER dosHeader = (PIMAGE_DOS_HEADER)moduleInfo.lpBaseOfDll;
PIMAGE_NT_HEADERS ntHeaders =
(PIMAGE_NT_HEADERS)((BYTE *)moduleInfo.lpBaseOfDll +
dosHeader->e_lfanew);
if (ntHeaders->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) {
return TRUE;
} else if (ntHeaders->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) {
return FALSE;
} else {
return FALSE;
}
}
BOOL is_valid_rva(LPCWSTR module_name, uintptr_t rva) {
HMODULE module_base = GetModuleHandleW(module_name);
if (!module_base) {
@ -136,19 +113,18 @@ static void spike_insert_jmp(LPCWSTR module_name, uintptr_t rva, void *proc) {
uintptr_t target_addr = (uintptr_t)target;
uintptr_t func_addr = (uintptr_t)func_ptr;
if (is_current_module_x64()) {
#if defined(_WIN64) || defined(__amd64__)
uint64_t relativeOffset = (uint64_t)(func_addr - target_addr - 5);
uint8_t absoluteJump[] = {0x48, 0xB8, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0};
0x00, 0x00, 0x00, 0x00, 0xFF, 0xE0};
memcpy(absoluteJump + 2, &func_ptr, 8);
pe_patch(target, absoluteJump, sizeof(absoluteJump));
}
else {
#else
uint32_t jumpOffset = (uint32_t)(func_addr - target_addr - 5);
uint8_t relativeJump[] = {0xE9, 0x00, 0x00, 0x00, 0x00};
memcpy(relativeJump + 1, &jumpOffset, 4);
pe_patch(target, relativeJump, sizeof(relativeJump));
}
#endif
}
static void spike_insert_ptr(LPCWSTR module_name, uintptr_t rva, void *ptr) {
@ -242,7 +218,7 @@ void spike_hook_init(const wchar_t *ini_file)
basename = slash + 1;
} else {
basename = module;
}
}
/* Check our INI file to see if any spikes are configured for this EXE.
Normally we separate out config reading into a separate module... */

2
games/mercuryhook/elisabeth.c
View File

@ -23,7 +23,7 @@ static void dll_hook_insert_hooks(HMODULE target);
static FARPROC WINAPI my_GetProcAddress(HMODULE hModule, const char *name);
static FARPROC (WINAPI *next_GetProcAddress)(HMODULE hModule, const char *name);
static int my_USBIntLED_Init();
static int my_USBIntLED_set();
static int my_USBIntLED_set(int data1, struct led_data data2);
static const struct hook_symbol win32_hooks[] = {
{