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

Reverted Script Unicode fix in r928 as it causes some problems with ANSI encoded files.

Browse Source
This commit is contained in:
Birunthan Mohanathas 2011-09-03 18:19:43 +00:00
parent 754c33f82f
commit 9d370f63e8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/MeasureScript.cpp
View File

@ -232,7 +232,7 @@ void CMeasureScript::ReadConfig(CConfigParser& parser, const WCHAR* section)
*/ */
void CMeasureScript::ExecuteBang(const WCHAR* args) void CMeasureScript::ExecuteBang(const WCHAR* args)
{ {
std::string str = ConvertToUTF8(args); std::string str = ConvertToAscii(args);
m_LuaScript->RunString(str.c_str()); m_LuaScript->RunString(str.c_str());
} }

4
Library/lua/LuaManager.cpp
View File

@ -109,10 +109,10 @@ void LuaManager::LuaLog(int nLevel, const char* format, ... )
void LuaManager::PushWide(lua_State* L, const WCHAR* str) void LuaManager::PushWide(lua_State* L, const WCHAR* str)
{ {
lua_pushstring(L, ConvertToUTF8(str).c_str()); lua_pushstring(L, ConvertToAscii(str).c_str());
} }
std::wstring LuaManager::ToWide(lua_State* L, int narg) std::wstring LuaManager::ToWide(lua_State* L, int narg)
{ {
return ConvertUTF8ToWide(lua_tostring(L, narg)); return ConvertToWide(lua_tostring(L, narg));
} }

2
Library/lua/LuaScript.cpp
View File

@ -176,7 +176,7 @@ int LuaScript::RunFunctionWithReturn(const char* funcName, double& numValue, std
else if (type == LUA_TSTRING) else if (type == LUA_TSTRING)
{ {
const char* str = lua_tostring(m_State, -1); const char* str = lua_tostring(m_State, -1);
strValue = ConvertUTF8ToWide(str); strValue = ConvertToWide(str);
numValue = strtod(str, NULL); numValue = strtod(str, NULL);
} }