Skip to content

Fix PrepSDKCall_SetSignature on Windows #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KyleSanderson merged 3 commits into from
Oct 3, 2020
Merged

Fix PrepSDKCall_SetSignature on Windows #1346

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1acedb2
Fix sig scanner for windows
Rostu13 Sep 1, 2020
df07895
fix linux build
Rostu13 Sep 1, 2020
b2746c6
Update vcaller.cpp
KyleSanderson Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions extensions/sdktools/vcaller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,15 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
char *sig;
pContext->LocalToString(params[2], &sig);

#if defined PLATFORM_POSIX
if (sig[0] == '@')
{
#if defined PLATFORM_WINDOWS
MEMORY_BASIC_INFORMATION mem;
if (VirtualQuery(addrInBase, &mem, sizeof(mem)))
{
s_call_addr = memutils->ResolveSymbol(mem.AllocationBase, &sig[1]);
}
#elif defined PLATFORM_POSIX
Dl_info info;
if (dladdr(addrInBase, &info) == 0)
{
Expand All @@ -132,6 +138,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
{
return 0;
}

#if SOURCE_ENGINE == SE_CSS \
|| SOURCE_ENGINE == SE_HL2DM \
|| SOURCE_ENGINE == SE_DODS \
Expand All @@ -148,12 +155,13 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
s_call_addr = memutils->ResolveSymbol(handle, &sig[1]);
#else
s_call_addr = dlsym(handle, &sig[1]);
#endif
#endif /* SOURCE_ENGINE */

dlclose(handle);
#endif

return (s_call_addr != NULL) ? 1 : 0;
}
#endif

s_call_addr = memutils->FindPattern(addrInBase, sig, params[3]);

Expand Down