Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

chore: Apply code formatting on entire codebase for consistent style

Browse Source
This commit is contained in:
icex2
2023-04-06 15:39:53 +02:00
committed by icex2
parent a1a849aef3
commit 031836ef0e
186 changed files with 2446 additions and 1979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/launcher/main.c
+3 -4
View File
@@ -215,7 +215,8 @@ int main(int argc, const char **argv)
/* Load game DLL */
if (options.iat_hook_dlls.nitems > 0) {
module_context_init_with_iat_hooks(&module, options.module, &options.iat_hook_dlls);
module_context_init_with_iat_hooks(
&module, options.module, &options.iat_hook_dlls);
} else {
module_context_init(&module, options.module);
}
@@ -302,9 +303,7 @@ int main(int argc, const char **argv)
log_info("Overriding service url to: %s", options.override_service);
ea3_ident_replace_property_str(
ea3_config_root,
"/network/services",
options.override_service);
ea3_config_root, "/network/services", options.override_service);
}
/* Start up e-Amusement client */
src/main/launcher/module.c
+38 -22
View File
@@ -12,7 +12,6 @@
#define MM_ALLOCATION_GRANULARITY 0x10000
static bool module_replace_dll_iat(HMODULE hModule, struct array *iat_hook_dlls)
{
log_assert(hModule);
@@ -21,23 +20,25 @@ static bool module_replace_dll_iat(HMODULE hModule, struct array *iat_hook_dlls)
if (iat_hook_dlls->nitems == 0)
return true;
PBYTE pbModule = (PBYTE)hModule;
PBYTE pbModule = (PBYTE) hModule;
// Find EXE base in process memory
IMAGE_DOS_HEADER *idh = (IMAGE_DOS_HEADER *) pbModule;
IMAGE_NT_HEADERS *inh = (IMAGE_NT_HEADERS *) (pbModule + idh->e_lfanew);
// Search through import table if it exists and replace the target DLL with our DLL filename
PIMAGE_SECTION_HEADER pRemoteSectionHeaders
= (PIMAGE_SECTION_HEADER)((PBYTE)pbModule
+ sizeof(inh->Signature)
+ sizeof(inh->FileHeader)
+ inh->FileHeader.SizeOfOptionalHeader);
// Search through import table if it exists and replace the target DLL with
// our DLL filename
PIMAGE_SECTION_HEADER pRemoteSectionHeaders =
(PIMAGE_SECTION_HEADER) ((PBYTE) pbModule + sizeof(inh->Signature) +
sizeof(inh->FileHeader) +
inh->FileHeader.SizeOfOptionalHeader);
size_t total_size = inh->OptionalHeader.SizeOfHeaders;
for (DWORD n = 0; n < inh->FileHeader.NumberOfSections; ++n) {
IMAGE_SECTION_HEADER *header = (IMAGE_SECTION_HEADER *)(pRemoteSectionHeaders + n);
size_t new_total_size = header->VirtualAddress + header->Misc.VirtualSize;
IMAGE_SECTION_HEADER *header =
(IMAGE_SECTION_HEADER *) (pRemoteSectionHeaders + n);
size_t new_total_size =
header->VirtualAddress + header->Misc.VirtualSize;
if (new_total_size > total_size)
total_size = new_total_size;
}
@@ -55,20 +56,29 @@ static bool module_replace_dll_iat(HMODULE hModule, struct array *iat_hook_dlls)
log_assert(remote_addr != NULL);
if (inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress != 0) {
PIMAGE_IMPORT_DESCRIPTOR pImageImport = (PIMAGE_IMPORT_DESCRIPTOR)(pbModule
+ inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
if (inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]
.VirtualAddress != 0) {
PIMAGE_IMPORT_DESCRIPTOR pImageImport =
(PIMAGE_IMPORT_DESCRIPTOR) (pbModule +
inh->OptionalHeader
.DataDirectory
[IMAGE_DIRECTORY_ENTRY_IMPORT]
.VirtualAddress);
DWORD size = 0;
while (inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size == 0
|| size < inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size) {
IMAGE_IMPORT_DESCRIPTOR *ImageImport = (IMAGE_IMPORT_DESCRIPTOR *)pImageImport;
while (inh->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]
.Size == 0 ||
size < inh->OptionalHeader
.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]
.Size) {
IMAGE_IMPORT_DESCRIPTOR *ImageImport =
(IMAGE_IMPORT_DESCRIPTOR *) pImageImport;
if (ImageImport->Name == 0) {
break;
}
const char *name = (const char *)(pbModule + ImageImport->Name);
const char *name = (const char *) (pbModule + ImageImport->Name);
for (size_t i = 0; i < iat_hook_dlls->nitems; i++) {
const char *iat_hook_dll =
@@ -85,11 +95,15 @@ static bool module_replace_dll_iat(HMODULE hModule, struct array *iat_hook_dlls)
const char *replacement_path_dll = iat_hook_replacement + 1;
if (strcmp(name, expected_dll) == 0) {
pe_patch((PBYTE)remote_addr + remote_addr_ptr, replacement_path_dll, strlen(replacement_path_dll));
pe_patch(
(PBYTE) remote_addr + remote_addr_ptr,
replacement_path_dll,
strlen(replacement_path_dll));
log_misc("Replacing %s with %s", name, replacement_path_dll);
log_misc(
"Replacing %s with %s", name, replacement_path_dll);
DWORD val = (DWORD)((PBYTE)remote_addr - pbModule);
DWORD val = (DWORD) ((PBYTE) remote_addr - pbModule);
pe_patch(&ImageImport->Name, &val, sizeof(DWORD));
pe_patch(pImageImport, &ImageImport, sizeof(ImageImport));
@@ -147,8 +161,10 @@ void module_context_init(struct module_context *module, const char *path)
module->path = str_dup(path);
}
void module_context_init_with_iat_hooks(struct module_context *module, const char *path, struct array *iat_hook_dlls)
void module_context_init_with_iat_hooks(
struct module_context *module,
const char *path,
struct array *iat_hook_dlls)
{
log_assert(module != NULL);
log_assert(path != NULL);
src/main/launcher/module.h
+4 -1
View File
@@ -13,7 +13,10 @@ struct module_context {
};
void module_context_init(struct module_context *module, const char *path);
void module_context_init_with_iat_hooks(struct module_context *module, const char *path, struct array *iat_hook_dlls);
void module_context_init_with_iat_hooks(
struct module_context *module,
const char *path,
struct array *iat_hook_dlls);
bool module_context_invoke_init(
const struct module_context *module,
char *sidcode,
src/main/launcher/options.c
+3 -2
View File
@@ -171,7 +171,7 @@ bool options_read_cmdline(struct options *options, int argc, const char **argv)
options->override_urlslash_enabled = true;
const char * urlslash_value = argv[++i];
const char *urlslash_value = argv[++i];
options->override_urlslash_value = false;
if (_stricmp(urlslash_value, "1") == 0) {
@@ -233,7 +233,8 @@ void options_print_usage(void)
"times)\n"
" -B [filename] Load pre-hook DLL loaded before avs boot "
"(can be specified multiple times)\n"
" -I [filename] Load pre-hook DLL that overrides IAT reference before execution"
" -I [filename] Load pre-hook DLL that overrides IAT reference "
"before execution"
"(can be specified multiple times)\n"
" -Y [filename] Log to a file in addition to the console\n"
" -D Halt the launcher before bootstrapping AVS "