int hLangpack/m_hLang removed and replaced with HPLUGIN

6 files changed, 10 insertions, 15 deletions

diff --git a/plugins/MirLua/src/Modules/m_clist.cpp b/plugins/MirLua/src/Modules/m_clist.cpp
index c43ee1782e..0b6d390004 100644
--- a/plugins/MirLua/src/Modules/m_clist.cpp
+++ b/plugins/MirLua/src/Modules/m_clist.cpp
@@ -2,7 +2,7 @@
 
 void MakeMenuItem(lua_State *L, CMenuItem &mi)
 {
-	mi.langId = CMLuaEnvironment::GetEnvironmentId(L);
+	mi.pPlugin = CMLuaEnvironment::GetEnvironmentId(L);
 
 	lua_getfield(L, -1, "Flags");
 	mi.flags = lua_tointeger(L, -1);
@@ -57,7 +57,7 @@ static int clist_AddMainMenuItem(lua_State *L)
 {
 	luaL_checktype(L, 1, LUA_TTABLE);
 
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	MakeMenuItem(L, mi);
 
 	HGENMENU res = Menu_AddMainMenuItem(&mi);
@@ -88,7 +88,7 @@ static int clist_AddContactMenuItem(lua_State *L)
 {
 	luaL_checktype(L, 1, LUA_TTABLE);
 
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	MakeMenuItem(L, mi);
 
 	ptrA szProto(mir_utf8decodeA(lua_tostring(L, 2)));
@@ -105,7 +105,7 @@ static int clist_AddTrayMenuItem(lua_State *L)
 {
 	luaL_checktype(L, 1, LUA_TTABLE);
 
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	MakeMenuItem(L, mi);
 
 	HGENMENU res = Menu_AddTrayMenuItem(&mi);
diff --git a/plugins/MirLua/src/Modules/m_core.cpp b/plugins/MirLua/src/Modules/m_core.cpp
index 281aa288fe..36cbcb3dc4 100644
--- a/plugins/MirLua/src/Modules/m_core.cpp
+++ b/plugins/MirLua/src/Modules/m_core.cpp
@@ -222,7 +222,7 @@ static int core_Translate(lua_State *L)
 	char *what = (char*)luaL_checkstring(L, 1);
 
 	ptrW value(mir_utf8decodeW(what));
-	lua_pushstring(L, T2Utf(TranslateW_LP(value, g_plugin.m_hLang)));
+	lua_pushstring(L, T2Utf(TranslateW_LP(value, &g_plugin)));
 
 	return 1;
 }
diff --git a/plugins/MirLua/src/Modules/m_hotkeys.cpp b/plugins/MirLua/src/Modules/m_hotkeys.cpp
index 1245d2348f..a6c35fdefb 100644
--- a/plugins/MirLua/src/Modules/m_hotkeys.cpp
+++ b/plugins/MirLua/src/Modules/m_hotkeys.cpp
@@ -41,9 +41,7 @@ static int hotkeys_Register(lua_State *L)
 	HOTKEYDESC hk;
 	MakeHotkey(L, hk);
 
-	int hScriptLangpack = CMLuaEnvironment::GetEnvironmentId(L);
-
-	INT_PTR res = Hotkey_Register(&hk, hScriptLangpack);
+	INT_PTR res = Hotkey_Register(&hk, CMLuaEnvironment::GetEnvironmentId(L));
 	lua_pushboolean(L, res);
 
 	return 1;
diff --git a/plugins/MirLua/src/Modules/m_icolib.cpp b/plugins/MirLua/src/Modules/m_icolib.cpp
index 86b5163290..3f94e26894 100644
--- a/plugins/MirLua/src/Modules/m_icolib.cpp
+++ b/plugins/MirLua/src/Modules/m_icolib.cpp
@@ -69,8 +69,7 @@ static int lua_AddIcon(lua_State *L)
 	else

 		luaL_argerror(L, 1, luaL_typename(L, 1));

 

-	int hScriptLangpack = CMLuaEnvironment::GetEnvironmentId(L);

-	HANDLE res = IcoLib_AddIcon(&sid, hScriptLangpack);

+	HANDLE res = IcoLib_AddIcon(&sid, CMLuaEnvironment::GetEnvironmentId(L));

 	lua_pushlightuserdata(L, res);

 

 	mir_free((void*)sid.pszName);

diff --git a/plugins/MirLua/src/Modules/m_options.cpp b/plugins/MirLua/src/Modules/m_options.cpp
index 29383e89ad..bcb9c799d0 100644
--- a/plugins/MirLua/src/Modules/m_options.cpp
+++ b/plugins/MirLua/src/Modules/m_options.cpp
@@ -45,8 +45,7 @@ public:
 
 void MakeOptionDialogPage(lua_State *L, OPTIONSDIALOGPAGE &odp)
 {
-	odp.hInstance = g_plugin.getInst();
-	odp.langId = CMLuaEnvironment::GetEnvironmentId(L);
+	odp.pPlugin = CMLuaEnvironment::GetEnvironmentId(L);
 
 	lua_getfield(L, -1, "Flags");
 	odp.flags = luaL_optinteger(L, -1, ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE);
@@ -91,7 +90,7 @@ int opt_AddPage(lua_State *L)
 	luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
 	WPARAM wParam = (WPARAM)lua_touserdata(L, 1);
 
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	MakeOptionDialogPage(L, odp);
 
 	INT_PTR res = g_plugin.addOptions(wParam, &odp);
diff --git a/plugins/MirLua/src/Modules/m_srmm.cpp b/plugins/MirLua/src/Modules/m_srmm.cpp
index bbaf3edc3f..316a81171f 100644
--- a/plugins/MirLua/src/Modules/m_srmm.cpp
+++ b/plugins/MirLua/src/Modules/m_srmm.cpp
@@ -47,8 +47,7 @@ static int lua_AddButton(lua_State *L)
 	BBButton bbb = {};
 	MakeBBButton(L, bbb);
 
-	int hScriptLangpack = CMLuaEnvironment::GetEnvironmentId(L);
-	HANDLE res = Srmm_AddButton(&bbb, hScriptLangpack);
+	HANDLE res = Srmm_AddButton(&bbb, CMLuaEnvironment::GetEnvironmentId(L));
 	CleanBBButton(bbb);
 	
 	if (!res) {