- old useless helpers removed from the Options module;

- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h

10 files changed, 40 insertions, 40 deletions

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index 982820b259..e5a2742d6c 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -526,8 +526,8 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM)
 	odp.position = 870000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AWAYMSG);

-	odp.pszTitle = LPGEN("Status messages");

-	odp.pszGroup = LPGEN("Status");

+	odp.szTitle.a = LPGEN("Status messages");

+	odp.szGroup.a = LPGEN("Status");

 	odp.pfnDlgProc = DlgProcAwayMsgOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 0635bd0b54..331602ee95 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -735,25 +735,25 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.position = 910000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);

-	odp.pszGroup = LPGEN("Message sessions");

-	odp.pszTitle = LPGEN("Group chats");

-	odp.pszTab = LPGEN("General");

+	odp.szGroup.a = LPGEN("Message sessions");

+	odp.szTitle.a = LPGEN("Group chats");

+	odp.szTab.a = LPGEN("General");

 	odp.pfnDlgProc = DlgProcOptions1;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.position = 910000001;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS2);

-	odp.pszTab = LPGEN("Chat log");

+	odp.szTab.a = LPGEN("Chat log");

 	odp.pfnDlgProc = DlgProcOptions2;

 	Options_AddPage(wParam, &odp);

 

 	if (PopupInstalled) {

 		odp.position = 910000002;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);

-		odp.pszTitle = LPGEN(CHAT_MODULE);

-		odp.pszGroup = LPGEN("Popups");

-		odp.pszTab = NULL;

+		odp.szTitle.a = LPGEN(CHAT_MODULE);

+		odp.szGroup.a = LPGEN("Popups");

+		odp.szTab.a = NULL;

 		odp.pfnDlgProc = DlgProcOptionsPopup;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index d0c625c2c7..aa1186d684 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -429,15 +429,15 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

-	odp.pszGroup = LPGEN("Contact list");

+	odp.szGroup.a = LPGEN("Contact list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

-	odp.pszTitle = LPGEN("List");

+	odp.szTitle.a = LPGEN("List");

 	odp.pfnDlgProc = DlgProcClcMainOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);

-	odp.pszTitle = LPGEN("List background");

+	odp.szTitle.a = LPGEN("List background");

 	odp.pfnDlgProc = DlgProcClcBkgOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index c0cd03b652..3cb99c8a2b 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -202,7 +202,7 @@ int CListOptInit(WPARAM wParam, LPARAM)
 	odp.position = -1000000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);

-	odp.pszTitle = LPGEN("Contact list");

+	odp.szTitle.a = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcGenOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index d911261f71..0c27835461 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -318,14 +318,14 @@ int CluiOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);

-	odp.pszTitle = LPGEN("Window");

-	odp.pszGroup = LPGEN("Contact list");

+	odp.szTitle.a = LPGEN("Window");

+	odp.szGroup.a = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcCluiOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);

-	odp.pszTitle = LPGEN("Status bar");

+	odp.szTitle.a = LPGEN("Status bar");

 	odp.pfnDlgProc = DlgProcSBarOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp
index 0a021853a4..8f7effdd2c 100644
--- a/src/core/stdfile/src/fileopts.cpp
+++ b/src/core/stdfile/src/fileopts.cpp
@@ -228,8 +228,8 @@ int FileOptInitialise(WPARAM wParam, LPARAM)
 	odp.position = 900000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILETRANSFER);

-	odp.pszTitle = LPGEN("File transfers");

-	odp.pszGroup = LPGEN("Events");

+	odp.szTitle.a = LPGEN("File transfers");

+	odp.szGroup.a = LPGEN("Events");

 	odp.pfnDlgProc = DlgProcFileOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdidle/src/idle.cpp b/src/core/stdidle/src/idle.cpp
index f2a62e0d1a..7221c0d9a0 100644
--- a/src/core/stdidle/src/idle.cpp
+++ b/src/core/stdidle/src/idle.cpp
@@ -346,8 +346,8 @@ static int IdleOptInit(WPARAM wParam, LPARAM)
 	odp.position = 100000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IDLE);

-	odp.pszGroup = LPGEN("Status");

-	odp.pszTitle = LPGEN("Idle");

+	odp.szGroup.a = LPGEN("Status");

+	odp.szTitle.a = LPGEN("Idle");

 	odp.pfnDlgProc = IdleOptsDlgProc;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 0c59ddabaa..d82cdb6b76 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -546,19 +546,19 @@ static int OptInitialise(WPARAM wParam, LPARAM)
 	odp.position = 910000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);

-	odp.pszTab = LPGEN("Messaging");

-	odp.pszTitle = LPGEN("Message sessions");

+	odp.szTab.a = LPGEN("Messaging");

+	odp.szTitle.a = LPGEN("Message sessions");

 	odp.pfnDlgProc = DlgProcOptions;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGLOG);

-	odp.pszTab = LPGEN("Messaging log");

+	odp.szTab.a = LPGEN("Messaging log");

 	odp.pfnDlgProc = DlgProcLogOptions;

 	Options_AddPage(wParam, &odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);

-	odp.pszTab = LPGEN("Typing notify");

+	odp.szTab.a = LPGEN("Typing notify");

 	odp.pfnDlgProc = DlgProcTypeOptions;

 	Options_AddPage(wParam, &odp);

 	return 0;

diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp
index fd3ae677bc..ca21c9d3ee 100644
--- a/src/core/stduserinfo/src/stdinfo.cpp
+++ b/src/core/stduserinfo/src/stdinfo.cpp
@@ -610,37 +610,37 @@ int DetailsInit(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = SummaryDlgProc;

 	odp.position = -2100000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SUMMARY);

-	odp.pszTitle = LPGEN("Summary");

+	odp.szTitle.a = LPGEN("Summary");

 	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = ContactDlgProc;

 	odp.position = -1800000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_CONTACT);

-	odp.pszTitle = LPGEN("Contact");

+	odp.szTitle.a = LPGEN("Contact");

 	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = LocationDlgProc;

 	odp.position = -1500000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_LOCATION);

-	odp.pszTitle = LPGEN("Location");

+	odp.szTitle.a = LPGEN("Location");

 	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = WorkDlgProc;

 	odp.position = -1200000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_WORK);

-	odp.pszTitle = LPGEN("Work");

+	odp.szTitle.a = LPGEN("Work");

 	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = BackgroundDlgProc;

 	odp.position = -900000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_BACKGROUND);

-	odp.pszTitle = LPGEN("Background info");

+	odp.szTitle.a = LPGEN("Background info");

 	UserInfo_AddPage(wParam, &odp);

 

 	odp.pfnDlgProc = NotesDlgProc;

 	odp.position = 0;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_NOTES);

-	odp.pszTitle = LPGEN("Notes");

+	odp.szTitle.a = LPGEN("Notes");

 	UserInfo_AddPage(wParam, &odp);

 	return 0;

 }

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 82ce214f67..04bd08fba3 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->pwszTitle : TranslateW_LP(p->pwszTitle, p->hLangpack);

+	return (p->flags & ODPF_DONTTRANSLATE) ? p->szTitle.w : TranslateW_LP(p->szTitle.w, p->hLangpack);

 }

 

 wchar_t* getTab(OPTIONSDIALOGPAGE *p)

 {

-	return (p->flags & ODPF_DONTTRANSLATE) ? p->pwszTab : TranslateW_LP(p->pwszTab, p->hLangpack);

+	return (p->flags & ODPF_DONTTRANSLATE) ? p->szTab.w : TranslateW_LP(p->szTab.w, p->hLangpack);

 }

 

 static int PageSortProc(OPTIONSDIALOGPAGE *item1, OPTIONSDIALOGPAGE *item2)

@@ -121,8 +121,8 @@ static INT_PTR ShowDetailsDialogCommand(WPARAM wParam, LPARAM)
 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DETAILS), NULL, DlgProcDetails, (LPARAM)&psh);

 	for (int i = 0; i < opi.pageCount; i++) {

 		//cleanup moved to WM_DESTROY

-		if (opi.odp[i].pszGroup != NULL)

-			mir_free(opi.odp[i].pszGroup);

+		if (opi.odp[i].szGroup.w != NULL)

+			mir_free(opi.odp[i].szGroup.a);

 		if ((DWORD_PTR)opi.odp[i].pszTemplate & 0xFFFF0000)

 			mir_free((char*)opi.odp[i].pszTemplate);

 	}

@@ -147,12 +147,12 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam)
 	dst->pszTemplate = ((DWORD_PTR)odp->pszTemplate & 0xFFFF0000) ? mir_strdup(odp->pszTemplate) : odp->pszTemplate;

 

 	if (odp->flags & ODPF_UNICODE) {

-		dst->pwszTitle = (odp->pwszTitle == 0) ? NULL : mir_wstrdup(odp->pwszTitle);

-		dst->pwszTab = (!(odp->flags & ODPF_USERINFOTAB) || !odp->pwszTab) ? NULL : mir_wstrdup(odp->pwszTab);

+		dst->szTitle.w = (odp->szTitle.w == 0) ? NULL : mir_wstrdup(odp->szTitle.w);

+		dst->szTab.w = (odp->flags & ODPF_USERINFOTAB) ? mir_wstrdup(odp->szTab.w) : NULL;

 	}

 	else {

-		dst->pwszTitle = mir_a2u(odp->pszTitle);

-		dst->pwszTab = (!(odp->flags & ODPF_USERINFOTAB) || !odp->pszTab) ? NULL : mir_a2u(odp->pszTab);

+		dst->szTitle.w = mir_a2u(odp->szTitle.a);

+		dst->szTab.w = (odp->flags & ODPF_USERINFOTAB) ? mir_a2u(odp->szTab.a) : NULL;

 	}

 

 	dst->hLangpack = odp->hLangpack;

@@ -289,8 +289,8 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				p.dlgParam = odp[i].dwInitParam;

 				p.hInst = odp[i].hInstance;

 

-				p.ptszTitle = odp[i].pwszTitle;

-				p.ptszTab = odp[i].pwszTab;

+				p.ptszTitle = odp[i].szTitle.w;

+				p.ptszTab = odp[i].szTab.w;

 				p.hLangpack = odp[i].hLangpack;

 

 				if (i && p.ptszTab && !mir_wstrcmp(dat->opd[i - 1].ptszTitle, p.ptszTitle)) {