diff options
author | Oliver Schneider <oliver@assarbad.net> | 2018-10-08 23:48:52 +0300 |
---|---|---|
committer | Oliver Schneider <oliver@assarbad.net> | 2018-10-08 23:48:52 +0300 |
commit | 3008e91efac446fc21d607485cb787c457401a8b (patch) | |
tree | 1bba3159c29b56fa63a1fe3e5d5720b9e4ddfab3 /3rdparty/lua/src/modules/lua-winreg/src | |
parent | f045e0d70bc3c17933ce61302f3e0bfb30c2ec2f (diff) |
Using EOL extension now, including a .hgeol file to make certain line ending specifications explicit
Added missing test case for lua-winreg
A number of warnings addressed
Adding some helpers to deal with user privileges
Some improvements regarding the inclusion of a basic set of Lua scripts in the resource section
New version of setvcvars.cmd
Diffstat (limited to '3rdparty/lua/src/modules/lua-winreg/src')
4 files changed, 21 insertions, 9 deletions
diff --git a/3rdparty/lua/src/modules/lua-winreg/src/lua_tstring.h b/3rdparty/lua/src/modules/lua-winreg/src/lua_tstring.h index 0f7be45..2b398ab 100644 --- a/3rdparty/lua/src/modules/lua-winreg/src/lua_tstring.h +++ b/3rdparty/lua/src/modules/lua-winreg/src/lua_tstring.h @@ -47,10 +47,10 @@ const wchar_t *lua_optlwcs_from_char(lua_State *L, int narg, const wchar_t *def, #define lua_tolwstring lua_tolwcs_from_utf8
#define lua_towstring lua_towcs_from_utf8
-#define lua_pushlwstring lua_pushlutf8_from_wcs -#define lua_pushwstring lua_pushutf8_from_wcs +#define lua_pushlwstring lua_pushlutf8_from_wcs
+#define lua_pushwstring lua_pushutf8_from_wcs
#define lua_pushwchar lua_pushutf8_from_wchar
-#define lua_addwchar lua_addutf8_from_wchar +#define lua_addwchar lua_addutf8_from_wchar
#else
/* all lua*wstring function will use char <--> wide convertion */
#define lua_checkwstring lua_checkwcs_from_char
diff --git a/3rdparty/lua/src/modules/lua-winreg/src/luamacro.h b/3rdparty/lua/src/modules/lua-winreg/src/luamacro.h index 18fd7dd..0a6ac13 100644 --- a/3rdparty/lua/src/modules/lua-winreg/src/luamacro.h +++ b/3rdparty/lua/src/modules/lua-winreg/src/luamacro.h @@ -18,12 +18,12 @@ # define lua_recycle(L) lua_gc(L,LUA_GCCOLLECT,0)
#endif
#ifndef lua_boxpointer
-# define lua_boxpointer(L,u) (*(void **)(lua_newuserdata(L, sizeof(void *))) = (u)) -#endif +# define lua_boxpointer(L,u) (*(void **)(lua_newuserdata(L, sizeof(void *))) = (u))
+#endif
#ifndef lua_unboxpointer
# define lua_unboxpointer(L,i) (*(void **)(lua_touserdata(L, i)))
#endif
-/* convert a stack index to positive */ +/* convert a stack index to positive */
#define lua_absindex(L, i) (((i)>0)?(i):((i)<=LUA_REGISTRYINDEX?(i):(lua_gettop(L)+(i)+1)))
diff --git a/3rdparty/lua/src/modules/lua-winreg/src/luareg.h b/3rdparty/lua/src/modules/lua-winreg/src/luareg.h index 26c5f05..0a46aa5 100644 --- a/3rdparty/lua/src/modules/lua-winreg/src/luareg.h +++ b/3rdparty/lua/src/modules/lua-winreg/src/luareg.h @@ -15,13 +15,19 @@ int reg_enumvalue(lua_State *L); int reg_flushkey(lua_State *L);
int reg_getinfo(lua_State *L);
int reg_getvalue(lua_State *L);
+#ifndef LUA_REG_NO_HIVEOPS
int reg_loadkey(lua_State *L);
+#endif // LUA_REG_NO_HIVEOPS
int reg_openkey(lua_State *L);
+#ifndef LUA_REG_NO_HIVEOPS
int reg_replacekey(lua_State *L);
int reg_restorekey(lua_State *L);
int reg_savekey(lua_State *L);
+#endif // LUA_REG_NO_HIVEOPS
int reg_setvalue(lua_State *L);
+#ifndef LUA_REG_NO_HIVEOPS
int reg_unloadkey(lua_State *L);
+#endif // LUA_REG_NO_HIVEOPS
int reg_handle(lua_State *L);
int reg_detach(lua_State *L);
int reg_getstrval(lua_State *L);
@@ -41,13 +47,19 @@ luaL_Reg lreg_regobj[] = { {"flushkey",reg_flushkey},
{"getinfo",reg_getinfo},
{"getvalue",reg_getvalue},
+#ifndef LUA_REG_NO_HIVEOPS
{"load",reg_loadkey},
+#endif // LUA_REG_NO_HIVEOPS
{"openkey",reg_openkey},
+#ifndef LUA_REG_NO_HIVEOPS
{"replace",reg_replacekey},
{"restore",reg_restorekey},
{"save",reg_savekey},
+#endif // LUA_REG_NO_HIVEOPS
{"setvalue",reg_setvalue},
+#ifndef LUA_REG_NO_HIVEOPS
{"unload",reg_unloadkey},
+#endif // LUA_REG_NO_HIVEOPS
{"handle",reg_handle},
{"detach",reg_detach},
{"getstrval",reg_getstrval},
diff --git a/3rdparty/lua/src/modules/lua-winreg/src/winreg.c b/3rdparty/lua/src/modules/lua-winreg/src/winreg.c index 87b518a..be50635 100644 --- a/3rdparty/lua/src/modules/lua-winreg/src/winreg.c +++ b/3rdparty/lua/src/modules/lua-winreg/src/winreg.c @@ -297,10 +297,10 @@ BOOL reg_aux_setvalue(lua_State *L, HKEY hKey, const TCHAR * pszVal, int type, i luaL_Buffer B;
luaL_buffinit(L, &B);
if(lua_istable(L, i)){
- int n;
- int last = lua_objlen(L, i);
+ size_t n;
+ size_t last = lua_objlen(L, i);
for (n = 1; n <= last; n++) {
- lua_rawgeti(L, i, n);
+ lua_rawgeti(L, i, (int)n);
luaL_addstring(&B, lua_checkstring(L, -1));
luaL_addchar(&B, 0);
}
|