[Dr!fter]

Originally Posted by Neuro Toxin Spoiler #pragma semicolon 1 #include <sourcemod> #include <sdktools> #include <dhooks> //int CCSPlayer::GiveNamedItem(char const*, int, CEconItemView*, bool) Handle hGiveNamedItem; public void OnPluginStart() { int offset = 445; // change to 446 for linux hGiveNamedItem = DHookCreate(offset, HookType_Entity, ReturnType_Int, ThisPointer_CBaseEntity, OnGiveNamedItem); DHookAddParam(hGiveNamedItem, HookParamType_CharPtr, -1, DHookPass_ByRef); DHookAddParam(hGiveNamedItem, HookParamType_Int, -1, DHookPass_ByVal); DHookAddParam(hGiveNamedItem, HookParamType_Int, -1, DHookPass_ByRef); DHookAddParam(hGiveNamedItem, HookParamType_Bool, -1, DHookPass_ByVal); } public void OnMapStart() { for (int client = 1; client < MaxClients; client++) { if (IsClientInGame(client)) OnClientPutInServer(client); } } public void OnClientPutInServer(client) { if (IsFakeClient(client)) return; DHookEntity(hGiveNamedItem, true, client); } //CBaseEntity *GiveNamedItem(char const*, int, CEconItemView*, bool) public MRESReturn OnGiveNamedItem(int client, Handle hReturn, Handle hParams) { int entity = DHookGetReturn(hReturn); PrintToConsole(client, "----------==========> MRESReturn:OnGiveNamedItem(client=%d, entity=%d)", client, entity); return MRES_Ignored; } I cant get DHookGetReturn to give me an entity index for GiveNamedItem's return type. If I create a hook with the return type of ReturnType_Int it get this: ----------==========> MRESReturn:OnGiveNamedItem(client=3, entity=164975072) ----------==========> MRESReturn:OnGiveNamedItem(client=3, entity=177344800) ----------==========> MRESReturn:OnGiveNamedItem(client=3, entity=177231552) ----------==========> MRESReturn:OnGiveNamedItem(client=3, entity=164039216) Which looks like a pointer to me. So I naturally try ReturnType_CBaseEntity which crashes the server I think the return type is CBaseEntity*. Is there anyway way for me to convert this into a entity index?

There is a bug in DHooks2, I will fix it soon. It appears I did some bad copy pasting from the param logic and this totally broke returns of pointers

[Neuro Toxin]

Yay!

I have to mention where due.

This extension is really useful. Love your work guys.

[Powerlord]

Originally Posted by psychonic It's in sourcepawn/include now, instead of public/sourcepawn/ or wherever it was.

Actually, there are a number of other build problem building on SM 1.8.

The first four can just be tossed into the existing AMBuildScript. Specifically:

      os.path.join(self.sm_root, 'sourcepawn', 'include'),
      os.path.join(self.sm_root, 'sourcepawn', 'vm'),
      os.path.join(self.sm_root, 'sourcepawn', 'vm', 'x86'),
      os.path.join(self.sm_root, 'public', 'amtl', 'include'),

in the builder.compiler.cxxincludes array.

The last problem I see may not be compatible. DHooks has the path to assembler-x86.cpp hard-coded into the AMBuildScript (well... using os.path.join, but close enough):

program.sources += [os.path.join(DHooks.sm_root, 'public', 'jit', 'x86', "assembler-x86.cpp"),]

This file moved in SM 1.8:

program.sources += [os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', "assembler-x86.cpp"),]

Is it possible to detect if a file exists and/or what SM version we're compiling against inside AMBuild?

Edit: Herpa-Derp... of course you can. AMBuildScript is just a Python script after all. os.path.isfile should work for this.

Incidentally, I've attached the working AMBuildScript for DHooks2 and SM 1.8.

[Dr!fter]

I fixed the problem with returns that were pointers. I hopefully didnt break anything else, the code for handling returns needs to be rewritten at some point as it is quiet ugly (Ill probably get around to it soon). I tested changing returns of ints, floats, bools, and pointers and they all appear to be working correctly so hopefully the ones I didnt test also work. I also updated the test plugin so it no longer spews things about keywords (this, interface).

The code i used to test.

PHP Code:

new Handle:hGiveNamedItem;
public OnPluginStart()
{
    int offset = 445;
    
    hGiveNamedItem = DHookCreate(offset, HookType_Entity, ReturnType_CBaseEntity, ThisPointer_CBaseEntity, OnGiveNamedItem);
    DHookAddParam(hGiveNamedItem, HookParamType_CharPtr);
    DHookAddParam(hGiveNamedItem, HookParamType_Int);
    DHookAddParam(hGiveNamedItem, HookParamType_Unknown);
    DHookAddParam(hGiveNamedItem, HookParamType_Bool);
}
public void OnClientPutInServer(client)
{
    if (IsFakeClient(client))
        return;
    
    DHookEntity(hGiveNamedItem, true, client);
}

public MRESReturn OnGiveNamedItem(pThis, Handle hReturn, Handle hParams)
{   
    PrintToConsole(pThis, "----------==========> MRESReturn:OnGiveNamedItem(client=%d, entity=%d)", pThis, DHookGetReturn(hReturn));
    return MRES_Ignored;
} 


You can grab the latest snapshot on the link in the first post.

[Electr000999]

anyone can help with this?
issue only on linux..

[Powerlord]

Here's a new AMBuilldScript file that compiles on both SM 1.7 and SM 1.8.

I should do a pull request on this, but I haven't had a chance.

Edit: Filed a pull request.

[Neuro Toxin]

Originally Posted by Dr!fter I fixed the problem with returns that were pointers. I hopefully didnt break anything else, the code for handling returns needs to be rewritten at some point as it is quiet ugly (Ill probably get around to it soon). I tested changing returns of ints, floats, bools, and pointers and they all appear to be working correctly so hopefully the ones I didnt test also work. I also updated the test plugin so it no longer spews things about keywords (this, interface). The code i used to test. PHP Code: new Handle:hGiveNamedItem; public OnPluginStart() {     int offset = 445;          hGiveNamedItem = DHookCreate(offset, HookType_Entity, ReturnType_CBaseEntity, ThisPointer_CBaseEntity, OnGiveNamedItem);     DHookAddParam(hGiveNamedItem, HookParamType_CharPtr);     DHookAddParam(hGiveNamedItem, HookParamType_Int);     DHookAddParam(hGiveNamedItem, HookParamType_Unknown);     DHookAddParam(hGiveNamedItem, HookParamType_Bool); } public void OnClientPutInServer(client) {     if (IsFakeClient(client))         return;          DHookEntity(hGiveNamedItem, true, client); } public MRESReturn OnGiveNamedItem(pThis, Handle hReturn, Handle hParams) {        PrintToConsole(pThis, "----------==========> MRESReturn:OnGiveNamedItem(client=%d, entity=%d)", pThis, DHookGetReturn(hReturn));     return MRES_Ignored; }  You can grab the latest snapshot on the link in the first post.

Thanks Dr!fter

Just left for work. I'll test it tonight

[Neuro Toxin]

Works perfect now.

Thanks Dr!fter!

[Dr!fter]

Updated to version 2.0.2. In my attempt to fix pointer returns i created a memory leak, it is now fixed in the latest build.

[Apina]

[12] <FAILED> file "dhooks.ext.so": Extension version is too new to load (8, max is 7)

Using in CSS, sourcemod 1.6.4 and using latest version css server

Tryed out 2.0.0 version to 2.0.2 version dhooks same problem.