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

Revert "Fix crash"

Browse Source 
This reverts commit 67b3b54ae1.
This commit is contained in:
BotoX 2019-09-25 18:58:02 +02:00
parent cc15c3479f
commit c9a3f0c59d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vhook.cpp
View File

@ -444,6 +444,7 @@ void *Callback(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
ret = CallVFunction<void *>(dg, paramStruct, g_SHPtr->GetIfacePtr()); ret = CallVFunction<void *>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_ChangedOverride: case MRES_ChangedOverride:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -471,6 +472,7 @@ void *Callback(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
CallVFunction<void *>(dg, paramStruct, g_SHPtr->GetIfacePtr()); CallVFunction<void *>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_Override: case MRES_Override:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -524,6 +526,7 @@ void *Callback(DHooksCallback *dg, void **argStack)
g_SHPtr->DoRecall(); g_SHPtr->DoRecall();
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
g_SHPtr->EndContext(NULL);
} }
break; break;
default: default:
@ -625,6 +628,7 @@ float Callback_float(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
*(float *)ret = CallVFunction<float>(dg, paramStruct, g_SHPtr->GetIfacePtr()); *(float *)ret = CallVFunction<float>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_ChangedOverride: case MRES_ChangedOverride:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -645,6 +649,7 @@ float Callback_float(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
CallVFunction<float>(dg, paramStruct, g_SHPtr->GetIfacePtr()); CallVFunction<float>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_Override: case MRES_Override:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -782,6 +787,7 @@ SDKVector *Callback_vector(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
*vec_result = CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr()); *vec_result = CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_ChangedOverride: case MRES_ChangedOverride:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -802,6 +808,7 @@ SDKVector *Callback_vector(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr()); CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_Override: case MRES_Override:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -930,6 +937,7 @@ string_t *Callback_stringt(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
*string_result = CallVFunction<string_t>(dg, paramStruct, g_SHPtr->GetIfacePtr()); *string_result = CallVFunction<string_t>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_ChangedOverride: case MRES_ChangedOverride:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)
@ -950,6 +958,7 @@ string_t *Callback_stringt(DHooksCallback *dg, void **argStack)
g_SHPtr->SetRes(MRES_SUPERCEDE); g_SHPtr->SetRes(MRES_SUPERCEDE);
mres = MRES_SUPERCEDE; mres = MRES_SUPERCEDE;
CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr()); CallVFunction<SDKVector>(dg, paramStruct, g_SHPtr->GetIfacePtr());
g_SHPtr->EndContext(NULL);
break; break;
case MRES_Override: case MRES_Override:
if(dg->returnType != ReturnType_Void) if(dg->returnType != ReturnType_Void)