diff options
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/mir_app.def | 4 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 4 | ||||
| -rw-r--r-- | src/mir_app/src/options.cpp | 14 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 6fa1d98644..e6e2e8f009 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -27,7 +27,6 @@ Skin_GetIconName @24 ??0CProtoIntDlgBase@@QAE@PAUPROTO_INTERFACE@@H@Z @26 NONAME
??0PROTO_INTERFACE@@QAE@ABU0@@Z @27 NONAME
??1CProtoIntDlgBase@@UAE@XZ @29 NONAME
-??4CProtoIntDlgBase@@QAEAAV0@ABV0@@Z @30 NONAME
??4PROTO_INTERFACE@@QAEAAU0@ABU0@@Z @31 NONAME
??_7CProtoIntDlgBase@@6B@ @32 NONAME
??_7PROTO_INTERFACE@@6B@ @33 NONAME
@@ -384,7 +383,7 @@ Chat_UnescapeTags @399 NONAME ProtoGetAvatarFormatByMimeType @400
ProtoGetAvatarMimeType @401
?set_uin@DB_AUTH_BLOB@@QAEXK@Z @402 NONAME
-??0CSrmmBaseDialog@@IAE@PAUHINSTANCE__@@HPAUSESSION_INFO@@@Z @403 NONAME
+??0CSrmmBaseDialog@@IAE@AAVCMPluginBase@@HPAUSESSION_INFO@@@Z @403 NONAME
??1CSrmmBaseDialog@@UAE@XZ @405 NONAME
??_7CSrmmBaseDialog@@6B@ @407 NONAME
?DlgProc@CSrmmBaseDialog@@MAEHIIJ@Z @408 NONAME
@@ -449,7 +448,6 @@ Clist_SetStatusMode @464 ??0MIDatabase@@QAE@ABU0@@Z @470 NONAME
??0MIDatabase@@QAE@XZ @471 NONAME
??1MDatabaseCommon@@UAE@XZ @472 NONAME
-??4CProtoIntDlgBase@@QAEAAV0@$$QAV0@@Z @474 NONAME
??4MDatabaseCommon@@QAEAAV0@ABV0@@Z @476 NONAME
??4MIDatabase@@QAEAAU0@$$QAU0@@Z @477 NONAME
??4MIDatabase@@QAEAAU0@ABU0@@Z @478 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 109b032808..dc486e6845 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -27,7 +27,6 @@ Skin_GetIconName @24 ??0CProtoIntDlgBase@@QEAA@PEAUPROTO_INTERFACE@@H@Z @26 NONAME
??0PROTO_INTERFACE@@QEAA@AEBU0@@Z @27 NONAME
??1CProtoIntDlgBase@@UEAA@XZ @29 NONAME
-??4CProtoIntDlgBase@@QEAAAEAV0@AEBV0@@Z @30 NONAME
??4PROTO_INTERFACE@@QEAAAEAU0@AEBU0@@Z @31 NONAME
??_7CProtoIntDlgBase@@6B@ @32 NONAME
??_7PROTO_INTERFACE@@6B@ @33 NONAME
@@ -384,7 +383,7 @@ Chat_UnescapeTags @399 NONAME ProtoGetAvatarFormatByMimeType @400
ProtoGetAvatarMimeType @401
?set_uin@DB_AUTH_BLOB@@QEAAXK@Z @402 NONAME
-??0CSrmmBaseDialog@@IEAA@PEAUHINSTANCE__@@HPEAUSESSION_INFO@@@Z @403 NONAME
+??0CSrmmBaseDialog@@IEAA@AEAVCMPluginBase@@HPEAUSESSION_INFO@@@Z @403 NONAME
??1CSrmmBaseDialog@@UEAA@XZ @405 NONAME
??_7CSrmmBaseDialog@@6B@ @407 NONAME
?DlgProc@CSrmmBaseDialog@@MEAA_JI_K_J@Z @408 NONAME
@@ -449,7 +448,6 @@ Clist_SetStatusMode @464 ??0MIDatabase@@QEAA@AEBU0@@Z @470 NONAME
??0MIDatabase@@QEAA@XZ @471 NONAME
??1MDatabaseCommon@@UEAA@XZ @472 NONAME
-??4CProtoIntDlgBase@@QEAAAEAV0@$$QEAV0@@Z @474 NONAME
??4MDatabaseCommon@@QEAAAEAV0@AEBV0@@Z @476 NONAME
??4MIDatabase@@QEAAAEAU0@$$QEAU0@@Z @477 NONAME
??4MIDatabase@@QEAAAEAU0@AEBU0@@Z @478 NONAME
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp index 0cc0f87a49..92002dca6e 100644 --- a/src/mir_app/src/options.cpp +++ b/src/mir_app/src/options.cpp @@ -172,8 +172,8 @@ class COptionPageDialog : public CDlgBase LPARAM m_lParam;
public:
- COptionPageDialog(HINSTANCE hInst, int idDialog, DLGPROC pProc, LPARAM lParam) :
- CDlgBase(hInst, idDialog),
+ COptionPageDialog(CMPluginBase &pPlug, int idDialog, DLGPROC pProc, LPARAM lParam) :
+ CDlgBase(pPlug, idDialog),
m_wndProc(pProc),
m_lParam(lParam)
{
@@ -200,7 +200,7 @@ struct OptionsPageData : public MZeroedObject OptionsPageData(const OPTIONSDIALOGPAGE &src)
{
if (src.hInstance != nullptr && src.pszTemplate != nullptr)
- pDialog = new COptionPageDialog(src.hInstance, (INT_PTR)src.pszTemplate, src.pfnDlgProc, src.dwInitParam);
+ pDialog = new COptionPageDialog(::GetPluginByInstance(src.hInstance), (INT_PTR)src.pszTemplate, src.pfnDlgProc, src.dwInitParam);
else
pDialog = src.pDialog;
assert(pDialog != nullptr);
@@ -438,13 +438,13 @@ class COptionsDlg : public CDlgBase int countKnownInst = 0;
m_keywordFilter.ResetContent();
m_keywordFilter.AddString(ALL_MODULES_FILTER, 0);
- m_keywordFilter.AddString(CORE_MODULES_FILTER, (LPARAM)g_hInst);
+ m_keywordFilter.AddString(CORE_MODULES_FILTER, (LPARAM)g_plugin.getInst());
for (auto &opd : m_arOpd) {
opd->FindFilterStrings(false, 0, m_hwnd); // only modules name (fast enougth)
HINSTANCE inst = opd->getInst();
- if (inst == g_hInst)
+ if (inst == g_plugin.getInst())
continue;
int j;
@@ -512,7 +512,7 @@ class COptionsDlg : public CDlgBase else if (mir_wstrcmp(m_szFilterString, CORE_MODULES_FILTER) == 0) {
// replace string with process name - that will show core settings
wchar_t szFileName[300];
- GetModuleFileName(g_hInst, szFileName, _countof(szFileName));
+ GetModuleFileName(g_plugin.getInst(), szFileName, _countof(szFileName));
wchar_t *pos = wcsrchr(szFileName, '\\');
if (pos)
pos++;
@@ -685,7 +685,7 @@ class COptionsDlg : public CDlgBase public:
COptionsDlg(const wchar_t *pszCaption, const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, bool bSinglePage, const OptionsPageList &arPages) :
- CDlgBase(g_hInst, bSinglePage ? IDD_OPTIONSPAGE : IDD_OPTIONS),
+ CDlgBase(g_plugin, bSinglePage ? IDD_OPTIONSPAGE : IDD_OPTIONS),
m_btnApply(this, IDC_APPLY),
m_btnCancel(this, IDCANCEL),
m_pageTree(this, IDC_PAGETREE),
|