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

More return struct fixes.

Browse Source
This commit is contained in:
Dr!fter 2013-08-26 17:44:18 -04:00
parent 0a051ab32e
commit a916cdb66b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vhook.cpp
View File

@ -122,37 +122,33 @@ HookParamsStruct *GetParamStruct(DHooksCallback *dg, void **argStack, size_t arg
} }
return params; return params;
} }
HookReturnStruct *GetReturnStruct(DHooksCallback *dg, const void *result) HookReturnStruct *GetReturnStruct(DHooksCallback *dg)
{ {
HookReturnStruct *res = new HookReturnStruct(); HookReturnStruct *res = new HookReturnStruct();
res->isChanged = false; res->isChanged = false;
res->type = dg->returnType; res->type = dg->returnType;
res->newResult = malloc(sizeof(void *)); res->newResult = malloc(sizeof(void *));
res->orgResult = malloc(sizeof(void *)); res->orgResult = malloc(sizeof(void *));
if(dg->returnType != ReturnType_CharPtr && dg->returnType != ReturnType_StringPtr)
{
res->newResult = malloc(sizeof(void *));
}
if(result && dg->post) if(g_SHPtr->GetOrigRet() && dg->post)
{ {
switch(dg->returnType) switch(dg->returnType)
{ {
case ReturnType_String: case ReturnType_String:
*(string_t *)res->orgResult = *(string_t *)result; *(string_t *)res->orgResult = META_RESULT_ORIG_RET(string_t);
break; break;
//ReturnType_Vector, //ReturnType_Vector,
case ReturnType_Int: case ReturnType_Int:
*(int *)res->orgResult = *(int *)result; *(int *)res->orgResult = META_RESULT_ORIG_RET(int);
break; break;
case ReturnType_Bool: case ReturnType_Bool:
*(bool *)res->orgResult = *(bool *)result; *(bool *)res->orgResult = META_RESULT_ORIG_RET(bool);
break; break;
case ReturnType_Float: case ReturnType_Float:
*(float *)res->orgResult = *(float *)result; *(float *)res->orgResult = META_RESULT_ORIG_RET(float);
break; break;
default: default:
*(void **)res->orgResult = (void *)result; *(void **)res->orgResult = META_RESULT_ORIG_RET(void *);
break; break;
} }
} }
@ -214,7 +210,7 @@ void *Callback(DHooksCallback *dg, void **argStack)
} }
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
{ {
returnStruct = GetReturnStruct(dg, g_SHPtr->GetOrigRet()); returnStruct = GetReturnStruct(dg);
rHndl = handlesys->CreateHandle(g_HookReturnHandle, returnStruct, dg->plugin_callback->GetParentRuntime()->GetDefaultContext()->GetIdentity(), myself->GetIdentity(), NULL); rHndl = handlesys->CreateHandle(g_HookReturnHandle, returnStruct, dg->plugin_callback->GetParentRuntime()->GetDefaultContext()->GetIdentity(), myself->GetIdentity(), NULL);
if(!rHndl) if(!rHndl)
{ {
@ -369,7 +365,7 @@ void *Callback_float(DHooksCallback *dg, void **argStack)
dg->plugin_callback->PushCell(GetThisPtr(g_SHPtr->GetIfacePtr(), dg->thisType)); dg->plugin_callback->PushCell(GetThisPtr(g_SHPtr->GetIfacePtr(), dg->thisType));
} }
returnStruct = GetReturnStruct(dg, g_SHPtr->GetOrigRet()); returnStruct = GetReturnStruct(dg);
rHndl = handlesys->CreateHandle(g_HookReturnHandle, returnStruct, dg->plugin_callback->GetParentRuntime()->GetDefaultContext()->GetIdentity(), myself->GetIdentity(), NULL); rHndl = handlesys->CreateHandle(g_HookReturnHandle, returnStruct, dg->plugin_callback->GetParentRuntime()->GetDefaultContext()->GetIdentity(), myself->GetIdentity(), NULL);
if(!rHndl) if(!rHndl)