Add new natives

Author: Kenzzer

core/logic/smn_core.cpp

@@ -892,7 +892,6 @@ 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]);
@@ -949,6 +948,60 @@ static cell_t StoreToAddress(IPluginContext *pContext, const cell_t *params)
 	return 0;
 }
 
+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) {
+		addr = pseudoAddr.FromPseudoAddress(params[1]);
+	}
+
+	if (addr == NULL)
+	{
+		return pContext->ThrowNativeError("Address cannot be null");
+	}
+	else if (reinterpret_cast<uintptr_t>(addr) < VALID_MINIMUM_MEMORY_ADDRESS)
+	{
+		return pContext->ThrowNativeError("Invalid address 0x%x is pointing to reserved memory.", addr);
+	}
+
+	void* data = *reinterpret_cast<void**>(addr);
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+		return pseudoAddr.ToPseudoAddress(data);
+	}
+	return (cell_t)data;
+}
+
+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) {
+		addr = pseudoAddr.FromPseudoAddress(params[1]);
+	}
+
+	if (addr == NULL)
+	{
+		return pContext->ThrowNativeError("Address cannot be null");
+	}
+	else if (reinterpret_cast<uintptr_t>(addr) < VALID_MINIMUM_MEMORY_ADDRESS)
+	{
+		return pContext->ThrowNativeError("Invalid address 0x%x is pointing to reserved memory.", addr);
+	}
+
+	void *data = reinterpret_cast<void*>(params[2]);
+	if (pContext->GetRuntime()->FindPubvarByName("__Virtual_Address__", nullptr) != SP_ERROR_NONE) {
+		data = pseudoAddr.FromPseudoAddress(params[2]);
+	}
+
+	bool updateMemAccess = params[3];
+
+	if (updateMemAccess) {
+		SourceHook::SetMemAccess(addr, sizeof(void*), SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
+	}
+	*reinterpret_cast<void**>(addr) = data;
+
+	return 0;
+}
+
 static cell_t IsNullVector(IPluginContext *pContext, const cell_t *params)
 {
 	cell_t *pNullVec = pContext->GetNullRef(SP_NULL_VECTOR);
@@ -1156,6 +1209,8 @@ REGISTER_NATIVES(coreNatives)
 	{"RequireFeature",          RequireFeature},
 	{"LoadFromAddress",         LoadFromAddress},
 	{"StoreToAddress",          StoreToAddress},
+	{"LoadAddressFromAddress",  LoadAddressFromAddress},
+	{"StoreAddressToAddress",   StoreAddressToAddress},
 	{"IsNullVector",			IsNullVector},
 	{"IsNullString",			IsNullString},
 	{"LogStackTrace",           LogStackTrace},

extensions/sdktools/vdecoder.cpp

@@ -164,6 +164,21 @@ size_t ValveParamToBinParam(ValveType type,
 				return sizeof(float);
 			}
 		}
+	case Valve_VirtualAddress:
+	    {
+			info->flags = flags;
+			if (flags & PASSFLAG_ASPOINTER)
+			{
+				needs_extra = true;
+				info->type = PassType_Basic;
+				info->size = sizeof(void**);
+				return sizeof(void**) + sizeof(void*);
+			} else {
+				info->type = PassType_Basic;
+				info->size = sizeof(void*);
+				return sizeof(void*);
+			}
+		}
 	}
 
 	return 0;
@@ -276,6 +291,16 @@ DataStatus EncodeValveParam(IPluginContext *pContext,
 
 			*addr = *(bool *)buffer ? 1 : 0;
 
+			return Data_Okay;
+		}
+	case Valve_VirtualAddress:
+	    {
+			if (data->flags & PASSFLAG_ASPOINTER)
+			{
+				buffer = *(void **)buffer;
+			}
+			param = g_pSM->ToPseudoAddress((void*)buffer);
+
 			return Data_Okay;
 		}
 	}
@@ -585,6 +610,18 @@ DataStatus DecodeValveParam(IPluginContext *pContext,
 			*(char **)buffer = addr;
 			return Data_Okay;
 		}
+	case Valve_VirtualAddress:
+	    {
+			void* addr = g_pSM->FromPseudoAddress(param);
+			if (addr == nullptr && (data->decflags & VDECODE_FLAG_ALLOWNULL) == 0)
+			{
+				pContext->ThrowNativeError("NULL Address not allowed");
+				return Data_Fail;
+			}
+
+			*(void **)buffer = addr;
+			return Data_Okay;
+		}
 	}
 
 	return Data_Fail;

extensions/sdktools/vdecoder.h

@@ -53,6 +53,7 @@ enum ValveType
 	Valve_Edict,			/**< Edict */
 	Valve_String,			/**< String */
 	Valve_Bool,				/**< Boolean */
+	Valve_VirtualAddress,   /**< SM Virtual Address */
 	Valve_Object,			/**< Object, not matching one of the above types */
 };
 

plugins/include/sdktools.inc

@@ -88,7 +88,10 @@ 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) */
+#if defined VIRTUAL_ADDRESS
+	SDKType_VirtualAddress, /**< SM Virtual Address */
+#endif
 };
 
 enum SDKPassMethod

plugins/include/sourcemod.inc

@@ -730,6 +730,10 @@ enum Address
     Address_Null = 0               // a typical invalid result when an address lookup fails
 };
 
+#if defined VIRTUAL_ADDRESS
+public const Address __Virtual_Address__ = 0;
+#endif
+
 /**
  * Load up to 4 bytes from a memory address.
  *
@@ -754,6 +758,28 @@ native any LoadFromAddress(Address addr, NumberType size);
  */
 native void StoreToAddress(Address addr, any data, NumberType size, bool updateMemAccess = true);
 
+/**
+ * Load sizeof(void*) from a memory address.
+ *
+ * @param addr          Address to a memory location.
+ * @param size          How many bytes should be read.
+ *                      If loading a floating-point value, use NumberType_Int32.
+ * @return              The address that is stored at that address.
+ * @error               Address is null or pointing to reserved memory.
+ */
+native Address LoadAddressFromAddress(Address addr);
+
+/**
+ * Store sizeof(void*) bytes to a memory address.
+ *
+ * @param addr                     Address to a memory location.
+ * @param data                     Address to store at that location.
+ * @param updateMemAccess          If true, SourceMod will set read / write / exec permissions
+ *                                 on the memory page being written to.
+ * @error                          Address is null or pointing to reserved memory.
+ */
+native void StoreAddressToAddress(Address addr, any data, NumberType size, bool updateMemAccess = true);
+
 methodmap FrameIterator < Handle {
 	// Creates a stack frame iterator to build your own stack traces.
 	// @return              New handle to a FrameIterator.