chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Script: Fixed ScriptFile with Unicode path and tweaks

Browse Source
This commit is contained in:
Birunthan Mohanathas
2012-10-06 21:43:07 +03:00
parent d449e5dac6
commit a4844ca924
4 changed files with 89 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
Library/lua/LuaScript.cpp
View File

@ -25,15 +25,45 @@
** The constructor
**
*/
LuaScript::LuaScript(const char* file) :
m_Ref(LUA_NOREF),
m_Initialized(true)
LuaScript::LuaScript() :
m_Ref(LUA_NOREF)
{
lua_State* L = LuaManager::GetState();
int result = luaL_loadfile(L, file);
}
// If the file loaded okay.
if (result == 0)
/*
** The destructor
**
*/
LuaScript::~LuaScript()
{
Uninitialize();
}
bool LuaScript::Initialize(const WCHAR* scriptFile)
{
assert(!IsInitialized());
lua_State* L = LuaManager::GetState();
// Load file into a buffer as luaL_loadfile does not support Unicode paths.
FILE* file = _wfopen(scriptFile, L"rb");
if (!file)
{
return false;
}
fseek(file, 0, SEEK_END);
long fileSize = ftell(file);
char* fileData = new char[fileSize];
fseek(file, 0, SEEK_SET);
fread(fileData, fileSize, 1, file);
std::string scriptName = ConvertToUTF8(wcsrchr(scriptFile, L'\\') + 1);
int load = luaL_loadbuffer(L, fileData, fileSize, scriptName.c_str());
delete [] fileData;
if (load == 0)
{
// Create the table this script will reside in
lua_newtable(L);
@ -60,32 +90,34 @@ LuaScript::LuaScript(const char* file) :
lua_setfenv(L, -2);
// Execute the Lua script
result = lua_pcall(L, 0, 0, 0);
if (result)
int result = lua_pcall(L, 0, 0, 0);
if (result == 0)
{
return true;
}
else
{
m_Initialized = false;
LuaManager::ReportErrors(L);
luaL_unref(L, LUA_GLOBALSINDEX, m_Ref);
m_Ref = LUA_NOREF;
Uninitialize();
}
}
else
{
m_Initialized = false;
LuaManager::ReportErrors(L);
}
return false;
}
/*
** The destructor
**
*/
LuaScript::~LuaScript()
void LuaScript::Uninitialize()
{
lua_State* L = LuaManager::GetState();
luaL_unref(L, LUA_GLOBALSINDEX, m_Ref);
if (m_Ref != LUA_NOREF)
{
luaL_unref(L, LUA_GLOBALSINDEX, m_Ref);
m_Ref = LUA_NOREF;
}
}
/*
@ -97,7 +129,7 @@ bool LuaScript::IsFunction(const char* funcName)
lua_State* L = LuaManager::GetState();
bool bExists = false;
if (m_Initialized)
if (IsInitialized())
{
// Push our table onto the stack
lua_rawgeti(L, LUA_GLOBALSINDEX, m_Ref);
@ -125,7 +157,7 @@ void LuaScript::RunFunction(const char* funcName)
{
lua_State* L = LuaManager::GetState();
if (m_Initialized)
if (IsInitialized())
{
// Push our table onto the stack
lua_rawgeti(L, LUA_GLOBALSINDEX, m_Ref);
@ -151,7 +183,7 @@ int LuaScript::RunFunctionWithReturn(const char* funcName, double& numValue, std
lua_State* L = LuaManager::GetState();
int type = LUA_TNIL;
if (m_Initialized)
if (IsInitialized())
{
// Push our table onto the stack
lua_rawgeti(L, LUA_GLOBALSINDEX, m_Ref);
@ -193,7 +225,7 @@ void LuaScript::RunString(const char* str)
{
lua_State* L = LuaManager::GetState();
if (m_Initialized)
if (IsInitialized())
{
// Load the string as a Lua chunk
if (luaL_loadstring(L, str))

10
Library/lua/LuaScript.h
View File

@ -24,10 +24,13 @@
class LuaScript
{
public:
LuaScript(const char* file);
LuaScript();
~LuaScript();
bool IsInitialized() { return m_Initialized; }
bool Initialize(const WCHAR* scriptFile);
void Uninitialize();
bool IsInitialized() { return m_Ref != LUA_NOREF; }
int GetRef() { return m_Ref; }
bool IsFunction(const char* funcName);
@ -37,7 +40,6 @@ public:
protected:
int m_Ref;
bool m_Initialized;
};
#endif