Moved gameconf code from core to logic (bug 4406 part 11, r=ds).

--HG--
rename : core/GameConfigs.cpp => core/logic/GameConfigs.cpp
rename : core/GameConfigs.h => core/logic/GameConfigs.h
rename : core/smn_gameconfigs.cpp => core/logic/smn_gameconfigs.cpp

core/logic/AMBuilder

@@ -42,6 +42,8 @@ files = [
 	'smn_string.cpp',
 	'smn_handles.cpp',
 	'smn_datapacks.cpp',
+	'smn_gameconfigs.cpp',
+	'GameConfigs.cpp',
 	'sm_crc32.cpp'
 	]
 if AMBuild.target['platform'] == 'windows':

core/logic/GameConfigs.h

@@ -0,0 +1,147 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
+#define _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
+
+#include "common_logic.h"
+#include <IGameConfigs.h>
+#include <ITextParsers.h>
+#include <sh_list.h>
+#include "sm_memtable.h"
+#include <sm_trie_tpl.h>
+
+using namespace SourceMod;
+using namespace SourceHook;
+
+class SendProp;
+
+class CGameConfig : 
+	public ITextListener_SMC,
+	public IGameConfig
+{
+	friend class GameConfigManager;
+public:
+	CGameConfig(const char *file);
+	~CGameConfig();
+public:
+	bool Reparse(char *error, size_t maxlength);
+	bool EnterFile(const char *file, char *error, size_t maxlength);
+public: //ITextListener_SMC
+	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
+	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
+	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
+public: //IGameConfig
+	const char *GetKeyValue(const char *key);
+	bool GetOffset(const char *key, int *value);
+	SendProp *GetSendProp(const char *key);
+	bool GetMemSig(const char *key, void **addr);
+	bool GetAddress(const char *key, void **addr);
+public:
+	void IncRefCount();
+	unsigned int DecRefCount();
+private:
+	BaseStringTable *m_pStrings;
+	char m_File[PLATFORM_MAX_PATH];
+	char m_CurFile[PLATFORM_MAX_PATH];
+	KTrie<int> m_Offsets;
+	KTrie<SendProp *> m_Props;
+	KTrie<int> m_Keys;
+	KTrie<void *> m_Sigs;
+	unsigned int m_RefCount;
+	/* Parse states */
+	int m_ParseState;
+	unsigned int m_IgnoreLevel;
+	char m_Class[64];
+	char m_Prop[64];
+	char m_offset[64];
+	char m_Game[256];
+	bool bShouldBeReadingDefault;
+	bool had_game;
+	bool matched_game;
+	bool had_engine;
+	bool matched_engine;
+
+	/* Custom Sections */
+	unsigned int m_CustomLevel;
+	ITextListener_SMC *m_CustomHandler;
+
+	/* Support for reading Addresses */
+	struct AddressConf
+	{
+		char signatureName[64];
+		int readCount;
+		int read[8];
+
+		AddressConf(char *sigName, unsigned sigLength, unsigned readCount, int *read);
+
+		AddressConf() {}
+	};
+
+	char m_Address[64];
+	char m_AddressSignature[64];
+	int m_AddressReadCount;
+	int m_AddressRead[8];
+	KTrie<AddressConf> *m_pAddresses;
+};
+
+class GameConfigManager : 
+	public IGameConfigManager,
+	public SMGlobalClass
+{
+public:
+	GameConfigManager();
+	~GameConfigManager();
+public: //IGameConfigManager
+	bool LoadGameConfigFile(const char *file, IGameConfig **pConfig, char *error, size_t maxlength);
+	void CloseGameConfigFile(IGameConfig *cfg);
+	IGameConfig *ReadHandle(Handle_t hndl,
+		IdentityToken_t *ident,
+		HandleError *err);
+	void AddUserConfigHook(const char *sectionname, ITextListener_SMC *listener);
+	void RemoveUserConfigHook(const char *sectionname, ITextListener_SMC *listener);
+	void AcquireLock();
+	void ReleaseLock();
+public: //SMGlobalClass
+	void OnSourceModStartup(bool late);
+	void OnSourceModAllInitialized();
+	void OnSourceModAllShutdown();
+private:
+	List<CGameConfig *> m_cfgs;
+	KTrie<CGameConfig *> m_Lookup;
+public:
+	KTrie<ITextListener_SMC *> m_customHandlers;
+};
+
+extern GameConfigManager g_GameConfigs;
+extern IGameConfig *g_pGameConf;
+
+#endif //_INCLUDE_SOURCEMOD_CGAMECONFIGS_H_

core/logic/Makefile

@@ -38,6 +38,8 @@ OBJECTS = \
 	smn_string.cpp		\
 	smn_handles.cpp		\
 	smn_datapacks.cpp	\
+	smn_gameconfigs.cpp	\
+	GameConfigs.cpp		\
 	smn_players.cpp
 
 ##############################################

core/logic/common_logic.cpp

@@ -40,6 +40,7 @@
 #include "MemoryUtils.h"
 #include "stringutil.h"
 #include "Translator.h"
+#include "GameConfigs.h"
 
 sm_core_t smcore;
 IHandleSys *handlesys;
@@ -64,19 +65,24 @@ static void AddCorePhraseFile(const char *filename)
 	g_pCorePhrases->AddPhraseFile("antiflood.phrases");
 }
 
+static IGameConfig *GetCoreGameConfig()
+{
+	return g_pGameConf;
+}
+
 static sm_logic_t logic =
 {
 	NULL,
 	g_pThreader,
 	sm_profiler,
-	&g_MemUtils,
 	&g_Translator,
-	UTIL_CRC32,
 	stristr,
 	CoreTranslate,
 	AddCorePhraseFile,
 	UTIL_ReplaceAll,
-	UTIL_ReplaceEx
+	UTIL_ReplaceEx,
+	UTIL_DecodeHexString,
+	GetCoreGameConfig
 };
 
 static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
@@ -99,6 +105,7 @@ static void logic_init(const sm_core_t* core, sm_logic_t* _logic)
 	timersys = core->timersys;
 	playerhelpers = core->playerhelpers;
 	adminsys = core->adminsys;
+	gamehelpers = core->gamehelpers;
 }
 
 PLATFORM_EXTERN_C ITextParsers *get_textparsers()

core/logic/intercom.h

@@ -42,7 +42,7 @@ using namespace SourceMod;
  * Add 1 to the RHS of this expression to bump the intercom file
  * This is to prevent mismatching core/logic binaries
  */
-#define SM_LOGIC_MAGIC		(0x0F47C0DE - 13)
+#define SM_LOGIC_MAGIC		(0x0F47C0DE - 14)
 
 #if defined SM_LOGIC
 class IVEngineServer
@@ -66,11 +66,11 @@ namespace SourceMod
 	class IForwardManager;
 	class ITimerSystem;
 	class IPlayerManager;
-	class IMemoryUtils;
 	class IAdminSystem;
 	class IGameHelpers;
 	class IPhraseCollection;
 	class ITranslator;
+	class IGameConfig;
 }
 
 class IVEngineServer;
@@ -98,7 +98,7 @@ struct sm_core_t
 	ITimerSystem    *timersys;
 	IPlayerManager  *playerhelpers;
 	IAdminSystem	*adminsys;
-	IGameHelpers    *gamehelers;
+	IGameHelpers    *gamehelpers;
 	/* Functions */
 	void			(*AddNatives)(sp_nativeinfo_t* nlist);
 	ConVar *		(*FindConVar)(const char*);
@@ -111,8 +111,14 @@ struct sm_core_t
 	bool			(*gnprintf)(char *, size_t, const char *, IPhraseCollection *, void **,
 	                            unsigned int, unsigned int &, size_t *, const char **);
 	size_t			(*atcprintf)(char *, size_t, const char *, IPluginContext *, const cell_t *, int *);
+	bool            (*GetGameName)(char *buffer, size_t maxlength);
+	const char *    (*GetGameDescription)();
+	const char *    (*GetSourceEngineName)();
+	bool            (*SymbolsAreHidden)();
 	/* Data */
 	ServerGlobals   *serverGlobals;
+	void *          serverFactory;
+	void *          engineFactory;
 };
 
 struct sm_logic_t
@@ -120,14 +126,14 @@ struct sm_logic_t
 	SMGlobalClass	*head;
 	IThreader		*threader;
 	IProfiler		*profiler;
-	IMemoryUtils    *memutils;
 	ITranslator		*translator;
-	unsigned int    (*CRC32)(const void *, size_t);
 	const char      *(*stristr)(const char *, const char *);
 	bool			(*CoreTranslate)(char *,  size_t, const char *, unsigned int, size_t *, ...);
 	void            (*AddCorePhraseFile)(const char *filename);
 	unsigned int	(*ReplaceAll)(char*, size_t, const char *, const char *, bool);
 	char            *(*ReplaceEx)(char *, size_t, const char *, size_t, const char *, size_t, bool);
+	size_t          (*DecodeHexString)(unsigned char *, size_t, const char *);
+	IGameConfig *   (*GetCoreGameConfig)();
 };
 
 typedef void (*LogicInitFunction)(const sm_core_t *core, sm_logic_t *logic);

core/logic/smn_gameconfigs.cpp

@@ -0,0 +1,167 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include "common_logic.h"
+#include <IHandleSys.h>
+#include "GameConfigs.h"
+
+HandleType_t g_GameConfigsType;
+
+class GameConfigsNatives :
+	public IHandleTypeDispatch, 
+	public SMGlobalClass 
+{
+public:
+	void OnSourceModAllInitialized()
+	{
+		g_GameConfigsType = handlesys->CreateType("GameConfigs", this, 0, NULL, NULL, g_pCoreIdent, NULL);
+	}
+	void OnSourceModShutdown()
+	{
+		handlesys->RemoveType(g_GameConfigsType, g_pCoreIdent);
+		g_GameConfigsType = 0;
+	}
+	void OnHandleDestroy(HandleType_t type, void *object)
+	{
+		g_GameConfigs.CloseGameConfigFile(reinterpret_cast<IGameConfig *>(object));
+	}
+};
+
+static cell_t smn_LoadGameConfigFile(IPluginContext *pCtx, const cell_t *params)
+{
+	IGameConfig *gc;
+	char *filename;
+	char error[128];
+
+	pCtx->LocalToString(params[1], &filename);
+	if (!g_GameConfigs.LoadGameConfigFile(filename, &gc, error, sizeof(error)))
+	{
+		return pCtx->ThrowNativeError("Unable to open %s: %s", filename, error);
+	}
+
+	return handlesys->CreateHandle(g_GameConfigsType, gc, pCtx->GetIdentity(), g_pCoreIdent, NULL);
+}
+
+static cell_t smn_GameConfGetOffset(IPluginContext *pCtx, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	IGameConfig *gc;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+		!= HandleError_None)
+	{
+		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
+	}
+
+	char *key;
+	int val;
+	pCtx->LocalToString(params[2], &key);
+
+	if (!gc->GetOffset(key, &val))
+	{
+		return -1;
+	}
+
+	return val;
+}
+
+static cell_t smn_GameConfGetKeyValue(IPluginContext *pCtx, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	IGameConfig *gc;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+		!= HandleError_None)
+	{
+		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
+	}
+
+	char *key;
+	const char *val;
+	pCtx->LocalToString(params[2], &key);
+
+	if ((val=gc->GetKeyValue(key)) == NULL)
+	{
+		return 0;
+	}
+
+	pCtx->StringToLocalUTF8(params[3], params[4], val, NULL);
+
+	return 1;
+}
+
+
+static cell_t smn_GameConfGetAddress(IPluginContext *pCtx, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	IGameConfig *gc;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=handlesys->ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&gc))
+		!= HandleError_None)
+	{
+		return pCtx->ThrowNativeError("Invalid game config handle %x (error %d)", hndl, herr);
+	}
+
+	char *key;
+	void* val;
+	pCtx->LocalToString(params[2], &key);
+
+	if (!gc->GetAddress(key, &val))
+		return 0;
+
+	return (cell_t)val;
+}
+
+static GameConfigsNatives s_GameConfigsNatives;
+
+REGISTER_NATIVES(gameconfignatives)
+{
+	{"LoadGameConfigFile",			smn_LoadGameConfigFile},
+	{"GameConfGetOffset",			smn_GameConfGetOffset},
+	{"GameConfGetKeyValue",			smn_GameConfGetKeyValue},
+	{"GameConfGetAddress",			smn_GameConfGetAddress},
+	{NULL,							NULL}
+};

core/logic/stringutil.cpp

@@ -30,6 +30,7 @@
  */
 
 #include <string.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <sm_platform.h>
 #include "stringutil.h"
@@ -270,3 +271,35 @@ char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t se
 	return NULL;
 }
 
+size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char *hexstr)
+{
+	size_t written = 0;
+	size_t length = strlen(hexstr);
+
+	for (size_t i = 0; i < length; i++)
+	{
+		if (written >= maxlength)
+			break;
+		buffer[written++] = hexstr[i];
+		if (hexstr[i] == '\\' && hexstr[i + 1] == 'x')
+		{
+			if (i + 3 >= length)
+				continue;
+			/* Get the hex part. */
+			char s_byte[3];
+			int r_byte;
+			s_byte[0] = hexstr[i + 2];
+			s_byte[1] = hexstr[i + 3];
+			s_byte[2] = '\0';
+			/* Read it as an integer */
+			sscanf(s_byte, "%x", &r_byte);
+			/* Save the value */
+			buffer[written - 1] = r_byte;
+			/* Adjust index */
+			i += 3;
+		}
+	}
+
+	return written;
+}
+

core/logic/stringutil.h

@@ -38,6 +38,7 @@ unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search
                              const char *replace, bool caseSensitive = true);
 char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t searchLen,
                      const char *replace, size_t replaceLen, bool caseSensitive = true);
+size_t UTIL_DecodeHexString(unsigned char *buffer, size_t maxlength, const char *hexstr);
 
 #endif /* _INCLUDE_SOURCEMOD_COMMON_STRINGUTIL_H_ */