Skip to content
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

Jump to bottom

Add templated helper class to promote type-safety #965

Merged
merged 6 commits into from
Apr 12, 2019
Merged

Add templated helper class to promote type-safety #965

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e10edf5
Add type-safety to vstk blobs
Headline Mar 9, 2019
90544a0
Static alloc, renaming, & whitespace fixes
Headline Mar 16, 2019
2dfa9d2
Implicit conversions to raw ptr
Headline Mar 16, 2019
a10f53a
Remove constexpr due to old limitations
Headline Mar 17, 2019
0c9950d
Last whitespace changes...
Headline Mar 19, 2019
5dd428c
Little ease-of-use additions
Headline Mar 19, 2019
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
52 changes: 7 additions & 45 deletions extensions/cstrike/natives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "forwards.h"
#include "util_cstrike.h"
#include <server_class.h>
#include <sm_argbuffer.h>

#if SOURCE_ENGINE == SE_CSGO
#include "itemdef-hash.h"
Expand Down Expand Up @@ -178,12 +179,8 @@ static cell_t CS_SwitchTeam(IPluginContext *pContext, const cell_t *params)
return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
}

unsigned char vstk[sizeof(CBaseEntity *) + sizeof(int)];
unsigned char *vptr = vstk;
ArgBuffer<CBaseEntity*, int> vstk(pEntity, params[2]);

Headline marked this conversation as resolved.
Show resolved Hide resolved
*(CBaseEntity **)vptr = pEntity;
vptr += sizeof(CBaseEntity *);
*(int *)vptr = params[2];
pWrapper->Execute(vstk, NULL);
#else
if (g_pSDKTools == NULL)
Expand Down Expand Up @@ -273,20 +270,10 @@ static cell_t CS_DropWeapon(IPluginContext *pContext, const cell_t *params)
if (params[4] == 1 && g_pCSWeaponDropDetoured)
g_pIgnoreCSWeaponDropDetour = true;

unsigned char vstk[sizeof(CBaseEntity *) * 2 + sizeof(bool) * 2];
unsigned char *vptr = vstk;

// <psychonic> first one is always false. second is true to toss, false to just drop
*(CBaseEntity **)vptr = pEntity;
vptr += sizeof(CBaseEntity *);
*(CBaseEntity **)vptr = pWeapon;
vptr += sizeof(CBaseEntity *);
*(bool *)vptr = false;
vptr += sizeof(bool);
*(bool *)vptr = (params[3]) ? true : false;

pWrapper->Execute(vstk, NULL);
ArgBuffer<CBaseEntity*, CBaseEntity*, bool, bool> vstk(pEntity, pWeapon, false, (params[3]) ? true : false);

pWrapper->Execute(vstk, NULL);
return 1;
}

Expand Down Expand Up @@ -333,14 +320,7 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
if (params[3] == 1 && g_pTerminateRoundDetoured)
g_pIgnoreTerminateDetour = true;

unsigned char vstk[sizeof(void *) + sizeof(float)+ sizeof(int)];
unsigned char *vptr = vstk;

*(void **)vptr = gamerules;
vptr += sizeof(void *);
*(float *)vptr = sp_ctof(params[1]);
vptr += sizeof(float);
*(int*)vptr = reason;
ArgBuffer<void*, float, int> vstk(gamerules, sp_ctof(params[1]), reason);

pWrapper->Execute(vstk, NULL);
#elif SOURCE_ENGINE == SE_CSGO && !defined(WIN32)
Expand Down Expand Up @@ -368,18 +348,7 @@ static cell_t CS_TerminateRound(IPluginContext *pContext, const cell_t *params)
if (params[3] == 1 && g_pTerminateRoundDetoured)
g_pIgnoreTerminateDetour = true;

unsigned char vstk[sizeof(void *) + sizeof(float) + (sizeof(int)*3)];
unsigned char *vptr = vstk;

*(void **)vptr = gamerules;
vptr += sizeof(void *);
*(float *)vptr = sp_ctof(params[1]);
vptr += sizeof(float);
*(int*)vptr = reason;
vptr += sizeof(int);
*(int*)vptr = 0;
vptr += sizeof(int);
*(int*)vptr = 0;
ArgBuffer<void*, float, int, int, int> vstk(gamerules, sp_ctof(params[1]), reason, 0, 0);

pWrapper->Execute(vstk, NULL);
#else // CSGO Win32
Expand Down Expand Up @@ -881,15 +850,8 @@ static cell_t CS_SetClientClanTag(IPluginContext *pContext, const cell_t *params
char *szNewTag;
pContext->LocalToString(params[2], &szNewTag);

unsigned char vstk[sizeof(CBaseEntity *) + sizeof(char *)];
unsigned char *vptr = vstk;

*(CBaseEntity **)vptr = pEntity;
vptr += sizeof(CBaseEntity *);
*(char **)vptr = szNewTag;

ArgBuffer<CBaseEntity*, char*> vstk(pEntity, szNewTag);
pWrapper->Execute(vstk, NULL);

return 1;
#endif
}
Expand Down
76 changes: 20 additions & 56 deletions extensions/cstrike/util_cstrike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <iplayerinfo.h>
#if SOURCE_ENGINE == SE_CSGO
#include "itemdef-hash.h"
#include <sm_argbuffer.h>

ClassnameMap g_mapClassToDefIdx;
ItemIndexMap g_mapDefIdxToClass;
Expand Down Expand Up @@ -135,17 +136,9 @@ CEconItemView *GetEconItemView(CBaseEntity *pEntity, int iSlot)
return NULL;

CEconItemView *ret;
unsigned char vstk[sizeof(void *) + sizeof(int) * 2];
unsigned char *vptr = vstk;

*(void **)vptr = (void *)((intptr_t)pEntity + thisPtrOffset);
vptr += sizeof(void *);
*(int *)vptr = team;
vptr += sizeof(int);
*(int *)vptr = iSlot;
ArgBuffer<void*, int> vstk(reinterpret_cast<void*>(((intptr_t)pEntity + thisPtrOffset)), iSlot);

pWrapper->Execute(vstk, &ret);

return ret;
}

Expand All @@ -163,15 +156,10 @@ CCSWeaponData *GetCCSWeaponData(CEconItemView *view)
pWrapper = g_pBinTools->CreateCall(addr, CallConv_ThisCall, &retpass, NULL, 0))
}

unsigned char vstk[sizeof(CEconItemView *)];
unsigned char *vptr = vstk;

*(CEconItemView **)vptr = view;

CCSWeaponData *pWpnData = NULL;

CCSWeaponData *pWpnData;
ArgBuffer<CEconItemView*> vstk(view);

pWrapper->Execute(vstk, &pWpnData);

return pWpnData;
}

Expand Down Expand Up @@ -234,16 +222,10 @@ CEconItemDefinition *GetItemDefintionByName(const char *classname)
g_RegNatives.Register(pWrapper);
}

unsigned char vstk[sizeof(void *) + sizeof(const char *)];
unsigned char *vptr = vstk;

*(void **)vptr = pSchema;
vptr += sizeof(void *);
*(const char **)vptr = classname;

CEconItemDefinition *pItemDef = NULL;
CEconItemDefinition *pItemDef;
ArgBuffer<void*, const char *> vstk(pSchema, classname);

pWrapper->Execute(vstk, &pItemDef);

return pItemDef;
}

Expand Down Expand Up @@ -390,8 +372,6 @@ ItemDefHashValue *GetHashValueFromWeapon(const char *szWeapon)
#if SOURCE_ENGINE != SE_CSGO
void *GetWeaponInfo(int weaponID)
{
void *info;

static ICallWrapper *pWrapper = NULL;
if (!pWrapper)
{
Expand All @@ -407,13 +387,10 @@ void *GetWeaponInfo(int weaponID)
pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
}

unsigned char vstk[sizeof(int)];
unsigned char *vptr = vstk;

*(int *)vptr = weaponID;

void *info = nullptr;
ArgBuffer<int> vstk(weaponID);

pWrapper->Execute(vstk, &info);

return info;
}
#endif
Expand All @@ -435,7 +412,6 @@ const char *GetWeaponNameFromClassname(const char *weapon)
const char *GetTranslatedWeaponAlias(const char *weapon)
{
#if SOURCE_ENGINE != SE_CSGO
const char *alias = NULL;

static ICallWrapper *pWrapper = NULL;

Expand All @@ -453,11 +429,9 @@ const char *GetTranslatedWeaponAlias(const char *weapon)
pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
}

unsigned char vstk[sizeof(const char *)];
unsigned char *vptr = vstk;

*(const char **)vptr = GetWeaponNameFromClassname(weapon);

const char *alias = nullptr;
ArgBuffer<const char *> vstk(GetWeaponNameFromClassname(weapon));

pWrapper->Execute(vstk, &alias);
return alias;
#else //this should work for both games maybe replace both?
Expand Down Expand Up @@ -492,8 +466,6 @@ const char *GetTranslatedWeaponAlias(const char *weapon)
int AliasToWeaponID(const char *weapon)
{
#if SOURCE_ENGINE != SE_CSGO
int weaponID = 0;

static ICallWrapper *pWrapper = NULL;

if (!pWrapper)
Expand All @@ -510,13 +482,10 @@ int AliasToWeaponID(const char *weapon)
pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
}

unsigned char vstk[sizeof(const char *)];
unsigned char *vptr = vstk;

*(const char **)vptr = GetWeaponNameFromClassname(weapon);

int weaponID = 0;
ArgBuffer<const char *> vstk(GetWeaponNameFromClassname(weapon));

pWrapper->Execute(vstk, &weaponID);

return weaponID;
#else
ItemDefHashValue *pHashValue = GetHashValueFromWeapon(weapon);
Expand All @@ -531,10 +500,8 @@ int AliasToWeaponID(const char *weapon)
const char *WeaponIDToAlias(int weaponID)
{
#if SOURCE_ENGINE != SE_CSGO
const char *alias = NULL;

static ICallWrapper *pWrapper = NULL;

if (!pWrapper)
{
REGISTER_ADDR("WeaponIDToAlias", 0,
Expand All @@ -549,13 +516,10 @@ const char *WeaponIDToAlias(int weaponID)
pWrapper = g_pBinTools->CreateCall(addr, CallConv_Cdecl, &retpass, pass, 1))
}

unsigned char vstk[sizeof(int)];
unsigned char *vptr = vstk;

*(int *)vptr = weaponID;

const char *alias = nullptr;
ArgBuffer<int> vstk(weaponID);

pWrapper->Execute(vstk, &alias);

return alias;
#else
WeaponIDMap::Result res = g_mapWeaponIDToDefIdx.find((SMCSWeapon)weaponID);
Expand Down
18 changes: 3 additions & 15 deletions extensions/sdktools/inputnatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "extension.h"
#include "variant-t.h"
#include <datamap.h>
#include <sm_argbuffer.h>

ICallWrapper *g_pAcceptInput = NULL;

Expand Down Expand Up @@ -79,9 +80,6 @@ static cell_t AcceptEntityInput(IPluginContext *pContext, const cell_t *params)
CBaseEntity *pActivator, *pCaller, *pDest;

char *inputname;
unsigned char vstk[sizeof(void *) + sizeof(const char *) + sizeof(CBaseEntity *)*2 + SIZEOF_VARIANT_T + sizeof(int)];
unsigned char *vptr = vstk;

ENTINDEX_TO_CBASEENTITY(params[1], pDest);
pContext->LocalToString(params[2], &inputname);
if (params[3] == -1)
Expand All @@ -97,19 +95,9 @@ static cell_t AcceptEntityInput(IPluginContext *pContext, const cell_t *params)
ENTINDEX_TO_CBASEENTITY(params[4], pCaller);
}

*(void **)vptr = pDest;
vptr += sizeof(void *);
*(const char **)vptr = inputname;
vptr += sizeof(const char *);
*(CBaseEntity **)vptr = pActivator;
vptr += sizeof(CBaseEntity *);
*(CBaseEntity **)vptr = pCaller;
vptr += sizeof(CBaseEntity *);
memcpy(vptr, g_Variant_t, SIZEOF_VARIANT_T);
vptr += SIZEOF_VARIANT_T;
*(int *)vptr = params[5];
bool ret = false;

bool ret;
ArgBuffer<void*, const char*, CBaseEntity*, CBaseEntity*, decltype(g_Variant_t), int> vstk(pDest, inputname, pActivator, pCaller, g_Variant_t, params[5]);
g_pAcceptInput->Execute(vstk, &ret);

_init_variant_t();
Expand Down
18 changes: 4 additions & 14 deletions extensions/sdktools/outputnatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "extension.h"
#include "variant-t.h"
#include "output.h"
#include <sm_argbuffer.h>

ICallWrapper *g_pFireOutput = NULL;

Expand Down Expand Up @@ -365,9 +366,6 @@ static cell_t FireEntityOutput(IPluginContext *pContext, const cell_t *params)
void *pOutput = NULL;

char *outputname;
unsigned char vstk[sizeof(void *) + sizeof(CBaseEntity *)*2 + SIZEOF_VARIANT_T + sizeof(float)];
unsigned char *vptr = vstk;

ENTINDEX_TO_CBASEENTITY(params[1], pCaller);
pContext->LocalToString(params[2], &outputname);

Expand All @@ -382,17 +380,9 @@ static cell_t FireEntityOutput(IPluginContext *pContext, const cell_t *params)
ENTINDEX_TO_CBASEENTITY(params[3], pActivator);
}

*(void **)vptr = pOutput;
vptr += sizeof(void *);
memcpy(vptr, g_Variant_t, SIZEOF_VARIANT_T);
vptr += SIZEOF_VARIANT_T;
*(CBaseEntity **)vptr = pActivator;
vptr += sizeof(CBaseEntity *);
*(CBaseEntity **)vptr = pCaller;
vptr += sizeof(CBaseEntity *);
*(float *)vptr = sp_ctof(params[4]);

g_pFireOutput->Execute(vstk, NULL);
ArgBuffer<void*, decltype(g_Variant_t), CBaseEntity*, CBaseEntity*, float> vstk(pOutput, g_Variant_t, pActivator, pCaller, sp_ctof(params[4]));

g_pFireOutput->Execute(vstk, nullptr);

_init_variant_t();
return 1;
Expand Down
Loading