From 3f23417a1099f73dc28ec1b7d6ec2a1a7fc2b7a2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 18 Jun 2012 20:53:59 +0000 Subject: - PLUGININFO structure removed at all; - Options_AddPage & UserInfo_AddPage replaced MS_OPT_ADDPAGE & MS_USERINFO_ADDPAGE services respectively - total internal redesign of options' translation - code reformatting git-svn-id: http://svn.miranda-ng.org/main/trunk@477 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/ui.cpp | 8 ++++---- protocols/FacebookRM/proto.cpp | 6 +++--- protocols/GTalkExt/options.cpp | 4 ++-- protocols/Gadu-Gadu/dialogs.c | 8 ++++---- protocols/IRCG/options.cpp | 8 ++++---- protocols/IRCG/userinfo.cpp | 2 +- protocols/IcqOscarJ/UI/userinfotab.cpp | 4 ++-- protocols/IcqOscarJ/icq_opts.cpp | 10 +++++----- protocols/JabberG/jabber_opt.cpp | 21 +++++++++------------ protocols/JabberG/jabber_userinfo.cpp | 4 ++-- protocols/JabberG/jabber_vcard.cpp | 12 ++++++------ protocols/MRA/MraPopUp.cpp | 2 +- protocols/MRA/Mra_options.cpp | 10 +++++----- protocols/MSN/msn_opts.cpp | 20 +++++++++----------- protocols/MSN/msn_useropts.cpp | 2 +- protocols/NewsAggregator/Src/Options.cpp | 2 +- protocols/Omegle/proto.cpp | 2 +- protocols/Quotes/OptionDukasCopy.cpp | 2 +- protocols/Quotes/QuoteInfoDlg.cpp | 3 +-- protocols/Quotes/QuotesProviderFinance.cpp | 2 +- protocols/Quotes/QuotesProviderGoogle.cpp | 2 +- protocols/Twitter/main.cpp | 8 +------- protocols/Twitter/proto.cpp | 15 +++------------ protocols/Twitter/proto.h | 2 +- protocols/Weather/weather_opt.cpp | 6 +++--- protocols/Weather/weather_userinfo.cpp | 4 ++-- protocols/YAMN/main.cpp | 2 +- protocols/YAMN/proto/pop3/pop3opt.cpp | 8 ++++---- protocols/Yahoo/options.cpp | 6 +++--- protocols/Yahoo/user_info.cpp | 9 +++------ 30 files changed, 85 insertions(+), 109 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/ui.cpp b/protocols/AimOscar/ui.cpp index d365d910ae..4aa7502f73 100644 --- a/protocols/AimOscar/ui.cpp +++ b/protocols/AimOscar/ui.cpp @@ -761,12 +761,12 @@ int CAimProto::OnUserInfoInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Profile"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO); odp.pfnDlgProc = userinfo_dialog; - CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Admin"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_ADMIN); odp.pfnDlgProc = admin_dialog; - CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); } return 0; } @@ -1159,13 +1159,13 @@ int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM); odp.pfnDlgProc = options_dialog; odp.nIDBottomSimpleControl = IDC_OPTIONS; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Privacy"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY); odp.pfnDlgProc = privacy_dialog; odp.nIDBottomSimpleControl = 0; - CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); return 0; } diff --git a/protocols/FacebookRM/proto.cpp b/protocols/FacebookRM/proto.cpp index 50ff0f66bc..b0887d3f66 100644 --- a/protocols/FacebookRM/proto.cpp +++ b/protocols/FacebookRM/proto.cpp @@ -424,13 +424,13 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = FBOptionsProc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.position = 271829; odp.ptszTab = LPGENT("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_ADVANCED); odp.pfnDlgProc = FBOptionsAdvancedProc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.position = 271830; if (ServiceExists(MS_POPUP_ADDPOPUPT)) @@ -438,7 +438,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Events"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS); odp.pfnDlgProc = FBEventsProc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); return 0; } diff --git a/protocols/GTalkExt/options.cpp b/protocols/GTalkExt/options.cpp index c7321de8a8..4232054a2c 100644 --- a/protocols/GTalkExt/options.cpp +++ b/protocols/GTalkExt/options.cpp @@ -252,7 +252,7 @@ void AddPopupsPage(WPARAM wParam) odp.ptszGroup = POPUPS_OPTIONS_GROUP; odp.flags = ODPF_UNICODE | ODPF_USERINFOTAB; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); + Options_AddPage(wParam, &odp); } void AddAccPage(LPCTSTR acc, LPCSTR mod, WPARAM wParam) @@ -268,7 +268,7 @@ void AddAccPage(LPCTSTR acc, LPCSTR mod, WPARAM wParam) odp.ptszTab =_T(MAIL_NOTIFICATIONS); odp.dwInitParam = (LPARAM)mod; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); + Options_AddPage(wParam, &odp); } int OptionsInitialization(WPARAM wParam, LPARAM lParam) diff --git a/protocols/Gadu-Gadu/dialogs.c b/protocols/Gadu-Gadu/dialogs.c index b6bfc8f5c0..ed068a1d16 100644 --- a/protocols/Gadu-Gadu/dialogs.c +++ b/protocols/Gadu-Gadu/dialogs.c @@ -138,18 +138,18 @@ int gg_options_init(GGPROTO *gg, WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_GG_GENERAL); odp.pfnDlgProc = gg_genoptsdlgproc; odp.flags = ODPF_BOLDGROUPS | ODPF_DONTTRANSLATE; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp); + Options_AddPage(wParam, &odp); odp.pszTab = LPGEN("Conference"); odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_GG_CONFERENCE); odp.pfnDlgProc = gg_confoptsdlgproc; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp); + Options_AddPage(wParam, &odp); odp.pszTab = LPGEN("Advanced"); odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_GG_ADVANCED); odp.pfnDlgProc = gg_advoptsdlgproc; odp.flags |= ODPF_EXPERTONLY; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp); + Options_AddPage(wParam, &odp); return 0; } @@ -916,7 +916,7 @@ int gg_details_init(GGPROTO *gg, WPARAM wParam, LPARAM lParam) odp.pszTemplate = ((HANDLE)lParam != NULL) ? MAKEINTRESOURCE(IDD_INFO_GG) : MAKEINTRESOURCE(IDD_CHINFO_GG); odp.ptszTitle = GG_PROTONAME; odp.dwInitParam = (LPARAM)gg; - CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); } // Start search for user data diff --git a/protocols/IRCG/options.cpp b/protocols/IRCG/options.cpp index 25cf9d38b1..61684cbae1 100644 --- a/protocols/IRCG/options.cpp +++ b/protocols/IRCG/options.cpp @@ -1722,7 +1722,7 @@ int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) odp.dwInitParam = (LPARAM)&OptCreateAccount; OptCreateAccount.create = CConnectPrefsDlg::Create; OptCreateAccount.param = this; - CallService( MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam, &odp); odp.flags |= ODPF_EXPERTONLY; odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_CTCP); @@ -1730,21 +1730,21 @@ int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) odp.dwInitParam = (LPARAM)&OptCreateConn; OptCreateConn.create = CCtcpPrefsDlg::Create; OptCreateConn.param = this; - CallService( MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam, &odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_OTHER); odp.ptszTab = LPGENT("Advanced"); odp.dwInitParam = (LPARAM)&OptCreateOther; OptCreateOther.create = COtherPrefsDlg::Create; OptCreateOther.param = this; - CallService( MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam, &odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PREFS_IGNORE); odp.ptszTab = LPGENT("Ignore"); odp.dwInitParam = (LPARAM)&OptCreateIgnore; OptCreateIgnore.create = CIgnorePrefsDlg::Create; OptCreateIgnore.param = this; - CallService( MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/IRCG/userinfo.cpp b/protocols/IRCG/userinfo.cpp index d7e8f071b4..8f6378a3ce 100644 --- a/protocols/IRCG/userinfo.cpp +++ b/protocols/IRCG/userinfo.cpp @@ -219,6 +219,6 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = UserDetailsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO); odp.pszTitle = m_szModuleName; - CallService( MS_USERINFO_ADDPAGE, wParam, (LPARAM) & odp); + UserInfo_AddPage(wParam, &odp); return 0; } diff --git a/protocols/IcqOscarJ/UI/userinfotab.cpp b/protocols/IcqOscarJ/UI/userinfotab.cpp index 788dd2ca31..f04d27f8b3 100644 --- a/protocols/IcqOscarJ/UI/userinfotab.cpp +++ b/protocols/IcqOscarJ/UI/userinfotab.cpp @@ -306,7 +306,7 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.position = -1900000000; odp.ptszTitle = m_tszUserName; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_ICQ); - CallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); if (!lParam) { @@ -317,7 +317,7 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) odp.position = -1899999999; odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_CHANGEINFO); odp.pfnDlgProc = ChangeInfoDlgProc; - CallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); } return 0; } diff --git a/protocols/IcqOscarJ/icq_opts.cpp b/protocols/IcqOscarJ/icq_opts.cpp index d7433ea978..67c71d014e 100644 --- a/protocols/IcqOscarJ/icq_opts.cpp +++ b/protocols/IcqOscarJ/icq_opts.cpp @@ -597,22 +597,22 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQ); odp.pfnDlgProc = DlgProcIcqOpts; - CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Contacts"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQCONTACTS); odp.pfnDlgProc = DlgProcIcqContactsOpts; - CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Features"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQFEATURES); odp.pfnDlgProc = DlgProcIcqFeaturesOpts; - CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Privacy"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQPRIVACY); odp.pfnDlgProc = DlgProcIcqPrivacyOpts; - CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); if (bPopUpService) { @@ -622,7 +622,7 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcIcqPopupOpts; odp.ptszGroup = LPGENT("Popups"); odp.ptszTab = NULL; - CallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); } return 0; } diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/jabber_opt.cpp index 230fdb8a5f..63c38d6d0c 100644 --- a/protocols/JabberG/jabber_opt.cpp +++ b/protocols/JabberG/jabber_opt.cpp @@ -1609,34 +1609,34 @@ int CJabberProto::OnOptionsInit( WPARAM wParam, LPARAM ) odp.cbSize = sizeof( odp ); odp.hInstance = hInst; odp.ptszGroup = LPGENT("Network"); - odp.ptszTitle = m_tszUserName; // title!!!!!!!!!!! - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR|ODPF_DONTTRANSLATE; + odp.ptszTitle = m_tszUserName; + odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER); odp.pfnDlgProc = CDlgBase::DynamicDlgProc; - odp.dwInitParam = (LPARAM)&OptCreateAccount; + odp.dwInitParam = (LPARAM)&OptCreateAccount; OptCreateAccount.create = CDlgOptAccount::Create; OptCreateAccount.param = this; - JCallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Conferences"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_JABBER4); odp.pfnDlgProc = CDlgBase::DynamicDlgProc; - odp.dwInitParam = (LPARAM)&OptCreateGc; + odp.dwInitParam = (LPARAM)&OptCreateGc; OptCreateGc.create = CDlgOptGc::Create; OptCreateGc.param = this; - JCallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.flags |= ODPF_EXPERTONLY; odp.ptszTab = LPGENT("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_JABBER2 ); odp.pfnDlgProc = CDlgBase::DynamicDlgProc; - odp.dwInitParam = (LPARAM)&OptCreateAdvanced; + odp.dwInitParam = (LPARAM)&OptCreateAdvanced; OptCreateAdvanced.create = CDlgOptAdvanced::Create; OptCreateAdvanced.param = this; - JCallService( MS_OPT_ADDPAGE, wParam, ( LPARAM )&odp ); + Options_AddPage(wParam, &odp); return 0; } @@ -2074,8 +2074,7 @@ void CJabberDlgAccMgrUI::CheckRegistration() void CJabberDlgAccMgrUI::setupConnection(int type) { - switch (type) - { + switch (type) { case ACC_PUBLIC: setupPublic(); break; case ACC_TLS: setupSecure(); break; case ACC_SSL: setupSecureSSL(); break; @@ -2185,7 +2184,6 @@ void CJabberDlgAccMgrUI::setupFB() m_txtManualHost.Disable(); m_txtPort.Disable(); m_btnRegister.Disable(); -// m_cbResource.Disable(); } void CJabberDlgAccMgrUI::setupVK() @@ -2204,7 +2202,6 @@ void CJabberDlgAccMgrUI::setupVK() m_txtManualHost.Disable(); m_txtPort.Disable(); m_btnRegister.Disable(); -// m_cbResource.Disable(); } void CJabberDlgAccMgrUI::setupSMS() diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/jabber_userinfo.cpp index d80276361a..713b838262 100644 --- a/protocols/JabberG/jabber_userinfo.cpp +++ b/protocols/JabberG/jabber_userinfo.cpp @@ -864,13 +864,13 @@ int CJabberProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) odp.position = -2000000000; odp.pszTemplate = MAKEINTRESOURCEA( IDD_INFO_JABBER ); odp.pszTitle = LPGEN("Account"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = JabberUserPhotoDlgProc; odp.position = 2000000000; odp.pszTemplate = MAKEINTRESOURCEA( IDD_VCARD_PHOTO ); odp.pszTitle = LPGEN("Photo"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); } } else { diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/jabber_vcard.cpp index 2ec8dcf3d7..470eac42c6 100644 --- a/protocols/JabberG/jabber_vcard.cpp +++ b/protocols/JabberG/jabber_vcard.cpp @@ -1223,32 +1223,32 @@ void CJabberProto::OnUserInfoInit_VCard( WPARAM wParam, LPARAM ) odp.pfnDlgProc = PersonalDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PERSONAL); odp.ptszTab = LPGENT("General"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = ContactDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_CONTACT); odp.ptszTab = LPGENT("Contacts"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = HomeDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_HOME); odp.ptszTab = LPGENT("Home"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = WorkDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_WORK); odp.ptszTab = LPGENT("Work"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = PhotoDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_PHOTO); odp.ptszTab = LPGENT("Photo"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); odp.pfnDlgProc = NoteDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_VCARD_NOTE); odp.ptszTab = LPGENT("Note"); - JCallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); + UserInfo_AddPage(wParam, &odp); SendGetVcard( m_szJabberJID ); } diff --git a/protocols/MRA/MraPopUp.cpp b/protocols/MRA/MraPopUp.cpp index 00247bd3a7..67cf3ad263 100644 --- a/protocols/MRA/MraPopUp.cpp +++ b/protocols/MRA/MraPopUp.cpp @@ -38,7 +38,7 @@ int MraPopupOptInit(WPARAM wParam,LPARAM lParam) odp.flags = (ODPF_BOLDGROUPS | ODPF_UNICODE); odp.nIDBottomSimpleControl = IDC_GROUPMAIN; odp.pfnDlgProc = MraPopupDlgProcOpts; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); + Options_AddPage(wParam, &odp); } return(0); } diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/Mra_options.cpp index d478ac5308..664a9ce8a6 100644 --- a/protocols/MRA/Mra_options.cpp +++ b/protocols/MRA/Mra_options.cpp @@ -20,27 +20,27 @@ int OptInit(WPARAM wParam,LPARAM lParam) odp.pszTab="Account"; odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ACCOUNT); odp.pfnDlgProc=DlgProcOptsAccount; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.pszTab="Connections"; odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS); odp.pfnDlgProc=DlgProcOptsConnections; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.pszTab="Anti spam"; odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_ANTISPAM); odp.pfnDlgProc=MraAntiSpamDlgProcOpts; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.pszTab="Files"; odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_FILES); odp.pfnDlgProc=MraFilesQueueDlgProcOpts; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.pszTab="Avatars"; odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_AVATRS); odp.pfnDlgProc=MraAvatarsQueueDlgProcOpts; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); MraPopupOptInit(wParam,lParam); return(0); diff --git a/protocols/MSN/msn_opts.cpp b/protocols/MSN/msn_opts.cpp index a15f956439..11d077c52c 100644 --- a/protocols/MSN/msn_opts.cpp +++ b/protocols/MSN/msn_opts.cpp @@ -720,7 +720,6 @@ INT_PTR CALLBACK DlgDeleteContactUI(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) { OPTIONSDIALOGPAGE odp = {0}; - odp.cbSize = sizeof(odp); odp.position = -790000000; odp.hInstance = hInst; @@ -731,22 +730,22 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; odp.pfnDlgProc = DlgProcMsnOpts; odp.dwInitParam = (LPARAM)this; - MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.ptszTab = LPGENT("Connection"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN); odp.pfnDlgProc = DlgProcMsnConnOpts; - MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); - odp.ptszTab = LPGENT("Server list"); + odp.ptszTab = LPGENT("Server list"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR); odp.pfnDlgProc = DlgProcMsnServLists; - MSN_CallService(MS_OPT_ADDPAGE, wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); odp.ptszTab = LPGENT("Notifications"); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); - odp.pfnDlgProc = DlgProcHotmailPopUpOpts; - MSN_CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); + odp.pfnDlgProc = DlgProcHotmailPopUpOpts; + Options_AddPage(wParam, &odp); return 0; } @@ -761,7 +760,7 @@ INT_PTR CMsnProto::SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// // Load resident option values into memory -void CMsnProto::LoadOptions(void) +void CMsnProto::LoadOptions(void) { memset(&MyOptions, 0, sizeof(MyOptions)); @@ -773,8 +772,7 @@ void CMsnProto::LoadOptions(void) MyOptions.szEmail[0] = 0; _strlwr(MyOptions.szEmail); - if (getStaticString(NULL, "MachineGuid", MyOptions.szMachineGuid, sizeof(MyOptions.szMachineGuid))) - { + if (getStaticString(NULL, "MachineGuid", MyOptions.szMachineGuid, sizeof(MyOptions.szMachineGuid))) { char* uuid = getNewUuid(); strcpy(MyOptions.szMachineGuid, uuid); setString("MachineGuid", MyOptions.szMachineGuid); diff --git a/protocols/MSN/msn_useropts.cpp b/protocols/MSN/msn_useropts.cpp index 1462224783..d8d247cf4b 100644 --- a/protocols/MSN/msn_useropts.cpp +++ b/protocols/MSN/msn_useropts.cpp @@ -70,7 +70,7 @@ int MsnOnDetailsInit(WPARAM wParam, LPARAM lParam) odp.ptszTitle = m_tszUserName; odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE; - MSN_CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); } */ return 0; diff --git a/protocols/NewsAggregator/Src/Options.cpp b/protocols/NewsAggregator/Src/Options.cpp index b9dc78b90c..c9264f3d27 100644 --- a/protocols/NewsAggregator/Src/Options.cpp +++ b/protocols/NewsAggregator/Src/Options.cpp @@ -644,6 +644,6 @@ INT OptInit(WPARAM wParam, LPARAM lParam) odp.ptszGroup = LPGENT("Network"); odp.ptszTitle = LPGENT("News Aggregator"); odp.pfnDlgProc = UpdateNotifyOptsProc; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM)&odp); + Options_AddPage(wParam, &odp); return 0; } \ No newline at end of file diff --git a/protocols/Omegle/proto.cpp b/protocols/Omegle/proto.cpp index e954b9dd2c..ca930961b8 100644 --- a/protocols/Omegle/proto.cpp +++ b/protocols/Omegle/proto.cpp @@ -219,7 +219,7 @@ int OmegleProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = OmegleOptionsProc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); return 0; } diff --git a/protocols/Quotes/OptionDukasCopy.cpp b/protocols/Quotes/OptionDukasCopy.cpp index 1aef56b824..6fcc542b09 100644 --- a/protocols/Quotes/OptionDukasCopy.cpp +++ b/protocols/Quotes/OptionDukasCopy.cpp @@ -410,5 +410,5 @@ void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider,WPARAM wp,OPTIONS // odp.ptszTitle = TranslateTS(const_cast(sTitle.c_str())); // #endif - CallService(MS_OPT_ADDPAGE,wp,reinterpret_cast(&odp)); + Options_AddPage(wp, &odp); } diff --git a/protocols/Quotes/QuoteInfoDlg.cpp b/protocols/Quotes/QuoteInfoDlg.cpp index 88253ec45d..0cb1c8a686 100644 --- a/protocols/Quotes/QuoteInfoDlg.cpp +++ b/protocols/Quotes/QuoteInfoDlg.cpp @@ -161,8 +161,7 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp,LPARAM lp) odp.position = -2000000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO); odp.ptszTitle = TranslateT("Quote"); - CallService(MS_USERINFO_ADDPAGE,wp,reinterpret_cast(&odp)); - + UserInfo_AddPage(wp, &odp); return 0; } diff --git a/protocols/Quotes/QuotesProviderFinance.cpp b/protocols/Quotes/QuotesProviderFinance.cpp index 99d6127b32..e8b335035d 100644 --- a/protocols/Quotes/QuotesProviderFinance.cpp +++ b/protocols/Quotes/QuotesProviderFinance.cpp @@ -314,5 +314,5 @@ void CQuotesProviderFinance::ShowPropertyPage(WPARAM wp,OPTIONSDIALOGPAGE& odp) odp.pfnDlgProc = GoogleFinanceOptDlgProc; odp.dwInitParam = reinterpret_cast(static_cast(this)); odp.ptszTab = const_cast(GetInfo().m_sName.c_str()); - CallService(MS_OPT_ADDPAGE,wp,reinterpret_cast(&odp)); + Options_AddPage(wp, &odp); } diff --git a/protocols/Quotes/QuotesProviderGoogle.cpp b/protocols/Quotes/QuotesProviderGoogle.cpp index 6458180324..c2b30a9a6a 100644 --- a/protocols/Quotes/QuotesProviderGoogle.cpp +++ b/protocols/Quotes/QuotesProviderGoogle.cpp @@ -470,7 +470,7 @@ void CQuotesProviderGoogle::ShowPropertyPage(WPARAM wp,OPTIONSDIALOGPAGE& odp) // tstring sTitle = o.str(); // odp.ptszTitle = TranslateTS(const_cast(sTitle.c_str())); // #endif - CallService(MS_OPT_ADDPAGE,wp,reinterpret_cast(&odp)); + Options_AddPage(wp, &odp); } void CQuotesProviderGoogle::Accept(CQuotesProviderVisitor& visitor)const diff --git a/protocols/Twitter/main.cpp b/protocols/Twitter/main.cpp index 42ffac5220..1aeac73b83 100644 --- a/protocols/Twitter/main.cpp +++ b/protocols/Twitter/main.cpp @@ -102,21 +102,15 @@ int OnModulesLoaded(WPARAM,LPARAM) char curr_version[30]; upd.szComponentName = pluginInfo.shortName; - upd.szUpdateURL = UPDATER_AUTOREGISTER; - upd.szBetaVersionURL = "http://twosx.net/mim/twitter/updater/version.html"; upd.szBetaChangelogURL = "http://twosx.net/mim/twitter/updater/changelog.html"; upd.pbBetaVersionPrefix = reinterpret_cast("Twitter "); upd.cpbBetaVersionPrefix = (int)strlen(reinterpret_cast(upd.pbBetaVersionPrefix)); - upd.szBetaUpdateURL = "http://twosx.net/mim/twitter/updater/twitter.zip"; - - upd.pbVersion = reinterpret_cast( CreateVersionStringPlugin( - reinterpret_cast(&pluginInfo),curr_version) ); + upd.pbVersion = reinterpret_cast( CreateVersionStringPluginEx(&pluginInfo,curr_version) ); upd.cpbVersion = (int)strlen(reinterpret_cast(upd.pbVersion)); - CallService(MS_UPDATE_REGISTER,0,(LPARAM)&upd); } diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/proto.cpp index c2108358ae..30b3b90a16 100644 --- a/protocols/Twitter/proto.cpp +++ b/protocols/Twitter/proto.cpp @@ -367,14 +367,14 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Basic"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = options_proc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); if(ServiceExists(MS_POPUP_ADDPOPUPT)) { odp.ptszTab = LPGENT("Popups"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS); odp.pfnDlgProc = popup_options_proc; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); } return 0; @@ -525,23 +525,14 @@ void TwitterProto::LOG(TCHAR *fmt,...) CallService(MS_NETLIB_LOG, (WPARAM)hNetlib_, (LPARAM)( char* )_T2A(text)); } -void TwitterProto::WLOG(TCHAR* first, const wstring last) -{ - TCHAR *str1 = new TCHAR[1024*96]; - _stprintf(str1,_T("%s"), last.c_str()); - LOG(first, str1); -} - // TODO: the more I think about it, the more I think all twit.* methods should // be in MessageLoop void TwitterProto::SendTweetWorker(void *p) { if(p == 0) return; - char *text = static_cast(p); - - + char *text = static_cast(p); if (strlen(text) > 140) { // looks like the chat max outgoing msg thing doesn't work, so i'll do it here. char * errorPopup = new char[280]; // i hate c strings ... i should use std::string here. why did i use char* ??? need to delete[] or use std::String sprintf(errorPopup, "Don't be crazy! Everyone knows the max tweet size is 140, and you're trying to fit %d chars in there?", strlen(text)); diff --git a/protocols/Twitter/proto.h b/protocols/Twitter/proto.h index ca3fd8596c..6cea35b33d 100644 --- a/protocols/Twitter/proto.h +++ b/protocols/Twitter/proto.h @@ -147,7 +147,7 @@ private: void SetAllContactStatuses(int); void LOG(TCHAR *fmt,...); - void WLOG(TCHAR* first, const wstring last); + __inline void WLOG(TCHAR* first, const tstring& last) { LOG(first, last.c_str()); } static void CALLBACK APC_callback(ULONG_PTR p); void UpdateChat(const twitter_user &update); diff --git a/protocols/Weather/weather_opt.cpp b/protocols/Weather/weather_opt.cpp index 2ec33bd371..6e27c45e5c 100644 --- a/protocols/Weather/weather_opt.cpp +++ b/protocols/Weather/weather_opt.cpp @@ -291,13 +291,13 @@ int OptInit(WPARAM wParam,LPARAM lParam) { odp.pszTitle = WEATHERPROTOTEXT; odp.pszTab = LPGEN("General"); odp.flags = ODPF_BOLDGROUPS; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); // text options odp.pszTemplate = MAKEINTRESOURCEA(IDD_TEXTOPT); odp.pfnDlgProc = DlgProcText; odp.pszTab = LPGEN("Display"); - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); // if popup service exists, load the weather popup options if ((ServiceExists(MS_POPUP_ADDPOPUP))) { @@ -307,7 +307,7 @@ int OptInit(WPARAM wParam,LPARAM lParam) { odp.groupPosition = 910000000; odp.pszTab = NULL; odp.pfnDlgProc = DlgPopUpOpts; - CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + Options_AddPage(wParam,&odp); } return 0; diff --git a/protocols/Weather/weather_userinfo.cpp b/protocols/Weather/weather_userinfo.cpp index c0b196bf4d..9041805fbd 100644 --- a/protocols/Weather/weather_userinfo.cpp +++ b/protocols/Weather/weather_userinfo.cpp @@ -44,7 +44,7 @@ int UserInfoInit(WPARAM wParam, LPARAM lParam) { odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO); odp.pfnDlgProc = DlgProcINIPage; - CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); } else { @@ -55,7 +55,7 @@ int UserInfoInit(WPARAM wParam, LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO); odp.pfnDlgProc = DlgProcUIPage; odp.flags = ODPF_BOLDGROUPS; - CallService(MS_USERINFO_ADDPAGE, wParam, (LPARAM)&odp); + UserInfo_AddPage(wParam, &odp); } } diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/main.cpp index 20a4adc20b..33a5fc186c 100644 --- a/protocols/YAMN/main.cpp +++ b/protocols/YAMN/main.cpp @@ -264,7 +264,7 @@ int SystemModulesLoaded(WPARAM, LPARAM) wsprintfA(szUrl, "http://www.miranda-fr.net/tweety/yamn/%s.zip", YAMN_FILENAME); update.szComponentName = pluginInfo.shortName; - update.pbVersion = (BYTE *)CreateVersionStringPlugin((PLUGININFO *)&pluginInfo, szVersion); + update.pbVersion = (BYTE *)CreateVersionStringPluginEx((PLUGININFOEX *)&pluginInfo, szVersion); update.cpbVersion = (int)strlen((char *)update.pbVersion); update.szUpdateURL = "http://addons.miranda-im.org/feed.php?dlfile = 3411"; update.szVersionURL = "http://addons.miranda-im.org/details.php?action = viewfile&id = 3411"; diff --git a/protocols/YAMN/proto/pop3/pop3opt.cpp b/protocols/YAMN/proto/pop3/pop3opt.cpp index bcbf78e380..ded7a63c80 100644 --- a/protocols/YAMN/proto/pop3/pop3opt.cpp +++ b/protocols/YAMN/proto/pop3/pop3opt.cpp @@ -175,24 +175,24 @@ int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam) odp.pszTab = LPGEN("Accounts"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTOPT); odp.pfnDlgProc = DlgProcPOP3AccOpt; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) &odp); + Options_AddPage(wParam, &odp); odp.pszTab = LPGEN("General"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_YAMNOPT); odp.pfnDlgProc = DlgProcYAMNOpt; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) &odp); + Options_AddPage(wParam, &odp); odp.pszTab = LPGEN("Plugins"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PLUGINOPT); odp.pfnDlgProc = DlgProcPluginOpt; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) &odp); + Options_AddPage(wParam, &odp); if ( ServiceExists(MS_POPUP_ADDPOPUPEX)) { odp.pszGroup = LPGEN("PopUps"); odp.pszTab = LPGEN("YAMN"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP); odp.pfnDlgProc = DlgProcPOP3AccPopup; - CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) &odp); + Options_AddPage(wParam, &odp); } return 0; } diff --git a/protocols/Yahoo/options.cpp b/protocols/Yahoo/options.cpp index 01fa96330a..da51259fcc 100644 --- a/protocols/Yahoo/options.cpp +++ b/protocols/Yahoo/options.cpp @@ -381,17 +381,17 @@ INT_PTR __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Account"); odp.pfnDlgProc = DlgProcYahooOpts; odp.dwInitParam = LPARAM(this); - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Connection"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO_CONNECTION); odp.pfnDlgProc = DlgProcYahooOptsConn; - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Ignore List"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO_IGNORE); odp.pfnDlgProc = DlgProcYahooOptsIgnore; - YAHOO_CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); + Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/Yahoo/user_info.cpp b/protocols/Yahoo/user_info.cpp index b82d26a495..77b06344f6 100644 --- a/protocols/Yahoo/user_info.cpp +++ b/protocols/Yahoo/user_info.cpp @@ -122,17 +122,14 @@ INT_PTR __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam ) odp.dwInitParam = ( LPARAM )this; HANDLE hContact = ( HANDLE )lParam; - if ( hContact ) - { + if ( hContact ) { char* szProto = ( char* )CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM ) hContact, 0 ); - if ( szProto != NULL && !strcmp( szProto, m_szModuleName )) - { + if ( szProto != NULL && !strcmp( szProto, m_szModuleName )) { odp.pfnDlgProc = YahooUserInfoDlgProc; odp.position = -1900000000; odp.pszTemplate = MAKEINTRESOURCEA( IDD_USER_INFO ); odp.pszTitle = m_szModuleName; - CallService( MS_USERINFO_ADDPAGE, wParam, ( LPARAM )&odp ); - + UserInfo_AddPage(wParam, &odp); } } -- cgit v1.2.3