decompals
/
wibo
mirror of https://github.com/decompals/wibo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up function resolution a little

This commit is contained in:
Simon Lindholm 2022-07-15 00:45:35 +02:00
parent 11bdc5e8a2
commit ced712df09
3 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.h
View File

@ -22,8 +22,8 @@ namespace wibo {
void *resolveOle32(const char *name); void *resolveOle32(const char *name);
void *resolveAdvApi32(const char *name); void *resolveAdvApi32(const char *name);
void *resolveLmgr(uint16_t ordinal); void *resolveLmgr(uint16_t ordinal);
void *resolveStubByName(const char *dllName, const char *funcName); void *resolveFuncByName(const char *dllName, const char *funcName);
void *resolveStubByOrdinal(const char *dllName, uint16_t ordinal); void *resolveFuncByOrdinal(const char *dllName, uint16_t ordinal);
struct Executable { struct Executable {
Executable(); Executable();

8
loader.cpp
View File

@ -183,8 +183,8 @@ bool wibo::Executable::loadPE(FILE *file) {
PEImportDirectoryEntry *dir = fromRVA<PEImportDirectoryEntry>(header32.importTable.virtualAddress); PEImportDirectoryEntry *dir = fromRVA<PEImportDirectoryEntry>(header32.importTable.virtualAddress);
while (dir->name) { while (dir->name) {
char *name = fromRVA(dir->name); char *dllName = fromRVA(dir->name);
DEBUG_LOG("DLL Name: %s\n", name); DEBUG_LOG("DLL Name: %s\n", dllName);
uint32_t *lookupTable = fromRVA(dir->importLookupTable); uint32_t *lookupTable = fromRVA(dir->importLookupTable);
uint32_t *addressTable = fromRVA(dir->importAddressTable); uint32_t *addressTable = fromRVA(dir->importAddressTable);
@ -194,12 +194,12 @@ bool wibo::Executable::loadPE(FILE *file) {
// Import by ordinal // Import by ordinal
uint16_t ordinal = lookup & 0xFFFF; uint16_t ordinal = lookup & 0xFFFF;
DEBUG_LOG(" Ordinal: %d\n", ordinal); DEBUG_LOG(" Ordinal: %d\n", ordinal);
*addressTable = (uint32_t) resolveStubByOrdinal(name, ordinal); *addressTable = (uint32_t) resolveFuncByOrdinal(dllName, ordinal);
} else { } else {
// Import by name // Import by name
PEHintNameTableEntry *hintName = fromRVA<PEHintNameTableEntry>(lookup); PEHintNameTableEntry *hintName = fromRVA<PEHintNameTableEntry>(lookup);
DEBUG_LOG(" Name: %s\n", hintName->name); DEBUG_LOG(" Name: %s\n", hintName->name);
*addressTable = (uint32_t) resolveStubByName(name, hintName->name); *addressTable = (uint32_t) resolveFuncByName(dllName, hintName->name);
} }
++lookupTable; ++lookupTable;
++addressTable; ++addressTable;

94
main.cpp
View File

@ -21,59 +21,38 @@ void wibo::debug_log(const char *fmt, ...) {
va_end(args); va_end(args);
} }
#define FOR_256_3(a, b, c, d) FOR_ITER((a << 6 | b << 4 | c << 2 | d))
#define FOR_256_2(a, b) \
FOR_256_3(a, b, 0, 0) FOR_256_3(a, b, 0, 1) FOR_256_3(a, b, 0, 2) FOR_256_3(a, b, 0, 3) \
FOR_256_3(a, b, 1, 0) FOR_256_3(a, b, 1, 1) FOR_256_3(a, b, 1, 2) FOR_256_3(a, b, 1, 3) \
FOR_256_3(a, b, 2, 0) FOR_256_3(a, b, 2, 1) FOR_256_3(a, b, 2, 2) FOR_256_3(a, b, 2, 3) \
FOR_256_3(a, b, 3, 0) FOR_256_3(a, b, 3, 1) FOR_256_3(a, b, 3, 2) FOR_256_3(a, b, 3, 3)
#define FOR_256 \
FOR_256_2(0, 0) FOR_256_2(0, 1) FOR_256_2(0, 2) FOR_256_2(0, 3) \
FOR_256_2(1, 0) FOR_256_2(1, 1) FOR_256_2(1, 2) FOR_256_2(1, 3) \
FOR_256_2(2, 0) FOR_256_2(2, 1) FOR_256_2(2, 2) FOR_256_2(2, 3) \
FOR_256_2(3, 0) FOR_256_2(3, 1) FOR_256_2(3, 2) FOR_256_2(3, 3) \
static int stubIndex = 0; static int stubIndex = 0;
static char stubDlls[0x100][0x100]; static char stubDlls[0x100][0x100];
static char stubFuncNames[0x100][0x100]; static char stubFuncNames[0x100][0x100];
static void stubBase(int index) { static void stubBase(int index) {
// should go through all the functions imported by mwcceppc.exe
// and create template stubs for them, at least...
printf("Unhandled function %s (%s)\n", stubFuncNames[index], stubDlls[index]); printf("Unhandled function %s (%s)\n", stubFuncNames[index], stubDlls[index]);
exit(1); exit(1);
} }
void (*stubFuncs[0x100])(void) = { void (*stubFuncs[0x100])(void) = {
#define DEFINE_STUB(a, b, c, d) []() { stubBase(a << 6 | b << 4 | c << 2 | d); }, #define FOR_ITER(i) []() { stubBase(i); },
#define DEFINE_STUBS(a, b) \ FOR_256
DEFINE_STUB(a, b, 0, 0) DEFINE_STUB(a, b, 0, 1) DEFINE_STUB(a, b, 0, 2) DEFINE_STUB(a, b, 0, 3) \ #undef FOR_ITER
DEFINE_STUB(a, b, 1, 0) DEFINE_STUB(a, b, 1, 1) DEFINE_STUB(a, b, 1, 2) DEFINE_STUB(a, b, 1, 3) \
DEFINE_STUB(a, b, 2, 0) DEFINE_STUB(a, b, 2, 1) DEFINE_STUB(a, b, 2, 2) DEFINE_STUB(a, b, 2, 3) \
DEFINE_STUB(a, b, 3, 0) DEFINE_STUB(a, b, 3, 1) DEFINE_STUB(a, b, 3, 2) DEFINE_STUB(a, b, 3, 3)
DEFINE_STUBS(0, 0) DEFINE_STUBS(0, 1) DEFINE_STUBS(0, 2) DEFINE_STUBS(0, 3)
DEFINE_STUBS(1, 0) DEFINE_STUBS(1, 1) DEFINE_STUBS(1, 2) DEFINE_STUBS(1, 3)
DEFINE_STUBS(2, 0) DEFINE_STUBS(2, 1) DEFINE_STUBS(2, 2) DEFINE_STUBS(2, 3)
DEFINE_STUBS(3, 0) DEFINE_STUBS(3, 1) DEFINE_STUBS(3, 2) DEFINE_STUBS(3, 3)
}; };
#undef DEFINE_STUB
#undef DEFINE_STUBS
void *wibo::resolveStubByName(const char *dllName, const char *funcName) { #undef FOR_256_3
if (strcasecmp(dllName, "KERNEL32.dll") == 0) { #undef FOR_256_2
void *func = wibo::resolveKernel32(funcName); #undef FOR_256
if (func)
return func;
}
if (strcasecmp(dllName, "USER32.dll") == 0) {
void *func = wibo::resolveUser32(funcName);
if (func)
return func;
}
if (strcasecmp(dllName, "ADVAPI32.dll") == 0) {
void *func = wibo::resolveAdvApi32(funcName);
if (func)
return func;
}
if (strcasecmp(dllName, "VERSION.dll") == 0) {
void *func = wibo::resolveVersion(funcName);
if (func)
return func;
}
if (strcasecmp(dllName, "ole32.dll") == 0) {
void *func = wibo::resolveOle32(funcName);
if (func)
return func;
}
static void *resolveMissingFunc(const char *dllName, const char *funcName) {
DEBUG_LOG("Missing function: %s (%s)\n", dllName, funcName); DEBUG_LOG("Missing function: %s (%s)\n", dllName, funcName);
assert(stubIndex < 0x100); assert(stubIndex < 0x100);
assert(strlen(dllName) < 0x100); assert(strlen(dllName) < 0x100);
@ -83,19 +62,38 @@ void *wibo::resolveStubByName(const char *dllName, const char *funcName) {
return (void *) stubFuncs[stubIndex++]; return (void *) stubFuncs[stubIndex++];
} }
void *wibo::resolveStubByOrdinal(const char *dllName, uint16_t ordinal) { void *wibo::resolveFuncByName(const char *dllName, const char *funcName) {
void *func = nullptr;
if (strcasecmp(dllName, "KERNEL32.dll") == 0) {
func = wibo::resolveKernel32(funcName);
} else if (strcasecmp(dllName, "USER32.dll") == 0) {
func = wibo::resolveUser32(funcName);
} else if (strcasecmp(dllName, "ADVAPI32.dll") == 0) {
func = wibo::resolveAdvApi32(funcName);
} else if (strcasecmp(dllName, "VERSION.dll") == 0) {
func = wibo::resolveVersion(funcName);
} else if (strcasecmp(dllName, "OLE32.dll") == 0) {
func = wibo::resolveOle32(funcName);
}
if (func)
return func;
return resolveMissingFunc(dllName, funcName);
}
void *wibo::resolveFuncByOrdinal(const char *dllName, uint16_t ordinal) {
void *func;
if (strcmp(dllName, "LMGR11.dll") == 0 || if (strcmp(dllName, "LMGR11.dll") == 0 ||
strcmp(dllName, "LMGR326B.dll") == 0 || strcmp(dllName, "LMGR326B.dll") == 0 ||
strcmp(dllName, "LMGR8C.dll") == 0) { strcmp(dllName, "LMGR8C.dll") == 0) {
void* func = wibo::resolveLmgr(ordinal); func = wibo::resolveLmgr(ordinal);
}
if (func) if (func)
return func; return func;
} char buf[16];
assert(stubIndex < 0x100); sprintf(buf, "%d", ordinal);
assert(strlen(dllName) < 0x100); return resolveMissingFunc(dllName, buf);
sprintf(stubFuncNames[stubIndex], "%d", ordinal);
strcpy(stubDlls[stubIndex], dllName);
return (void *) stubFuncs[stubIndex++];
} }
// Windows Thread Information Block // Windows Thread Information Block