summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_cluiframes.h2
-rw-r--r--include/m_core.h4
-rw-r--r--include/m_extraicons.h2
-rw-r--r--include/m_fontservice.h6
-rw-r--r--include/m_genmenu.h6
-rw-r--r--include/m_hotkeys.h2
-rw-r--r--include/m_icolib.h2
-rw-r--r--include/m_options.h2
-rw-r--r--include/m_skin.h2
-rw-r--r--include/m_userinfo.h2
-rw-r--r--include/newpluginapi.h4
-rw-r--r--plugins/CloudFile/src/menus.cpp2
-rw-r--r--plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp2
-rw-r--r--plugins/MirLua/src/m_genmenu.cpp2
-rw-r--r--plugins/MirLua/src/m_options.cpp2
-rw-r--r--src/core/stduserinfo/src/userinfo.cpp8
-rw-r--r--src/mir_app/src/menu_clist.cpp2
-rw-r--r--src/mir_app/src/menu_options.cpp2
-rw-r--r--src/mir_app/src/menu_utils.cpp10
-rw-r--r--src/mir_app/src/options.cpp18
20 files changed, 41 insertions, 41 deletions
diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h
index 26177c283f..020f5fe688 100644
--- a/include/m_cluiframes.h
+++ b/include/m_cluiframes.h
@@ -221,7 +221,7 @@ typedef struct tagCLISTFrame {
//contactowner=advanced parameter
__forceinline HGENMENU Menu_AddContextFrameMenuItem(TMO_MenuItem *pmi)
-{ pmi->hLangpack = hLangpack;
+{ pmi->langId = hLangpack;
return (HGENMENU)CallService("CList/AddContextFrameMenuItem", 0, (LPARAM)pmi);
}
diff --git a/include/m_core.h b/include/m_core.h
index 5c6ce4dd5a..8aac2587fb 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -172,8 +172,8 @@ typedef struct tagIconItemT
}
IconItemT;
-MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix, int hLangpack);
-MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix, int hLangpack);
+MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix, int langId);
+MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix, int langId);
///////////////////////////////////////////////////////////////////////////////
// language packs support
diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index 11ce000a32..e394306d5b 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -101,7 +101,7 @@ struct EXTRAICON_INFO
LPARAM onClickParam;
};
-EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int hLangpack);
+EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int langId);
#pragma warning(disable:4505)
diff --git a/include/m_fontservice.h b/include/m_fontservice.h
index f126a49f1f..4f6f0f264d 100644
--- a/include/m_fontservice.h
+++ b/include/m_fontservice.h
@@ -236,8 +236,8 @@ EXTERN_C MIR_APP_DLL(int) Effect_GetW(const wchar_t *wszGroup, const wchar_t *sz
// wparam = lparam = 0
#define ME_EFFECT_RELOAD "Effect/Reload"
-EXTERN_C MIR_APP_DLL(void) KillModuleFonts(int hLangpack);
-EXTERN_C MIR_APP_DLL(void) KillModuleColours(int hLangpack);
-EXTERN_C MIR_APP_DLL(void) KillModuleEffects(int hLangpack);
+EXTERN_C MIR_APP_DLL(void) KillModuleFonts(int langId);
+EXTERN_C MIR_APP_DLL(void) KillModuleColours(int langId);
+EXTERN_C MIR_APP_DLL(void) KillModuleEffects(int langId);
#endif // _FONT_SERVICE_API_INC
diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index 33a56e2daa..8fa4ef0728 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -46,7 +46,7 @@ struct TMO_MenuItem
HICON hIcon;
HANDLE hIcolibItem;
};
- int hLangpack;
+ int langId;
MUUID uid;
};
@@ -64,7 +64,7 @@ struct CMenuItem : public TMO_MenuItem
CMenuItem()
{
memset(this, 0, sizeof(CMenuItem));
- this->hLangpack = ::hLangpack;
+ this->langId = ::hLangpack;
}
};
#endif
@@ -260,7 +260,7 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_GetProtocolRoot(PROTO_INTERFACE *pThis);
/////////////////////////////////////////////////////////////////////////////////////////
// kills all menu items & submenus that belong to the hLangpack given
-EXTERN_C MIR_APP_DLL(void) KillModuleMenus(int hLangpack);
+EXTERN_C MIR_APP_DLL(void) KillModuleMenus(int langId);
#endif // M_GENMENU_H__
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index a68c100e87..016a4864b1 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -88,6 +88,6 @@ EXTERN_C MIR_APP_DLL(void) Hotkey_Unsubclass(HWND hwndEdit);
/////////////////////////////////////////////////////////////////////////////////////////
-EXTERN_C MIR_APP_DLL(void) KillModuleHotkeys(int hLangpack);
+EXTERN_C MIR_APP_DLL(void) KillModuleHotkeys(int langId);
#endif // M_HOTKEYS_H__
diff --git a/include/m_icolib.h b/include/m_icolib.h
index 71cb29fad9..d06160ffcd 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -117,7 +117,7 @@ MIR_APP_DLL(void) Window_FreeIcon_IcoLib(HWND hWnd);
///////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(void) KillModuleIcons(int hLangpack);
+MIR_APP_DLL(void) KillModuleIcons(int langId);
#if defined(__cplusplus)
}
diff --git a/include/m_options.h b/include/m_options.h
index cdf89a9115..0b2112d1aa 100644
--- a/include/m_options.h
+++ b/include/m_options.h
@@ -66,7 +66,7 @@ struct OPTIONSDIALOGPAGE
DLGPROC pfnDlgProc;
char *pszTemplate;
HINSTANCE hInstance;
- int hLangpack;
+ int langId;
DWORD flags;
union {
diff --git a/include/m_skin.h b/include/m_skin.h
index 956f693fed..8a62a295e6 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -134,7 +134,7 @@ EXTERN_C MIR_APP_DLL(int) Skin_PlaySoundFile(const wchar_t *pwszFileName);
/////////////////////////////////////////////////////////////////////////////////////////
-EXTERN_C MIR_APP_DLL(void) KillModuleSounds(int hLangpack);
+EXTERN_C MIR_APP_DLL(void) KillModuleSounds(int langId);
/////////////////////////////////////////////////////////////////////////////////////////
// sent when the icons DLL has been changed in the options dialog, and everyone
diff --git a/include/m_userinfo.h b/include/m_userinfo.h
index 167cbb09f5..8f4ff6ec67 100644
--- a/include/m_userinfo.h
+++ b/include/m_userinfo.h
@@ -77,7 +77,7 @@ All PSN_ WM_NOTIFY messages have PSHNOTIFY.lParam = (LPARAM)hContact
#define PSM_FORCECHANGED (WM_USER+100) //force-send a PSN_INFOCHANGED to all pages
__forceinline INT_PTR UserInfo_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE* odp)
-{ odp->hLangpack = hLangpack;
+{ odp->langId = hLangpack;
return CallService("UserInfo/AddPage", wParam, (LPARAM)odp);
}
diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index ab75e18a64..e8bc7b4435 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -52,7 +52,7 @@ __forceinline bool operator!=(const MUUID &p1, const MUUID &p2)
{ return memcmp(&p1, &p2, sizeof(MUUID)) != 0;
}
-MIR_APP_DLL(int) GetPluginLangId(const MUUID &uuid, int hLangpack);
+MIR_APP_DLL(int) GetPluginLangId(const MUUID &uuid, int langId);
MIR_APP_DLL(int) IsPluginLoaded(const MUUID &uuid);
MIR_APP_DLL(int) SetServiceModePlugin(const wchar_t *wszPluginName);
@@ -444,7 +444,7 @@ OBJLIST<P> ACCPROTOPLUGIN<P>::g_arInstances(1, PtrKeySortT);
#endif
EXTERN_C MIR_APP_DLL(HINSTANCE) GetInstByAddress(void* codePtr);
-EXTERN_C MIR_APP_DLL(CMPluginBase*) GetPluginByLangId(int hLangpack);
+EXTERN_C MIR_APP_DLL(CMPluginBase*) GetPluginByLangId(int langId);
EXTERN_C MIR_APP_DLL(CMPluginBase&) GetPluginByInstance(HINSTANCE hInst);
#endif // M_NEWPLUGINAPI_H__
diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp
index b05b9d5e87..6fcfeafd6e 100644
--- a/plugins/CloudFile/src/menus.cpp
+++ b/plugins/CloudFile/src/menus.cpp
@@ -36,7 +36,7 @@ void CCloudService::OnModulesLoaded()
mi.root = hContactMenu;
CMStringA serviceName(FORMAT, "/%s/Upload", GetAccountName());
mi.pszService = serviceName.GetBuffer();
- mi.hLangpack = GetId();
+ mi.langId = GetId();
mi.flags = CMIF_SYSTEM | CMIF_UNICODE;
mi.name.w = (wchar_t*)GetUserName();
mi.position = Services.getCount();
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp
index 897ad38cec..d16be454d7 100644
--- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp
+++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp
@@ -126,7 +126,7 @@ int initializeOptions(WPARAM wParam, LPARAM)
OptDlgPg.szGroup.w = LPGENW("Customize");
OptDlgPg.szTitle.w = LPGENW("Hardware HotKeys");
OptDlgPg.pfnDlgProc = OptDlgProc;
- OptDlgPg.hLangpack = hLangpack;
+ OptDlgPg.langId = hLangpack;
Options_AddPage(wParam, &OptDlgPg);
return 0;
}
diff --git a/plugins/MirLua/src/m_genmenu.cpp b/plugins/MirLua/src/m_genmenu.cpp
index e84f792a28..50043827ed 100644
--- a/plugins/MirLua/src/m_genmenu.cpp
+++ b/plugins/MirLua/src/m_genmenu.cpp
@@ -2,7 +2,7 @@
void MakeMenuItem(lua_State *L, CMenuItem &mi)
{
- mi.hLangpack = CMLuaEnvironment::GetEnvironmentId(L);
+ mi.langId = CMLuaEnvironment::GetEnvironmentId(L);
lua_getfield(L, -1, "Flags");
mi.flags = lua_tointeger(L, -1);
diff --git a/plugins/MirLua/src/m_options.cpp b/plugins/MirLua/src/m_options.cpp
index 593348cb4d..32df2ca366 100644
--- a/plugins/MirLua/src/m_options.cpp
+++ b/plugins/MirLua/src/m_options.cpp
@@ -44,7 +44,7 @@ public:
void MakeOptionDialogPage(lua_State *L, OPTIONSDIALOGPAGE &odp)
{
odp.hInstance = g_plugin.getInst();
- odp.hLangpack = CMLuaEnvironment::GetEnvironmentId(L);
+ odp.langId = CMLuaEnvironment::GetEnvironmentId(L);
lua_getfield(L, -1, "Flags");
odp.flags = luaL_optinteger(L, -1, ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE);
diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index ab80204d29..5d65eac93c 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -66,12 +66,12 @@ struct DetailsData
wchar_t* getTitle(OPTIONSDIALOGPAGE *p)
{
- return (p->flags & ODPF_DONTTRANSLATE) ? p->szTitle.w : TranslateW_LP(p->szTitle.w, p->hLangpack);
+ return (p->flags & ODPF_DONTTRANSLATE) ? p->szTitle.w : TranslateW_LP(p->szTitle.w, p->langId);
}
wchar_t* getTab(OPTIONSDIALOGPAGE *p)
{
- return (p->flags & ODPF_DONTTRANSLATE) ? p->szTab.w : TranslateW_LP(p->szTab.w, p->hLangpack);
+ return (p->flags & ODPF_DONTTRANSLATE) ? p->szTab.w : TranslateW_LP(p->szTab.w, p->langId);
}
static int PageSortProc(OPTIONSDIALOGPAGE *item1, OPTIONSDIALOGPAGE *item2)
@@ -155,7 +155,7 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam)
dst->szTab.w = (odp->flags & ODPF_USERINFOTAB) ? mir_a2u(odp->szTab.a) : nullptr;
}
- dst->hLangpack = odp->hLangpack;
+ dst->langId = odp->langId;
dst->flags = odp->flags;
dst->dwInitParam = odp->dwInitParam;
opi->pageCount++;
@@ -288,7 +288,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP
p.ptszTitle = odp[i].szTitle.w;
p.ptszTab = odp[i].szTab.w;
- p.hLangpack = odp[i].hLangpack;
+ p.hLangpack = odp[i].langId;
if (i && p.ptszTab && !mir_wstrcmp(dat->opd[i - 1].ptszTitle, p.ptszTitle)) {
p.hItem = dat->opd[i - 1].hItem;
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index b7c1e66ea5..d2cbbfeac8 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -425,7 +425,7 @@ static INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM)
if (reset || check) {
TMO_IntMenuItem *timiParent = MO_GetIntMenuItem(pimi->mi.root);
if (timiParent) {
- LPTSTR ptszName = TranslateW_LP(pimi->mi.hIcolibItem ? pimi->mi.name.w : LPGENW("Custom status"), pimi->mi.hLangpack);
+ LPTSTR ptszName = TranslateW_LP(pimi->mi.hIcolibItem ? pimi->mi.name.w : LPGENW("Custom status"), pimi->mi.langId);
timiParent = MO_GetIntMenuItem(pimi->mi.root);
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
index 2845b0f3fa..223d8b6e4a 100644
--- a/src/mir_app/src/menu_options.cpp
+++ b/src/mir_app/src/menu_options.cpp
@@ -506,7 +506,7 @@ public:
m_service.SetTextA(szText);
}
- m_module.SetTextA(GetPluginNameByLangpack(iod->pimi->mi.hLangpack));
+ m_module.SetTextA(GetPluginNameByLangpack(iod->pimi->mi.langId));
m_btnInsMenu.Enable(iod->pimi->mi.root == nullptr);
m_btnDefault.Enable(mir_wstrcmp(iod->name, iod->defname) != 0);
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index c19e5eb90e..2aeaf57922 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -78,7 +78,7 @@ LPTSTR GetMenuItemText(TMO_IntMenuItem *pimi)
if (pimi->mi.flags & CMIF_KEEPUNTRANSLATED)
return pimi->mi.name.w;
- return TranslateW_LP(pimi->mi.name.w, pimi->mi.hLangpack);
+ return TranslateW_LP(pimi->mi.name.w, pimi->mi.langId);
}
///////////////////////////////////////////////////////////////////////////////
@@ -610,18 +610,18 @@ MIR_APP_DLL(int) Menu_RemoveItem(HGENMENU hMenuItem)
struct KillMenuItemsParam
{
KillMenuItemsParam(int _hLangpack) :
- hLangpack(_hLangpack),
+ langId(_hLangpack),
arItems(10)
{
}
- int hLangpack;
+ int langId;
LIST<TMO_IntMenuItem> arItems;
};
int KillMenuItems(TMO_IntMenuItem *pimi, KillMenuItemsParam* param)
{
- if (pimi->mi.hLangpack == param->hLangpack)
+ if (pimi->mi.langId == param->langId)
param->arItems.insert(pimi);
return FALSE;
}
@@ -689,7 +689,7 @@ MIR_APP_DLL(HGENMENU) Menu_CreateRoot(int hMenuObject, LPCTSTR ptszName, int pos
CMenuItem mi;
mi.flags = CMIF_UNICODE;
mi.hIcolibItem = hIcoLib;
- mi.hLangpack = _hLang;
+ mi.langId = _hLang;
mi.name.w = (wchar_t*)ptszName;
mi.position = position;
return Menu_AddItem(hMenuObject, &mi, nullptr);
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 92002dca6e..7347b2e23f 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -206,7 +206,7 @@ struct OptionsPageData : public MZeroedObject
assert(pDialog != nullptr);
flags = src.flags;
- hLangpack = src.hLangpack;
+ langId = src.langId;
if (src.flags & ODPF_UNICODE)
ptszTitle = mir_wstrdup(src.szTitle.w);
@@ -231,7 +231,7 @@ struct OptionsPageData : public MZeroedObject
}
CDlgBase *pDialog;
- int hLangpack;
+ int langId;
ptrW ptszTitle, ptszGroup, ptszTab;
HTREEITEM hTreeItem;
bool bChanged, bInsideTab;
@@ -246,7 +246,7 @@ struct OptionsPageData : public MZeroedObject
{
if (flags & ODPF_DONTTRANSLATE)
return ptszStr;
- return TranslateW_LP(ptszStr, hLangpack);
+ return TranslateW_LP(ptszStr, langId);
}
HWND CreateOptionWindow(HWND hWndParent) const
@@ -565,9 +565,9 @@ class COptionsDlg : public CDlgBase
continue;
opd = m_arOpd[i];
- wchar_t *ptszGroup = TranslateW_LP(opd->ptszGroup, opd->hLangpack);
+ wchar_t *ptszGroup = TranslateW_LP(opd->ptszGroup, opd->langId);
wchar_t *ptszTitle = opd->getString(opd->ptszTitle), *useTitle;
- wchar_t *ptszTab = TranslateW_LP(opd->ptszTab, opd->hLangpack);
+ wchar_t *ptszTab = TranslateW_LP(opd->ptszTab, opd->langId);
tvis.hParent = nullptr;
useTitle = ptszTitle;
@@ -985,7 +985,7 @@ public:
if (mir_wstrcmp(opd->ptszTitle, p->ptszTitle) || mir_wstrcmp(opd->ptszGroup, p->ptszGroup))
continue;
- tie.pszText = TranslateW_LP(p->ptszTab, p->hLangpack);
+ tie.pszText = TranslateW_LP(p->ptszTab, p->langId);
tie.lParam = i;
TabCtrl_InsertItem(hwndTab, pages, &tie);
if (!mir_wstrcmp(opd->ptszTab, p->ptszTab))
@@ -1139,7 +1139,7 @@ public:
void KillModule(int _hLang)
{
for (auto &opd : m_arOpd) {
- if (opd->hLangpack != _hLang)
+ if (opd->langId != _hLang)
continue;
if (opd->pDialog != nullptr) {
@@ -1199,7 +1199,7 @@ MIR_APP_DLL(HWND) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPa
/////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int _hLangpack)
+MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int langId)
{
OptionsPageList *pList = (OptionsPageList*)wParam;
if (odp == nullptr)
@@ -1207,7 +1207,7 @@ MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int _hLa
OptionsPage *dst = new OptionsPage();
memcpy(dst, odp, sizeof(OPTIONSDIALOGPAGE));
- dst->hLangpack = _hLangpack;
+ dst->langId = langId;
if (odp->szTitle.w != nullptr) {
if (odp->flags & ODPF_UNICODE)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:51:44 +0000