Fix erroneous __Virtual_Address__ checks

Kenzzer · Kenzzer · commit 7b89db285b02 · 2025-10-30T21:53:09.000Z
diff --git a/core/logic/smn_core.cpp b/core/logic/smn_core.cpp
@@ -865,7 +865,7 @@ enum NumberType
 static cell_t LoadFromAddress(IPluginContext *pContext, const cell_t *params)
 {
 	void *addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = pseudoAddr.FromPseudoAddress(params[1]);
 	}
 
@@ -895,7 +895,7 @@ static cell_t LoadFromAddress(IPluginContext *pContext, const cell_t *params)
 static cell_t StoreToAddress(IPluginContext *pContext, const cell_t *params)
 {
 	void *addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = pseudoAddr.FromPseudoAddress(params[1]);
 	}
 
@@ -951,7 +951,7 @@ static cell_t StoreToAddress(IPluginContext *pContext, const cell_t *params)
 static cell_t LoadAddressFromAddress(IPluginContext *pContext, const cell_t *params)
 {
 	void *addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = pseudoAddr.FromPseudoAddress(params[1]);
 	}
 
@@ -965,7 +965,7 @@ static cell_t LoadAddressFromAddress(IPluginContext *pContext, const cell_t *par
 	}
 
 	void* data = *reinterpret_cast<void**>(addr);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		return pseudoAddr.ToPseudoAddress(data);
 	}
 	return reinterpret_cast<uintptr_t>(data);
@@ -974,7 +974,7 @@ static cell_t LoadAddressFromAddress(IPluginContext *pContext, const cell_t *par
 static cell_t StoreAddressToAddress(IPluginContext *pContext, const cell_t *params)
 {
 	void *addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = pseudoAddr.FromPseudoAddress(params[1]);
 	}
 
@@ -988,7 +988,7 @@ static cell_t StoreAddressToAddress(IPluginContext *pContext, const cell_t *para
 	}
 
 	void *data = reinterpret_cast<void*>(params[2]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		data = pseudoAddr.FromPseudoAddress(params[2]);
 	}
 
diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp
@@ -725,7 +725,7 @@ static cell_t GetEntDataEnt2(IPluginContext *pContext, const cell_t *params)
 static cell_t LoadEntityFromHandleAddress(IPluginContext *pContext, const cell_t *params)
 {
 	void *addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = g_SourceMod.FromPseudoAddress(params[1]);
 	}
 
diff --git a/extensions/dhooks/natives.cpp b/extensions/dhooks/natives.cpp
@@ -123,7 +123,7 @@ cell_t Native_CreateHook(IPluginContext *pContext, const cell_t *params)
 cell_t Native_CreateDetour(IPluginContext *pContext, const cell_t *params)
 {
 	void* addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		addr = g_pSM->FromPseudoAddress(params[1]);
 	}
 
@@ -595,7 +595,7 @@ cell_t HookRawImpl(IPluginContext *pContext, const cell_t *params, int callbackI
 		removalcb = pContext->GetFunctionById(params[removalcbIndex]);
 
 	void* iface = reinterpret_cast<void*>(params[3]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		iface = g_pSM->FromPseudoAddress(params[3]);
 	}
 
@@ -1519,7 +1519,7 @@ cell_t Native_GetParamAddress(IPluginContext *pContext, const cell_t *params)
 
 	size_t offset = GetParamOffset(paramStruct, index);
 
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		return g_pSM->ToPseudoAddress(*(void**)((intptr_t)paramStruct->orgParams + offset));
 	}
 	return *(cell_t *)((intptr_t)paramStruct->orgParams + offset);
diff --git a/extensions/dhooks/vhook.cpp b/extensions/dhooks/vhook.cpp
@@ -473,7 +473,7 @@ cell_t GetThisPtr(IPluginContext* pContext, void *iface, ThisPointerType type)
 			return -1;
 		return gamehelpers->EntityToBCompatRef((CBaseEntity *)iface);
 	}
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		return g_pSM->ToPseudoAddress(iface);
 	}
 	return (cell_t)iface;
diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp
@@ -173,7 +173,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
 static cell_t PrepSDKCall_SetAddress(IPluginContext *pContext, const cell_t *params)
 {
 	s_call_addr = reinterpret_cast<void*>(params[1]);
-	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {
 		s_call_addr = g_pSM->FromPseudoAddress(params[1]);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ enum NumberType`
`865`	`865`	`static cell_t LoadFromAddress(IPluginContext pContext, const cell_t params)`
`866`	`866`	`{`
`867`	`867`	`void addr = reinterpret_cast<void>(params[1]);`
`868`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`868`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`869`	`869`	`addr = pseudoAddr.FromPseudoAddress(params[1]);`
`870`	`870`	`}`
`871`	`871`
`@@ -895,7 +895,7 @@ static cell_t LoadFromAddress(IPluginContext pContext, const cell_t params)`
`895`	`895`	`static cell_t StoreToAddress(IPluginContext pContext, const cell_t params)`
`896`	`896`	`{`
`897`	`897`	`void addr = reinterpret_cast<void>(params[1]);`
`898`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`898`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`899`	`899`	`addr = pseudoAddr.FromPseudoAddress(params[1]);`
`900`	`900`	`}`
`901`	`901`
`@@ -951,7 +951,7 @@ static cell_t StoreToAddress(IPluginContext pContext, const cell_t params)`
`951`	`951`	`static cell_t LoadAddressFromAddress(IPluginContext pContext, const cell_t params)`
`952`	`952`	`{`
`953`	`953`	`void addr = reinterpret_cast<void>(params[1]);`
`954`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`954`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`955`	`955`	`addr = pseudoAddr.FromPseudoAddress(params[1]);`
`956`	`956`	`}`
`957`	`957`
`@@ -965,7 +965,7 @@ static cell_t LoadAddressFromAddress(IPluginContext pContext, const cell_t par`
`965`	`965`	`}`
`966`	`966`
`967`	`967`	`void* data = reinterpret_cast<void*>(addr);`
`968`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`968`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`969`	`969`	`return pseudoAddr.ToPseudoAddress(data);`
`970`	`970`	`}`
`971`	`971`	`return reinterpret_cast<uintptr_t>(data);`
`@@ -974,7 +974,7 @@ static cell_t LoadAddressFromAddress(IPluginContext pContext, const cell_t par`
`974`	`974`	`static cell_t StoreAddressToAddress(IPluginContext pContext, const cell_t params)`
`975`	`975`	`{`
`976`	`976`	`void addr = reinterpret_cast<void>(params[1]);`
`977`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`977`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`978`	`978`	`addr = pseudoAddr.FromPseudoAddress(params[1]);`
`979`	`979`	`}`
`980`	`980`
`@@ -988,7 +988,7 @@ static cell_t StoreAddressToAddress(IPluginContext pContext, const cell_t para`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`void data = reinterpret_cast<void>(params[2]);`
`991`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`991`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`992`	`992`	`data = pseudoAddr.FromPseudoAddress(params[2]);`
`993`	`993`	`}`
`994`	`994`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ static cell_t GetEntDataEnt2(IPluginContext pContext, const cell_t params)`
`725`	`725`	`static cell_t LoadEntityFromHandleAddress(IPluginContext pContext, const cell_t params)`
`726`	`726`	`{`
`727`	`727`	`void addr = reinterpret_cast<void>(params[1]);`
`728`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`728`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`729`	`729`	`addr = g_SourceMod.FromPseudoAddress(params[1]);`
`730`	`730`	`}`
`731`	`731`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ cell_t Native_CreateHook(IPluginContext pContext, const cell_t params)`
`123`	`123`	`cell_t Native_CreateDetour(IPluginContext pContext, const cell_t params)`
`124`	`124`	`{`
`125`	`125`	`void* addr = reinterpret_cast<void*>(params[1]);`
`126`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`126`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`127`	`127`	`addr = g_pSM->FromPseudoAddress(params[1]);`
`128`	`128`	`}`
`129`	`129`
`@@ -595,7 +595,7 @@ cell_t HookRawImpl(IPluginContext pContext, const cell_t params, int callbackI`
`595`	`595`	`removalcb = pContext->GetFunctionById(params[removalcbIndex]);`
`596`	`596`
`597`	`597`	`void* iface = reinterpret_cast<void*>(params[3]);`
`598`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`598`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`599`	`599`	`iface = g_pSM->FromPseudoAddress(params[3]);`
`600`	`600`	`}`
`601`	`601`
`@@ -1519,7 +1519,7 @@ cell_t Native_GetParamAddress(IPluginContext pContext, const cell_t params)`
`1519`	`1519`
`1520`	`1520`	`size_t offset = GetParamOffset(paramStruct, index);`
`1521`	`1521`
`1522`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`1522`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`1523`	`1523`	`return g_pSM->ToPseudoAddress((void*)((intptr_t)paramStruct->orgParams + offset));`
`1524`	`1524`	`}`
`1525`	`1525`	`return (cell_t )((intptr_t)paramStruct->orgParams + offset);`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ cell_t GetThisPtr(IPluginContext* pContext, void *iface, ThisPointerType type)`
`473`	`473`	`return -1;`
`474`	`474`	`return gamehelpers->EntityToBCompatRef((CBaseEntity *)iface);`
`475`	`475`	`}`
`476`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`476`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`477`	`477`	`return g_pSM->ToPseudoAddress(iface);`
`478`	`478`	`}`
`479`	`479`	`return (cell_t)iface;`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext pContext, const cell_t p`
`173`	`173`	`static cell_t PrepSDKCall_SetAddress(IPluginContext pContext, const cell_t params)`
`174`	`174`	`{`
`175`	`175`	`s_call_addr = reinterpret_cast<void*>(params[1]);`
`176`		`- if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {`
	`176`	`+ if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) == SP_ERROR_NONE) {`
`177`	`177`	`s_call_addr = g_pSM->FromPseudoAddress(params[1]);`
`178`	`178`	`}`
`179`	`179`