From cf9de21af3073e29cb7b149fbd8427241de70729 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 Oct 2016 16:18:50 +0300 Subject: - old useless helpers removed from the Options module; - mir_app functions introduced instead of them; - OPENOPTIONSDIALOG structure removed from m_options.h --- protocols/AimOscar/src/ui.cpp | 14 +++++++------- protocols/EmLanProto/src/amdproto.cpp | 4 ++-- protocols/FacebookRM/src/proto.cpp | 12 ++++++------ protocols/GTalkExt/src/options.cpp | 10 +++++----- protocols/Gadu-Gadu/src/dialogs.cpp | 12 ++++++------ protocols/ICQCorp/src/options.cpp | 4 ++-- protocols/ICQCorp/src/user.cpp | 2 +- protocols/IRCG/src/options.cpp | 12 ++++++------ protocols/IRCG/src/userinfo.cpp | 4 ++-- protocols/IcqOscarJ/src/icq_opts.cpp | 16 ++++++++-------- protocols/IcqOscarJ/src/userinfotab.cpp | 4 ++-- protocols/JabberG/src/jabber_opt.cpp | 19 ++++++------------- protocols/JabberG/src/jabber_userinfo.cpp | 4 ++-- protocols/JabberG/src/jabber_vcard.cpp | 14 +++++++------- protocols/MRA/src/MraPopUp.cpp | 4 ++-- protocols/MRA/src/Mra_options.cpp | 12 ++++++------ protocols/MSN/src/msn_opts.cpp | 12 ++++++------ protocols/MinecraftDynmap/src/proto.cpp | 6 +++--- protocols/Omegle/src/proto.cpp | 6 +++--- protocols/Sametime/src/options.cpp | 4 ++-- protocols/SkypeWeb/src/skype_options.cpp | 6 +++--- protocols/Steam/src/steam_events.cpp | 8 ++++---- protocols/Tlen/src/tlen_opt.cpp | 6 +++--- protocols/Tlen/src/tlen_userinfo.cpp | 2 +- protocols/Tox/src/tox_contacts.cpp | 2 +- protocols/Tox/src/tox_options.cpp | 10 +++++----- protocols/Twitter/src/proto.cpp | 8 ++++---- protocols/VKontakte/src/vk_options.cpp | 14 +++++++------- protocols/WhatsApp/src/dialogs.cpp | 6 +++--- 29 files changed, 115 insertions(+), 122 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index 0613134dd1..c2d37f170f 100755 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -685,15 +685,15 @@ int CAimProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.position = -1900000000; odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE; odp.hInstance = hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); - odp.pwszTab = LPGENW("Profile"); + odp.szTab.w = LPGENW("Profile"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO); odp.pfnDlgProc = userinfo_dialog; UserInfo_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Admin"); + odp.szTab.w = LPGENW("Admin"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_ADMIN); odp.pfnDlgProc = admin_dialog; UserInfo_AddPage(wParam, &odp); @@ -1058,17 +1058,17 @@ int CAimProto::OnOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 1003000; odp.hInstance = hInstance; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("Basic"); + odp.szTab.w = LPGENW("Basic"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM); odp.pfnDlgProc = options_dialog; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Privacy"); + odp.szTab.w = LPGENW("Privacy"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY); odp.pfnDlgProc = privacy_dialog; Options_AddPage(wParam, &odp); diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index 5956be29e0..e1203d023e 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -278,8 +278,8 @@ int __cdecl EMPCreateOptionsDlg(WPARAM wParam, LPARAM) odp.position = 100000000; odp.hInstance = g_hInstance; odp.pszTemplate = MAKEINTRESOURCE(IDD_EMP_FORM_OPT); - odp.pszTitle = LPGEN("E-mage LAN protocol"); - odp.pszGroup = LPGEN("Network"); + odp.szTitle.a = LPGEN("E-mage LAN protocol"); + odp.szGroup.a = LPGEN("Network"); odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = EMPDlgProcMainOpts; diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index f277745e98..ccfb0fbdbd 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -504,31 +504,31 @@ int FacebookProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.position = 271828; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szGroup.w = LPGENW("Network"); + odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = FBOptionsProc; Options_AddPage(wParam, &odp); odp.position = 271829; - odp.pwszTab = LPGENW("Events"); + odp.szTab.w = LPGENW("Events"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS); odp.pfnDlgProc = FBOptionsEventsProc; Options_AddPage(wParam, &odp); odp.position = 271830; - odp.pwszTab = LPGENW("Statuses"); + odp.szTab.w = LPGENW("Statuses"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_STATUSES); odp.pfnDlgProc = FBOptionsStatusesProc; Options_AddPage(wParam, &odp); odp.position = 271831; - odp.pwszTab = LPGENW("Messaging"); + odp.szTab.w = LPGENW("Messaging"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_MESSAGING); odp.pfnDlgProc = FBOptionsMessagingProc; Options_AddPage(wParam, &odp); diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 378f83404c..5e2a8858f0 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -223,11 +223,11 @@ int OptionsInitialization(WPARAM wParam, LPARAM) { if (ServiceExists(MS_POPUP_ADDPOPUPT)) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = MAIL_NOTIFICATIONS; + odp.szTitle.w = MAIL_NOTIFICATIONS; odp.pfnDlgProc = PopupsOptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPSETTINGS); odp.hInstance = g_hInst; - odp.pwszGroup = POPUPS_OPTIONS_GROUP; + odp.szGroup.w = POPUPS_OPTIONS_GROUP; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB; Options_AddPage(wParam, &odp); } @@ -237,13 +237,13 @@ int OptionsInitialization(WPARAM wParam, LPARAM) PROTOACCOUNT *pa = Proto_GetAccount(szProto); if (pa != NULL) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = pa->tszAccountName; + odp.szTitle.w = pa->tszAccountName; odp.pfnDlgProc = AccOptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAILSETTINGS); odp.hInstance = g_hInst; - odp.pwszGroup = NETWORK_OPTIONS_GROUP; + odp.szGroup.w = NETWORK_OPTIONS_GROUP; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE; - odp.pwszTab = MAIL_NOTIFICATIONS; + odp.szTab.w = MAIL_NOTIFICATIONS; odp.dwInitParam = (LPARAM)szProto; Options_AddPage(wParam, &odp); } diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index a662970ddf..1abf79e361 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -873,22 +873,22 @@ int GGPROTO::options_init(WPARAM wParam, LPARAM) odp.flags = ODPF_UNICODE; odp.position = 1003000; odp.hInstance = hInstance; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; odp.dwInitParam = (LPARAM)this; odp.flags = ODPF_UNICODE | ODPF_BOLDGROUPS | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("General"); + odp.szTab.w = LPGENW("General"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_GENERAL); odp.pfnDlgProc = gg_genoptsdlgproc; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Conference"); + odp.szTab.w = LPGENW("Conference"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_CONFERENCE); odp.pfnDlgProc = gg_confoptsdlgproc; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Advanced"); + odp.szTab.w = LPGENW("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_ADVANCED); odp.pfnDlgProc = gg_advoptsdlgproc; Options_AddPage(wParam, &odp); @@ -923,7 +923,7 @@ int GGPROTO::details_init(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = gg_detailsdlgproc; odp.position = -1900000000; odp.pszTemplate = pszTemplate; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = (LPARAM)this; UserInfo_AddPage(wParam, &odp); diff --git a/protocols/ICQCorp/src/options.cpp b/protocols/ICQCorp/src/options.cpp index cb0b7e31e0..707d2c5b0d 100644 --- a/protocols/ICQCorp/src/options.cpp +++ b/protocols/ICQCorp/src/options.cpp @@ -74,11 +74,11 @@ int icqOptionsInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -800000000; - odp.pszTitle = protoName; + odp.szTitle.a = protoName; odp.pfnDlgProc = icqOptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_ICQCORP); odp.hInstance = hInstance; - odp.pszGroup = LPGEN("Network"); + odp.szGroup.a = LPGEN("Network"); odp.flags = ODPF_BOLDGROUPS; Options_AddPage(wParam, &odp); diff --git a/protocols/ICQCorp/src/user.cpp b/protocols/ICQCorp/src/user.cpp index 73b5bcb98f..b1d68e0032 100644 --- a/protocols/ICQCorp/src/user.cpp +++ b/protocols/ICQCorp/src/user.cpp @@ -146,7 +146,7 @@ int icqUserInfoInitialise(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -1900000000; - odp.pszTitle = protoName; + odp.szTitle.a = protoName; odp.pfnDlgProc = icqUserInfoDlgProc; odp.pszTemplate = MAKEINTRESOURCE(IDD_INFO_ICQCORP); odp.hInstance = hInstance; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 20a7899faf..4037a5e288 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1633,23 +1633,23 @@ void CIgnorePrefsDlg::UpdateList() int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = new CConnectPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("DCC and CTCP"); + odp.szTab.w = LPGENW("DCC and CTCP"); odp.pDialog = new CCtcpPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Advanced"); + odp.szTab.w = LPGENW("Advanced"); odp.pDialog = new COtherPrefsDlg(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Ignore"); + odp.szTab.w = LPGENW("Ignore"); odp.pDialog = new CIgnorePrefsDlg(this); Options_AddPage(wParam, &odp); return 0; diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index 68b3705a5f..5b27200d1a 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -210,14 +210,14 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_DONTTRANSLATE; - odp.pszTitle = m_szModuleName; + odp.szTitle.a = m_szModuleName; odp.hIcon = NULL; odp.dwInitParam = (LPARAM)this; odp.hInstance = hInst; odp.position = -1900000000; odp.pfnDlgProc = UserDetailsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO); - odp.pszTitle = m_szModuleName; + odp.szTitle.a = m_szModuleName; UserInfo_AddPage(wParam, &odp); return 0; } diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 94633b1d97..c4e6fb538e 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -511,27 +511,27 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -800000000; odp.hInstance = hInst; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); odp.dwInitParam = LPARAM(this); - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQ); odp.pfnDlgProc = DlgProcIcqOpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Contacts"); + odp.szTab.w = LPGENW("Contacts"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQCONTACTS); odp.pfnDlgProc = DlgProcIcqContactsOpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Features"); + odp.szTab.w = LPGENW("Features"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQFEATURES); odp.pfnDlgProc = DlgProcIcqFeaturesOpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Privacy"); + odp.szTab.w = LPGENW("Privacy"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQPRIVACY); odp.pfnDlgProc = DlgProcIcqPrivacyOpts; Options_AddPage(wParam, &odp); @@ -541,8 +541,8 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.groupPosition = 900000000; odp.pfnDlgProc = DlgProcIcqPopupOpts; - odp.pwszGroup = LPGENW("Popups"); - odp.pwszTab = NULL; + odp.szGroup.w = LPGENW("Popups"); + odp.szTab.w = NULL; Options_AddPage(wParam, &odp); } return 0; diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index 607aa13da3..e6be98831a 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -273,14 +273,14 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.dwInitParam = LPARAM(this); odp.pfnDlgProc = IcqDlgProc; odp.position = -1900000000; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_ICQ); UserInfo_AddPage(wParam, &odp); if (!lParam) { wchar_t buf[200]; mir_snwprintf(buf, TranslateT("%s Details"), m_tszUserName); - odp.pwszTitle = buf; + odp.szTitle.w = buf; odp.position = -1899999999; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_CHANGEINFO); diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 2959ff5603..5ea705adfc 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -1508,19 +1508,19 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRosterControl(WPARAM, LPARAM) int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = new CDlgOptAccount(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Conferences"); + odp.szTab.w = LPGENW("Conferences"); odp.pDialog = new CDlgOptGc(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Advanced"); + odp.szTab.w = LPGENW("Advanced"); odp.pDialog = new CDlgOptAdvanced(this); Options_AddPage(wParam, &odp); return 0; @@ -2225,14 +2225,7 @@ void CJabberProto::JabberUpdateDialogs(BOOL) INT_PTR __cdecl CJabberProto::OnMenuOptions(WPARAM, LPARAM) { - OPENOPTIONSDIALOG ood = { 0 }; - ood.cbSize = sizeof(ood); - ood.pszGroup = "Network"; - ood.pszPage = mir_u2a(m_tszUserName); - ood.pszTab = "Account"; - Options_Open(&ood); - - mir_free((void*)ood.pszPage); + Options_Open(L"Network", m_tszUserName, L"Account"); return 0; } diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index bd464df117..aa26e63ff3 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -818,13 +818,13 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = JabberUserInfoDlgProc; odp.position = -2000000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_JABBER); - odp.pszTitle = LPGEN("Account"); + odp.szTitle.a = LPGEN("Account"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = JabberUserPhotoDlgProc; odp.position = 2000000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO); - odp.pszTitle = LPGEN("Photo"); + odp.szTitle.a = LPGEN("Photo"); UserInfo_AddPage(wParam, &odp); } return 0; diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index e4a6b04931..fd8b47928e 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -1188,36 +1188,36 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM) odp.hInstance = hInst; odp.dwInitParam = (LPARAM)this; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.pfnDlgProc = PersonalDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PERSONAL); - odp.pwszTab = LPGENW("General"); + odp.szTab.w = LPGENW("General"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = ContactDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_CONTACT); - odp.pwszTab = LPGENW("Contacts"); + odp.szTab.w = LPGENW("Contacts"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = HomeDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_HOME); - odp.pwszTab = LPGENW("Home"); + odp.szTab.w = LPGENW("Home"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = WorkDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_WORK); - odp.pwszTab = LPGENW("Work"); + odp.szTab.w = LPGENW("Work"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = PhotoDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO); - odp.pwszTab = LPGENW("Photo"); + odp.szTab.w = LPGENW("Photo"); UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = NoteDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_NOTE); - odp.pwszTab = LPGENW("Note"); + odp.szTab.w = LPGENW("Note"); UserInfo_AddPage(wParam, &odp); SendGetVcard(m_szJabberJID); diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 14b780924c..75db5f0f89 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -131,8 +131,8 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM) odp.position = 100000000; odp.hInstance = g_hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Popups"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Popups"); odp.groupPosition = 900000000; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pfnDlgProc = MraPopupDlgProcOpts; diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index ac742a9f29..68689c4385 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -216,26 +216,26 @@ int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.dwInitParam = (LPARAM)this; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT); odp.pfnDlgProc = DlgProcOptsAccount; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Connections"); + odp.szTab.w = LPGENW("Connections"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS); odp.pfnDlgProc = DlgProcOptsConnections; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Files"); + odp.szTab.w = LPGENW("Files"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES); odp.pfnDlgProc = MraFilesQueueDlgProcOpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Avatars"); + odp.szTab.w = LPGENW("Avatars"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS); odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts; Options_AddPage(wParam, &odp); diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index be5634e4aa..8212b26338 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -627,25 +627,25 @@ int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.position = -790000000; odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN); - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTab.w = LPGENW("Account"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.pfnDlgProc = DlgProcMsnOpts; odp.dwInitParam = (LPARAM)this; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Connection"); + odp.szTab.w = LPGENW("Connection"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN); odp.pfnDlgProc = DlgProcMsnConnOpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Server list"); + odp.szTab.w = LPGENW("Server list"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR); odp.pfnDlgProc = DlgProcMsnServLists; Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Notifications"); + odp.szTab.w = LPGENW("Notifications"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); odp.pfnDlgProc = DlgProcHotmailPopupOpts; Options_AddPage(wParam, &odp); diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp index 48c3cdfa80..34a097827f 100644 --- a/protocols/MinecraftDynmap/src/proto.cpp +++ b/protocols/MinecraftDynmap/src/proto.cpp @@ -172,13 +172,13 @@ int MinecraftDynmapProto::OnModulesLoaded(WPARAM, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.position = 271828; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szGroup.w = LPGENW("Network"); + odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = MinecraftDynmapOptionsProc; Options_AddPage(wParam, &odp); diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 7e76eeee51..7121cd67d1 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -181,13 +181,13 @@ int OmegleProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.position = 271828; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szGroup.w = LPGENW("Network"); + odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = OmegleOptionsProc; Options_AddPage(wParam, &odp); diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index 08f8bd8b61..86a5491d55 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -345,8 +345,8 @@ int CSametimeProto::OptInit(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTNET); - odp.pwszTitle = m_tszUserName; - odp.pwszGroup = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); odp.pfnDlgProc = DlgProcOptNet; odp.dwInitParam = (LPARAM)this; Options_AddPage(wParam, &odp); diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index b6ce46f0c5..bea9ee5239 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -72,11 +72,11 @@ int CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { sizeof(odp) }; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = CSkypeOptionsMain::CreateOptionsPage(this); Options_AddPage(wParam, &odp); diff --git a/protocols/Steam/src/steam_events.cpp b/protocols/Steam/src/steam_events.cpp index b545ec2808..43a906b56e 100644 --- a/protocols/Steam/src/steam_events.cpp +++ b/protocols/Steam/src/steam_events.cpp @@ -33,15 +33,15 @@ int CSteamProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = CSteamOptionsMain::CreateOptionsPage(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Blocked contacts"); + odp.szTab.w = LPGENW("Blocked contacts"); odp.pDialog = CSteamOptionsBlockList::CreateOptionsPage(this); Options_AddPage(wParam, &odp); return 0; diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp index c5ac79b364..ec23e45445 100644 --- a/protocols/Tlen/src/tlen_opt.cpp +++ b/protocols/Tlen/src/tlen_opt.cpp @@ -86,14 +86,14 @@ int TlenProtocol::OptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.dwInitParam = (LPARAM)this; for (int i = 0; i < _countof(tabPages); i++) { odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId); odp.pfnDlgProc = tabPages[i].dlgProc; - odp.pwszTab = tabPages[i].tabName; + odp.szTab.w = tabPages[i].tabName; Options_AddPage(wParam, &odp); } return 0; diff --git a/protocols/Tlen/src/tlen_userinfo.cpp b/protocols/Tlen/src/tlen_userinfo.cpp index 0742ccdf38..6815573b78 100644 --- a/protocols/Tlen/src/tlen_userinfo.cpp +++ b/protocols/Tlen/src/tlen_userinfo.cpp @@ -139,7 +139,7 @@ int TlenProtocol::UserInfoInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = TlenUserInfoDlgProc; odp.position = -2000000000; odp.pszTemplate = ((HANDLE)lParam != NULL) ? MAKEINTRESOURCEA(IDD_USER_INFO):MAKEINTRESOURCEA(IDD_USER_VCARD); - odp.pwszTitle = (hContact != NULL) ? LPGENW("Account") : m_tszUserName; + odp.szTitle.w = (hContact != NULL) ? LPGENW("Account") : m_tszUserName; odp.dwInitParam = (LPARAM)this; UserInfo_AddPage(wParam, &odp); diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp index fa6b05a7c2..4c2f582e41 100644 --- a/protocols/Tox/src/tox_contacts.cpp +++ b/protocols/Tox/src/tox_contacts.cpp @@ -401,7 +401,7 @@ int CToxProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.flags = ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.hInstance = g_hInstance; odp.dwInitParam = (LPARAM)this; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.pfnDlgProc = UserInfoProc; odp.position = -2000000000; diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 271df96825..8a865f58fa 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -680,19 +680,19 @@ void CToxOptionsNodeList::OnApply() int CToxProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = CToxOptionsMain::CreateOptionsPage(this); Options_AddPage(wParam, &odp); - /*odp.pwszTab = LPGENW("Multimedia"); + /*odp.szTab.w = LPGENW("Multimedia"); odp.pDialog = CToxOptionsMultimedia::CreateOptionsPage(this); Options_AddPage(wParam, &odp);*/ - odp.pwszTab = LPGENW("Nodes"); + odp.szTab.w = LPGENW("Nodes"); odp.pDialog = CToxOptionsNodeList::CreateOptionsPage(this); Options_AddPage(wParam, &odp); diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index cadee6121f..bfd02990c4 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -276,18 +276,18 @@ int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 271828; odp.hInstance = g_hInstance; - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = m_tszUserName; + odp.szGroup.w = LPGENW("Network"); + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - odp.pwszTab = LPGENW("Basic"); + odp.szTab.w = LPGENW("Basic"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = options_proc; Options_AddPage(wParam, &odp); if (ServiceExists(MS_POPUP_ADDPOPUPT)) { - odp.pwszTab = LPGENW("Popups"); + odp.szTab.w = LPGENW("Popups"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS); odp.pfnDlgProc = popup_options_proc; Options_AddPage(wParam, &odp); diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index f0eeed2c87..bb9ceb7bab 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -74,32 +74,32 @@ int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.dwInitParam = LPARAM(this); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.position = 1; odp.pDialog = new CVkOptionAccountForm(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Advanced"); + odp.szTab.w = LPGENW("Advanced"); odp.position = 2; odp.pDialog = new CVkOptionAdvancedForm(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("News and notifications"); + odp.szTab.w = LPGENW("News and notifications"); odp.position = 3; odp.pDialog = new CVkOptionFeedsForm(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("View"); + odp.szTab.w = LPGENW("View"); odp.position = 4; odp.pDialog = new CVkOptionViewForm(this); Options_AddPage(wParam, &odp); - odp.pwszTab = LPGENW("Menu"); + odp.szTab.w = LPGENW("Menu"); odp.position = 5; odp.pDialog = new CVkOptionMenuForm(this); Options_AddPage(wParam, &odp); diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp index be9cb7de70..39e5e2831f 100644 --- a/protocols/WhatsApp/src/dialogs.cpp +++ b/protocols/WhatsApp/src/dialogs.cpp @@ -133,11 +133,11 @@ INT_PTR WhatsAppProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam) int WhatsAppProto::OnOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.pwszTitle = m_tszUserName; + odp.szTitle.w = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; - odp.pwszGroup = LPGENW("Network"); + odp.szGroup.w = LPGENW("Network"); - odp.pwszTab = LPGENW("Account"); + odp.szTab.w = LPGENW("Account"); odp.pDialog = new COptionsDlg(this, IDD_OPTIONS); Options_AddPage(wParam, &odp); return 0; -- cgit v1.2.3