diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-11-10 14:57:40 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-11-10 14:57:40 +0100 |
| commit | d85764ba937792c7aa95265472c563c9ea5fd743 (patch) | |
| tree | 80aa91a4fcbabc6b8cebf1444713c75486935309 /TestDLL | |
| parent | 9b93c88dc9f3d6674021bbadb098960ded20be54 (diff) | |
switched to a simple pointer to the EntitiySystem in LibEntry to a complex struct of pointers
Diffstat (limited to 'TestDLL')
| -rw-r--r-- | TestDLL/HuntClasses.h | 9 | ||||
| -rw-r--r-- | TestDLL/dllmain.cpp | 17 |
2 files changed, 18 insertions, 8 deletions
diff --git a/TestDLL/HuntClasses.h b/TestDLL/HuntClasses.h index 692ad1d..2692a3e 100644 --- a/TestDLL/HuntClasses.h +++ b/TestDLL/HuntClasses.h @@ -957,4 +957,11 @@ static inline bool WorldToScreen(SSystemGlobalEnvironment* globalEnv, Vec3 vEntP vOut.z *= 1.0f; return ((vOut.z < 1.0f) && (vOut.x > 0) && (vOut.x < (float)Renderer->GetWidth()) && (vOut.y > 0) && (vOut.y < (float)Renderer->GetHeight())); -}
\ No newline at end of file +} + + +struct HuntCtx { + IEntitySystem ** ppEntSys; + SSystemGlobalEnvironment ** ppGlobalEnv; + IActorSystem ** ppCCryAction; +};
\ No newline at end of file diff --git a/TestDLL/dllmain.cpp b/TestDLL/dllmain.cpp index 7904c24..481f4b4 100644 --- a/TestDLL/dllmain.cpp +++ b/TestDLL/dllmain.cpp @@ -219,12 +219,12 @@ static bool ConfigureAndInitGDI(void) return true; } -static bool InitAndCheckPtr(PVOID user_ptr) +static bool InitAndCheckPtr(struct HuntCtx * HuntCtx) { char reserved_stack_space[256]; - pEntSys = *(UINT64*)user_ptr; - iEnt = *(IEntitySystem **)user_ptr; + pEntSys = *(UINT64*)(HuntCtx->ppEntSys); + iEnt = *HuntCtx->ppEntSys; ZeroMemory(&reserved_stack_space[0], sizeof reserved_stack_space); if (iEnt->GetNumEntities() > 65535) { @@ -328,10 +328,13 @@ static bool InitAndCheckPtr(PVOID user_ptr) return true; } -void APIENTRY LibEntry(PVOID user_ptr) +void APIENTRY LibEntry(struct HuntCtx * HuntCtx) { static bool firstEntry = true; + if (!HuntCtx || !HuntCtx->ppEntSys || !HuntCtx->ppGlobalEnv || !HuntCtx->ppCCryAction) + return; + if (firstEntry) { firstEntry = false; #if 0 @@ -341,7 +344,7 @@ void APIENTRY LibEntry(PVOID user_ptr) "TestDLL Notification", MB_OK | MB_ICONINFORMATION); return; - } +} void *bla = malloc(10); free(bla); #endif @@ -349,7 +352,7 @@ void APIENTRY LibEntry(PVOID user_ptr) HINSTANCE addr = GetModuleHandle(NULL); _CRT_INIT(addr, DLL_PROCESS_ATTACH, NULL); - if (!InitAndCheckPtr(user_ptr)) + if (!InitAndCheckPtr(HuntCtx)) { return; } @@ -433,4 +436,4 @@ void APIENTRY LibEntry(PVOID user_ptr) } gdi_radar_process_window_events_nonblocking(ctx); -}
\ No newline at end of file + }
\ No newline at end of file |