Utf8DecodeT/Utf8EncodeT macros considered useless and replaced with Utf8DecodeW/Utf8EncodeW

4 files changed, 7 insertions, 15 deletions

diff --git a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
index 40c80555bf..da4f62ec50 100644
--- a/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
+++ b/plugins/MirLua/Modules/WinAPI/src/winapi.cpp
@@ -217,10 +217,10 @@ static int lua_GetRegValue(lua_State *L)
 		case REG_SZ:

 		case REG_LINK:

 		case REG_EXPAND_SZ:

-		{

-			ptrA str(Utf8EncodeT((wchar_t*)value));

-			lua_pushlstring(L, str, mir_strlen(str));

-		}

+			{

+				ptrA str(Utf8EncodeW((wchar_t*)value));

+				lua_pushlstring(L, str, mir_strlen(str));

+			}

 			break;

 

 		default:

diff --git a/plugins/MirLua/src/m_clist.cpp b/plugins/MirLua/src/m_clist.cpp
index 59a5415b32..7620ef9e9e 100644
--- a/plugins/MirLua/src/m_clist.cpp
+++ b/plugins/MirLua/src/m_clist.cpp
@@ -6,7 +6,7 @@ static int clist_AddMainMenuRoot(lua_State *L)
 	int position = lua_tointeger(L, 2);

 	HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);

 

-	HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrW(Utf8DecodeT(name)), position, hIcon);

+	HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrW(Utf8DecodeW(name)), position, hIcon);

 	lua_pushlightuserdata(L, res);

 

 	return 1;

@@ -29,7 +29,7 @@ static int clist_AddContactMenuRoot(lua_State *L)
 	int position = lua_tointeger(L, 2);

 	HANDLE hIcon = (HANDLE)lua_touserdata(L, 3);

 

-	HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrW(Utf8DecodeT(name)), position, hIcon);

+	HGENMENU res = Menu_CreateRoot(MO_MAIN, ptrW(Utf8DecodeW(name)), position, hIcon);

 	lua_pushlightuserdata(L, res);

 

 	return 1;

diff --git a/plugins/MirLua/src/m_genmenu.cpp b/plugins/MirLua/src/m_genmenu.cpp
index 0eaafee37a..2359549fb5 100644
--- a/plugins/MirLua/src/m_genmenu.cpp
+++ b/plugins/MirLua/src/m_genmenu.cpp
@@ -47,7 +47,7 @@ void MakeMenuItem(lua_State *L, CMenuItem &mi)
 	int position = lua_tointeger(L, 3);

 	HANDLE hIcon = (HANDLE)lua_touserdata(L, 4);

 

-	HGENMENU res = Menu_CreateRoot(hMenuObject, ptrW(Utf8DecodeT(name)), position, hIcon);

+	HGENMENU res = Menu_CreateRoot(hMenuObject, ptrW(Utf8DecodeW(name)), position, hIcon);

 	lua_pushlightuserdata(L, res);

 

 	return 1;

diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp
index 0539404a7d..03aed915d7 100644
--- a/plugins/MirLua/src/main.cpp
+++ b/plugins/MirLua/src/main.cpp
@@ -74,14 +74,6 @@ extern "C" int __declspec(dllexport) Load(void)
 

 	hRecvMessage = CreateHookableEvent(MODULE PSR_MESSAGE);

 	CreateProtoServiceFunction(MODULE, PSR_MESSAGE, FilterRecvMessage);

-

-	/*CreateProtoServiceFunction(MODULE, PSR_AUTH, FilterRecvAuth);

-	CreateProtoServiceFunction(MODULE, PSR_FILE, FilterRecvFile);

-	CreateProtoServiceFunction(MODULE, PSR_URL, FilterRecvUrl);

-	CreateProtoServiceFunction(MODULE, PSR_CONTACTS, FilterRecvUrl);

-	CreateProtoServiceFunction(MODULE, PSR_AWAYMSG, FilterRecvUrl);*/

-	

-

 	return 0;

 }