redo/BlockLua
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix all warnings and errors in C++

Browse Source
This commit is contained in:
Connor O'Connor
2025-10-06 12:03:51 -04:00
parent 93a47d54be
commit e47f6d4651
17 changed files with 1373 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.clang-format Normal file
View File

@@ -0,0 +1,14 @@
BasedOnStyle: LLVM
SortIncludes: CaseSensitive
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '<Windows\.h>'
Priority: 1
- Regex: '<Psapi\.h>'
Priority: 2
- Regex: '"BlHooks\\.hpp"'
Priority: 3
- Regex: '"BlFuncs\\.hpp"'
Priority: 4
- Regex: ".*"
Priority: 5

8
inc/lua/lauxlib.h
View File

@@ -4,17 +4,14 @@
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
#ifndef lauxlib_h #ifndef lauxlib_h
#define lauxlib_h #define lauxlib_h
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include "lua.h" #include "lua.h"
/* extra error code for `luaL_load' */ /* extra error code for `luaL_load' */
#define LUA_ERRFILE (LUA_ERRERR + 1) #define LUA_ERRFILE (LUA_ERRERR + 1)
@@ -69,7 +66,6 @@ LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
LUALIB_API lua_State *(luaL_newstate)(void); LUALIB_API lua_State *(luaL_newstate)(void);
LUALIB_API const char *(luaL_gsub)(lua_State * L, const char *s, const char *p, LUALIB_API const char *(luaL_gsub)(lua_State * L, const char *s, const char *p,
const char *r); const char *r);
@@ -91,7 +87,6 @@ LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
LUALIB_API void *(luaL_testudata)(lua_State * L, int ud, const char *tname); LUALIB_API void *(luaL_testudata)(lua_State * L, int ud, const char *tname);
LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname); LUALIB_API void(luaL_setmetatable)(lua_State *L, const char *tname);
/* /*
** =============================================================== ** ===============================================================
** some useful macros ** some useful macros
@@ -130,8 +125,6 @@ LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
** ======================================================= ** =======================================================
*/ */
typedef struct luaL_Buffer { typedef struct luaL_Buffer {
char *p; /* current position in buffer */ char *p; /* current position in buffer */
int lvl; /* number of strings in the stack (level) */ int lvl; /* number of strings in the stack (level) */
@@ -155,7 +148,6 @@ LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
LUALIB_API void(luaL_addvalue)(luaL_Buffer *B); LUALIB_API void(luaL_addvalue)(luaL_Buffer *B);
LUALIB_API void(luaL_pushresult)(luaL_Buffer *B); LUALIB_API void(luaL_pushresult)(luaL_Buffer *B);
/* }====================================================== */ /* }====================================================== */
#endif #endif

38
inc/lua/lua.h
View File

@@ -5,31 +5,26 @@
** See Copyright Notice at the end of this file ** See Copyright Notice at the end of this file
*/ */
#ifndef lua_h #ifndef lua_h
#define lua_h #define lua_h
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include "luaconf.h" #include "luaconf.h"
#define LUA_VERSION "Lua 5.1" #define LUA_VERSION "Lua 5.1"
#define LUA_RELEASE "Lua 5.1.4" #define LUA_RELEASE "Lua 5.1.4"
#define LUA_VERSION_NUM 501 #define LUA_VERSION_NUM 501
#define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
/* mark for precompiled code (`<esc>Lua') */ /* mark for precompiled code (`<esc>Lua') */
#define LUA_SIGNATURE "\033Lua" #define LUA_SIGNATURE "\033Lua"
/* option for multiple returns in `lua_pcall' and `lua_call' */ /* option for multiple returns in `lua_pcall' and `lua_call' */
#define LUA_MULTRET (-1) #define LUA_MULTRET (-1)
/* /*
** pseudo-indices ** pseudo-indices
*/ */
@@ -38,7 +33,6 @@
#define LUA_GLOBALSINDEX (-10002) #define LUA_GLOBALSINDEX (-10002)
#define lua_upvalueindex(i) (LUA_GLOBALSINDEX - (i)) #define lua_upvalueindex(i) (LUA_GLOBALSINDEX - (i))
/* thread status */ /* thread status */
#define LUA_OK 0 #define LUA_OK 0
#define LUA_YIELD 1 #define LUA_YIELD 1
@@ -47,12 +41,10 @@
#define LUA_ERRMEM 4 #define LUA_ERRMEM 4
#define LUA_ERRERR 5 #define LUA_ERRERR 5
typedef struct lua_State lua_State; typedef struct lua_State lua_State;
typedef int (*lua_CFunction)(lua_State *L); typedef int (*lua_CFunction)(lua_State *L);
/* /*
** functions that read/write blocks when loading/dumping Lua chunks ** functions that read/write blocks when loading/dumping Lua chunks
*/ */
@@ -60,13 +52,11 @@ typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
typedef int (*lua_Writer)(lua_State *L, const void *p, size_t sz, void *ud); typedef int (*lua_Writer)(lua_State *L, const void *p, size_t sz, void *ud);
/* /*
** prototype for memory-allocation functions ** prototype for memory-allocation functions
*/ */
typedef void *(*lua_Alloc)(void *ud, void *ptr, size_t osize, size_t nsize); typedef void *(*lua_Alloc)(void *ud, void *ptr, size_t osize, size_t nsize);
/* /*
** basic types ** basic types
*/ */
@@ -82,12 +72,9 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
#define LUA_TUSERDATA 7 #define LUA_TUSERDATA 7
#define LUA_TTHREAD 8 #define LUA_TTHREAD 8
/* minimum Lua stack available to a C function */ /* minimum Lua stack available to a C function */
#define LUA_MINSTACK 20 #define LUA_MINSTACK 20
/* /*
** generic extra include file ** generic extra include file
*/ */
@@ -95,16 +82,12 @@ typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
#include LUA_USER_H #include LUA_USER_H
#endif #endif
/* type of numbers in Lua */ /* type of numbers in Lua */
typedef LUA_NUMBER lua_Number; typedef LUA_NUMBER lua_Number;
/* type for integer functions */ /* type for integer functions */
typedef LUA_INTEGER lua_Integer; typedef LUA_INTEGER lua_Integer;
/* /*
** state manipulation ** state manipulation
*/ */
@@ -114,7 +97,6 @@ LUA_API lua_State *(lua_newthread) (lua_State *L);
LUA_API lua_CFunction(lua_atpanic)(lua_State *L, lua_CFunction panicf); LUA_API lua_CFunction(lua_atpanic)(lua_State *L, lua_CFunction panicf);
/* /*
** basic stack manipulation ** basic stack manipulation
*/ */
@@ -128,7 +110,6 @@ LUA_API int (lua_checkstack) (lua_State *L, int sz);
LUA_API void(lua_xmove)(lua_State *from, lua_State *to, int n); LUA_API void(lua_xmove)(lua_State *from, lua_State *to, int n);
/* /*
** access functions (stack -> C) ** access functions (stack -> C)
*/ */
@@ -154,7 +135,6 @@ LUA_API void *(lua_touserdata) (lua_State *L, int idx);
LUA_API lua_State *(lua_tothread)(lua_State * L, int idx); LUA_API lua_State *(lua_tothread)(lua_State * L, int idx);
LUA_API const void *(lua_topointer)(lua_State * L, int idx); LUA_API const void *(lua_topointer)(lua_State * L, int idx);
/* /*
** push functions (C -> stack) ** push functions (C -> stack)
*/ */
@@ -171,7 +151,6 @@ LUA_API void (lua_pushboolean) (lua_State *L, int b);
LUA_API void(lua_pushlightuserdata)(lua_State *L, void *p); LUA_API void(lua_pushlightuserdata)(lua_State *L, void *p);
LUA_API int(lua_pushthread)(lua_State *L); LUA_API int(lua_pushthread)(lua_State *L);
/* /*
** get functions (Lua -> stack) ** get functions (Lua -> stack)
*/ */
@@ -184,7 +163,6 @@ LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
LUA_API int(lua_getmetatable)(lua_State *L, int objindex); LUA_API int(lua_getmetatable)(lua_State *L, int objindex);
LUA_API void(lua_getfenv)(lua_State *L, int idx); LUA_API void(lua_getfenv)(lua_State *L, int idx);
/* /*
** set functions (stack -> Lua) ** set functions (stack -> Lua)
*/ */
@@ -195,7 +173,6 @@ LUA_API void (lua_rawseti) (lua_State *L, int idx, int n);
LUA_API int(lua_setmetatable)(lua_State *L, int objindex); LUA_API int(lua_setmetatable)(lua_State *L, int objindex);
LUA_API int(lua_setfenv)(lua_State *L, int idx); LUA_API int(lua_setfenv)(lua_State *L, int idx);
/* /*
** `load' and `call' functions (load and run Lua code) ** `load' and `call' functions (load and run Lua code)
*/ */
@@ -207,7 +184,6 @@ LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt,
LUA_API int(lua_dump)(lua_State *L, lua_Writer writer, void *data); LUA_API int(lua_dump)(lua_State *L, lua_Writer writer, void *data);
/* /*
** coroutine functions ** coroutine functions
*/ */
@@ -231,7 +207,6 @@ LUA_API int (lua_status) (lua_State *L);
LUA_API int(lua_gc)(lua_State *L, int what, int data); LUA_API int(lua_gc)(lua_State *L, int what, int data);
/* /*
** miscellaneous functions ** miscellaneous functions
*/ */
@@ -245,8 +220,6 @@ LUA_API void (lua_concat) (lua_State *L, int n);
LUA_API lua_Alloc(lua_getallocf)(lua_State *L, void **ud); LUA_API lua_Alloc(lua_getallocf)(lua_State *L, void **ud);
LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud); LUA_API void lua_setallocf(lua_State *L, lua_Alloc f, void *ud);
/* /*
** =============================================================== ** ===============================================================
** some useful macros ** some useful macros
@@ -280,8 +253,6 @@ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
#define lua_tostring(L, i) lua_tolstring(L, (i), NULL) #define lua_tostring(L, i) lua_tolstring(L, (i), NULL)
/* /*
** compatibility macros and functions ** compatibility macros and functions
*/ */
@@ -295,18 +266,15 @@ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
#define lua_Chunkreader lua_Reader #define lua_Chunkreader lua_Reader
#define lua_Chunkwriter lua_Writer #define lua_Chunkwriter lua_Writer
/* hack */ /* hack */
LUA_API void lua_setlevel(lua_State *from, lua_State *to); LUA_API void lua_setlevel(lua_State *from, lua_State *to);
/* /*
** {====================================================================== ** {======================================================================
** Debug API ** Debug API
** ======================================================================= ** =======================================================================
*/ */
/* /*
** Event codes ** Event codes
*/ */
@@ -316,7 +284,6 @@ LUA_API void lua_setlevel (lua_State *from, lua_State *to);
#define LUA_HOOKCOUNT 3 #define LUA_HOOKCOUNT 3
#define LUA_HOOKTAILRET 4 #define LUA_HOOKTAILRET 4
/* /*
** Event masks ** Event masks
*/ */
@@ -327,11 +294,9 @@ LUA_API void lua_setlevel (lua_State *from, lua_State *to);
typedef struct lua_Debug lua_Debug; /* activation record */ typedef struct lua_Debug lua_Debug; /* activation record */
/* Functions to be called by the debuger in specific events */ /* Functions to be called by the debuger in specific events */
typedef void (*lua_Hook)(lua_State *L, lua_Debug *ar); typedef void (*lua_Hook)(lua_State *L, lua_Debug *ar);
LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar); LUA_API int lua_getstack(lua_State *L, int level, lua_Debug *ar);
LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar); LUA_API int lua_getinfo(lua_State *L, const char *what, lua_Debug *ar);
LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n); LUA_API const char *lua_getlocal(lua_State *L, const lua_Debug *ar, int n);
@@ -356,7 +321,6 @@ LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum);
/* From Lua 5.3. */ /* From Lua 5.3. */
LUA_API int lua_isyieldable(lua_State *L); LUA_API int lua_isyieldable(lua_State *L);
struct lua_Debug { struct lua_Debug {
int event; int event;
const char *name; /* (n) */ const char *name; /* (n) */
@@ -374,7 +338,6 @@ struct lua_Debug {
/* }====================================================================== */ /* }====================================================================== */
/****************************************************************************** /******************************************************************************
* Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved. * Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved.
* *
@@ -398,5 +361,4 @@ struct lua_Debug {
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************/ ******************************************************************************/
#endif #endif

5
inc/lua/lua.hpp
View File

@@ -1,9 +1,8 @@
// C++ wrapper for LuaJIT header files. // C++ wrapper for LuaJIT header files.
extern "C" { extern "C" {
#include "lua.h"
#include "lauxlib.h" #include "lauxlib.h"
#include "lualib.h" #include "lua.h"
#include "luajit.h" #include "luajit.h"
#include "lualib.h"
} }

21
inc/lua/luaconf.h
View File

@@ -20,10 +20,8 @@
*/ */
#define LUA_LDIR "!\\lua\\" #define LUA_LDIR "!\\lua\\"
#define LUA_CDIR "!\\" #define LUA_CDIR "!\\"
#define LUA_PATH_DEFAULT \ #define LUA_PATH_DEFAULT ".\\?.lua;" LUA_LDIR "?.lua;" LUA_LDIR "?\\init.lua;"
".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" #define LUA_CPATH_DEFAULT ".\\?.dll;" LUA_CDIR "?.dll;" LUA_CDIR "loadall.dll"
#define LUA_CPATH_DEFAULT \
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
#else #else
/* /*
** Note to distribution maintainers: do NOT patch the following lines! ** Note to distribution maintainers: do NOT patch the following lines!
@@ -78,8 +76,8 @@
#define LUA_EXECDIR "!" #define LUA_EXECDIR "!"
#define LUA_IGMARK "-" #define LUA_IGMARK "-"
#define LUA_PATH_CONFIG \ #define LUA_PATH_CONFIG \
LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" \ LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" LUA_EXECDIR \
LUA_EXECDIR "\n" LUA_IGMARK "\n" "\n" LUA_IGMARK "\n"
/* Quoting in error messages. */ /* Quoting in error messages. */
#define LUA_QL(x) "'" x "'" #define LUA_QL(x) "'" x "'"
@@ -144,9 +142,16 @@
#define lua_assert(x) assert(x) #define lua_assert(x) assert(x)
#endif #endif
#ifdef LUA_USE_APICHECK #ifdef LUA_USE_APICHECK
#define luai_apicheck(L, o) { (void)L; assert(o); } #define luai_apicheck(L, o) \
{ \
(void)L; \
assert(o); \
}
#else #else
#define luai_apicheck(L, o) { (void)L; } #define luai_apicheck(L, o) \
{ \
(void)L; \
}
#endif #endif
#endif #endif

4
inc/lua/luajit.h
View File

@@ -65,8 +65,8 @@ enum {
LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode); LUA_API int luaJIT_setmode(lua_State *L, int idx, int mode);
/* Low-overhead profiling API. */ /* Low-overhead profiling API. */
typedef void (*luaJIT_profile_callback)(void *data, lua_State *L, typedef void (*luaJIT_profile_callback)(void *data, lua_State *L, int samples,
int samples, int vmstate); int vmstate);
LUA_API void luaJIT_profile_start(lua_State *L, const char *mode, LUA_API void luaJIT_profile_start(lua_State *L, const char *mode,
luaJIT_profile_callback cb, void *data); luaJIT_profile_callback cb, void *data);
LUA_API void luaJIT_profile_stop(lua_State *L); LUA_API void luaJIT_profile_stop(lua_State *L);

133
inc/tsfuncs/BlFuncs.cpp
View File

@@ -2,15 +2,18 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
// BlFuncs Version 1.0 // BlFuncs Version 1.0
// Includes // Includes
#ifndef WIN32_LEAN_AND_MEAN
#include "BlHooks.hpp" #define WIN32_LEAN_AND_MEAN
#endif
#include "BlFuncs.hpp" #include "BlFuncs.hpp"
#include <Windows.h>
#include "BlHooks.hpp"
#include <cstdarg>
#include <cstring>
#include <stdio.h> #include <stdio.h>
// Scanned structures // Scanned structures
ADDR tsf_mCacheSequence; ADDR tsf_mCacheSequence;
@@ -33,7 +36,6 @@ BlFunctionDefIntern(tsf_BlSimObject__getDataField );
BlFunctionDefIntern(tsf_BlSimObject__setDataField); BlFunctionDefIntern(tsf_BlSimObject__setDataField);
BlFunctionDefIntern(tsf_BlCon__getReturnBuffer); BlFunctionDefIntern(tsf_BlCon__getReturnBuffer);
// C->TS Args // C->TS Args
char *tsf_GetIntArg(signed int value) { char *tsf_GetIntArg(signed int value) {
@@ -56,7 +58,6 @@ char* tsf_GetThisArg(ADDR obj) {
return tsf_GetIntArg(*(signed int *)(obj + 32)); return tsf_GetIntArg(*(signed int *)(obj + 32));
} }
// Eval // Eval
const char *tsf_Eval(const char *code) { const char *tsf_Eval(const char *code) {
@@ -74,16 +75,17 @@ const char* tsf_Evalf(const char *fmt, ...) {
return tsf_Eval((const char *)code); return tsf_Eval((const char *)code);
} }
// Objects // Objects
ADDR tsf_FindObject(unsigned int id) { ADDR tsf_FindObject(unsigned int id) {
ADDR obj = *(ADDR *)(*(ADDR *)(tsf_gIdDictionary) + 4 * (id & 0xFFF)); ADDR obj = *(ADDR *)(*(ADDR *)(tsf_gIdDictionary) + 4 * (id & 0xFFF));
if(!obj) return 0; if (!obj)
return 0;
while (obj && *(unsigned int *)(obj + 32) != id) { while (obj && *(unsigned int *)(obj + 32) != id) {
obj = *(ADDR *)(obj + 16); obj = *(ADDR *)(obj + 16);
if(!obj) return 0; if (!obj)
return 0;
} }
return obj; return obj;
@@ -112,10 +114,10 @@ ADDR tsf_LookupNamespace(const char* ns) {
return tsf_LookupNamespace(ns, nullptr); return tsf_LookupNamespace(ns, nullptr);
} }
// Object Fields // Object Fields
const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* array) { const char *tsf_GetDataField(ADDR simObject, const char *slotName,
const char *array) {
const char *ste_slotName; const char *ste_slotName;
if (slotName) { if (slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
@@ -126,7 +128,8 @@ const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* a
return tsf_BlSimObject__getDataField(simObject, ste_slotName, array); return tsf_BlSimObject__getDataField(simObject, ste_slotName, array);
} }
void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, const char* value) { void tsf_SetDataField(ADDR simObject, const char *slotName, const char *array,
const char *value) {
const char *ste_slotName; const char *ste_slotName;
if (slotName) { if (slotName) {
ste_slotName = tsf_BlStringTable__insert(slotName, 0); ste_slotName = tsf_BlStringTable__insert(slotName, 0);
@@ -137,7 +140,6 @@ void tsf_SetDataField(ADDR simObject, const char* slotName, const char* array, c
tsf_BlSimObject__setDataField(simObject, ste_slotName, array, value); tsf_BlSimObject__setDataField(simObject, ste_slotName, array, value);
} }
// TS Global Variables // TS Global Variables
const char *tsf_GetVar(const char *name) { const char *tsf_GetVar(const char *name) {
@@ -145,7 +147,8 @@ const char *tsf_GetVar(const char* name) {
} }
void tsf_AddVarInternal(const char *name, signed int varType, void *data) { void tsf_AddVarInternal(const char *name, signed int varType, void *data) {
tsf_BlDictionary__addVariable((ADDR *)tsf_gEvalState_globalVars, name, varType, data); tsf_BlDictionary__addVariable((ADDR *)tsf_gEvalState_globalVars, name,
varType, data);
} }
void tsf_AddVar(const char *name, const char **data) { void tsf_AddVar(const char *name, const char **data) {
@@ -161,10 +164,12 @@ void tsf_AddVar(const char* name, bool* data) {
tsf_AddVarInternal(name, 6, data); tsf_AddVarInternal(name, 6, data);
} }
// TS->C Functions // TS->C Functions
ADDR tsf_AddConsoleFuncInternal(const char* pname, const char* cname, const char* fname, signed int cbtype, const char* usage, signed int mina, signed int maxa) { ADDR tsf_AddConsoleFuncInternal(const char *pname, const char *cname,
const char *fname, signed int cbtype,
const char *usage, signed int mina,
signed int maxa) {
const char *ste_fname = tsf_BlStringTable__insert(fname, 0); const char *ste_fname = tsf_BlStringTable__insert(fname, 0);
ADDR ns = tsf_LookupNamespace(cname, pname); ADDR ns = tsf_LookupNamespace(cname, pname);
ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname); ADDR ent = tsf_BlNamespace__createLocalEntry(ns, ste_fname);
@@ -180,50 +185,92 @@ ADDR tsf_AddConsoleFuncInternal(const char* pname, const char* cname, const char
return ent; return ent;
} }
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_StringCallback sc, const char* usage, signed int mina, signed int maxa) { void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa); tsf_StringCallback sc, const char *usage,
signed int mina, signed int maxa) {
ADDR ent =
tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, maxa);
*(tsf_StringCallback *)(ent + 40) = sc; *(tsf_StringCallback *)(ent + 40) = sc;
} }
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_IntCallback ic, const char* usage, signed int mina, signed int maxa) { void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa); tsf_IntCallback ic, const char *usage, signed int mina,
signed int maxa) {
ADDR ent =
tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
*(tsf_IntCallback *)(ent + 40) = ic; *(tsf_IntCallback *)(ent + 40) = ic;
} }
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_FloatCallback fc, const char* usage, signed int mina, signed int maxa) { void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa); tsf_FloatCallback fc, const char *usage,
signed int mina, signed int maxa) {
ADDR ent =
tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
*(tsf_FloatCallback *)(ent + 40) = fc; *(tsf_FloatCallback *)(ent + 40) = fc;
} }
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_VoidCallback vc, const char* usage, signed int mina, signed int maxa) { void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa); tsf_VoidCallback vc, const char *usage, signed int mina,
signed int maxa) {
ADDR ent =
tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
*(tsf_VoidCallback *)(ent + 40) = vc; *(tsf_VoidCallback *)(ent + 40) = vc;
} }
void tsf_AddConsoleFunc(const char* pname, const char* cname, const char* fname, tsf_BoolCallback bc, const char* usage, signed int mina, signed int maxa) { void tsf_AddConsoleFunc(const char *pname, const char *cname, const char *fname,
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa); tsf_BoolCallback bc, const char *usage, signed int mina,
signed int maxa) {
ADDR ent =
tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
*(tsf_BoolCallback *)(ent + 40) = bc; *(tsf_BoolCallback *)(ent + 40) = bc;
} }
// Initialization // Initialization
bool tsf_InitInternal() { bool tsf_InitInternal() {
BlScanFunctionText(tsf_BlStringTable__insert, "83 EC 0C 80 3D ? ? ? ? ?"); BlScanFunctionText(tsf_BlStringTable__insert, "83 EC 0C 80 3D ? ? ? ? ?");
BlScanFunctionText(tsf_BlNamespace__find , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 0C 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B DA 8B D1" ); BlScanFunctionText(
BlScanFunctionText(tsf_BlNamespace__createLocalEntry, "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0" ); tsf_BlNamespace__find,
BlScanFunctionText(tsf_BlDataChunker__freeBlocks , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33" ); "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 0C 53 56 57 A1 ? ? ? ? "
BlScanFunctionText(tsf_BlCon__evaluate , "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10" ); "33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B DA 8B D1");
BlScanFunctionText(tsf_BlCon__executef , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 8B B4 24 ? ? ? ? 33 C9" ); BlScanFunctionText(
BlScanFunctionText(tsf_BlCon__executefSimObj , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B B4 24 ? ? ? ? 33 C9" ); tsf_BlNamespace__createLocalEntry,
BlScanFunctionText(tsf_BlCon__getVariable , "53 56 8B F1 57 85 F6 0F 84 ? ? ? ?" ); "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 83 EC 08 53 56 57 A1 ? ? ? ? "
"33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0");
BlScanFunctionText(tsf_BlDataChunker__freeBlocks,
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 "
"A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33");
BlScanFunctionText(tsf_BlCon__evaluate,
"55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 56 57 A1 ? ? "
"? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B 75 10");
BlScanFunctionText(tsf_BlCon__executef,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 55 56 "
"8B B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(tsf_BlCon__executefSimObj,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 53 56 8B "
"B4 24 ? ? ? ? 33 C9");
BlScanFunctionText(tsf_BlCon__getVariable,
"53 56 8B F1 57 85 F6 0F 84 ? ? ? ?");
BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9"); BlScanFunctionText(tsf_BlDictionary__addVariable, "8B 44 24 04 56 57 8B F9");
BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17"); BlScanFunctionText(tsf_BlSim__findObject_name, "57 8B F9 8A 17");
BlScanFunctionText(tsf_BlStringStack__getArgBuffer , "55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D 08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D" ); BlScanFunctionText(tsf_BlStringStack__getArgBuffer,
BlScanFunctionText(tsf_BlSimObject__getDataField , "51 53 8B D9 55 56 8B 74 24 14" ); "55 8B EC 83 E4 F8 8B 0D ? ? ? ? A1 ? ? ? ? 56 57 8B 7D "
BlScanFunctionText(tsf_BlSimObject__setDataField , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 ? ? ? ? 53 8B D9 89 44 24 04" ); "08 8D 14 01 03 D7 3B 15 ? ? ? ? 72 2C 8B 0D");
BlScanFunctionText(tsf_BlSimObject__getDataField,
"51 53 8B D9 55 56 8B 74 24 14");
BlScanFunctionText(tsf_BlSimObject__setDataField,
"81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 "
"? ? ? ? 53 8B D9 89 44 24 04");
BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B"); BlScanFunctionText(tsf_BlCon__getReturnBuffer, "81 F9 ? ? ? ? 76 2B");
ADDR BlScanText (tsf_mCacheSequenceLoc , "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 18 8B 44 24 14" ); ADDR BlScanText(tsf_mCacheSequenceLoc,
ADDR BlScanText (tsf_mCacheAllocatorLoc , "89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? ? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3"); "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 "
ADDR BlScanText (tsf_gIdDictionaryLoc , "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0" ); "18 8B 44 24 14");
ADDR BlScanText (tsf_gEvalState_globalVarsLoc , "B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ?" ); ADDR BlScanText(
tsf_mCacheAllocatorLoc,
"89 35 ? ? ? ? C7 06 ? ? ? ? A1 ? ? ? ? 68 ? ? ? ? C7 40 ? ? ? ? ? E8 ? "
"? ? ? 83 C4 04 8B 4D F4 64 89 0D ? ? ? ? 59 5E 8B E5 5D C3");
ADDR BlScanText(tsf_gIdDictionaryLoc,
"89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0");
ADDR BlScanText(tsf_gEvalState_globalVarsLoc,
"B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? "
"? E8 ? ? ? ? E8 ? ? ? ?");
tsf_mCacheSequence = *(ADDR *)(tsf_mCacheSequenceLoc + 2); tsf_mCacheSequence = *(ADDR *)(tsf_mCacheSequenceLoc + 2);
tsf_mCacheAllocator = *(ADDR *)(tsf_mCacheAllocatorLoc + 2); tsf_mCacheAllocator = *(ADDR *)(tsf_mCacheAllocatorLoc + 2);
@@ -233,6 +280,4 @@ bool tsf_InitInternal() {
return true; return true;
} }
bool tsf_DeinitInternal() { bool tsf_DeinitInternal() { return true; }
return true;
}

87
inc/tsfuncs/BlFuncs.hpp
View File

@@ -5,10 +5,10 @@
#ifndef _H_BLFUNCS #ifndef _H_BLFUNCS
#define _H_BLFUNCS #define _H_BLFUNCS
// Require BlHooks to be included before this header // Ensure BlHooks is available (include it if not already included)
#ifndef _H_BLHOOKS #ifndef _H_BLHOOKS
#error "BlFuncs.hpp: You must include BlHooks.hpp first" #include "BlHooks.hpp"
#else #endif
typedef const char *(*tsf_StringCallback)(ADDR, signed int, const char *[]); typedef const char *(*tsf_StringCallback)(ADDR, signed int, const char *[]);
typedef signed int (*tsf_IntCallback)(ADDR, signed int, const char *[]); typedef signed int (*tsf_IntCallback)(ADDR, signed int, const char *[]);
@@ -42,12 +42,21 @@ void tsf_AddVar(const char *, signed int *);
void tsf_AddVar(const char *, float *); void tsf_AddVar(const char *, float *);
void tsf_AddVar(const char *, bool *); void tsf_AddVar(const char *, bool *);
ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *, signed int, const char *, signed int, signed int); ADDR tsf_AddConsoleFuncInternal(const char *, const char *, const char *,
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_StringCallback, const char *, signed int, signed int); signed int, const char *, signed int,
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_IntCallback, const char *, signed int, signed int); signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_FloatCallback, const char *, signed int, signed int); void tsf_AddConsoleFunc(const char *, const char *, const char *,
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_VoidCallback, const char *, signed int, signed int); tsf_StringCallback, const char *, signed int,
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_BoolCallback, const char *, signed int, signed int); signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_IntCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_FloatCallback, const char *, signed int,
signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_VoidCallback, const char *, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *,
tsf_BoolCallback, const char *, signed int, signed int);
bool tsf_InitInternal(); bool tsf_InitInternal();
@@ -56,21 +65,32 @@ extern ADDR tsf_mCacheAllocator;
extern ADDR tsf_gIdDictionary; extern ADDR tsf_gIdDictionary;
extern ADDR tsf_gEvalState_globalVars; extern ADDR tsf_gEvalState_globalVars;
BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert, const char *, bool); BlFunctionDefExtern(const char *, __stdcall, tsf_BlStringTable__insert,
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *, const char *); const char *, bool);
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, const char *); BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *,
const char *);
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR,
const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR); BlFunctionDefExtern(void, __thiscall, tsf_BlDataChunker__freeBlocks, ADDR);
BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int, const char **); BlFunctionDefExtern(const char *, , tsf_BlCon__evaluate, ADDR, signed int,
const char **);
BlFunctionDefExtern(const char *, , tsf_BlCon__executef, signed int, ...); BlFunctionDefExtern(const char *, , tsf_BlCon__executef, signed int, ...);
BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *, signed int, ...); BlFunctionDefExtern(const char *, , tsf_BlCon__executefSimObj, ADDR *,
BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable, const char *); signed int, ...);
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *, const char *, signed int, void *); BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable,
BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name, const char *); const char *);
BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int); BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *,
BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char *, const char *); const char *, signed int, void *);
BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char *, const char *, const char *); BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name,
BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int); const char *);
BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer,
unsigned int);
BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField,
ADDR, const char *, const char *);
BlFunctionDefExtern(void, __thiscall, tsf_BlSimObject__setDataField, ADDR,
const char *, const char *, const char *);
BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer,
unsigned int);
// Function short names // Function short names
@@ -94,16 +114,23 @@ BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int
#define BlAddFunction tsf_AddConsoleFunc #define BlAddFunction tsf_AddConsoleFunc
#define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) a22 #define __22ND_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, \
#define __NUM_LIST(...) __22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, ...) \
#define BlCall(...) \ a22
tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__) #define __NUM_LIST(...) \
__22ND_ARGUMENT(dummy, ##__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, \
11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
#define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlCallObj(obj, ...) \ #define BlCallObj(obj, ...) \
tsf_BlCon__executefSimObj((ADDR *)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__) tsf_BlCon__executefSimObj((ADDR *)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlFuncsInit() if(!tsf_InitInternal()) { return false; } #define BlFuncsInit() \
#define BlFuncsDeinit() if(!tsf_DeinitInternal()) { return false; } if (!tsf_InitInternal()) { \
return false; \
}
#define BlFuncsDeinit() \
if (!tsf_DeinitInternal()) { \
return false; \
}
#endif #endif
#endif

44
inc/tsfuncs/BlHooks.cpp
View File

@@ -2,21 +2,22 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
// RedoBlHooks Version 3.0 // RedoBlHooks Version 3.0
// Includes // Includes
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#include <cstdlib>
#endif
#include <Windows.h> #include <Windows.h>
#include <Psapi.h> #include <Psapi.h>
// #include <map> // #include <map>
#include "BlHooks.hpp" #include "BlHooks.hpp"
// Scanned structures // Scanned structures
BlFunctionDefIntern(tsh_BlPrintf); BlFunctionDefIntern(tsh_BlPrintf);
// Sig Scanning // Sig Scanning
ADDR ImageBase; ADDR ImageBase;
@@ -26,7 +27,8 @@ void tsh_i_InitScanner(){
HMODULE module = GetModuleHandle(NULL); HMODULE module = GetModuleHandle(NULL);
if (module) { if (module) {
MODULEINFO info; MODULEINFO info;
GetModuleInformation(GetCurrentProcess(), module, &info, sizeof(MODULEINFO)); GetModuleInformation(GetCurrentProcess(), module, &info,
sizeof(MODULEINFO));
ImageBase = (ADDR)info.lpBaseOfDll; ImageBase = (ADDR)info.lpBaseOfDll;
ImageSize = info.SizeOfImage; ImageSize = info.SizeOfImage;
} }
@@ -40,7 +42,8 @@ bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char* mask){
return (*mask) == 0; return (*mask) == 0;
} }
ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern, char *mask){ ADDR tsh_i_FindPattern(ADDR imageBase, ADDR imageSize, BYTE *pattern,
char *mask) {
for (ADDR i = imageBase; i < imageBase + imageSize; i++) { for (ADDR i = imageBase; i < imageBase + imageSize; i++) {
if (tsh_i_CompareData((PBYTE)i, pattern, mask)) { if (tsh_i_CompareData((PBYTE)i, pattern, mask)) {
return i; return i;
@@ -87,12 +90,12 @@ void tsh_i_PatternTextToCode(char* text, char** opatt, char** omask) {
*omask = mask; *omask = mask;
} }
// Public functions for sig scanning // Public functions for sig scanning
// Scan using code-style pattern // Scan using code-style pattern
ADDR tsh_ScanCode(char *pattern, char *mask) { ADDR tsh_ScanCode(char *pattern, char *mask) {
return tsh_i_FindPattern(ImageBase, ImageSize-strlen(mask), (BYTE*)pattern, mask); return tsh_i_FindPattern(ImageBase, ImageSize - strlen(mask), (BYTE *)pattern,
mask);
} }
// Scan using a text-style pattern // Scan using a text-style pattern
@@ -109,7 +112,6 @@ ADDR tsh_ScanText(char* text) {
return res; return res;
} }
// Call Patching and Hooking // Call Patching and Hooking
// Remove protection from address // Remove protection from address
@@ -117,7 +119,8 @@ ADDR tsh_ScanText(char* text) {
void tsh_DeprotectAddress(ADDR length, ADDR location) { void tsh_DeprotectAddress(ADDR length, ADDR location) {
DWORD oldProtection; DWORD oldProtection;
VirtualProtect((void*)location, length, PAGE_EXECUTE_READWRITE, &oldProtection); VirtualProtect((void *)location, length, PAGE_EXECUTE_READWRITE,
&oldProtection);
// tsh_DeprotectedAddresses[location] = {length, oldProtection}; // tsh_DeprotectedAddresses[location] = {length, oldProtection};
} }
@@ -135,9 +138,7 @@ void tsh_ReplaceInt(ADDR addr, int rval) {
tsh_PatchBytes(4, addr, (BYTE *)(&rval)); tsh_PatchBytes(4, addr, (BYTE *)(&rval));
} }
int tsh_i_CallOffset(ADDR instr, ADDR func) { int tsh_i_CallOffset(ADDR instr, ADDR func) { return func - (instr + 4); }
return func - (instr+4);
}
void tsh_i_ReplaceCall(ADDR instr, ADDR target) { void tsh_i_ReplaceCall(ADDR instr, ADDR target) {
tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target)); tsh_ReplaceInt(instr, tsh_i_CallOffset(instr, target));
@@ -161,11 +162,13 @@ void tsh_UnhookFunction(ADDR victim, BYTE* origbytes){
tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data tsh_i_PatchCopy(victim, (ADDR)origbytes, 6); // restore old data
} }
int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, bool debugprint){ int tsh_PatchAllMatchesCode(ADDR len, char *patt, char *mask, char *replace,
bool debugprint) {
int numpatched = 0; int numpatched = 0;
for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) { for (ADDR i = ImageBase; i < ImageBase + ImageSize - len; i++) {
if (tsh_i_CompareData((BYTE *)i, (BYTE *)patt, mask)) { if (tsh_i_CompareData((BYTE *)i, (BYTE *)patt, mask)) {
if(debugprint) BlPrintf("RedoBlHooks: Patching call at %08x", i); if (debugprint)
BlPrintf("RedoBlHooks: Patching call at %08x", i);
numpatched++; numpatched++;
tsh_DeprotectAddress(i, len); tsh_DeprotectAddress(i, len);
@@ -177,7 +180,8 @@ int tsh_PatchAllMatchesCode(ADDR len, char* patt, char* mask, char* replace, boo
return numpatched; return numpatched;
} }
int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint) { int tsh_PatchAllMatchesHex(ADDR len, char *text, char *replace,
bool debugprint) {
char *patt; char *patt;
char *mask; char *mask;
tsh_i_PatternTextToCode(text, &patt, &mask); tsh_i_PatternTextToCode(text, &patt, &mask);
@@ -190,18 +194,16 @@ int tsh_PatchAllMatchesHex(ADDR len, char* text, char* replace, bool debugprint)
return res; return res;
} }
// Initialization // Initialization
bool tsh_InitInternal() { bool tsh_InitInternal() {
tsh_i_InitScanner(); tsh_i_InitScanner();
BlScanFunctionText(tsh_BlPrintf, "8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3"); BlScanFunctionText(
tsh_BlPrintf,
"8D 44 24 08 33 D2 50 FF 74 24 08 33 C9 E8 ? ? ? ? 83 C4 08 C3");
return true; return true;
} }
bool tsh_DeinitInternal() { bool tsh_DeinitInternal() { return true; }
return true;
}

67
inc/tsfuncs/BlHooks.hpp
View File

@@ -5,13 +5,11 @@
#ifndef _H_BLHOOKS #ifndef _H_BLHOOKS
#define _H_BLHOOKS #define _H_BLHOOKS
// Typedefs // Typedefs
typedef unsigned char BYTE; typedef unsigned char BYTE;
typedef unsigned int ADDR; typedef unsigned int ADDR;
// Prototypes // Prototypes
bool tsh_InitInternal(); bool tsh_InitInternal();
@@ -25,7 +23,6 @@ void tsh_PatchByte(ADDR, BYTE);
void tsh_PatchBytes(unsigned int, ADDR, BYTE *); void tsh_PatchBytes(unsigned int, ADDR, BYTE *);
void tsh_PatchInt(ADDR, int); void tsh_PatchInt(ADDR, int);
// Debug print settings // Debug print settings
#ifndef TSH_NO_DEBUG_PRINT #ifndef TSH_NO_DEBUG_PRINT
@@ -34,29 +31,32 @@ void tsh_PatchInt(ADDR, int);
#define tsh_DEBUGPRINT true #define tsh_DEBUGPRINT true
#endif #endif
// Function short names // Function short names
// Use in code when the def is not shared in a header // Use in code when the def is not shared in a header
#define BlFunctionDef(returnType, convention, name, ...) \ #define BlFunctionDef(returnType, convention, name, ...) \
typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \ typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \
tsh_##name##FnT name; tsh_##name##FnT name;
// Use in header for shared function defs when a BlFunctionDefIntern exists in code // Use in header for shared function defs when a BlFunctionDefIntern exists in
// code
#define BlFunctionDefExtern(returnType, convention, name, ...) \ #define BlFunctionDefExtern(returnType, convention, name, ...) \
typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \ typedef returnType(convention *tsh_##name##FnT)(__VA_ARGS__); \
extern tsh_##name##FnT name; extern tsh_##name##FnT name;
// Use in code for shared function defs when a BlFunctionDefExtern exists in header // Use in code for shared function defs when a BlFunctionDefExtern exists in
#define BlFunctionDefIntern(name) \ // header
tsh_##name##FnT name; #define BlFunctionDefIntern(name) tsh_##name##FnT name;
// Scan for and assign the pattern to the variable, or err and return if not found // Scan for and assign the pattern to the variable, or err and return if not
// found
#define BlScanFunctionCode(target, patt, mask) \ #define BlScanFunctionCode(target, patt, mask) \
target = (tsh_##target##FnT)tsh_ScanCode((char *)patt, (char *)mask); \ target = (tsh_##target##FnT)tsh_ScanCode((char *)patt, (char *)mask); \
if (!target) { \ if (!target) { \
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found function "#target" at %08x", (int)target); \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \
(int)target); \
} }
#define BlScanFunctionText(target, text) \ #define BlScanFunctionText(target, text) \
target = (tsh_##target##FnT)tsh_ScanText((char *)text); \ target = (tsh_##target##FnT)tsh_ScanText((char *)text); \
@@ -64,7 +64,9 @@ void tsh_PatchInt(ADDR, int);
BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find function " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found function "#target" at %08x", (int)target); \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found function " #target " at %08x", \
(int)target); \
} }
#define BlScanCode(target, patt, mask) \ #define BlScanCode(target, patt, mask) \
target = tsh_ScanCode((char *)patt, (char *)mask); \ target = tsh_ScanCode((char *)patt, (char *)mask); \
@@ -72,7 +74,8 @@ void tsh_PatchInt(ADDR, int);
BlPrintf("RedoBlHooks | Cannot find pattern " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find pattern " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found "#target" at %08x", (int)target); \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \
} }
#define BlScanText(target, text) \ #define BlScanText(target, text) \
target = tsh_ScanText((char *)text); \ target = tsh_ScanText((char *)text); \
@@ -80,14 +83,20 @@ void tsh_PatchInt(ADDR, int);
BlPrintf("RedoBlHooks | Cannot find " #target "!"); \ BlPrintf("RedoBlHooks | Cannot find " #target "!"); \
return false; \ return false; \
} else { \ } else { \
if(tsh_DEBUGPRINT) BlPrintf("RedoBlHooks | Found "#target" at %08x", (int)target); \ if (tsh_DEBUGPRINT) \
BlPrintf("RedoBlHooks | Found " #target " at %08x", (int)target); \
} }
// Use in code to define the data and functions for hooking a function // Use in code to define the data and functions for hooking a function
#define BlFunctionHookDef(func) \ #define BlFunctionHookDef(func) \
BYTE tsh_BlFunctionHook##func##Data[6]; \ BYTE tsh_BlFunctionHook##func##Data[6]; \
void func##HookOn(){ tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \ void func##HookOn() { \
void func##HookOff(){ tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); } tsh_HookFunction((ADDR)func, (ADDR)func##Hook, \
tsh_BlFunctionHook##func##Data); \
} \
void func##HookOff() { \
tsh_UnhookFunction((ADDR)func, tsh_BlFunctionHook##func##Data); \
}
// Use in code to initialize the hook once // Use in code to initialize the hook once
#define BlFunctionHookInit(func) \ #define BlFunctionHookInit(func) \
tsh_DeprotectAddress(6, (ADDR)func); \ tsh_DeprotectAddress(6, (ADDR)func); \
@@ -95,28 +104,38 @@ void tsh_PatchInt(ADDR, int);
// Replace all matches of the pattern with the given byte string // Replace all matches of the pattern with the given byte string
#define BlPatchAllMatchesCode(len, patt, mask, repl) \ #define BlPatchAllMatchesCode(len, patt, mask, repl) \
tsh_PatchAllMatchesCode((ADDR)len, (char*)patt, (char*)mask, (char*)repl, tsh_DEBUGPRINT); tsh_PatchAllMatchesCode((ADDR)len, (char *)patt, (char *)mask, (char *)repl, \
tsh_DEBUGPRINT);
#define BlPatchAllMatchesText(len, text, repl) \ #define BlPatchAllMatchesText(len, text, repl) \
tsh_PatchAllMatchesCode((ADDR)len, (char*)text, (char*)repl, tsh_DEBUGPRINT); tsh_PatchAllMatchesCode((ADDR)len, (char *)text, (char *)repl, \
tsh_DEBUGPRINT);
// Deprotect and replace one byte // Deprotect and replace one byte
#define BlPatchByte(addr, byte) \ #define BlPatchByte(addr, byte) tsh_PatchByte((ADDR)addr, (BYTE)byte);
tsh_PatchByte((ADDR)addr, (BYTE)byte);
// Deprotect and replace a byte string // Deprotect and replace a byte string
#define BlPatchBytes(len, addr, repl) \ #define BlPatchBytes(len, addr, repl) \
tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE *)repl); tsh_PatchBytes((ADDR)len, (ADDR)addr, (BYTE *)repl);
// BlPrintf(char* format, ...) // BlPrintf(char* format, ...)
#define BlPrintf(...) if(tsh_BlPrintf) { tsh_BlPrintf(__VA_ARGS__); } #define BlPrintf(...) \
if (tsh_BlPrintf) { \
tsh_BlPrintf(__VA_ARGS__); \
}
// BlHooksInit() -> bool: success // BlHooksInit() -> bool: success
#define BlHooksInit() if(!tsh_InitInternal()) { BlPrintf("BlHooksInit failed"); return false; } #define BlHooksInit() \
if (!tsh_InitInternal()) { \
BlPrintf("BlHooksInit failed"); \
return false; \
}
// BlHooksDeinit() -> bool: success // BlHooksDeinit() -> bool: success
#define BlHooksDeinit() if(!tsh_DeinitInternal()) { BlPrintf("BlHooksDeinit failed"); return false; } #define BlHooksDeinit() \
if (!tsh_DeinitInternal()) { \
BlPrintf("BlHooksDeinit failed"); \
return false; \
}
// Scanned structures // Scanned structures
BlFunctionDefExtern(void, , tsh_BlPrintf, const char *, ...); BlFunctionDefExtern(void, , tsh_BlPrintf, const char *, ...);
#endif #endif

20
src/bllua4.cpp
View File

@@ -2,12 +2,15 @@
// Includes // Includes
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <Windows.h> #include <Windows.h>
#include <Psapi.h> #include <Psapi.h>
#include "lua.hpp"
#include "BlHooks.cpp"
#include "BlFuncs.cpp" #include "BlFuncs.cpp"
#include "BlHooks.cpp"
#include "lua.hpp"
#include "luainterp.cpp" #include "luainterp.cpp"
#include "lualibts.cpp" #include "lualibts.cpp"
@@ -61,7 +64,9 @@ bool init() {
#endif #endif
// Expose Lua API to TS // Expose Lua API to TS
BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20); BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall,
"LuaCall(name, ...) - Call Lua function and return result", 2,
20);
BlEval(bll_fileTsEnv); BlEval(bll_fileTsEnv);
// Load utilities // Load utilities
@@ -98,8 +103,11 @@ bool deinit() {
bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void *reserved) { bool __stdcall DllMain(HINSTANCE hinstance, DWORD reason, void *reserved) {
switch (reason) { switch (reason) {
case DLL_PROCESS_ATTACH: return init(); case DLL_PROCESS_ATTACH:
case DLL_PROCESS_DETACH: return deinit(); return init();
default : return true; case DLL_PROCESS_DETACH:
return deinit();
default:
return true;
} }
} }

20
src/luainterp.cpp
View File

@@ -1,5 +1,10 @@
// Handle errors with a Lua function, defined in lua-env.lua // Handle errors with a Lua function, defined in lua-env.lua
#include "luainterp.hpp"
#include "BlHooks.hpp"
#include "lauxlib.h"
#include "lua.h"
#include <cstring>
int bll_error_handler(lua_State *L) { int bll_error_handler(lua_State *L) {
lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error"); lua_getfield(L, LUA_GLOBALSINDEX, "_bllua_on_error");
if (!lua_isfunction(L, -1)) { if (!lua_isfunction(L, -1)) {
@@ -48,21 +53,26 @@ bool bll_LuaEval(lua_State* L, const char* str) {
// Convert a Lua stack entry into a string for providing to TS // Convert a Lua stack entry into a string for providing to TS
// Use static buffer to avoid excessive malloc // Use static buffer to avoid excessive malloc
#define BLL_ARG_COUNT 20
#define BLL_ARG_MAX 8192
char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX]; char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State *L, char *buf, int i, bool err) { bool bll_toarg(lua_State *L, char *buf, int i, bool err) {
if (lua_isstring(L, i)) { if (lua_isstring(L, i)) {
const char *str = lua_tostring(L, i); const char *str = lua_tostring(L, i);
if (strlen(str) >= BLL_ARG_MAX) { if (strlen(str) >= BLL_ARG_MAX) {
if(err) luaL_error(L, "argument to TS is too long - max length is 8192"); if (err)
luaL_error(L, "argument to TS is too long - max length is 8192");
return true; return true;
} else { } else {
strcpy(buf, str); #ifdef _MSC_VER
strncpy_s(buf, BLL_ARG_MAX, str, _TRUNCATE);
#else
strncpy(buf, str, BLL_ARG_MAX - 1);
buf[BLL_ARG_MAX - 1] = '\0';
#endif
return false; return false;
} }
} else { } else {
if(err) luaL_error(L, "argument to TS must be a string"); if (err)
luaL_error(L, "argument to TS must be a string");
return true; return true;
} }
} }

16
src/luainterp.hpp Normal file
View File

@@ -0,0 +1,16 @@
// Shared declarations for Lua <-> TS argument handling
#ifndef _H_LUAINTERP_SHARED
#define _H_LUAINTERP_SHARED
#include "lua.h"
#define BLL_ARG_COUNT 20
#define BLL_ARG_MAX 8192
extern char bll_arg_buffer[BLL_ARG_COUNT][BLL_ARG_MAX];
bool bll_toarg(lua_State *L, char *buf, int i, bool err);
int bll_pcall(lua_State *L, int nargs, int nret);
void bll_printError(lua_State *L, const char *operation, const char *item);
extern lua_State *gL;
#endif

268
src/lualibts.cpp
View File

@@ -3,14 +3,24 @@
// TS -> Lua API // TS -> Lua API
// Call a TS function from Lua, push the result to Lua stack // Call a TS function from Lua, push the result to Lua stack
int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int ofs) { #include "BlFuncs.hpp"
#include "BlHooks.hpp"
#include "lauxlib.h"
#include "lua.h"
#include "luainterp.hpp"
int bll_TsCall(lua_State *L, const char *oname, const char *fname, int argc,
int ofs) {
ADDR obj = (ADDR)NULL; ADDR obj = (ADDR)NULL;
if (oname) { if (oname) {
obj = BlObject(oname); obj = BlObject(oname);
if(!obj) { return luaL_error(L, "Lua->TS call: Object not found"); } if (!obj) {
return luaL_error(L, "Lua->TS call: Object not found");
}
} }
if(argc > BLL_ARG_COUNT) { return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)"); } if (argc > BLL_ARG_COUNT) {
return luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
}
char *argv[BLL_ARG_COUNT]; char *argv[BLL_ARG_COUNT];
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
@@ -23,52 +33,184 @@ int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int
const char *res; const char *res;
if (obj) { if (obj) {
switch (argc) { switch (argc) {
case 0: res = BlCallObj(obj, fname); break; // no idea why this happens sometimes, it shouldnt be possible case 0:
case 1: res = BlCallObj(obj, fname); break; res = BlCallObj(obj, fname);
case 2: res = BlCallObj(obj, fname, argv[0]); break; break; // no idea why this happens sometimes, it shouldnt be possible
case 3: res = BlCallObj(obj, fname, argv[0], argv[1]); break; case 1:
case 4: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2]); break; res = BlCallObj(obj, fname);
case 5: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3]); break; break;
case 6: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]); break; case 2:
case 7: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); break; res = BlCallObj(obj, fname, argv[0]);
case 8: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]); break; break;
case 9: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]); break; case 3:
case 10: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]); break; res = BlCallObj(obj, fname, argv[0], argv[1]);
case 11: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]); break; break;
case 12: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); break; case 4:
case 13: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); break; res = BlCallObj(obj, fname, argv[0], argv[1], argv[2]);
case 14: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12]); break; break;
case 15: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13]); break; case 5:
case 16: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14]); break; res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3]);
case 17: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]); break; break;
case 18: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]); break; case 6:
case 19: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]); break; res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4]);
case 20: res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]); break; break;
default: res = ""; luaL_error(L, "Lua->TS object call: Too many arguments (Max is 19)"); case 7:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5]);
break;
case 8:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6]);
break;
case 9:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7]);
break;
case 10:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8]);
break;
case 11:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9]);
break;
case 12:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
break;
case 13:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11]);
break;
case 14:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12]);
break;
case 15:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13]);
break;
case 16:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14]);
break;
case 17:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15]);
break;
case 18:
res =
BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]);
break;
case 19:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15],
argv[16], argv[17]);
break;
case 20:
res = BlCallObj(obj, fname, argv[0], argv[1], argv[2], argv[3], argv[4],
argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
argv[11], argv[12], argv[13], argv[14], argv[15],
argv[16], argv[17], argv[18]);
break;
default:
res = "";
luaL_error(L, "Lua->TS object call: Too many arguments (Max is 19)");
} }
} else { } else {
switch (argc) { switch (argc) {
case 0: res = BlCall(fname); break; case 0:
case 1: res = BlCall(fname, argv[0]); break; res = BlCall(fname);
case 2: res = BlCall(fname, argv[0], argv[1]); break; break;
case 3: res = BlCall(fname, argv[0], argv[1], argv[2]); break; case 1:
case 4: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3]); break; res = BlCall(fname, argv[0]);
case 5: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4]); break; break;
case 6: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]); break; case 2:
case 7: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]); break; res = BlCall(fname, argv[0], argv[1]);
case 8: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7]); break; break;
case 9: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8]); break; case 3:
case 10: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9]); break; res = BlCall(fname, argv[0], argv[1], argv[2]);
case 11: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]); break; break;
case 12: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]); break; case 4:
case 13: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12]); break; res = BlCall(fname, argv[0], argv[1], argv[2], argv[3]);
case 14: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13]); break; break;
case 15: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14]); break; case 5:
case 16: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15]); break; res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4]);
case 17: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16]); break; break;
case 18: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]); break; case 6:
case 19: res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11], argv[12], argv[13], argv[14], argv[15], argv[16], argv[17], argv[18]); break; res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
default: res = ""; luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)"); break;
case 7:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6]);
break;
case 8:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7]);
break;
case 9:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8]);
break;
case 10:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9]);
break;
case 11:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10]);
break;
case 12:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
break;
case 13:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12]);
break;
case 14:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13]);
break;
case 15:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13], argv[14]);
break;
case 16:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13], argv[14], argv[15]);
break;
case 17:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13], argv[14], argv[15], argv[16]);
break;
case 18:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17]);
break;
case 19:
res = BlCall(fname, argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
argv[6], argv[7], argv[8], argv[9], argv[10], argv[11],
argv[12], argv[13], argv[14], argv[15], argv[16], argv[17],
argv[18]);
break;
default:
res = "";
luaL_error(L, "Lua->TS call: Too many arguments (Max is 19)");
} }
} }
@@ -79,7 +221,8 @@ int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int
// Lua lib function: ts.call // Lua lib function: ts.call
int bll_lua_tscall(lua_State *L) { int bll_lua_tscall(lua_State *L) {
int argc = lua_gettop(L) - 1; // number of arguments after function name int argc = lua_gettop(L) - 1; // number of arguments after function name
if(argc < 0) return luaL_error(L, "_bllua_ts.call: Must provide a function name"); if (argc < 0)
return luaL_error(L, "_bllua_ts.call: Must provide a function name");
const char *fname = luaL_checkstring(L, 1); const char *fname = luaL_checkstring(L, 1);
@@ -87,8 +230,11 @@ int bll_lua_tscall(lua_State* L) {
} }
// Lua lib function: ts.callobj // Lua lib function: ts.callobj
int bll_lua_tscallobj(lua_State *L) { int bll_lua_tscallobj(lua_State *L) {
int argc = lua_gettop(L)-2; // number of arguments after function name and object? int argc =
if(argc < 0) return luaL_error(L, "_bllua_ts.callobj: Must provide an object and function name"); lua_gettop(L) - 2; // number of arguments after function name and object?
if (argc < 0)
return luaL_error(
L, "_bllua_ts.callobj: Must provide an object and function name");
const char *oname = luaL_checkstring(L, 1); const char *oname = luaL_checkstring(L, 1);
const char *fname = luaL_checkstring(L, 2); const char *fname = luaL_checkstring(L, 2);
@@ -110,7 +256,9 @@ int bll_lua_tsgetfield(lua_State* L) {
const char *oname = luaL_checkstring(L, 1); const char *oname = luaL_checkstring(L, 1);
const char *vname = luaL_checkstring(L, 2); const char *vname = luaL_checkstring(L, 2);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if(!obj) { return luaL_error(L, "_bllua_ts.getfield: Object not found"); } if (!obj) {
return luaL_error(L, "_bllua_ts.getfield: Object not found");
}
const char *val = BlGetField(obj, vname, NULL); const char *val = BlGetField(obj, vname, NULL);
lua_pushstring(L, val); lua_pushstring(L, val);
@@ -122,7 +270,9 @@ int bll_lua_tssetfield(lua_State* L) {
const char *vname = luaL_checkstring(L, 2); const char *vname = luaL_checkstring(L, 2);
const char *val = luaL_checkstring(L, 3); const char *val = luaL_checkstring(L, 3);
ADDR obj = BlObject(oname); ADDR obj = BlObject(oname);
if(!obj) { return luaL_error(L, "_bllua_ts.setfield: Object not found"); } if (!obj) {
return luaL_error(L, "_bllua_ts.setfield: Object not found");
}
BlSetField(obj, vname, NULL, val); BlSetField(obj, vname, NULL, val);
return 0; return 0;
@@ -145,15 +295,9 @@ int bll_lua_tsecho(lua_State* L) {
} }
const luaL_Reg bll_lua_reg[] = { const luaL_Reg bll_lua_reg[] = {
{"call" , bll_lua_tscall }, {"call", bll_lua_tscall}, {"callobj", bll_lua_tscallobj},
{"callobj" , bll_lua_tscallobj }, {"getvar", bll_lua_tsgetvar}, {"getfield", bll_lua_tsgetfield},
{"getvar" , bll_lua_tsgetvar }, {"setfield", bll_lua_tssetfield}, {"eval", bll_lua_tseval},
{"getfield", bll_lua_tsgetfield}, {"echo", bll_lua_tsecho}, {NULL, NULL},
{"setfield", bll_lua_tssetfield},
{"eval" , bll_lua_tseval },
{"echo" , bll_lua_tsecho },
{NULL, NULL},
}; };
void llibbl_init(lua_State* L) { void llibbl_init(lua_State *L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }
luaL_register(L, "_bllua_ts", bll_lua_reg);
}

13
src/tsliblua.cpp
View File

@@ -1,5 +1,9 @@
// Call a Lua function from TS, return true if success - result will be on Lua stack // Call a Lua function from TS, return true if success - result will be on Lua
// stack
#include "BlFuncs.hpp"
#include "BlHooks.hpp"
#include "luainterp.hpp"
bool bll_LuaCall(const char *fname, int argc, const char *argv[]) { bool bll_LuaCall(const char *fname, int argc, const char *argv[]) {
lua_getglobal(gL, fname); lua_getglobal(gL, fname);
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
@@ -14,9 +18,12 @@ bool bll_LuaCall(const char* fname, int argc, const char* argv[]) {
// TS lib function: luacall // TS lib function: luacall
const char *bll_ts_luacall(ADDR obj, int argc, const char *argv[]) { const char *bll_ts_luacall(ADDR obj, int argc, const char *argv[]) {
if(argc<2) return ""; if (argc < 2)
return "";
if(!bll_LuaCall(argv[1], argc-2, &argv[2])) { return ""; } if (!bll_LuaCall(argv[1], argc - 2, &argv[2])) {
return "";
}
char *retbuf = BlReturnBuffer(BLL_ARG_MAX); char *retbuf = BlReturnBuffer(BLL_ARG_MAX);
bll_toarg(gL, retbuf, -1, false); // provide returned value to ts bll_toarg(gL, retbuf, -1, false); // provide returned value to ts

6
src/util/libts-lua.lua
View File

@@ -135,8 +135,8 @@ end
---@diagnostic disable-next-line: duplicate-set-field ---@diagnostic disable-next-line: duplicate-set-field
function io.lines(fn) function io.lines(fn)
local fi, err, fn2 = io.open(fn, nil, 2) local fi, err, fn2 = io.open(fn, 'r', 2)
if not fi then error('Error opening file \'' .. fn2 .. '\': ' .. err, 2) end if not fi then error('Error opening file \'' .. tostring(fn2) .. '\': ' .. tostring(err), 2) end
return fi:lines() return fi:lines()
end end
@@ -156,7 +156,7 @@ function dofile(fn, errn)
errn = errn or 1 errn = errn or 1
local fi, err, fn2 = io.open(fn, 'r', errn + 1) local fi, err, fn2 = io.open(fn, 'r', errn + 1)
if not fi then error('Error executing file \'' .. fn2 .. '\': ' .. err, errn + 1) end if not fi then error('Error executing file \'' .. tostring(fn2) .. '\': ' .. tostring(err), errn + 1) end
print('Executing ' .. fn2) print('Executing ' .. fn2)
local text = fi:read('*a') local text = fi:read('*a')