Auios/BlockLua
1
0
Fork 0
forked from redo/BlockLua
Code Pull Requests Activity

Compare commits

base: Auios:e309e2427bf05b43dbe426075ea8df772194c241
Branches Tags
Auios:master redo:master
..
compare: Auios:master
Branches Tags
Auios:master redo:master

24 Commits
e309e2427b ... master

Author SHA1 Message Date
Connor O'Connor
b328f0b21a Merge branch 'master' 2025-12-09 15:43:41 -05:00
Connor O'Connor
71b73c816b ... 2025-12-08 15:29:41 -05:00
Connor O'Connor
c5dc8b15f9 Delete BlockLua.dll 2025-12-08 15:26:53 -05:00
Redo
8399b11322 fix table.empty, from auios 2025-12-08 11:49:23 -05:00
Connor O'Connor
d494f02fe3 fix table.empty being inverted 2025-12-08 03:32:56 -05:00
Connor O'Connor
a7db0d8e81 Update lua-env.lua 2025-12-08 03:32:31 -05:00
Connor O'Connor
33f5ec9bbe Ensure fn is a string path 2025-12-08 03:32:12 -05:00
Connor O'Connor
f6bf18efaa Fix md formatting + remove trailing whitespace 2025-12-08 03:30:54 -05:00
Connor O'Connor
4f42801da6 Update compiling.md 2025-12-08 03:22:47 -05:00
Connor O'Connor
15f67e0eef Fix invalid escape sequence for 5.1 2025-12-08 03:12:03 -05:00
Connor O'Connor
5885dcbed3 Update libbl.lua 2025-12-08 03:09:47 -05:00
Connor O'Connor
d9a416f5d5 Merge branch 'master' 2025-12-08 03:09:44 -05:00
Redo
2191e004ad recompile 2025-12-07 12:02:56 -05:00
Redo
ae34bb8b7a fix commandToClient, handle net strings when passed to lua, misc readme additions 2025-12-07 11:52:40 -05:00
Redo
b71bfdb73e support more+empty args in hooks 2025-10-13 12:28:16 -05:00
Redo
7232ede09d make :members() not return index, add -DBLLUA_ALLOWFFI, allow reading modules/lualib/, bug fixes 2025-10-06 23:03:12 -05:00
Connor O'Connor
ed5c254480 .clang-format updates 2025-10-06 17:00:12 -04:00
Connor O'Connor
5718ba8e6b Merge branch 'master' 2025-10-06 13:16:24 -04:00
Connor O'Connor
a4f78b7425 Merge branch 'master' 2025-10-06 13:11:57 -04:00
Connor O'Connor
e47f6d4651 Fix all warnings and errors in C++ 2025-10-06 12:03:51 -04:00
Connor O'Connor
93a47d54be make 2025-10-06 11:47:11 -04:00
Redo
76c758a47b allow luaget/luaset/luacall to access tables and methods, improve type conversion, add bl.string, begin adding matrix 2025-10-06 10:30:25 -05:00
Connor O'Connor
87e199ea5c formatting 2025-10-06 10:08:17 -04:00
Connor O'Connor
66ed695010 Update libbl.lua 2025-10-06 10:01:54 -04:00
32 changed files with 2764 additions and 2157 deletions
Expand all files Collapse all files

42
.clang-format Normal file
View File

@@ -0,0 +1,42 @@
BasedOnStyle: LLVM
# Include sorting and grouping
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
# Indentation settings
IndentWidth: 2
UseTab: Never
IndentAccessModifiers: false
AccessModifierOffset: 0
NamespaceIndentation: All
# Line breaking and wrapping
ColumnLimit: 120
BreakBeforeTernaryOperators: false
BreakBeforeBinaryOperators: None
AlwaysBreakAfterReturnType: None
AlwaysBreakAfterDefinitionReturnType: None
# Alignment
AlignOperands: DontAlign
AlignAfterOpenBracket: AlwaysBreak
PointerAlignment: Left
# Parameter formatting
BinPackParameters: false
AllowAllParametersOfDeclarationOnNextLine: false
# Code organization
SeparateDefinitionBlocks: Always

1
.gitignore vendored
View File

@@ -1 +1,2 @@
build/ build/
.cache/

7
.vscode/settings.json vendored
View File

@@ -5,8 +5,7 @@
"_bllua_on_unload" "_bllua_on_unload"
], ],
"Lua.runtime.version": "Lua 5.1", "Lua.runtime.version": "Lua 5.1",
"Lua.diagnostics.disable": [ "Lua.diagnostics.disable": ["lowercase-global", "undefined-global"],
"lowercase-global", "C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
"undefined-global" "C_Cpp.default.compilerPath": "C:/msys64/mingw32/bin/g++.exe"
]
} }

56
CMakeLists.txt Normal file
View File

@@ -0,0 +1,56 @@
cmake_minimum_required(VERSION 3.10)
project(BlockLua CXX)
# Export compile_commands.json for VSCode IntelliSense
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Output directories to mirror build.bat's build folder
set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/build)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})
# Global build options to mirror build.bat
add_compile_options(
-Wall
-Werror
-m32
-static-libgcc
-static-libstdc++
)
# Include paths
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/inc/tsfuncs
${CMAKE_SOURCE_DIR}/inc/lua
)
# Link directories (for -L.) and libraries from build.bat
link_directories(
${CMAKE_SOURCE_DIR}
)
# Safe DLL
add_library(BlockLua SHARED src/bllua4.cpp)
# Ensure output name matches build.bat
set_target_properties(BlockLua PROPERTIES OUTPUT_NAME "BlockLua")
# Linker flags and libraries
if(MSVC)
# Not expected with mingw, but keep placeholder
else()
target_link_libraries(BlockLua PRIVATE psapi lua5.1)
endif()
# Unsafe DLL (with BLLUA_UNSAFE definition)
add_library(BlockLuaUnsafe SHARED src/bllua4.cpp)
set_target_properties(BlockLuaUnsafe PROPERTIES OUTPUT_NAME "BlockLua-Unsafe")
target_compile_definitions(BlockLuaUnsafe PRIVATE BLLUA_UNSAFE)
if(MSVC)
# Not expected with mingw, but keep placeholder
else()
target_link_libraries(BlockLuaUnsafe PRIVATE psapi lua5.1)
endif()

27
build.bat Normal file
View File

@@ -0,0 +1,27 @@
@echo off
cd /d %~dp0
REM Ensure MinGW32 toolchain is first in PATH
set "PATH=C:\msys64\mingw32\bin;%PATH%"
REM Configure CMake (generate into build/)
cmake -S . -B build -G "MinGW Makefiles"
if errorlevel 1 goto :error
REM Build (Release by default)
cmake --build build --config Release -j
if errorlevel 1 goto :error
echo.
echo Build completed.
echo Outputs in .\build :
echo - BlockLua.dll
echo - BlockLua-Unsafe.dll
exit /b 0
:error
echo.
echo Build failed. See errors above.
exit /b 1

13
compile.bat
View File

@@ -1,13 +0,0 @@
@echo off
cd /d %~dp0
set "PATH=C:\msys64\mingw32\bin;%PATH%"
if not exist build mkdir build
set buildargs=-Wall -Werror -m32 -shared -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 -static-libgcc -static-libstdc++
echo on
g++ src/bllua4.cpp %buildargs% -o build\BlockLua.dll
g++ -DBLLUA_UNSAFE src/bllua4.cpp %buildargs% -o build\BlockLua-Unsafe.dll
@echo off

4
compiling.md
View File

@@ -27,7 +27,7 @@ What these packages are for:
- Run the script: - Run the script:
```powershell ```powershell
compile.bat build.bat
``` ```
What the script does: What the script does:
@@ -48,5 +48,5 @@ You should see `architecture: i386` in the output.
### Notes ### Notes
- Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won’t work for a 32-bit build. - Ensure you installed the i686 (32-bit) variants of the packages; x86_64 packages won't work for a 32-bit build.
- If the linker cannot find `-llua5.1`, confirm `mingw-w64-i686-lua51` is installed and you are using the `mingw32` toolchain (not `x86_64`). - If the linker cannot find `-llua5.1`, confirm `mingw-w64-i686-lua51` is installed and you are using the `mingw32` toolchain (not `x86_64`).

154
inc/lua/lauxlib.h
View File

@@ -4,93 +4,75 @@
** 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)
typedef struct luaL_Reg { typedef struct luaL_Reg {
const char *name; const char* name;
lua_CFunction func; lua_CFunction func;
} luaL_Reg; } luaL_Reg;
LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname, LUALIB_API void(luaL_openlib)(lua_State* L, const char* libname, const luaL_Reg* l, int nup);
const luaL_Reg *l, int nup); LUALIB_API void(luaL_register)(lua_State* L, const char* libname, const luaL_Reg* l);
LUALIB_API void (luaL_register) (lua_State *L, const char *libname, LUALIB_API int(luaL_getmetafield)(lua_State* L, int obj, const char* e);
const luaL_Reg *l); LUALIB_API int(luaL_callmeta)(lua_State* L, int obj, const char* e);
LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e); LUALIB_API int(luaL_typerror)(lua_State* L, int narg, const char* tname);
LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e); LUALIB_API int(luaL_argerror)(lua_State* L, int numarg, const char* extramsg);
LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname); LUALIB_API const char*(luaL_checklstring)(lua_State * L, int numArg, size_t* l);
LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg); LUALIB_API const char*(luaL_optlstring)(lua_State * L, int numArg, const char* def, size_t* l);
LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg, LUALIB_API lua_Number(luaL_checknumber)(lua_State* L, int numArg);
size_t *l); LUALIB_API lua_Number(luaL_optnumber)(lua_State* L, int nArg, lua_Number def);
LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
const char *def, size_t *l);
LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg); LUALIB_API lua_Integer(luaL_checkinteger)(lua_State* L, int numArg);
LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg, LUALIB_API lua_Integer(luaL_optinteger)(lua_State* L, int nArg, lua_Integer def);
lua_Integer def);
LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg); LUALIB_API void(luaL_checkstack)(lua_State* L, int sz, const char* msg);
LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t); LUALIB_API void(luaL_checktype)(lua_State* L, int narg, int t);
LUALIB_API void (luaL_checkany) (lua_State *L, int narg); LUALIB_API void(luaL_checkany)(lua_State* L, int narg);
LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname); LUALIB_API int(luaL_newmetatable)(lua_State* L, const char* tname);
LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname); LUALIB_API void*(luaL_checkudata)(lua_State * L, int ud, const char* tname);
LUALIB_API void (luaL_where) (lua_State *L, int lvl); LUALIB_API void(luaL_where)(lua_State* L, int lvl);
LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...); LUALIB_API int(luaL_error)(lua_State* L, const char* fmt, ...);
LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def, LUALIB_API int(luaL_checkoption)(lua_State* L, int narg, const char* def, const char* const lst[]);
const char *const lst[]);
/* pre-defined references */ /* pre-defined references */
#define LUA_NOREF (-2) #define LUA_NOREF (-2)
#define LUA_REFNIL (-1) #define LUA_REFNIL (-1)
LUALIB_API int (luaL_ref) (lua_State *L, int t); LUALIB_API int(luaL_ref)(lua_State* L, int t);
LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref); LUALIB_API void(luaL_unref)(lua_State* L, int t, int ref);
LUALIB_API int (luaL_loadfile) (lua_State *L, const char *filename); LUALIB_API int(luaL_loadfile)(lua_State* L, const char* filename);
LUALIB_API int (luaL_loadbuffer) (lua_State *L, const char *buff, size_t sz, LUALIB_API int(luaL_loadbuffer)(lua_State* L, const char* buff, size_t sz, const char* name);
const char *name); LUALIB_API int(luaL_loadstring)(lua_State* L, const char* s);
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, const char* r);
LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p, LUALIB_API const char*(luaL_findtable)(lua_State * L, int idx, const char* fname, int szhint);
const char *r);
LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
const char *fname, int szhint);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname); LUALIB_API int luaL_fileresult(lua_State* L, int stat, const char* fname);
LUALIB_API int luaL_execresult(lua_State *L, int stat); LUALIB_API int luaL_execresult(lua_State* L, int stat);
LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename, LUALIB_API int(luaL_loadfilex)(lua_State* L, const char* filename, const char* mode);
const char *mode); LUALIB_API int(luaL_loadbufferx)(lua_State* L, const char* buff, size_t sz, const char* name, const char* mode);
LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, LUALIB_API void luaL_traceback(lua_State* L, lua_State* L1, const char* msg, int level);
const char *name, const char *mode); LUALIB_API void(luaL_setfuncs)(lua_State* L, const luaL_Reg* l, int nup);
LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg, LUALIB_API void(luaL_pushmodule)(lua_State* L, const char* modname, int sizehint);
int level); LUALIB_API void*(luaL_testudata)(lua_State * L, int ud, const char* tname);
LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup); LUALIB_API void(luaL_setmetatable)(lua_State* L, const char* tname);
LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
int sizehint);
LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
/* /*
** =============================================================== ** ===============================================================
@@ -98,30 +80,26 @@ LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
** =============================================================== ** ===============================================================
*/ */
#define luaL_argcheck(L, cond,numarg,extramsg) \ #define luaL_argcheck(L, cond, numarg, extramsg) ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
((void)((cond) || luaL_argerror(L, (numarg), (extramsg)))) #define luaL_checkstring(L, n) (luaL_checklstring(L, (n), NULL))
#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL)) #define luaL_optstring(L, n, d) (luaL_optlstring(L, (n), (d), NULL))
#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL)) #define luaL_checkint(L, n) ((int)luaL_checkinteger(L, (n)))
#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n))) #define luaL_optint(L, n, d) ((int)luaL_optinteger(L, (n), (d)))
#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d))) #define luaL_checklong(L, n) ((long)luaL_checkinteger(L, (n)))
#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n))) #define luaL_optlong(L, n, d) ((long)luaL_optinteger(L, (n), (d)))
#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d)))
#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i))) #define luaL_typename(L, i) lua_typename(L, lua_type(L, (i)))
#define luaL_dofile(L, fn) \ #define luaL_dofile(L, fn) (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_dostring(L, s) \ #define luaL_dostring(L, s) (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n))) #define luaL_getmetatable(L, n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
#define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n))) #define luaL_opt(L, f, n, d) (lua_isnoneornil(L, (n)) ? (d) : f(L, (n)))
/* From Lua 5.2. */ /* From Lua 5.2. */
#define luaL_newlibtable(L, l) \ #define luaL_newlibtable(L, l) lua_createtable(L, 0, sizeof(l) / sizeof((l)[0]) - 1)
lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0)) #define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
/* /*
@@ -130,31 +108,27 @@ 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) */
lua_State *L; lua_State* L;
char buffer[LUAL_BUFFERSIZE]; char buffer[LUAL_BUFFERSIZE];
} luaL_Buffer; } luaL_Buffer;
#define luaL_addchar(B,c) \ #define luaL_addchar(B, c) \
((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \ ((void)((B)->p < ((B)->buffer + LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), (*(B)->p++ = (char)(c)))
(*(B)->p++ = (char)(c)))
/* compatibility only */ /* compatibility only */
#define luaL_putchar(B,c) luaL_addchar(B,c) #define luaL_putchar(B, c) luaL_addchar(B, c)
#define luaL_addsize(B,n) ((B)->p += (n)) #define luaL_addsize(B, n) ((B)->p += (n))
LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
LUALIB_API char *(luaL_prepbuffer) (luaL_Buffer *B);
LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
LUALIB_API void(luaL_buffinit)(lua_State* L, luaL_Buffer* B);
LUALIB_API char*(luaL_prepbuffer)(luaL_Buffer * B);
LUALIB_API void(luaL_addlstring)(luaL_Buffer* B, const char* s, size_t l);
LUALIB_API void(luaL_addstring)(luaL_Buffer* B, const char* s);
LUALIB_API void(luaL_addvalue)(luaL_Buffer* B);
LUALIB_API void(luaL_pushresult)(luaL_Buffer* B);
/* }====================================================== */ /* }====================================================== */

310
inc/lua/lua.h
View File

@@ -5,39 +5,33 @@
** 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
*/ */
#define LUA_REGISTRYINDEX (-10000) #define LUA_REGISTRYINDEX (-10000)
#define LUA_ENVIRONINDEX (-10001) #define LUA_ENVIRONINDEX (-10001)
#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
@@ -47,25 +41,21 @@
#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
*/ */
typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz); 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,125 +82,112 @@ 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
*/ */
LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud); LUA_API lua_State*(lua_newstate)(lua_Alloc f, void* ud);
LUA_API void (lua_close) (lua_State *L); LUA_API void(lua_close)(lua_State* L);
LUA_API lua_State *(lua_newthread) (lua_State *L); 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
*/ */
LUA_API int (lua_gettop) (lua_State *L); LUA_API int(lua_gettop)(lua_State* L);
LUA_API void (lua_settop) (lua_State *L, int idx); LUA_API void(lua_settop)(lua_State* L, int idx);
LUA_API void (lua_pushvalue) (lua_State *L, int idx); LUA_API void(lua_pushvalue)(lua_State* L, int idx);
LUA_API void (lua_remove) (lua_State *L, int idx); LUA_API void(lua_remove)(lua_State* L, int idx);
LUA_API void (lua_insert) (lua_State *L, int idx); LUA_API void(lua_insert)(lua_State* L, int idx);
LUA_API void (lua_replace) (lua_State *L, int idx); LUA_API void(lua_replace)(lua_State* L, int idx);
LUA_API int (lua_checkstack) (lua_State *L, int sz); 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)
*/ */
LUA_API int (lua_isnumber) (lua_State *L, int idx); LUA_API int(lua_isnumber)(lua_State* L, int idx);
LUA_API int (lua_isstring) (lua_State *L, int idx); LUA_API int(lua_isstring)(lua_State* L, int idx);
LUA_API int (lua_iscfunction) (lua_State *L, int idx); LUA_API int(lua_iscfunction)(lua_State* L, int idx);
LUA_API int (lua_isuserdata) (lua_State *L, int idx); LUA_API int(lua_isuserdata)(lua_State* L, int idx);
LUA_API int (lua_type) (lua_State *L, int idx); LUA_API int(lua_type)(lua_State* L, int idx);
LUA_API const char *(lua_typename) (lua_State *L, int tp); LUA_API const char*(lua_typename)(lua_State * L, int tp);
LUA_API int (lua_equal) (lua_State *L, int idx1, int idx2); LUA_API int(lua_equal)(lua_State* L, int idx1, int idx2);
LUA_API int (lua_rawequal) (lua_State *L, int idx1, int idx2); LUA_API int(lua_rawequal)(lua_State* L, int idx1, int idx2);
LUA_API int (lua_lessthan) (lua_State *L, int idx1, int idx2); LUA_API int(lua_lessthan)(lua_State* L, int idx1, int idx2);
LUA_API lua_Number (lua_tonumber) (lua_State *L, int idx);
LUA_API lua_Integer (lua_tointeger) (lua_State *L, int idx);
LUA_API int (lua_toboolean) (lua_State *L, int idx);
LUA_API const char *(lua_tolstring) (lua_State *L, int idx, size_t *len);
LUA_API size_t (lua_objlen) (lua_State *L, int idx);
LUA_API lua_CFunction (lua_tocfunction) (lua_State *L, int idx);
LUA_API void *(lua_touserdata) (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 lua_Number(lua_tonumber)(lua_State* L, int idx);
LUA_API lua_Integer(lua_tointeger)(lua_State* L, int idx);
LUA_API int(lua_toboolean)(lua_State* L, int idx);
LUA_API const char*(lua_tolstring)(lua_State * L, int idx, size_t* len);
LUA_API size_t(lua_objlen)(lua_State* L, int idx);
LUA_API lua_CFunction(lua_tocfunction)(lua_State* L, int idx);
LUA_API void*(lua_touserdata)(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);
/* /*
** push functions (C -> stack) ** push functions (C -> stack)
*/ */
LUA_API void (lua_pushnil) (lua_State *L); LUA_API void(lua_pushnil)(lua_State* L);
LUA_API void (lua_pushnumber) (lua_State *L, lua_Number n); LUA_API void(lua_pushnumber)(lua_State* L, lua_Number n);
LUA_API void (lua_pushinteger) (lua_State *L, lua_Integer n); LUA_API void(lua_pushinteger)(lua_State* L, lua_Integer n);
LUA_API void (lua_pushlstring) (lua_State *L, const char *s, size_t l); LUA_API void(lua_pushlstring)(lua_State* L, const char* s, size_t l);
LUA_API void (lua_pushstring) (lua_State *L, const char *s); LUA_API void(lua_pushstring)(lua_State* L, const char* s);
LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt, LUA_API const char*(lua_pushvfstring)(lua_State * L, const char* fmt, va_list argp);
va_list argp); LUA_API const char*(lua_pushfstring)(lua_State * L, const char* fmt, ...);
LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...); LUA_API void(lua_pushcclosure)(lua_State* L, lua_CFunction fn, int n);
LUA_API void (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n); LUA_API void(lua_pushboolean)(lua_State* L, int b);
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)
*/ */
LUA_API void (lua_gettable) (lua_State *L, int idx); LUA_API void(lua_gettable)(lua_State* L, int idx);
LUA_API void (lua_getfield) (lua_State *L, int idx, const char *k); LUA_API void(lua_getfield)(lua_State* L, int idx, const char* k);
LUA_API void (lua_rawget) (lua_State *L, int idx); LUA_API void(lua_rawget)(lua_State* L, int idx);
LUA_API void (lua_rawgeti) (lua_State *L, int idx, int n); LUA_API void(lua_rawgeti)(lua_State* L, int idx, int n);
LUA_API void (lua_createtable) (lua_State *L, int narr, int nrec); LUA_API void(lua_createtable)(lua_State* L, int narr, int nrec);
LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz); 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)
*/ */
LUA_API void (lua_settable) (lua_State *L, int idx); LUA_API void(lua_settable)(lua_State* L, int idx);
LUA_API void (lua_setfield) (lua_State *L, int idx, const char *k); LUA_API void(lua_setfield)(lua_State* L, int idx, const char* k);
LUA_API void (lua_rawset) (lua_State *L, int idx); LUA_API void(lua_rawset)(lua_State* L, int idx);
LUA_API void (lua_rawseti) (lua_State *L, int idx, int n); 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)
*/ */
LUA_API void (lua_call) (lua_State *L, int nargs, int nresults); LUA_API void(lua_call)(lua_State* L, int nargs, int nresults);
LUA_API int (lua_pcall) (lua_State *L, int nargs, int nresults, int errfunc); LUA_API int(lua_pcall)(lua_State* L, int nargs, int nresults, int errfunc);
LUA_API int (lua_cpcall) (lua_State *L, lua_CFunction func, void *ud); LUA_API int(lua_cpcall)(lua_State* L, lua_CFunction func, void* ud);
LUA_API int (lua_load) (lua_State *L, lua_Reader reader, void *dt, LUA_API int(lua_load)(lua_State* L, lua_Reader reader, void* dt, const char* chunkname);
const char *chunkname);
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
*/ */
LUA_API int (lua_yield) (lua_State *L, int nresults); LUA_API int(lua_yield)(lua_State* L, int nresults);
LUA_API int (lua_resume) (lua_State *L, int narg); LUA_API int(lua_resume)(lua_State* L, int narg);
LUA_API int (lua_status) (lua_State *L); LUA_API int(lua_status)(lua_State* L);
/* /*
** garbage-collection function and options ** garbage-collection function and options
@@ -229,23 +203,20 @@ LUA_API int (lua_status) (lua_State *L);
#define LUA_GCSETSTEPMUL 7 #define LUA_GCSETSTEPMUL 7
#define LUA_GCISRUNNING 9 #define LUA_GCISRUNNING 9
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
*/ */
LUA_API int (lua_error) (lua_State *L); LUA_API int(lua_error)(lua_State* L);
LUA_API int (lua_next) (lua_State *L, int idx); LUA_API int(lua_next)(lua_State* L, int idx);
LUA_API void (lua_concat) (lua_State *L, int n);
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_concat)(lua_State* L, int n);
LUA_API lua_Alloc(lua_getallocf)(lua_State* L, void** ud);
LUA_API void lua_setallocf(lua_State* L, lua_Alloc f, void* ud);
/* /*
** =============================================================== ** ===============================================================
@@ -253,34 +224,31 @@ LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
** =============================================================== ** ===============================================================
*/ */
#define lua_pop(L,n) lua_settop(L, -(n)-1) #define lua_pop(L, n) lua_settop(L, -(n) - 1)
#define lua_newtable(L) lua_createtable(L, 0, 0) #define lua_newtable(L) lua_createtable(L, 0, 0)
#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n))) #define lua_register(L, n, f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
#define lua_pushcfunction(L,f) lua_pushcclosure(L, (f), 0) #define lua_pushcfunction(L, f) lua_pushcclosure(L, (f), 0)
#define lua_strlen(L,i) lua_objlen(L, (i)) #define lua_strlen(L, i) lua_objlen(L, (i))
#define lua_isfunction(L,n) (lua_type(L, (n)) == LUA_TFUNCTION) #define lua_isfunction(L, n) (lua_type(L, (n)) == LUA_TFUNCTION)
#define lua_istable(L,n) (lua_type(L, (n)) == LUA_TTABLE) #define lua_istable(L, n) (lua_type(L, (n)) == LUA_TTABLE)
#define lua_islightuserdata(L,n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA) #define lua_islightuserdata(L, n) (lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
#define lua_isnil(L,n) (lua_type(L, (n)) == LUA_TNIL) #define lua_isnil(L, n) (lua_type(L, (n)) == LUA_TNIL)
#define lua_isboolean(L,n) (lua_type(L, (n)) == LUA_TBOOLEAN) #define lua_isboolean(L, n) (lua_type(L, (n)) == LUA_TBOOLEAN)
#define lua_isthread(L,n) (lua_type(L, (n)) == LUA_TTHREAD) #define lua_isthread(L, n) (lua_type(L, (n)) == LUA_TTHREAD)
#define lua_isnone(L,n) (lua_type(L, (n)) == LUA_TNONE) #define lua_isnone(L, n) (lua_type(L, (n)) == LUA_TNONE)
#define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0) #define lua_isnoneornil(L, n) (lua_type(L, (n)) <= 0)
#define lua_pushliteral(L, s) \ #define lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s) / sizeof(char)) - 1)
lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
#define lua_setglobal(L,s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
#define lua_getglobal(L,s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
#define lua_tostring(L,i) lua_tolstring(L, (i), NULL)
#define lua_setglobal(L, s) lua_setfield(L, LUA_GLOBALSINDEX, (s))
#define lua_getglobal(L, s) lua_getfield(L, LUA_GLOBALSINDEX, (s))
#define lua_tostring(L, i) lua_tolstring(L, (i), NULL)
/* /*
** compatibility macros and functions ** compatibility macros and functions
@@ -295,10 +263,8 @@ 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);
/* /*
** {====================================================================== ** {======================================================================
@@ -306,7 +272,6 @@ LUA_API void lua_setlevel (lua_State *from, lua_State *to);
** ======================================================================= ** =======================================================================
*/ */
/* /*
** Event codes ** Event codes
*/ */
@@ -316,7 +281,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,42 +291,38 @@ 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); LUA_API const char* lua_setlocal(lua_State* L, const lua_Debug* ar, int n);
LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n); LUA_API const char* lua_getupvalue(lua_State* L, int funcindex, int n);
LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n); LUA_API const char* lua_setupvalue(lua_State* L, int funcindex, int n);
LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n); LUA_API int lua_sethook(lua_State* L, lua_Hook func, int mask, int count);
LUA_API int lua_sethook (lua_State *L, lua_Hook func, int mask, int count); LUA_API lua_Hook lua_gethook(lua_State* L);
LUA_API lua_Hook lua_gethook (lua_State *L); LUA_API int lua_gethookmask(lua_State* L);
LUA_API int lua_gethookmask (lua_State *L); LUA_API int lua_gethookcount(lua_State* L);
LUA_API int lua_gethookcount (lua_State *L);
/* From Lua 5.2. */ /* From Lua 5.2. */
LUA_API void *lua_upvalueid (lua_State *L, int idx, int n); LUA_API void* lua_upvalueid(lua_State* L, int idx, int n);
LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2); LUA_API void lua_upvaluejoin(lua_State* L, int idx1, int n1, int idx2, int n2);
LUA_API int lua_loadx (lua_State *L, lua_Reader reader, void *dt, LUA_API int lua_loadx(lua_State* L, lua_Reader reader, void* dt, const char* chunkname, const char* mode);
const char *chunkname, const char *mode); LUA_API const lua_Number* lua_version(lua_State* L);
LUA_API const lua_Number *lua_version (lua_State *L); LUA_API void lua_copy(lua_State* L, int fromidx, int toidx);
LUA_API void lua_copy (lua_State *L, int fromidx, int toidx); LUA_API lua_Number lua_tonumberx(lua_State* L, int idx, int* isnum);
LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum); LUA_API lua_Integer lua_tointegerx(lua_State* L, int idx, int* isnum);
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) */
const char *namewhat; /* (n) `global', `local', `field', `method' */ const char* namewhat; /* (n) `global', `local', `field', `method' */
const char *what; /* (S) `Lua', `C', `main', `tail' */ const char* what; /* (S) `Lua', `C', `main', `tail' */
const char *source; /* (S) */ const char* source; /* (S) */
int currentline; /* (l) */ int currentline; /* (l) */
int nups; /* (u) number of upvalues */ int nups; /* (u) number of upvalues */
int linedefined; /* (S) */ int linedefined; /* (S) */
@@ -374,29 +334,27 @@ 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.
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including * "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish, * without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to * distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to * permit persons to whom the Software is furnished to do so, subject to
* the following conditions: * the following conditions:
* *
* The above copyright notice and this permission notice shall be * The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software. * included in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* 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"
} }

22
inc/lua/luaconf.h
View File

@@ -9,6 +9,7 @@
#ifndef WINVER #ifndef WINVER
#define WINVER 0x0501 #define WINVER 0x0501
#endif #endif
#include <limits.h> #include <limits.h>
#include <stddef.h> #include <stddef.h>
@@ -20,10 +21,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!
@@ -77,9 +76,7 @@
#define LUA_PATH_MARK "?" #define LUA_PATH_MARK "?"
#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_EXECDIR "\n" LUA_IGMARK "\n"
LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" \
LUA_EXECDIR "\n" LUA_IGMARK "\n"
/* Quoting in error messages. */ /* Quoting in error messages. */
#define LUA_QL(x) "'" x "'" #define LUA_QL(x) "'" x "'"
@@ -144,9 +141,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

13
inc/lua/luajit.h
View File

@@ -62,16 +62,13 @@ enum {
/* LuaJIT public C API. */ /* LuaJIT public C API. */
/* Control the JIT engine. */ /* Control the JIT engine. */
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 vmstate);
int samples, int vmstate); LUA_API void luaJIT_profile_start(lua_State* L, const char* mode, luaJIT_profile_callback cb, void* data);
LUA_API void luaJIT_profile_start(lua_State *L, const char *mode, LUA_API void luaJIT_profile_stop(lua_State* L);
luaJIT_profile_callback cb, void *data); LUA_API const char* luaJIT_profile_dumpstack(lua_State* L, const char* fmt, int depth, size_t* len);
LUA_API void luaJIT_profile_stop(lua_State *L);
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
int depth, size_t *len);
/* Enforce (dynamic) linker error for version mismatches. Call from main. */ /* Enforce (dynamic) linker error for version mismatches. Call from main. */
LUA_API void LUAJIT_VERSION_SYM(void); LUA_API void LUAJIT_VERSION_SYM(void);

24
inc/lua/lualib.h
View File

@@ -22,19 +22,19 @@
#define LUA_JITLIBNAME "jit" #define LUA_JITLIBNAME "jit"
#define LUA_FFILIBNAME "ffi" #define LUA_FFILIBNAME "ffi"
LUALIB_API int luaopen_base(lua_State *L); LUALIB_API int luaopen_base(lua_State* L);
LUALIB_API int luaopen_math(lua_State *L); LUALIB_API int luaopen_math(lua_State* L);
LUALIB_API int luaopen_string(lua_State *L); LUALIB_API int luaopen_string(lua_State* L);
LUALIB_API int luaopen_table(lua_State *L); LUALIB_API int luaopen_table(lua_State* L);
LUALIB_API int luaopen_io(lua_State *L); LUALIB_API int luaopen_io(lua_State* L);
LUALIB_API int luaopen_os(lua_State *L); LUALIB_API int luaopen_os(lua_State* L);
LUALIB_API int luaopen_package(lua_State *L); LUALIB_API int luaopen_package(lua_State* L);
LUALIB_API int luaopen_debug(lua_State *L); LUALIB_API int luaopen_debug(lua_State* L);
LUALIB_API int luaopen_bit(lua_State *L); LUALIB_API int luaopen_bit(lua_State* L);
LUALIB_API int luaopen_jit(lua_State *L); LUALIB_API int luaopen_jit(lua_State* L);
LUALIB_API int luaopen_ffi(lua_State *L); LUALIB_API int luaopen_ffi(lua_State* L);
LUALIB_API void luaL_openlibs(lua_State *L); LUALIB_API void luaL_openlibs(lua_State* L);
#ifndef lua_assert #ifndef lua_assert
#define lua_assert(x) ((void)0) #define lua_assert(x) ((void)0)

276
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;
@@ -18,21 +21,20 @@ ADDR tsf_mCacheAllocator;
ADDR tsf_gIdDictionary; ADDR tsf_gIdDictionary;
ADDR tsf_gEvalState_globalVars; ADDR tsf_gEvalState_globalVars;
BlFunctionDefIntern(tsf_BlStringTable__insert ); BlFunctionDefIntern(tsf_BlStringTable__insert);
BlFunctionDefIntern(tsf_BlNamespace__find ); BlFunctionDefIntern(tsf_BlNamespace__find);
BlFunctionDefIntern(tsf_BlNamespace__createLocalEntry); BlFunctionDefIntern(tsf_BlNamespace__createLocalEntry);
BlFunctionDefIntern(tsf_BlDataChunker__freeBlocks ); BlFunctionDefIntern(tsf_BlDataChunker__freeBlocks);
BlFunctionDefIntern(tsf_BlCon__evaluate ); BlFunctionDefIntern(tsf_BlCon__evaluate);
BlFunctionDefIntern(tsf_BlCon__executef ); BlFunctionDefIntern(tsf_BlCon__executef);
BlFunctionDefIntern(tsf_BlCon__executefSimObj ); BlFunctionDefIntern(tsf_BlCon__executefSimObj);
BlFunctionDefIntern(tsf_BlCon__getVariable ); BlFunctionDefIntern(tsf_BlCon__getVariable);
BlFunctionDefIntern(tsf_BlDictionary__addVariable ); BlFunctionDefIntern(tsf_BlDictionary__addVariable);
BlFunctionDefIntern(tsf_BlSim__findObject_name ); BlFunctionDefIntern(tsf_BlSim__findObject_name);
BlFunctionDefIntern(tsf_BlStringStack__getArgBuffer ); BlFunctionDefIntern(tsf_BlStringStack__getArgBuffer);
BlFunctionDefIntern(tsf_BlSimObject__getDataField ); 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
@@ -41,30 +43,30 @@ char* tsf_GetIntArg(signed int value) {
snprintf(ret, 16, "%d", value); snprintf(ret, 16, "%d", value);
return ret; return ret;
} }
char* tsf_GetFloatArg(float value) { char* tsf_GetFloatArg(float value) {
char* ret = tsf_BlStringStack__getArgBuffer(32); char* ret = tsf_BlStringStack__getArgBuffer(32);
snprintf(ret, 32, "%g", value); snprintf(ret, 32, "%g", value);
return ret; return ret;
} }
char* tsf_GetStringArg(char* value) { char* tsf_GetStringArg(char* value) {
int len = strlen(value)+1; int len = strlen(value) + 1;
char* ret = tsf_BlStringStack__getArgBuffer(len); char* ret = tsf_BlStringStack__getArgBuffer(len);
memcpy(ret, value, len); memcpy(ret, value, len);
return ret; return ret;
} }
char* tsf_GetThisArg(ADDR obj) {
return tsf_GetIntArg(*(signed int *)(obj + 32));
}
char* tsf_GetThisArg(ADDR obj) { return tsf_GetIntArg(*(signed int*)(obj + 32)); }
// Eval // Eval
const char* tsf_Eval(const char *code) { const char* tsf_Eval(const char* code) {
const char *argv[] = {nullptr, code}; const char* argv[] = {nullptr, code};
return tsf_BlCon__evaluate(0, 2, argv); return tsf_BlCon__evaluate(0, 2, argv);
} }
const char* tsf_Evalf(const char *fmt, ...) { const char* tsf_Evalf(const char* fmt, ...) {
va_list args; va_list args;
char code[4096]; char code[4096];
va_start(args, fmt); va_start(args, fmt);
@@ -74,50 +76,47 @@ 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;
} }
ADDR tsf_FindObject(const char* name) { ADDR tsf_FindObject(const char* name) { return (ADDR)tsf_BlSim__findObject_name(name); }
return (ADDR)tsf_BlSim__findObject_name(name);
}
ADDR tsf_LookupNamespace(const char* ns, const char* package) { ADDR tsf_LookupNamespace(const char* ns, const char* package) {
const char* ste_package; const char* ste_package;
if(package) { if (package) {
ste_package = tsf_BlStringTable__insert(package, 0); ste_package = tsf_BlStringTable__insert(package, 0);
} else { } else {
ste_package = nullptr; ste_package = nullptr;
} }
if(ns) { if (ns) {
const char* ste_namespace = tsf_BlStringTable__insert(ns, 0); const char* ste_namespace = tsf_BlStringTable__insert(ns, 0);
return tsf_BlNamespace__find(ste_namespace, ste_package); return tsf_BlNamespace__find(ste_namespace, ste_package);
} else { } else {
return tsf_BlNamespace__find(nullptr, ste_package); return tsf_BlNamespace__find(nullptr, ste_package);
} }
} }
ADDR tsf_LookupNamespace(const char* ns) {
return tsf_LookupNamespace(ns, nullptr);
}
ADDR tsf_LookupNamespace(const char* ns) { 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);
} else { } else {
ste_slotName = nullptr; ste_slotName = nullptr;
@@ -128,7 +127,7 @@ const char* tsf_GetDataField(ADDR simObject, const char* slotName, const char* a
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);
} else { } else {
ste_slotName = nullptr; ste_slotName = nullptr;
@@ -137,93 +136,162 @@ 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) { return tsf_BlCon__getVariable(name); }
return tsf_BlCon__getVariable(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) { tsf_AddVarInternal(name, 10, data); }
tsf_AddVarInternal(name, 10, data);
}
void tsf_AddVar(const char* name, signed int* data) {
tsf_AddVarInternal(name, 4, data);
}
void tsf_AddVar(const char* name, float* data) {
tsf_AddVarInternal(name, 8, data);
}
void tsf_AddVar(const char* name, bool* data) {
tsf_AddVarInternal(name, 6, data);
}
void tsf_AddVar(const char* name, signed int* data) { tsf_AddVarInternal(name, 4, data); }
void tsf_AddVar(const char* name, float* data) { tsf_AddVarInternal(name, 8, data); }
void tsf_AddVar(const char* name, bool* 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 *ste_fname = tsf_BlStringTable__insert(fname, 0); 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);
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);
*(signed int *)tsf_mCacheSequence += 1; *(signed int*)tsf_mCacheSequence += 1;
tsf_BlDataChunker__freeBlocks(*(ADDR *)tsf_mCacheAllocator); tsf_BlDataChunker__freeBlocks(*(ADDR*)tsf_mCacheAllocator);
*(const char**)(ent + 24) = usage ; *(const char**)(ent + 24) = usage;
*(signed int* )(ent + 16) = mina ; *(signed int*)(ent + 16) = mina;
*(signed int* )(ent + 20) = maxa ; *(signed int*)(ent + 20) = maxa;
*(signed int* )(ent + 12) = cbtype; *(signed int*)(ent + 12) = cbtype;
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,
tsf_StringCallback sc,
const char* usage,
signed int mina,
signed int maxa) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 1, usage, mina, 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) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 2, usage, mina, maxa);
*(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) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 3, usage, mina, maxa);
*(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) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 4, usage, mina, maxa);
*(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) {
ADDR ent = tsf_AddConsoleFuncInternal(pname, cname, fname, 5, usage, mina, maxa);
*(tsf_BoolCallback *)(ent + 40) = bc;
} }
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
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;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
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;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
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;
}
void tsf_AddConsoleFunc(
const char* pname,
const char* cname,
const char* fname,
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;
}
// 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 ? ? ? ? "
BlScanFunctionText(tsf_BlDictionary__addVariable , "8B 44 24 04 56 57 8B F9" ); "33 C5 50 8D 45 F4 64 A3 ? ? ? ? 89 4D F0");
BlScanFunctionText(tsf_BlSim__findObject_name , "57 8B F9 8A 17" ); BlScanFunctionText(
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" ); tsf_BlDataChunker__freeBlocks,
BlScanFunctionText(tsf_BlSimObject__getDataField , "51 53 8B D9 55 56 8B 74 24 14" ); "55 8B EC 6A FF 68 ? ? ? ? 64 A1 ? ? ? ? 50 51 53 56 57 "
BlScanFunctionText(tsf_BlSimObject__setDataField , "81 EC ? ? ? ? A1 ? ? ? ? 33 C4 89 84 24 ? ? ? ? 8B 84 24 ? ? ? ? 53 8B D9 89 44 24 04" ); "A1 ? ? ? ? 33 C5 50 8D 45 F4 64 A3 ? ? ? ? 8B D9 8B 33");
BlScanFunctionText(tsf_BlCon__getReturnBuffer , "81 F9 ? ? ? ? 76 2B" ); 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_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_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");
ADDR BlScanText (tsf_mCacheSequenceLoc , "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 18 8B 44 24 14" ); ADDR BlScanText(
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"); tsf_mCacheSequenceLoc,
ADDR BlScanText (tsf_gIdDictionaryLoc , "89 15 ? ? ? ? E8 ? ? ? ? 8B F0 89 75 F0" ); "FF 05 ? ? ? ? B9 ? ? ? ? 8B F8 E8 ? ? ? ? 8B 44 24 1C 89 47 "
ADDR BlScanText (tsf_gEvalState_globalVarsLoc , "B9 ? ? ? ? E8 ? ? ? ? 68 ? ? ? ? 6A 0A 68 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ?" ); "18 8B 44 24 14");
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 +301,4 @@ bool tsf_InitInternal() {
return true; return true;
} }
bool tsf_DeinitInternal() { bool tsf_DeinitInternal() { return true; }
return true;
}

110
inc/tsfuncs/BlFuncs.hpp
View File

@@ -5,49 +5,49 @@
#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*[]);
typedef float (*tsf_FloatCallback )(ADDR, signed int, const char *[]); typedef float (*tsf_FloatCallback)(ADDR, signed int, const char*[]);
typedef void (*tsf_VoidCallback )(ADDR, signed int, const char *[]); typedef void (*tsf_VoidCallback)(ADDR, signed int, const char*[]);
typedef bool (*tsf_BoolCallback )(ADDR, signed int, const char *[]); typedef bool (*tsf_BoolCallback)(ADDR, signed int, const char*[]);
/* These functions are used for tsf_BlCon__executefSimObj. /* These functions are used for tsf_BlCon__executefSimObj.
They refer to a special buffer for the argument stack. They refer to a special buffer for the argument stack.
For tsf_BlCon__executef, you need to use your own buffers. */ For tsf_BlCon__executef, you need to use your own buffers. */
char *tsf_GetIntArg(int); char* tsf_GetIntArg(int);
char *tsf_GetFloatArg(float); char* tsf_GetFloatArg(float);
char *tsf_ScriptThis(ADDR); char* tsf_ScriptThis(ADDR);
const char *tsf_Eval(const char *); const char* tsf_Eval(const char*);
const char *tsf_Evalf(const char *, ...); const char* tsf_Evalf(const char*, ...);
ADDR tsf_FindObject(unsigned int); ADDR tsf_FindObject(unsigned int);
ADDR tsf_FindObject(const char *); ADDR tsf_FindObject(const char*);
ADDR tsf_LookupNamespace(const char *, const char *); ADDR tsf_LookupNamespace(const char*, const char*);
const char *tsf_GetDataField(ADDR, const char *, const char *); const char* tsf_GetDataField(ADDR, const char*, const char*);
void tsf_SetDataField(ADDR, const char *, const char *, const char *); void tsf_SetDataField(ADDR, const char*, const char*, const char*);
const char *tsf_GetVar(const char *); const char* tsf_GetVar(const char*);
void tsf_AddVarInternal(const char *, signed int, void *); void tsf_AddVarInternal(const char*, signed int, void*);
void tsf_AddVar(const char *, const char **); void tsf_AddVar(const char*, const char**);
void tsf_AddVar(const char *, signed int *); 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*, signed int, const char*, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_StringCallback, const char *, signed int, signed int); void tsf_AddConsoleFunc(const char*, const char*, const char*, tsf_StringCallback, const char*, 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_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_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_VoidCallback, const char*, signed int, signed int);
void tsf_AddConsoleFunc(const char *, const char *, const char *, tsf_BoolCallback, 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 +56,20 @@ 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, const char*, bool);
BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char *, const char *); BlFunctionDefExtern(ADDR, __fastcall, tsf_BlNamespace__find, const char*, const char*);
BlFunctionDefExtern(ADDR, __thiscall, tsf_BlNamespace__createLocalEntry, ADDR, 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*, signed int, ...);
BlFunctionDefExtern(const char *, __thiscall, tsf_BlCon__getVariable, const char *); BlFunctionDefExtern(const char*, __thiscall, tsf_BlCon__getVariable, const char*);
BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR *, const char *, signed int, void *); BlFunctionDefExtern(void, __thiscall, tsf_BlDictionary__addVariable, ADDR*, const char*, signed int, void*);
BlFunctionDefExtern(ADDR *, __thiscall, tsf_BlSim__findObject_name, const char *); BlFunctionDefExtern(ADDR*, __thiscall, tsf_BlSim__findObject_name, const char*);
BlFunctionDefExtern(char *, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int); BlFunctionDefExtern(char*, __stdcall, tsf_BlStringStack__getArgBuffer, unsigned int);
BlFunctionDefExtern(const char *, __thiscall, tsf_BlSimObject__getDataField, ADDR, const char *, const char *); 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(void, __thiscall, tsf_BlSimObject__setDataField, ADDR, const char*, const char*, const char*);
BlFunctionDefExtern(char *, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int); BlFunctionDefExtern(char*, __fastcall, tsf_BlCon__getReturnBuffer, unsigned int);
// Function short names // Function short names
@@ -94,16 +93,21 @@ 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( \
#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) a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, 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(...) \
#define BlCallObj(obj, ...) \ __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)
tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__) #define BlCall(...) tsf_BlCon__executef(__NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlCallObj(obj, ...) tsf_BlCon__executefSimObj((ADDR*)obj, __NUM_LIST(__VA_ARGS__), __VA_ARGS__)
#define BlFuncsInit() if(!tsf_InitInternal()) { return false; }
#define BlFuncsDeinit() if(!tsf_DeinitInternal()) { return false; }
#define BlFuncsInit() \
if (!tsf_InitInternal()) { \
return false; \
}
#define BlFuncsDeinit() \
if (!tsf_DeinitInternal()) { \
return false; \
}
#endif #endif
#endif

106
inc/tsfuncs/BlHooks.cpp
View File

@@ -2,29 +2,30 @@
////////////////////////////////////////////////// //////////////////////////////////////////////////
// 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;
ADDR ImageSize; ADDR ImageSize;
void tsh_i_InitScanner(){ 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;
@@ -32,17 +33,17 @@ void tsh_i_InitScanner(){
} }
} }
bool tsh_i_CompareData(BYTE *data, BYTE *pattern, char* mask){ bool tsh_i_CompareData(BYTE* data, BYTE* pattern, char* mask) {
for (; *mask; ++data, ++pattern, ++mask){ for (; *mask; ++data, ++pattern, ++mask) {
if (*mask=='x' && *data!=*pattern) if (*mask == 'x' && *data != *pattern)
return false; return false;
} }
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;
} }
} }
@@ -58,17 +59,17 @@ void tsh_i_PatternTextToCode(char* text, char** opatt, char** omask) {
int outidx = 0; int outidx = 0;
int val = 0; int val = 0;
bool uk = false; bool uk = false;
for(unsigned int i=0; i<len; i++){ for (unsigned int i = 0; i < len; i++) {
char c = text[i]; char c = text[i];
if(c=='?'){ if (c == '?') {
uk = true; uk = true;
}else if(c>='0' && c<='9'){ } else if (c >= '0' && c <= '9') {
val = (val<<4) + (c-'0'); val = (val << 4) + (c - '0');
}else if(c>='A' && c<='F'){ } else if (c >= 'A' && c <= 'F') {
val = (val<<4) + (c-'A'+10); val = (val << 4) + (c - 'A' + 10);
}else if(c>='a' && c<='f'){ } else if (c >= 'a' && c <= 'f') {
val = (val<<4) + (c-'a'+10); val = (val << 4) + (c - 'a' + 10);
}else if(c==' '){ } else if (c == ' ') {
patt[outidx] = uk ? 0 : val; patt[outidx] = uk ? 0 : val;
mask[outidx] = uk ? '?' : 'x'; mask[outidx] = uk ? '?' : 'x';
val = 0; val = 0;
@@ -87,12 +88,11 @@ 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,16 +109,15 @@ 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
//std::map<ADDR, std::pair<ADDR, ADDR>> tsh_DeprotectedAddresses; // std::map<ADDR, std::pair<ADDR, ADDR>> tsh_DeprotectedAddresses;
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};
} }
// Patch a string of bytes by deprotecting and then overwriting // Patch a string of bytes by deprotecting and then overwriting
@@ -127,50 +126,43 @@ void tsh_PatchBytes(ADDR length, ADDR location, BYTE* repl) {
memcpy((void*)location, (void*)repl, (size_t)length); memcpy((void*)location, (void*)repl, (size_t)length);
} }
void tsh_PatchByte(ADDR location, BYTE value) { void tsh_PatchByte(ADDR location, BYTE value) { tsh_PatchBytes(location, 1, &value); }
tsh_PatchBytes(location, 1, &value);
}
void tsh_ReplaceInt(ADDR addr, int rval) { 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));
}
void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) { void tsh_i_PatchCopy(ADDR dest, ADDR src, unsigned int len) {
for(unsigned int i=0; i<len; i++){ for (unsigned int i = 0; i < len; i++) {
tsh_PatchByte(dest+i, *((BYTE*)(src+i))); tsh_PatchByte(dest + i, *((BYTE*)(src + i)));
} }
} }
void tsh_HookFunction(ADDR victim, ADDR detour, BYTE* origbytes) { void tsh_HookFunction(ADDR victim, ADDR detour, BYTE* origbytes) {
memcpy(origbytes, (BYTE*)victim, 6); //save old data memcpy(origbytes, (BYTE*)victim, 6); // save old data
*(BYTE*)victim = 0xE9; //jmp rel32 *(BYTE*)victim = 0xE9; // jmp rel32
*(ADDR*)(victim+1) = (detour - (victim+5)); // jump offset *(ADDR*)(victim + 1) = (detour - (victim + 5)); // jump offset
*(BYTE*)(victim+5) = 0xC3; //retn *(BYTE*)(victim + 5) = 0xC3; // retn
} }
void tsh_UnhookFunction(ADDR victim, BYTE* origbytes){ 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);
for(ADDR c=0; c<len; c++){ for (ADDR c = 0; c < len; c++) {
tsh_PatchByte(i+c, replace[c]); tsh_PatchByte(i + c, replace[c]);
} }
} }
} }
@@ -190,10 +182,9 @@ 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");
@@ -201,7 +192,4 @@ bool tsh_InitInternal(){
return true; return true;
} }
bool tsh_DeinitInternal() { bool tsh_DeinitInternal() { return true; }
return true;
}

89
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,69 +23,73 @@ 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
#define tsh_DEBUGPRINT false #define tsh_DEBUGPRINT false
#else #else
#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); \
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 BlScanCode(target, patt, mask) \ #define BlScanCode(target, patt, mask) \
target = tsh_ScanCode((char*)patt, (char*)mask); \ target = tsh_ScanCode((char*)patt, (char*)mask); \
if(!target){ \ if (!target) { \
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); \
if(!target){ \ if (!target) { \
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() { tsh_HookFunction((ADDR)func, (ADDR)func##Hook, tsh_BlFunctionHook##func##Data); } \
void func##HookOff(){ tsh_UnhookFunction((ADDR)func, 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); \
@@ -100,23 +102,30 @@ void tsh_PatchInt(ADDR, int);
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

115
readme.md
View File

@@ -1,25 +1,26 @@
# BlockLua # BlockLua
Lua scripting for Blockland Lua scripting for Blockland
## How to Install ## How to Install
- Install RedBlocklandLoader - Install RedBlocklandLoader
- Copy `lua5.1.dll` into your Blockland install folder, next to `Blockland.exe` - Copy `lua5.1.dll` into your Blockland install folder, next to `Blockland.exe`
- Copy `BlockLua.dll` into the `modules` folder within the Blockland folder - Copy `BlockLua.dll` into the `modules` folder within the Blockland folder
## Quick Reference ## Quick Reference
### From TorqueScript ### From TorqueScript
`'print('hello world')` - Execute Lua in the console by prepending a `'` (single quote) `'print('hello world')` - Execute Lua in the console by prepending a `'` (single quote)
`luaeval("code");` - Execute Lua code `luaeval("code");` - Execute Lua code
`luacall("funcName", %args...);` - Call a Lua global function `luacall("funcName", %args...);` - Call a Lua function (supports indexing tables and object methods)
`luaexec("fileName");` - Execute a Lua file. Path rules are the same as executing .cs files. `luaexec("fileName");` - Execute a Lua file. Path rules are the same as when executing .cs files, relative paths are allowed.
`luaget("varName");` - Read a Lua global variable `luaget("varName");` - Read a Lua global variable (supports indexing tables)
`luaset("varName", %value);` - Write a Lua global variable `luaset("varName", %value);` - Write a Lua global variable (supports indexing tables)
### From Lua ### From Lua
`bl.eval('code')` - Eval TorqueScript code `bl.eval('code')` - Eval TorqueScript code
`bl.funcName(args)` - Call a TorqueScript function `bl.funcName(args)` - Call a TorqueScript function
`bl.varName` - Read a TorqueScript global variable `bl.varName` - Read a TorqueScript global variable
@@ -28,6 +29,7 @@ Lua scripting for Blockland
`bl['namespaceName::funcName'](args)` - Call a namespaced TorqueScript function `bl['namespaceName::funcName'](args)` - Call a namespaced TorqueScript function
### Accessing Torque Objects from Lua ### Accessing Torque Objects from Lua
`bl.objectName` - Access a Torque object by name `bl.objectName` - Access a Torque object by name
`bl[objectID]` - Access a Torque object by ID (or name) `bl[objectID]` - Access a Torque object by ID (or name)
`object.fieldOrKey` - Read a field or Lua key from a Torque object `object.fieldOrKey` - Read a field or Lua key from a Torque object
@@ -35,26 +37,43 @@ Lua scripting for Blockland
`object.key = value` - Associate Lua data with a Torque object `object.key = value` - Associate Lua data with a Torque object
`object:method(args)` - Call a Torque object method `object:method(args)` - Call a Torque object method
`object[index]` - Access a member of a Torque set or group `object[index]` - Access a member of a Torque set or group
`for childIndex, child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque. `for child in object:members() do` - Iterate objects within of a Torque set or group. Indices start at 0 like in Torque.
`bl.isObject(object, objectID, or 'objectName')` - Check if an object exists
`object:exists()` - Check if an object exists
### Timing/Schedules ### Timing/Schedules
`sched = bl.schedule(timeMs, function, args...)` - Schedule a Lua function to be called later, similar to schedule in Torque `sched = bl.schedule(timeMs, function, args...)` - Schedule a Lua function to be called later, similar to schedule in Torque
`sched:cancel()` - Cancel a previously scheduled timer `sched:cancel()` - Cancel a previously scheduled timer
### Raycasts and Searches ### Raycasts and Searches
`hitObject, hitPos, hitNormal = bl.raycast(vector{startPosX,y,z}, vector{endPosX,y,z}, 'objtype'/{'objtypes',...}, ignoreObjects...?)` - Cast a ray in the world over objects of the specified type(s) (possibly excluding some objects), and return the object hit, the position of the hit, and the normal vector to the surface hit. See the Types section for a list of valid object types. `hitObject, hitPos, hitNormal = bl.raycast(vector{startPosX,y,z}, vector{endPosX,y,z}, 'objtype'/{'objtypes',...}, ignoreObjects...?)` - Cast a ray in the world over objects of the specified type(s) (possibly excluding some objects), and return the object hit, the position of the hit, and the normal vector to the surface hit. See the Types section for a list of valid object types.
`for object in bl.boxSearch(vector{centerX,y,z}, vector{sizeX,y,z}, 'objtype'/{'objtypes',...}) do` - Find all objects in the world of the specified type(s) whose bounding box overlaps with the specified box. See the Types section for a list of valid object types. `for object in bl.boxSearch(vector{centerX,y,z}, vector{sizeX,y,z}, 'objtype'/{'objtypes',...}) do` - Find all objects in the world of the specified type(s) whose bounding box overlaps with the specified box. See the Types section for a list of valid object types.
`for object in bl.radiusSearch(vector{centerX,y,z}, radius, 'objtype'/{'objtypes',...}) do` - Find all objects of the specified type(s) whose bounding box overlaps with the specified sphere. See the Types section for a list of valid object types. `for object in bl.radiusSearch(vector{centerX,y,z}, radius, 'objtype'/{'objtypes',...}) do` - Find all objects of the specified type(s) whose bounding box overlaps with the specified sphere. See the Types section for a list of valid object types.
### List of Object Classes (for raycasts and searches)
`'all'` - Any object
`'player'` - Players or bots
`'item'` - Items
`'vehicle'` - Vehicles
`'projectile'` - Projectiles
`'brick'` - Bricks with raycasting enabled
`'brickalways'` - All bricks including those with raycasting disabled
Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`
### Server-Client Communication ### Server-Client Communication
`bl.addServerCmd('commandName', function(client, args...) yourCode end)` - Register a /command on the server
`bl.addClientCmd('commandName', function(args...) yourCode end)` - Register a client command on the client `bl.addServerCmd('commandName', function(client, args...) ... end)` - Register a /command on the server
`bl.commandToServer('commandName', args...)` - Execute a server command as a client `bl.addClientCmd('commandName', function(args...) ... end)` - Register a client command on the client
`bl.commandToClient('commandName', args...)` - As the server, execute a client command on a specific client `bl.commandToServer('commandName', args...)` - As a client, execute a server command
`bl.commandToClient(client, 'commandName', args...)` - As the server, execute a client command on a specific client
`bl.commandToAll('commandName', args...)` - As the server, execute a client command on all clients `bl.commandToAll('commandName', args...)` - As the server, execute a client command on all clients
### Packages/Hooks ### Packages/Hooks
`bl.hook('packageName', 'functionName', 'before'/'after', function(args) yourCode end)` - Hook a Torque function with a Lua function.
`bl.hook('packageName', 'functionName', 'before'/'after', function(args) ... end)` - Hook a Torque function with a Lua function.
`args` is an array containing the arguments provided to the function. If the hook is `before`, these can be modified before being passed to the parent function. `args` is an array containing the arguments provided to the function. If the hook is `before`, these can be modified before being passed to the parent function.
If `args._return` is set to anything other than nil by a `before` hook, the parent function will not be called, and the function will simply return that value. Also in this case, any `after` hook will not be executed. If `args._return` is set to anything other than nil by a `before` hook, the parent function will not be called, and the function will simply return that value. Also in this case, any `after` hook will not be executed.
In an `after` hook, `args._return` is set to the value returned by the parent function, and can be modified. In an `after` hook, `args._return` is set to the value returned by the parent function, and can be modified.
@@ -63,10 +82,12 @@ In an `after` hook, `args._return` is set to the value returned by the parent fu
`bl.unhook('packageName')` - Remove any previously defined hooks within the package `bl.unhook('packageName')` - Remove any previously defined hooks within the package
### Modules and Dependencies ### Modules and Dependencies
`dofile('Add-Ons/Path/file.lua')` - Execute a Lua file. Relative paths (`./file.lua`) are allowed. `..` is not allowed. `dofile('Add-Ons/Path/file.lua')` - Execute a Lua file. Relative paths (`./file.lua`) are allowed. `..` is not allowed.
`require('modulePath.moduleName')` - Load a Lua file or external library. `require('modulePath.moduleName')` - Load a Lua file or external library.
`require` replaces `.` with `/` in the path, and then searches for files in the following order: `require` replaces `.` with `/` in the path, and then searches for files in the following order:
- `./modulePath/moduleName.lua` - `./modulePath/moduleName.lua`
- `./modulePath/moduleName/init.lua` - `./modulePath/moduleName/init.lua`
- `modulePath/moduleName.lua` (Relative to game directory) - `modulePath/moduleName.lua` (Relative to game directory)
@@ -78,6 +99,7 @@ In an `after` hook, `args._return` is set to the value returned by the parent fu
Like in standard Lua, modules loaded using `require` are only executed the first time `require` is called with that path (from anywhere). Subsequent calls simply return the result from the initial execution. To allow hot reloading, use `dofile`. Like in standard Lua, modules loaded using `require` are only executed the first time `require` is called with that path (from anywhere). Subsequent calls simply return the result from the initial execution. To allow hot reloading, use `dofile`.
### File I/O ### File I/O
Lua's builtin file I/O is emulated, and is confined to the same directories as TorqueScript file I/O. Lua's builtin file I/O is emulated, and is confined to the same directories as TorqueScript file I/O.
Relative paths (`./`) are allowed. `..` is not allowed. Relative paths (`./`) are allowed. `..` is not allowed.
`file = io.open('./file.txt', 'r'/'w'/'a'/'rb'/'wb'/'ab')` - Open a file `file = io.open('./file.txt', 'r'/'w'/'a'/'rb'/'wb'/'ab')` - Open a file
@@ -88,6 +110,7 @@ Reading files from ZIPs is supported, with caveats. Null characters are not allo
When reading from outside ZIPs, binary files are fully supported. When reading from outside ZIPs, binary files are fully supported.
### Object Creation ### Object Creation
`bl.new('className')` - Create a new Torque object `bl.new('className')` - Create a new Torque object
`bl.new('className', {fieldName = value, ...})` - Create a new Torque object with the given fields `bl.new('className', {fieldName = value, ...})` - Create a new Torque object with the given fields
`bl.new('className objectName', fields?)` - Create a new named Torque object `bl.new('className objectName', fields?)` - Create a new named Torque object
@@ -96,15 +119,18 @@ When reading from outside ZIPs, binary files are fully supported.
`bl.datablock('datablockClassName datablockName:parentDatablockName', fields?)` - Create a new datablock with inheritance `bl.datablock('datablockClassName datablockName:parentDatablockName', fields?)` - Create a new datablock with inheritance
### Classes and Types ### Classes and Types
`bl.type('varName', 'type')` - Register the type of a Torque global variable, for conversion when accessing from Lua. Valid types are 'boolean', 'object', 'string' (prevents automatic conversion), and nil (default, applies automatic conversion). `bl.type('varName', 'type')` - Register the type of a Torque global variable, for conversion when accessing from Lua. Valid types are 'boolean', 'object', 'string' (prevents automatic conversion), and nil (default, applies automatic conversion).
`bl.type('funcName', 'type')` - Register the return type of a Torque function, for conversion when calling from Lua. Valid types are 'bool', 'object', and nil - all other conversion is automatic. Already done for all default functions. `bl.type('funcName', 'type')` - Register the return type of a Torque function, for conversion when calling from Lua. Valid types are 'bool', 'object', and nil - all other conversion is automatic. Already done for all default functions.
`bl.type('className::funcName', 'type')` - Register the return type of a Torque object method. `bl.type('className::funcName', 'type')` - Register the return type of a Torque object method.
`bl.class('className')` - Register an existing Torque class to be used from Lua. Already done for all built-in classes. `bl.class('className')` - Register an existing Torque class to be used from Lua. Already done for all built-in classes.
`bl.class('className', 'parentClassName')` - Same as above, with inheritance `bl.class('className', 'parentClassName')` - Same as above, with inheritance
`bl.boolean(thing)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean. `bl.boolean(arg)` - Manually convert a Torque boolean (0 or 1) into a Lua boolean.
`bl.object(thing)` - Manually convert a Torque object reference (object ID or name) into a Lua object. `bl.object(arg)` - Manually convert a Torque object reference (object ID or name) into a Lua object.
`bl.string(arg)` - Manually convert any automatically-converted Torque value back into a string. This is not as reliable as using `bl.type` to specify the type as a string beforehand.
### Vector
### Vectors
`vec = vector{x,y,z}` - Create a vector. Can have any number of elements `vec = vector{x,y,z}` - Create a vector. Can have any number of elements
`vec1 + vec2` - Add `vec1 + vec2` - Add
`vec1 - vec2` - Subtract `vec1 - vec2` - Subtract
@@ -129,15 +155,22 @@ When reading from outside ZIPs, binary files are fully supported.
`vec1:distance(vec2)` - Distance between two points `vec1:distance(vec2)` - Distance between two points
`vec2 = vec:copy()` - Clone a vector so its elements can be modified without affecting the original. Usually not needed - the builtin vector functions never modify vectors in-place. `vec2 = vec:copy()` - Clone a vector so its elements can be modified without affecting the original. Usually not needed - the builtin vector functions never modify vectors in-place.
### Matrix
WIP
### Extended Standard Lua Library ### Extended Standard Lua Library
`string[index]`
`string[{start,stop}]` `str[index]`
`str[{start,stop}]`
`string.split(str, separator='' (splits into chars), noregex=false)` `string.split(str, separator='' (splits into chars), noregex=false)`
`string.bytes(str)` `string.bytes(str)`
`string.trim(str, charsToTrim=' \t\r\n')` `string.trim(str, charsToTrim=' \t\r\n')`
`table.empty` `table.empty`
`table.map(func, ...)` `table.map(func, ...)`
`table.mapk(func, ...)`
`table.map_list(func, ...)` `table.map_list(func, ...)`
`table.mapi_list(func, ...)`
`table.swap(tbl)` `table.swap(tbl)`
`table.reverse(list)` `table.reverse(list)`
`table.islist(list)` `table.islist(list)`
@@ -161,43 +194,47 @@ When reading from outside ZIPs, binary files are fully supported.
`math.clamp(num, min, max)` `math.clamp(num, min, max)`
## Type Conversion ## Type Conversion
When a TorqueScript function is called from Lua or vice-versa, the arguments and return value must be converted between the two languages' type systems. When a TorqueScript function is called from Lua or vice-versa, the arguments and return value must be converted between the two languages' type systems.
TorqueScript stores no type information; all values in TorqueScript are strings. So it's necessary to make some inferences when converting values between the two languages. TorqueScript stores no type information; all values in TorqueScript are strings. So it's necessary to make some inferences when converting values between the two languages.
### From TorqueScript to Lua
- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.
- The empty string "" becomes `nil`
- A string containing three numbers separated by spaces becomes a `vector`
- A string containing six numbers separated by spaces becomes a table of two vectors
- Any other string is passed directly as a `string`
### From Lua to TorqueScript ### From Lua to TorqueScript
- `nil` becomes the empty string "" - `nil` becomes the empty string ""
- `true` and `false` become "1" and "0" respectively - `true` and `false` become "1" and "0" respectively
- Torque containers become their object ID - A Torque object container becomes its object ID
- A `vector` becomes a string containing three numbers separated by spaces - A `vector` becomes a string containing three numbers separated by spaces
- A table of two vectors becomes a string containing six numbers separated by spaces - A table of two `vector`s becomes a string containing six numbers separated by spaces
- (WIP) A `matrix` is converted into an axis-angle (a "transform"), a string containing seven numbers separated by spaces
- Any `string` is passed directly as a string - Any `string` is passed directly as a string
- Tables cannot be passed and will throw an error - Tables cannot be passed and will throw an error
### From TorqueScript to Lua
- The empty string "" becomes `nil`
- Any numeric value becomes a Lua `number`, except as specified with `bl.type`, which may convert a value into a `boolean` or a Torque object container.
- A string containing two or three numbers separated by single spaces becomes a `vector`
- A string containing six numbers separated by single spaces becomes a table of two vectors, usually defining the corners a bounding box
- (WIP) A string containing seven numbers separated by single spaces is treated as an axis-angle (a "transform"), and is converted into a `matrix` representing the translation and rotation
- Any other string is passed directly as a `string`
For scenarios where the automatic TorqueScript->Lua conversion rules are insufficient or incorrect, use `bl.type`.
To convert things by hand, use `bl.object`, `bl.boolean`, or `bl.string`.
## I/O and Safety ## I/O and Safety
All Lua code is sandboxed, and file access is confined to the default directories in the same way TorqueScript is. All Lua code is sandboxed, and file access is confined to the default directories in the same way TorqueScript is.
BlockLua also has access to any C libraries installed in the `modules/lualib` folder, so be careful throwing things in there. BlockLua also has access to any C libraries installed in the `modules/lualib` folder, so be careful throwing things in there.
### Unsafe Mode
BlockLua can be built in Unsafe Mode by specifying the `-DBLLUA_UNSAFE` compiler flag. This removes the sandboxing of Lua code, allowing it to access any file and use any library, including ffi.
Please do not publish add-ons that require unsafe mode.
### List of Object Types ### Unsafe Mode
`'all'` - Any object
`'player'` - Players or bots BlockLua can be built in Unsafe Mode by specifying the `-DBLLUA_UNSAFE` compiler flag. This removes the sandboxing of Lua code, allowing it to access any file and use any library, including ffi.
`'item'` - Items A more limited option is `-DBLLUA_ALLOWFFI`, which allows the use of the `ffi` library. This can still be exploited to grant all the same access as full unsafe mode.
`'vehicle'` - Vehicles Please do not publish add-ons that require either of these.
`'projectile'` - Projectiles
`'brick'` - Bricks with raycasting enabled
`'brickalways'` - All bricks including those with raycasting disabled
Other types: `'static'`, `'environment'`, `'terrain'`, `'water'`, `'trigger'`, `'marker'`, `'gamebase'`, `'shapebase'`, `'camera'`, `'staticshape'`, `'vehicleblocker'`, `'explosion'`, `'corpse'`, `'debris'`, `'physicalzone'`, `'staticts'`, `'staticrendered'`, `'damagableitem'`
## Compiling ## Compiling
With any *32-bit* variant of GCC installed (such as MinGW or MSYS2), run the following command in the repo directory: With any _32-bit_ variant of GCC installed (such as MinGW or MSYS2), run the following command in the repo directory:
`g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1 src/bllua` `g++ src/bllua4.cpp -o BlockLua.dll -m32 -shared -static-libgcc -Isrc -Iinc/tsfuncs -Iinc/lua -lpsapi -L. -llua5.1`
LuaJIT (lua5.1.dll) can be obtained from https://luajit.org/ LuaJIT (lua5.1.dll) can be obtained from https://luajit.org/

66
src/bllua4.cpp
View File

@@ -1,13 +1,16 @@
// BlockLua (bllua4): Simple Lua interface for TorqueScript // BlockLua (bllua4): Advanced Lua interface for TorqueScript
// 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"
@@ -24,19 +27,20 @@ lua_State* gL;
asm(".byte 0"); \ asm(".byte 0"); \
extern char varname[]; extern char varname[];
INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua"); INCLUDE_BIN(bll_fileLuaEnvSafe, "lua-env-safe.lua");
INCLUDE_BIN(bll_fileLuaEnv , "lua-env.lua"); INCLUDE_BIN(bll_fileLuaEnv, "lua-env.lua");
INCLUDE_BIN(bll_fileTsEnv , "ts-env.cs" ); INCLUDE_BIN(bll_fileTsEnv, "ts-env.cs");
INCLUDE_BIN(bll_fileLuaStd , "util/std.lua"); INCLUDE_BIN(bll_fileLuaStd, "util/std.lua");
INCLUDE_BIN(bll_fileLuaVector , "util/vector.lua"); INCLUDE_BIN(bll_fileLuaVector, "util/vector.lua");
INCLUDE_BIN(bll_fileLuaLibts , "util/libts-lua.lua"); INCLUDE_BIN(bll_fileLuaMatrix, "util/matrix.lua");
INCLUDE_BIN(bll_fileTsLibts , "util/libts-ts.cs"); INCLUDE_BIN(bll_fileLuaLibts, "util/libts-lua.lua");
INCLUDE_BIN(bll_fileLuaLibbl , "util/libbl.lua" ); INCLUDE_BIN(bll_fileTsLibts, "util/libts-ts.cs");
INCLUDE_BIN(bll_fileLuaLibblTypes , "util/libbl-types.lua"); INCLUDE_BIN(bll_fileLuaLibbl, "util/libbl.lua");
INCLUDE_BIN(bll_fileLuaLibblTypes, "util/libbl-types.lua");
INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs"); INCLUDE_BIN(bll_fileTsLibblSupport, "util/libbl-support.cs");
INCLUDE_BIN(bll_fileLoadaddons , "util/loadaddons.cs"); INCLUDE_BIN(bll_fileLoadaddons, "util/loadaddons.cs");
#define BLL_LOAD_LUA(lstate, vname) \ #define BLL_LOAD_LUA(lstate, vname) \
if(!bll_LuaEval(lstate, vname)) { \ if (!bll_LuaEval(lstate, vname)) { \
BlPrintf(" Error executing " #vname); \ BlPrintf(" Error executing " #vname); \
return false; \ return false; \
} }
@@ -56,21 +60,27 @@ bool init() {
// Set up Lua environment // Set up Lua environment
BLL_LOAD_LUA(gL, bll_fileLuaEnv); BLL_LOAD_LUA(gL, bll_fileLuaEnv);
#ifndef BLLUA_UNSAFE #ifdef BLLUA_ALLOWFFI
lua_pushboolean(gL, true);
lua_setglobal(gL, "_bllua_allowffi");
#endif
#ifndef BLLUA_UNSAFE
BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe); BLL_LOAD_LUA(gL, bll_fileLuaEnvSafe);
#endif #endif
// Expose Lua API to TS // Load utilities in Lua
BlAddFunction(NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
BlEval(bll_fileTsEnv);
// Load utilities
BLL_LOAD_LUA(gL, bll_fileLuaStd); BLL_LOAD_LUA(gL, bll_fileLuaStd);
BLL_LOAD_LUA(gL, bll_fileLuaVector); BLL_LOAD_LUA(gL, bll_fileLuaVector);
BLL_LOAD_LUA(gL, bll_fileLuaMatrix);
BLL_LOAD_LUA(gL, bll_fileLuaLibts); BLL_LOAD_LUA(gL, bll_fileLuaLibts);
BlEval(bll_fileTsLibts);
BLL_LOAD_LUA(gL, bll_fileLuaLibbl); BLL_LOAD_LUA(gL, bll_fileLuaLibbl);
BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes); BLL_LOAD_LUA(gL, bll_fileLuaLibblTypes);
// Expose Lua API to TS
BlAddFunction(
NULL, NULL, "_bllua_luacall", bll_ts_luacall, "LuaCall(name, ...) - Call Lua function and return result", 2, 20);
BlEval(bll_fileTsEnv);
BlEval(bll_fileTsLibts);
BlEval(bll_fileTsLibblSupport); BlEval(bll_fileTsLibblSupport);
BlEval(bll_fileLoadaddons); BlEval(bll_fileLoadaddons);
@@ -83,8 +93,7 @@ bool init() {
bool deinit() { bool deinit() {
BlPrintf("BlockLua: Unloading"); BlPrintf("BlockLua: Unloading");
BlEval("deactivatePackage(_bllua_main);"); BlEval("$_bllua_active=0;deactivatePackage(_bllua_main);");
BlEval("$_bllua_active = 0;");
bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end"); bll_LuaEval(gL, "for _,f in pairs(_bllua_on_unload) do f() end");
lua_close(gL); lua_close(gL);
@@ -97,9 +106,12 @@ 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;
} }
} }

26
src/lua-env-safe.lua
View File

@@ -14,6 +14,7 @@ local old_require = require
local old_os = os local old_os = os
local old_debug = debug local old_debug = debug
local old_package = package local old_package = package
local old_allowffi = _bllua_allowffi
-- Remove all global variables except a whitelist -- Remove all global variables except a whitelist
local ok_names = tmap { local ok_names = tmap {
@@ -39,13 +40,10 @@ end
-- Sanitize file paths to point only to allowed files within the game directory -- Sanitize file paths to point only to allowed files within the game directory
-- List of allowed directories for reading/writing -- List of allowed directories for reading/writing
-- modules/lualib is also allowed as read-only
local allowed_dirs = tmap { local allowed_dirs = tmap {
'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders' 'add-ons', 'base', 'config', 'saves', 'screenshots', 'shaders'
} }
-- List of allowed directories for reading only
local allowed_dirs_readonly = tmap {
'lualib'
}
-- List of disallowed file extensions - basically executable file extensions -- List of disallowed file extensions - basically executable file extensions
-- Note that even without this protection, exploiting would still require somehow -- Note that even without this protection, exploiting would still require somehow
-- getting a file within the allowed directories to autorun, -- getting a file within the allowed directories to autorun,
@@ -64,6 +62,9 @@ local disallowed_exts = tmap {
-- Return: clean file path if allowed (or nil if disallowed), -- Return: clean file path if allowed (or nil if disallowed),
-- error string (or nil if allowed) -- error string (or nil if allowed)
local function safe_path(fn, readonly) local function safe_path(fn, readonly)
if type(fn) ~= 'string' then
return nil, 'Filename must be a string'
end
fn = fn:gsub('\\', '/') fn = fn:gsub('\\', '/')
fn = fn:gsub('^ +', '') fn = fn:gsub('^ +', '')
fn = fn:gsub(' +$', '') fn = fn:gsub(' +$', '')
@@ -81,14 +82,15 @@ local function safe_path(fn, readonly)
end end
-- allow only whitelisted dirs -- allow only whitelisted dirs
local dir = fn:match('^([^/]+)/') local dir = fn:match('^([^/]+)/')
if (not dir) or ( if not (dir and (
(not allowed_dirs[dir:lower()]) and allowed_dirs[dir:lower()] or
((not readonly) or (not allowed_dirs_readonly[dir:lower()]))) then (readonly and fn:find('^modules/lualib/'))))
return nil, 'filename is in disallowed directory ' .. (dir or 'nil') then
return nil, 'File is in disallowed directory ' .. (dir or 'nil')
end end
-- disallow blacklisted extensions or no extension -- disallow blacklisted extensions
local ext = fn:match('%.([^/%.]+)$') local ext = fn:match('%.([^/%.]+)$')
if (not ext) or (disallowed_exts[ext:lower()]) then if ext and disallowed_exts[ext:lower()] then
return nil, 'Filename \'' .. fn .. '\' has disallowed extension \'' .. return nil, 'Filename \'' .. fn .. '\' has disallowed extension \'' ..
(ext or '') .. '\'' (ext or '') .. '\''
end end
@@ -120,6 +122,7 @@ local disallowed_packages = tmap {
'ffi', 'debug', 'package', 'io', 'os', 'ffi', 'debug', 'package', 'io', 'os',
'_bllua_ts', '_bllua_ts',
} }
if old_allowffi then disallowed_packages['ffi'] = nil end
function _bllua_requiresecure(name) function _bllua_requiresecure(name)
if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or if name:find('[^a-zA-Z0-9_%-%.]') or name:find('%.%.') or
name:find('^%.') or name:find('%.$') then name:find('^%.') or name:find('%.$') then
@@ -143,4 +146,5 @@ debug = {
getfilename = old_debug.getfilename, -- defined in lua.env.lua getfilename = old_debug.getfilename, -- defined in lua.env.lua
} }
_bllua_ts.echo(' Executed bllua-env-safe.lua') print = _bllua_ts.echo
print(' Executed bllua-env-safe.lua')

11
src/lua-env.lua
View File

@@ -18,6 +18,8 @@ end
-- Called when pcall fails on a ts->lua call, used to print detailed error info -- Called when pcall fails on a ts->lua call, used to print detailed error info
function _bllua_on_error(err) function _bllua_on_error(err)
-- Convert error to string if it's not already
err = tostring(err)
err = err:match(': (.+)$') or err err = err:match(': (.+)$') or err
local tracelines = { err } local tracelines = { err }
local level = 2 local level = 2
@@ -25,7 +27,7 @@ function _bllua_on_error(err)
local info = debug.getinfo(level) local info = debug.getinfo(level)
if not info then break end if not info then break end
local filename = debug.getfilename(level) or info.short_src local filename = debug.getfilename(level) or info.short_src
local funcname = info.name local funcname = info.name or '<unknown>'
if funcname == 'dofile' then break end if funcname == 'dofile' then break end
table.insert(tracelines, string.format('%s:%s in function \'%s\'', table.insert(tracelines, string.format('%s:%s in function \'%s\'',
filename, filename,
@@ -37,4 +39,9 @@ function _bllua_on_error(err)
return table.concat(tracelines, '\n') return table.concat(tracelines, '\n')
end end
_bllua_ts.echo(' Executed bllua-env.lua') -- overridden in lua-env-safe.lua (executed if not BLLUA_UNSAFE)
_bllua_io_open = io.open
_bllua_requiresecure = require
print = _bllua_ts.echo
print(' Executed bllua-env.lua')

33
src/luainterp.cpp
View File

@@ -1,6 +1,12 @@
// Handle errors with a Lua function, defined in lua-env.lua // Handle errors with a Lua function, defined in lua-env.lua
int bll_error_handler(lua_State *L) { #include "luainterp.hpp"
#include "BlHooks.hpp"
#include "lauxlib.h"
#include "lua.h"
#include <cstring>
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)) {
BlPrintf(" Lua error handler: _bllua_on_error not defined."); BlPrintf(" Lua error handler: _bllua_on_error not defined.");
@@ -15,6 +21,7 @@ int bll_error_handler(lua_State *L) {
lua_pcall(L, 1, 1, 0); lua_pcall(L, 1, 1, 0);
return 1; return 1;
} }
int bll_pcall(lua_State* L, int nargs, int nret) { int bll_pcall(lua_State* L, int nargs, int nret) {
// calculate stack position for message handler // calculate stack position for message handler
int hpos = lua_gettop(L) - nargs; int hpos = lua_gettop(L) - nargs;
@@ -31,7 +38,7 @@ int bll_pcall(lua_State* L, int nargs, int nret) {
// Display the last Lua error in the BL console // Display the last Lua error in the BL console
void bll_printError(lua_State* L, const char* operation, const char* item) { void bll_printError(lua_State* L, const char* operation, const char* item) {
//error_handler(L); // error_handler(L);
BlPrintf("\x03Lua error: %s", lua_tostring(L, -1)); BlPrintf("\x03Lua error: %s", lua_tostring(L, -1));
BlPrintf("\x03 (%s: %s)", operation, item); BlPrintf("\x03 (%s: %s)", operation, item);
lua_pop(L, 1); lua_pop(L, 1);
@@ -39,7 +46,7 @@ void bll_printError(lua_State* L, const char* operation, const char* item) {
// Eval a string of Lua code // Eval a string of Lua code
bool bll_LuaEval(lua_State* L, const char* str) { bool bll_LuaEval(lua_State* L, const char* str) {
if(luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) { if (luaL_loadbuffer(L, str, strlen(str), "input") || bll_pcall(L, 0, 1)) {
bll_printError(L, "eval", str); bll_printError(L, "eval", str);
return false; return false;
} }
@@ -48,21 +55,27 @@ 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;
} }
} }

17
src/luainterp.hpp Normal file
View File

@@ -0,0 +1,17 @@
// 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

274
src/lualibts.cpp
View File

@@ -1,74 +1,206 @@
//run ../compile // run ../compile
// 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
#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) { 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++) {
char* argbuf = bll_arg_buffer[i]; char* argbuf = bll_arg_buffer[i];
argv[i] = argbuf; argv[i] = argbuf;
bll_toarg(L, argbuf, i+ofs+1, true); bll_toarg(L, argbuf, i + ofs + 1, true);
} }
// /:^| / // /:^| /
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)");
} }
} }
@@ -76,19 +208,23 @@ int bll_TsCall(lua_State* L, const char* oname, const char* fname, int argc, int
return 1; return 1;
} }
// 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);
return bll_TsCall(L, NULL, fname, argc, 1); return bll_TsCall(L, NULL, fname, argc, 1);
} }
// 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 = 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"); 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,19 +246,24 @@ 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);
return 1; return 1;
} }
// Lua lib function: ts.setfield // Lua lib function: ts.setfield
int bll_lua_tssetfield(lua_State* L) { int bll_lua_tssetfield(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);
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 +286,10 @@ 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) {
luaL_register(L, "_bllua_ts", bll_lua_reg); void llibbl_init(lua_State* L) { luaL_register(L, "_bllua_ts", bll_lua_reg); }
}

18
src/tsliblua.cpp
View File

@@ -1,11 +1,16 @@
// 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++) {
lua_pushstring(gL, argv[i]); lua_pushstring(gL, argv[i]);
} }
if(bll_pcall(gL, argc, 1)) { if (bll_pcall(gL, argc, 1)) {
bll_printError(gL, "call", fname); bll_printError(gL, "call", fname);
return false; return false;
} }
@@ -14,9 +19,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

22
src/util/libbl-support.cs
View File

@@ -42,4 +42,26 @@ package _bllua_objectDeletionHook {
}; };
activatePackage(_bllua_objectDeletionHook); activatePackage(_bllua_objectDeletionHook);
// Public Lua library for TS
function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
if($_bllua_active)
return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
}
function luaexec(%fn) {
if($_bllua_active)
return _bllua_luacall("_bllua_exec", %fn);
}
function luaeval(%code) {
if($_bllua_active)
return _bllua_luacall("_bllua_eval", %code);
}
function luaget(%name) {
if($_bllua_active)
return _bllua_luacall("_bllua_getvar", %name);
}
function luaset(%name, %val) {
if($_bllua_active)
_bllua_luacall("_bllua_setvar", %name, %val);
}
echo(" Executed libbl-support.cs"); echo(" Executed libbl-support.cs");

808
src/util/libbl.lua
View File

File diff suppressed because it is too large Load Diff

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

@@ -93,11 +93,15 @@ local allowed_zip_dirs = tflip {
local function io_open_absolute(fn, mode) local function io_open_absolute(fn, mode)
-- if file exists, use original mode -- if file exists, use original mode
local res, err = _bllua_io_open(fn, mode) local res, err = _bllua_io_open(fn, mode)
if res then return res end if res then
return res
elseif err and not err:find('No such file or directory$') then
return nil, err
end
-- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader -- otherwise, if TS sees file but Lua doesn't, it must be in a zip, so use TS reader
local dir = fn:match('^[^/]+') local dir = fn:match('^[^/]+')
if not allowed_zip_dirs[dir:lower()] then return nil, 'File is not in one of the allowed directories' end if not allowed_zip_dirs[dir:lower()] then return nil, 'Zip is not in one of the allowed directories' end
local exist = _bllua_ts.call('isFile', fn) == '1' local exist = _bllua_ts.call('isFile', fn) == '1'
if not exist then return nil, err end if not exist then return nil, err end
@@ -204,15 +208,6 @@ function require(mod)
return _bllua_requiresecure(mod) return _bllua_requiresecure(mod)
end end
-- Exposure to TS
function _bllua_getvar(name) return _G[name] end
function _bllua_setvar(name, val) _G[name] = val end
function _bllua_eval(code) return loadstring(code)() end
function _bllua_exec(fn) return dofile(fn, 2) end
local function isValidCode(code) local function isValidCode(code)
local f, e = loadstring(code) local f, e = loadstring(code)
return f ~= nil return f ~= nil

22
src/util/libts-ts.cs
View File

@@ -49,26 +49,4 @@ function _bllua_set_var(%name, %val) {
return ""; return "";
} }
// Public Lua library for TS
function luacall(%func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p) {
if($_bllua_active)
return _bllua_luacall("_bllua_call", %func, %a,%b,%c,%d,%e,%f,%g,%h,%i,%j,%k,%l,%m,%n,%o,%p);
}
function luaexec(%fn) {
if($_bllua_active)
return _bllua_luacall("_bllua_exec", %fn);
}
function luaeval(%code) {
if($_bllua_active)
return _bllua_luacall("_bllua_eval", %code);
}
function luaget(%name) {
if($_bllua_active)
return _bllua_luacall("_bllua_getvar", %name);
}
function luaset(%name, %val) {
if($_bllua_active)
_bllua_luacall("_bllua_setvar", %name, %val);
}
echo(" Executed libts-ts.cs"); echo(" Executed libts-ts.cs");

6
src/util/matrix.lua Normal file
View File

@@ -0,0 +1,6 @@
-- todo
-- Matrix class with math operators
print(' Executed matrix.lua')

32
src/util/std.lua
View File

@@ -4,7 +4,7 @@
-- Table / List -- Table / List
-- Whether a table contains no keys -- Whether a table contains no keys
function table.empty(t) function table.empty(t)
return next(t) ~= nil return next(t) == nil
end end
-- Apply a function to each key in a table -- Apply a function to each key in a table
@@ -13,8 +13,19 @@ function table.map(f, ...)
local u = {} local u = {}
for k, _ in pairs(ts[1]) do for k, _ in pairs(ts[1]) do
local args = {} local args = {}
for j = 1, #ts do args[j] = ts[j][i] end for j = 1, #ts do args[j] = ts[j][k] end
u[i] = f(unpack(args)) u[k] = f(unpack(args))
end
return u
end
function table.mapk(f, ...)
local ts = { ... }
local u = {}
for k, _ in pairs(ts[1]) do
local args = {}
for j = 1, #ts do args[j] = ts[j][k] end
u[k] = f(k, unpack(args))
end end
return u return u
end end
@@ -30,6 +41,17 @@ function table.map_list(f, ...)
return u return u
end end
function table.mapi_list(f, ...)
local ts = { ... }
local u = {}
for i = 1, #ts[1] do
local args = {}
for j = 1, #ts do args[j] = ts[j][i] end
u[i] = f(i, unpack(args))
end
return u
end
-- Swap keys/values -- Swap keys/values
function table.swap(t) function table.swap(t)
local u = {} local u = {}
@@ -193,7 +215,7 @@ valueToString = function(v, tabLevel, seen)
return tostring(v) return tostring(v)
else else
--error('table.tostring: table contains a '..t..' value, cannot serialize') --error('table.tostring: table contains a '..t..' value, cannot serialize')
return 'nil --[[ cannot serialize ' .. t .. ': ' .. tostring(v) .. ' ]]' return 'nil --[[ ' .. tostring(v) .. ' ]]'
end end
end end
function table.tostring(t) function table.tostring(t)
@@ -372,3 +394,5 @@ end
function math.clamp(v, n, x) function math.clamp(v, n, x)
return math.min(x, math.max(v, n)) return math.min(x, math.max(v, n))
end end
print(' Executed std.lua')

3
src/util/vector.lua
View File

@@ -235,4 +235,7 @@ vector_new = function(vi)
end end
vector = vector_new vector = vector_new
print(' Executed vector.lua')
return vector_new return vector_new