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

Attempt to add 64 bit support to sdktools #2159

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+58 −6
Open

Attempt to add 64 bit support to sdktools #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdc837f
fix sdktools crash on 64 bits
bottiger1 May 9, 2024
8612720
remove other 32bit-isms from sdktools
bottiger1 May 9, 2024
3fb09e8
add pointer sdktools type
bottiger1 May 24, 2024
f874bf4
Merge branch 'master' into sdktools64
bottiger1 Jul 1, 2024
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
1 change: 1 addition & 0 deletions extensions/sdktools/hooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ void CHookManager::OnClientConnected(int client)
}
}


int hookid = SH_ADD_VPHOOK(IClientMessageHandler, ProcessVoiceData, (IClientMessageHandler *)((intptr_t)(pClient) + sizeof(void *)), SH_MEMBER(this, &CHookManager::ProcessVoiceData), true);
hook.SetHookID(hookid);
netProcessVoiceData.push_back(new CVTableHook(hook));
Expand Down
13 changes: 8 additions & 5 deletions extensions/sdktools/vcaller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ inline void DecodePassMethod(ValveType vtype, SDKPassMethod method, PassType &ty
type = PassType_Basic;
if (vtype == Valve_POD
|| vtype == Valve_Float
|| vtype == Valve_Bool)
|| vtype == Valve_Bool
|| vtype == Valve_Pointer)
{
flags = PASSFLAG_BYVAL | PASSFLAG_ASPOINTER;
} else {
Expand Down Expand Up @@ -394,8 +395,8 @@ static cell_t SDKCall(IPluginContext *pContext, const cell_t *params)
}

//note: varargs pawn args are passed by-ref
cell_t *cell;
pContext->LocalToPhysAddr(params[startparam], &cell);
intptr_t *cell;
pContext->LocalToPhysAddr(params[startparam], reinterpret_cast<cell_t**>(&cell));
void *thisptr = reinterpret_cast<void*>(*cell);

if (thisptr == nullptr)
Expand Down Expand Up @@ -429,7 +430,8 @@ static cell_t SDKCall(IPluginContext *pContext, const cell_t *params)
{
startparam += 2;
} else if (vc->retinfo->vtype == Valve_Vector
|| vc->retinfo->vtype == Valve_QAngle)
|| vc->retinfo->vtype == Valve_QAngle
|| vc->retinfo->vtype == Valve_Pointer)
{
startparam += 1;
}
Expand Down Expand Up @@ -506,7 +508,8 @@ static cell_t SDKCall(IPluginContext *pContext, const cell_t *params)
pContext->StringToLocalUTF8(params[retparam], *addr, *(char **)vc->retbuf, &written);
return (cell_t)written;
} else if (vc->retinfo->vtype == Valve_Vector
|| vc->retinfo->vtype == Valve_QAngle)
|| vc->retinfo->vtype == Valve_QAngle
|| vc->retinfo->vtype == Valve_Pointer)
{
if (numparams < 2)
{
Expand Down
45 changes: 45 additions & 0 deletions extensions/sdktools/vdecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,20 @@ size_t ValveParamToBinParam(ValveType type,
return sizeof(float);
}
}
case Valve_Pointer:
{
info->type = PassType_Basic;
info->flags = flags;
if (flags & PASSFLAG_ASPOINTER)
{
needs_extra = true;
info->size = sizeof(void*);
return sizeof(void*) * 2;
} else {
info->size = sizeof(void*);
return sizeof(void*);
}
}
}

return 0;
Expand Down Expand Up @@ -278,6 +292,20 @@ DataStatus EncodeValveParam(IPluginContext *pContext,

return Data_Okay;
}
case Valve_Pointer: // buffer -> sourcepawn
{
intptr_t *addr;
pContext->LocalToPhysAddr(param, reinterpret_cast<cell_t**>(&addr));

if (data->flags & PASSFLAG_ASPOINTER)
{
buffer = *(intptr_t **)buffer;
}

*addr = *(intptr_t *)buffer;

return Data_Okay;
}
}

return Data_Fail;
Expand Down Expand Up @@ -579,6 +607,23 @@ DataStatus DecodeValveParam(IPluginContext *pContext,
*(char **)buffer = addr;
return Data_Okay;
}
case Valve_Pointer: // sourcepawn -> buffer
{
intptr_t *addr;
pContext->LocalToPhysAddr(param, reinterpret_cast<cell_t**>(&addr));

if (data->decflags & VDECODE_FLAG_BYREF)
{
addr = reinterpret_cast<intptr_t*>(*addr);
}
if (data->flags & PASSFLAG_ASPOINTER)
{
*(void **)buffer = (unsigned char *)_buffer + pCall->stackEnd + data->obj_offset;
buffer = *(void **)buffer;
}
*(intptr_t *)buffer = *addr;
return Data_Okay;
}
}

return Data_Fail;
Expand Down
1 change: 1 addition & 0 deletions extensions/sdktools/vdecoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ enum ValveType
Valve_String, /**< String */
Valve_Bool, /**< Boolean */
Valve_Object, /**< Object, not matching one of the above types */
Valve_Pointer, /**< 64 bit or 32 bit array */
};

enum DataStatus
Expand Down
4 changes: 3 additions & 1 deletion plugins/include/sdktools.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ enum SDKType
SDKType_Float, /**< Float (any) */
SDKType_Edict, /**< edict_t (always as pointer) */
SDKType_String, /**< NULL-terminated string (always as pointer) */
SDKType_Bool /**< Boolean (any) */
SDKType_Bool, /**< Boolean (any) */
SDKType_Object,
SDKType_Pointer, /**< Pointer (pass in an array) */
};

enum SDKPassMethod
Expand Down