UNLOZE/sm-ext-dhooks2
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More linux changes.

Browse Source
This commit is contained in:
Dr!fter 2013-08-28 22:58:42 -04:00
parent 394f21e1a4
commit b2288d7333
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -106,24 +106,25 @@ ifneq (,$(filter original orangebox,$(ENGINE)))
LIB_SUFFIX = _i486.$(LIB_EXT) LIB_SUFFIX = _i486.$(LIB_EXT)
else else
LIB_PREFIX = lib LIB_PREFIX = lib
LIB_SUFFIX = .$(LIB_EXT) LIB_SUFFIX = _srv.$(LIB_EXT)
endif endif
INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit/x86 -I$(SMSDK)/public/jit INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions -I$(SMSDK)/public/jit/x86 -I$(SMSDK)/public/jit
ifeq "$(USEMETA)" "true" ifeq "$(USEMETA)" "true"
LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/$(LIB_PREFIX)vstdlib_srv$(LIB_SUFFIX) $(HL2LIB)/$(LIB_PREFIX)tier0_srv$(LIB_SUFFIX) LINK_HL2 = $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX)
ifeq "$(ENGINE)" "csgo" ifeq "$(ENGINE)" "csgo"
LINK_HL2 += $(HL2LIB)/interfaces_i486.a LINK_HL2 += $(HL2LIB)/interfaces_i486.a
endif endif
LINK += $(LINK_HL2) LINK += $(LINK_HL2)
INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(HL2SDK)/game/shared -I$(METAMOD) \ INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(HL2SDK)/game/shared\
-I$(METAMOD)/sourcehook -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/extensions \
-I$(SMSDK)/public/sourcepawn
CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \ CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \ -DSE_ORANGEBOXVALVE=6 -DSE_LEFT4DEAD=7 -DSE_LEFT4DEAD2=8 -DSE_ALIENSWARM=9 \
-DSE_PORTAL2=11 -DSE_CSGO=12 -DSE_PORTAL2=10 -DSE_CSGO=11 -DSE_CSS=12
endif endif
LINK += -m32 -lm -ldl LINK += -m32 -lm -ldl

28
vhook.h
View File

@ -165,7 +165,7 @@ Vector *Callback_vector(DHooksCallback *dg, void **stack, size_t *argsizep);
#else #else
void *Callback(DHooksCallback *dg, void **stack); void *Callback(DHooksCallback *dg, void **stack);
float Callback_float(DHooksCallback *dg, void **stack); float Callback_float(DHooksCallback *dg, void **stack);
Vector Callback_vector(DHooksCallback *dg, void **stack, size_t *argsizep); Vector *Callback_vector(DHooksCallback *dg, void **stack);
#endif #endif
bool SetupHookManager(ISmmAPI *ismm); bool SetupHookManager(ISmmAPI *ismm);
void CleanupHooks(IPluginContext *pContext); void CleanupHooks(IPluginContext *pContext);
@ -176,20 +176,32 @@ SourceHook::PassInfo::PassType GetParamTypePassType(HookParamType type);
static void *GenerateThunk(ReturnType type) static void *GenerateThunk(ReturnType type)
{ {
MacroAssemblerX86 masm; MacroAssemblerX86 masm;
static const size_t kStackNeeded = (2) * 4; // 2 args max
static const size_t kReserve = ke::Align(kStackNeeded+8, 16)-8;
masm.push(ebp); masm.push(ebp);
masm.movl(ebp, esp); masm.movl(ebp, esp);
masm.lea(eax, Operand(ebp, 12)); masm.subl(esp, kReserve);
masm.push(eax); masm.lea(eax, Operand(ebp, 12)); // grab the incoming caller argument vector
masm.push(Operand(ebp, 8)); masm.movl(Operand(esp, 1 * 4), eax); // set that as the 2nd argument
masm.lea(eax, Operand(ebp, 8)); // grab the |this|
masm.movl(Operand(esp, 0 * 4), eax); // set |this| as the 1st argument
if(type == ReturnType_Float) if(type == ReturnType_Float)
{
masm.call(ExternalAddress((void *)Callback_float)); masm.call(ExternalAddress((void *)Callback_float));
}
else if(type == ReturnType_Vector)
{
masm.call(ExternalAddress((void *)Callback_vector));
}
else else
{
masm.call(ExternalAddress((void *)Callback)); masm.call(ExternalAddress((void *)Callback));
masm.addl(esp, 8); }
masm.pop(ebp); masm.addl(esp, kReserve);
masm.pop(ebp); // restore ebp
masm.ret(); masm.ret();
void *base = g_pSM->GetScriptingEngine()->AllocatePageMemory(masm.length()); void *base = g_pSM->GetScriptingEngine()->AllocatePageMemory(masm.length());
masm.emitToExecutableMemory(base); masm.emitToExecutableMemory(base);
return base; return base;