[vanz]

Bug:

I have incorrect platform specific sections parsing when using DHookCreateFromConf.
When a section is ignored, after leaving from it, parser thinks that we are leaving from current oversection.

[Peace-Maker]

Originally Posted by vanz Bug: I have incorrect platform specific sections parsing when using DHookCreateFromConf. When a section is ignored, after leaving from it, parser thinks that we are leaving from current oversection.

Can you please create a test plugin/gamedata that triggers that bug?

[vanz]

Originally Posted by Peace-Maker Can you please create a test plugin/gamedata that triggers that bug?

Plugin:

Spoiler

PHP Code:

#pragma semicolon 1

#include <sourcemod>
#include <sdktools>
#include <dhooks>

#pragma newdecls required

Handle g_hFireBullet;

public void OnPluginStart()
{
    GameData conf = LoadGameConfigFile("firebullethook.games");

    g_hFireBullet = DHookCreateFromConf(conf, "CCSPlayer::FireBullet");
    
    if (g_hFireBullet == INVALID_HANDLE)
        SetFailState("Failed to setup detour for CCSPlayer::FireBullet");
    
    delete conf;

    if (!DHookEnableDetour(g_hFireBullet, false, Detour_OnFireBullet))
        SetFailState("Failed to detour CCSPlayer::FireBullet");
}

public MRESReturn Detour_OnFireBullet(int client, Handle params)
{
    return MRES_Ignored;
} 


Gamedata:

Spoiler

"Games"
{
    "csgo"
    {
        "Functions"
        {
            "CCSPlayer::FireBullet"
            {
                "signature" "CCSPlayer::FireBullet"
                "callconv" "thiscall"
                "return" "void"
                "this" "entity"
                "arguments"
                {
                    "origin"
                    {
                        "type" "object"
                        "size" "12"
                    }
                    "angles"
                    {
                        "type" "vectorptr"
                    }
                    "distance"
                    {
                        "type" "float"
                        "windows"
                        {
                            "register" "xmm3"
                        }
                    }
                    "penetration_power"
                    {
                        "type" "float"
                    }
                    "penetration"
                    {
                        "type" "int"
                    }
                    "bullet_type"
                    {
                        "type" "int"
                    }
                    "damage"
                    {
                        "type" "int"
                    }
                    "unknown"
                    {
                        "type" "int"
                    }
                    "bullet"
                    {
                        "type" "int"
                        "windows"
                        {
                            "register" "esi"
                        }
                        "linux"
                        {
                            "register" "ebx"
                        }
                    }
                    "range_modifier"
                    {
                        "type" "float"
                    }
                    "attacker"
                    {
                        "type" "cbaseentity"
                    }
                    "do_effects"
                    {
                        "type" "bool"
                    }
                    "spread_x"
                    {
                        "type" "float"
                    }
                    "spread_y"
                    {
                        "type" "float"
                    }
                }
            }
        }

        "Signatures"
        {
            "CCSPlayer::FireBullet"
            {
                "library" "server"
                "windows" "\x55\x8B\xEC\x83\xE4\xF0\x81\xEC\x2A\x2A\x2A\x2A\x66\x0F\x6E\x45\x2A\x8D\x94\x24\x2A\x2A\x2A\x2A"
                "linux" "\x55\x89\xE5\x57\x56\x53\x81\xEC\x2A\x2A\x2A\x2A\x0F\xB6\x45\x2A\xF3\x0F\x2A\x45\x2A\x88\x85\x2A\x2A\x2A\x2A\x8D\x85\x2A\x2A\x2A\x2A\x89\x44\x24\x2A\x8D\x85\x2A\x2A\x2A\x2A\x89\x44\x24\x2A\x8D\x85\x2A\x2A\x2A\x2A\x89\x44\x24\x2A\x8B\x45\x2A\xF3\x0F\x11\x45\x2A"
            }
        }
    }
}

Errors:

Spoiler

L 04/17/2020 - 23:58:09: SourceMod error session started
L 04/17/2020 - 23:58:09: Info (map "de_dust2") (file "D:\Servers\srcds_csgo\csgo\addons\sourcemod\ logs\errors_20200417.log")
L 04/17/2020 - 23:58:09: [DHOOKS] Unknown subsection "range_modifier" (expected "arguments"): line: 65 col: 21
L 04/17/2020 - 23:58:09: [SM] Error parsing gameconfig file "D:\Servers\srcds_csgo\csgo\addons\sourcemod\ gamedata\firebullethook.games.txt":
L 04/17/2020 - 23:58:09: [SM] Error 3 on line 65, col 21: Callback error
L 04/17/2020 - 23:58:09: [SM] Exception reported: Unable to open firebullethook.games: Callback error
L 04/17/2020 - 23:58:09: [SM] Blaming: firebullethook.smx
L 04/17/2020 - 23:58:09: [SM] Call stack trace:
L 04/17/2020 - 23:58:09: [SM] [0] LoadGameConfigFile
L 04/17/2020 - 23:58:09: [SM] [1] Line 13, firebullethook.sp::OnPluginStart
L 04/17/2020 - 23:58:09: [SM] Unable to load plugin "firebullethook.smx": Error detected in plugin startup (see error logs)

[Peace-Maker]

Thanks I've put up a new version 2.2.0-detours10 with that fixed.

https://github.com/peace-maker/DHook...3db63393a3ca7b

Can you test if that broke something else in your plugins?

[vanz]

Originally Posted by Peace-Maker Thanks I've put up a new version 2.2.0-detours10 with that fixed. https://github.com/peace-maker/DHook...3db63393a3ca7b Can you test if that broke something else in your plugins?

Thanks for fix.

Now it works fine

[Alienmario]

Could anyone help with CBaseEntity::AcceptInput hook as in the example?
It works correctly on windows but on linux the fourth parameter (variant_t) gives gibberish - both in the fieldtype (object offset 16) and the actual value (offset 0). Game is BMS.

Edit:
Okay, it works when the hook is configured through code. I think the "flags" keyvalue in functions might not parse correctly? This is on the latest version of dhooks-detours.

"CBaseEntity::AcceptInput"
{
	"offset"	"CBaseEntity::AcceptInput"
	"hooktype"	"entity"
	"return"	"bool"
	"this"		"entity"
	"arguments"
	{
		"szInputName"
		{
			"type"	"charptr"
		}
		"pActivator"
		{
			"type"	"cbaseentity"
		}
		"pCaller"
		{
			"type"	"cbaseentity"
		}
		"Value"
		{
			"type"	"object"
			"size"	"20"
			"flags"	"byval odtor octor oassignop"
		}
		"outputID"
		{
			"type"	"int"
		}
	}
}

[Peace-Maker]

Whops, copy&paste devil https://github.com/peace-maker/DHook....cpp#L280-L281

Try the new version detours12

[Alienmario]

Looking at the code, seems like it will only parse the first flag, in my case byval. I think you might want to remove the "elses" too Thanks.

[Peace-Maker]

Originally Posted by Alienmario Looking at the code, seems like it will only parse the first flag, in my case byval. I think you might want to remove the "elses" too Thanks.

Argh, you're right. I've tested it this time.. Sorry for the untested changes and thanks for the quick reports. Try detours13.

[Alienmario]

Originally Posted by Peace-Maker Argh, you're right. I've tested it this time.. Sorry for the untested changes and thanks for the quick reports. Try detours13.

That fixed it, thanks again.