From 95eaddd1080bc4278a66afdf0d6bce3f3865ef64 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 28 Jun 2015 14:53:43 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/Forex.cpp | 570 +++++++++++++++++++------------------------ 1 file changed, 255 insertions(+), 315 deletions(-) (limited to 'plugins/Quotes/src') diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 8a857aae89..5f848f8a8d 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -17,323 +17,268 @@ HGENMENU g_hMenuRefresh = NULL; #define DB_STR_AUTO_UPDATE "AutoUpdate" -namespace +typedef std::vector THandles; +THandles g_ahThreads; +HGENMENU g_hEnableDisableMenu; +HANDLE g_hTBButton; + +LPSTR g_pszAutoUpdateCmd = "Quotes/Enable-Disable Auto Update"; +LPSTR g_pszCurrencyConverter = "Quotes/CurrencyConverter"; + +PLUGININFOEX Global_pluginInfo = { - typedef std::vector THandles; - THandles g_ahThreads; - HGENMENU g_hEnableDisableMenu; - HANDLE g_hTBButton; - - LPSTR g_pszAutoUpdateCmd = "Quotes/Enable-Disable Auto Update"; - LPSTR g_pszCurrencyConverter = "Quotes/CurrencyConverter"; - - PLUGININFOEX Global_pluginInfo = - { - sizeof(PLUGININFOEX), - __PLUGIN_NAME, - PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), - __DESCRIPTION, - __AUTHOR, - __AUTHOREMAIL, - __COPYRIGHT, - __AUTHORWEB, - UNICODE_AWARE, - // {E882056D-0D1D-4131-9A98-404CBAEA6A9C} - { 0xe882056d, 0xd1d, 0x4131, { 0x9a, 0x98, 0x40, 0x4c, 0xba, 0xea, 0x6a, 0x9c } } - }; - - void UpdateMenu(bool bAutoUpdate) - { - if (bAutoUpdate) // to enable auto-update - Menu_ModifyItem(g_hEnableDisableMenu, LPGENT("Auto Update Enabled"), Quotes_GetIconHandle(IDI_ICON_MAIN)); - else // to disable auto-update - Menu_ModifyItem(g_hEnableDisableMenu, LPGENT("Auto Update Disabled"), Quotes_GetIconHandle(IDI_ICON_DISABLED)); - - CallService(MS_TTB_SETBUTTONSTATE, reinterpret_cast(g_hTBButton), !bAutoUpdate ? TTBST_PUSHED : 0); - } + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {E882056D-0D1D-4131-9A98-404CBAEA6A9C} + { 0xe882056d, 0xd1d, 0x4131, { 0x9a, 0x98, 0x40, 0x4c, 0xba, 0xea, 0x6a, 0x9c } } +}; + +void UpdateMenu(bool bAutoUpdate) +{ + if (bAutoUpdate) // to enable auto-update + Menu_ModifyItem(g_hEnableDisableMenu, LPGENT("Auto Update Enabled"), Quotes_GetIconHandle(IDI_ICON_MAIN)); + else // to disable auto-update + Menu_ModifyItem(g_hEnableDisableMenu, LPGENT("Auto Update Disabled"), Quotes_GetIconHandle(IDI_ICON_DISABLED)); - INT_PTR QuotesMenu_RefreshAll(WPARAM, LPARAM) - { - const CQuotesProviders::TQuotesProviders& apProviders = CModuleInfo::GetQuoteProvidersPtr()->GetProviders(); - std::for_each(apProviders.begin(), apProviders.end(), boost::bind(&IQuotesProvider::RefreshAllContacts, _1)); - return 0; - } + CallService(MS_TTB_SETBUTTONSTATE, reinterpret_cast(g_hTBButton), !bAutoUpdate ? TTBST_PUSHED : 0); +} - INT_PTR QuotesMenu_EnableDisable(WPARAM, LPARAM) - { - //QuoteProtoFunc_SetStatus(g_bAutoUpdate ? ID_STATUS_OFFLINE : ID_STATUS_ONLINE,0L); - - g_bAutoUpdate = (g_bAutoUpdate) ? false : true; - db_set_b(NULL, QUOTES_MODULE_NAME, DB_STR_AUTO_UPDATE, g_bAutoUpdate); - - const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); - const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); - std::for_each(std::begin(rapProviders), std::end(rapProviders), [](const CQuotesProviders::TQuotesProviderPtr& pProvider) - { - pProvider->RefreshSettings(); - if (g_bAutoUpdate) - { - pProvider->RefreshAllContacts(); - } - }); - UpdateMenu(g_bAutoUpdate); - - return 0; - } +INT_PTR QuotesMenu_RefreshAll(WPARAM, LPARAM) +{ + const CQuotesProviders::TQuotesProviders& apProviders = CModuleInfo::GetQuoteProvidersPtr()->GetProviders(); + std::for_each(apProviders.begin(), apProviders.end(), boost::bind(&IQuotesProvider::RefreshAllContacts, _1)); + return 0; +} - void InitMenu() - { - CLISTMENUITEM mi = { 0 }; - mi.flags = CMIF_TCHAR; - mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Quotes"), 0, Quotes_GetIconHandle(IDI_ICON_MAIN)); - - mi.name.t = LPGENT("Enable/Disable Auto Update"); - mi.position = 10100001; - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); - mi.pszService = g_pszAutoUpdateCmd; - g_hEnableDisableMenu = Menu_AddMainMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_EnableDisable); - UpdateMenu(g_bAutoUpdate); - - mi.name.t = LPGENT("Refresh All Quotes\\Rates"); - mi.position = 20100001; - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); - mi.pszService = "Quotes/RefreshAll"; - Menu_AddMainMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_RefreshAll); - - mi.name.t = LPGENT("Currency Converter..."); - mi.position = 20100002; - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); - mi.pszService = g_pszCurrencyConverter; - Menu_AddMainMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_CurrencyConverter); - - mi.name.t = LPGENT("Export All Quotes"); - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_EXPORT); - mi.pszService = "Quotes/ExportAll"; - mi.position = 20100003; - Menu_AddMainMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_ExportAll); - - mi.name.t = LPGENT("Import All Quotes"); - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_IMPORT); - mi.pszService = "Quotes/ImportAll"; - mi.position = 20100004; - Menu_AddMainMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_ImportAll); - - bool bSubGroups = 1 == ServiceExists(MS_CLIST_MENUBUILDSUBGROUP); - - HookEvent(ME_CLIST_PREBUILDCONTACTMENU, Quotes_PrebuildContactMenu); - - if (bSubGroups) { - CLISTMENUITEM miroot = { 0 }; - miroot.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); - miroot.name.a = QUOTES_PROTOCOL_NAME; - mi.hParentMenu = Menu_AddContactMenuItem(&miroot); +INT_PTR QuotesMenu_EnableDisable(WPARAM, LPARAM) +{ + g_bAutoUpdate = (g_bAutoUpdate) ? false : true; + db_set_b(NULL, QUOTES_MODULE_NAME, DB_STR_AUTO_UPDATE, g_bAutoUpdate); + + const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); + const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); + std::for_each(std::begin(rapProviders), std::end(rapProviders), [](const CQuotesProviders::TQuotesProviderPtr& pProvider) { + pProvider->RefreshSettings(); + if (g_bAutoUpdate) { + pProvider->RefreshAllContacts(); } - else mi.hParentMenu = NULL; - - mi.name.t = LPGENT("Refresh"); - mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_REFRESH); - mi.pszService = "Quotes/RefreshContact"; - g_hMenuRefresh = Menu_AddContactMenuItem(&mi); - Menu_ConfigureItem(g_hMenuRefresh, MCI_OPT_EXECPARAM, INT_PTR(0)); - CreateServiceFunction(mi.pszService, QuotesMenu_RefreshContact); - - mi.name.t = LPGENT("Open Log File..."); - mi.icolibItem = NULL; - mi.pszService = "Quotes/OpenLogFile"; - g_hMenuOpenLogFile = Menu_AddContactMenuItem(&mi); - Menu_ConfigureItem(g_hMenuOpenLogFile, MCI_OPT_EXECPARAM, 1); - CreateServiceFunction(mi.pszService, QuotesMenu_OpenLogFile); + }); + UpdateMenu(g_bAutoUpdate); + + return 0; +} + +void InitMenu() +{ + CLISTMENUITEM mi = { 0 }; + mi.flags = CMIF_TCHAR; + mi.hParentMenu = Menu_CreateRoot(MO_MAIN, LPGENT("Quotes"), 0, Quotes_GetIconHandle(IDI_ICON_MAIN)); + + mi.name.t = LPGENT("Enable/Disable Auto Update"); + mi.position = 10100001; + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); + mi.pszService = g_pszAutoUpdateCmd; + g_hEnableDisableMenu = Menu_AddMainMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_EnableDisable); + UpdateMenu(g_bAutoUpdate); + + mi.name.t = LPGENT("Refresh All Quotes\\Rates"); + mi.position = 20100001; + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); + mi.pszService = "Quotes/RefreshAll"; + Menu_AddMainMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_RefreshAll); + + mi.name.t = LPGENT("Currency Converter..."); + mi.position = 20100002; + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); + mi.pszService = g_pszCurrencyConverter; + Menu_AddMainMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_CurrencyConverter); + + mi.name.t = LPGENT("Export All Quotes"); + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_EXPORT); + mi.pszService = "Quotes/ExportAll"; + mi.position = 20100003; + Menu_AddMainMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_ExportAll); + + mi.name.t = LPGENT("Import All Quotes"); + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_IMPORT); + mi.pszService = "Quotes/ImportAll"; + mi.position = 20100004; + Menu_AddMainMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_ImportAll); + + bool bSubGroups = 1 == ServiceExists(MS_CLIST_MENUBUILDSUBGROUP); + + HookEvent(ME_CLIST_PREBUILDCONTACTMENU, Quotes_PrebuildContactMenu); + + if (bSubGroups) { + CLISTMENUITEM miroot = { 0 }; + miroot.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN); + miroot.name.a = QUOTES_PROTOCOL_NAME; + mi.hParentMenu = Menu_AddContactMenuItem(&miroot, QUOTES_PROTOCOL_NAME); + } + else mi.hParentMenu = NULL; + + mi.name.t = LPGENT("Refresh"); + mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_REFRESH); + mi.pszService = "Quotes/RefreshContact"; + g_hMenuRefresh = Menu_AddContactMenuItem(&mi); + Menu_ConfigureItem(g_hMenuRefresh, MCI_OPT_EXECPARAM, INT_PTR(0)); + CreateServiceFunction(mi.pszService, QuotesMenu_RefreshContact); + + mi.name.t = LPGENT("Open Log File..."); + mi.icolibItem = NULL; + mi.pszService = "Quotes/OpenLogFile"; + g_hMenuOpenLogFile = Menu_AddContactMenuItem(&mi); + Menu_ConfigureItem(g_hMenuOpenLogFile, MCI_OPT_EXECPARAM, 1); + CreateServiceFunction(mi.pszService, QuotesMenu_OpenLogFile); #ifdef CHART_IMPLEMENT - mi.name.t = LPGENT("Chart..."); - mi.popupPosition = 2; - mi.icolibItem = NULL; - mi.pszService = "Quotes/Chart"; - g_hMenuChart = Menu_AddContactMenuItem(&mi); - CreateServiceFunction(mi.pszService, QuotesMenu_Chart); + mi.name.t = LPGENT("Chart..."); + mi.popupPosition = 2; + mi.icolibItem = NULL; + mi.pszService = "Quotes/Chart"; + g_hMenuChart = Menu_AddContactMenuItem(&mi); + CreateServiceFunction(mi.pszService, QuotesMenu_Chart); #endif - mi.name.t = LPGENT("Edit Settings..."); - mi.icolibItem = NULL; - mi.pszService = "Quotes/EditSettings"; - g_hMenuEditSettings = Menu_AddContactMenuItem(&mi); + mi.name.t = LPGENT("Edit Settings..."); + mi.icolibItem = NULL; + mi.pszService = "Quotes/EditSettings"; + g_hMenuEditSettings = Menu_AddContactMenuItem(&mi); #ifdef CHART_IMPLEMENT - Menu_ConfigureItem(g_hMenuEditSettings, MCI_OPT_EXECPARAM, 3); + Menu_ConfigureItem(g_hMenuEditSettings, MCI_OPT_EXECPARAM, 3); #else - Menu_ConfigureItem(g_hMenuEditSettings, MCI_OPT_EXECPARAM, 2); + Menu_ConfigureItem(g_hMenuEditSettings, MCI_OPT_EXECPARAM, 2); #endif - CreateServiceFunction(mi.pszService, QuotesMenu_EditSettings); - } - - int Quotes_OnToolbarLoaded(WPARAM, LPARAM) - { - TTBButton ttb = { sizeof(ttb) }; - ttb.name = LPGEN("Enable/Disable Quotes Auto Update"); - ttb.pszService = g_pszAutoUpdateCmd; - ttb.pszTooltipUp = LPGEN("Quotes Auto Update Enabled"); - ttb.pszTooltipDn = LPGEN("Quotes Auto Update Disabled"); - ttb.hIconHandleUp = Quotes_GetIconHandle(IDI_ICON_MAIN); - ttb.hIconHandleDn = Quotes_GetIconHandle(IDI_ICON_DISABLED); - ttb.dwFlags = ((g_bAutoUpdate) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; - g_hTBButton = TopToolbar_AddButton(&ttb); - - ttb.name = LPGEN("Currency Converter"); - ttb.pszService = g_pszCurrencyConverter; - ttb.pszTooltipUp = LPGEN("Currency Converter"); - ttb.pszTooltipDn = LPGEN("Currency Converter"); - ttb.hIconHandleUp = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); - ttb.hIconHandleDn = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); - ttb.dwFlags = TTBBF_VISIBLE; - TopToolbar_AddButton(&ttb); - - return 0; - } + CreateServiceFunction(mi.pszService, QuotesMenu_EditSettings); +} - int QuotesEventFunc_OnModulesLoaded(WPARAM, LPARAM) - { - CHTTPSession::Init(); +int Quotes_OnToolbarLoaded(WPARAM, LPARAM) +{ + TTBButton ttb = { sizeof(ttb) }; + ttb.name = LPGEN("Enable/Disable Quotes Auto Update"); + ttb.pszService = g_pszAutoUpdateCmd; + ttb.pszTooltipUp = LPGEN("Quotes Auto Update Enabled"); + ttb.pszTooltipDn = LPGEN("Quotes Auto Update Disabled"); + ttb.hIconHandleUp = Quotes_GetIconHandle(IDI_ICON_MAIN); + ttb.hIconHandleDn = Quotes_GetIconHandle(IDI_ICON_DISABLED); + ttb.dwFlags = ((g_bAutoUpdate) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; + g_hTBButton = TopToolbar_AddButton(&ttb); + + ttb.name = LPGEN("Currency Converter"); + ttb.pszService = g_pszCurrencyConverter; + ttb.pszTooltipUp = LPGEN("Currency Converter"); + ttb.pszTooltipDn = LPGEN("Currency Converter"); + ttb.hIconHandleUp = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); + ttb.hIconHandleDn = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER); + ttb.dwFlags = TTBBF_VISIBLE; + TopToolbar_AddButton(&ttb); + + return 0; +} - // HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY,QuotesEventFunc_onExtraImageApply); +int QuotesEventFunc_OnModulesLoaded(WPARAM, LPARAM) +{ + CHTTPSession::Init(); - g_hEventWorkThreadStop = ::CreateEvent(NULL, TRUE, FALSE, NULL); - HookEvent(ME_USERINFO_INITIALISE, QuotesEventFunc_OnUserInfoInit); + // HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY,QuotesEventFunc_onExtraImageApply); - HookEvent(ME_CLIST_DOUBLECLICKED, Quotes_OnContactDoubleClick); + g_hEventWorkThreadStop = ::CreateEvent(NULL, TRUE, FALSE, NULL); + HookEvent(ME_USERINFO_INITIALISE, QuotesEventFunc_OnUserInfoInit); - HookEvent(ME_TTB_MODULELOADED, Quotes_OnToolbarLoaded); + HookEvent(ME_CLIST_DOUBLECLICKED, Quotes_OnContactDoubleClick); - g_bAutoUpdate = 1 == db_get_b(NULL, QUOTES_MODULE_NAME, DB_STR_AUTO_UPDATE, 1); + HookEvent(ME_TTB_MODULELOADED, Quotes_OnToolbarLoaded); - InitMenu(); + g_bAutoUpdate = 1 == db_get_b(NULL, QUOTES_MODULE_NAME, DB_STR_AUTO_UPDATE, 1); - BOOL b = ::ResetEvent(g_hEventWorkThreadStop); - assert(b && "Failed to reset event"); + InitMenu(); - const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); - const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); - for (CQuotesProviders::TQuotesProviders::const_iterator i = rapProviders.begin(); i != rapProviders.end(); ++i) - { - const CQuotesProviders::TQuotesProviderPtr& pProvider = *i; - g_ahThreads.push_back(mir_forkthread(WorkingThread, pProvider.get())); - } + BOOL b = ::ResetEvent(g_hEventWorkThreadStop); + assert(b && "Failed to reset event"); - return 0; + const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); + const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); + for (CQuotesProviders::TQuotesProviders::const_iterator i = rapProviders.begin(); i != rapProviders.end(); ++i) { + const CQuotesProviders::TQuotesProviderPtr& pProvider = *i; + g_ahThreads.push_back(mir_forkthread(WorkingThread, pProvider.get())); } - int QuotesEventFunc_OnContactDeleted(WPARAM wParam, LPARAM) - { - MCONTACT hContact = MCONTACT(wParam); + return 0; +} - const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); - CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact); - if (pProvider) - { - pProvider->DeleteContact(hContact); - } +int QuotesEventFunc_OnContactDeleted(WPARAM wParam, LPARAM) +{ + MCONTACT hContact = MCONTACT(wParam); - return 0; + const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); + CQuotesProviders::TQuotesProviderPtr pProvider = pProviders->GetContactProviderPtr(hContact); + if (pProvider) { + pProvider->DeleteContact(hContact); } - INT_PTR QuoteProtoFunc_GetStatus(WPARAM,LPARAM) - { - return g_bAutoUpdate ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE; - } + return 0; +} - void WaitForWorkingThreads() - { - size_t cThreads = g_ahThreads.size(); - if (cThreads > 0) - { - HANDLE* paHandles = &*(g_ahThreads.begin()); - ::WaitForMultipleObjects((DWORD)cThreads, paHandles, TRUE, INFINITE); - } +INT_PTR QuoteProtoFunc_GetStatus(WPARAM, LPARAM) +{ + return g_bAutoUpdate ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE; +} + +void WaitForWorkingThreads() +{ + size_t cThreads = g_ahThreads.size(); + if (cThreads > 0) { + HANDLE* paHandles = &*(g_ahThreads.begin()); + ::WaitForMultipleObjects((DWORD)cThreads, paHandles, TRUE, INFINITE); } +} - int QuotesEventFunc_PreShutdown(WPARAM, LPARAM) - { - //QuoteProtoFunc_SetStatus(ID_STATUS_OFFLINE,0); - ::SetEvent(g_hEventWorkThreadStop); +int QuotesEventFunc_PreShutdown(WPARAM, LPARAM) +{ + ::SetEvent(g_hEventWorkThreadStop); - CModuleInfo::GetInstance().OnMirandaShutdown(); - return 0; - } + CModuleInfo::GetInstance().OnMirandaShutdown(); + return 0; +} - // INT_PTR QuoteProtoFunc_GetName(WPARAM wParam, LPARAM lParam) - // { - // if(lParam) - // { - // mir_strncpy(reinterpret_cast(lParam),QUOTES_PROTOCOL_NAME,wParam); - // return 0; - // } - // else - // { - // return 1; - // } - // } - // - // INT_PTR QuoteProtoFunc_GetCaps(WPARAM wp,LPARAM lp) - // { - // int ret = 0; - // switch(wp) - // { - // case PFLAGNUM_1: - // ret = PF1_PEER2PEER; - // break; - // case PFLAGNUM_3: - // case PFLAGNUM_2: - // ret = PF2_ONLINE|PF2_LONGAWAY; - // if(CModuleInfo::GetInstance().GetExtendedStatusFlag()) - // { - // ret |= PF2_LIGHTDND; - // } - // break; - // } - // - // return ret; - // } - // - // INT_PTR QuoteProtoFunc_LoadIcon(WPARAM wp,LPARAM /*lp*/) - // { - // if ((wp & 0xffff) == PLI_PROTOCOL) - // { - // return reinterpret_cast(::CopyIcon(Quotes_LoadIconEx(ICON_STR_MAIN))); - // } - // - // return 0; - // } - - int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/) - { - const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); - const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); - - OPTIONSDIALOGPAGE odp = { 0 }; - odp.position = 910000000; - odp.hInstance = g_hInstance; - odp.ptszTitle = _T(QUOTES_PROTOCOL_NAME); - odp.ptszGroup = LPGENT("Network"); - odp.hIcon = Quotes_LoadIconEx(ICON_STR_MAIN); - odp.flags = ODPF_USERINFOTAB | ODPF_TCHAR; - - std::for_each(rapProviders.begin(), rapProviders.end(), boost::bind(&IQuotesProvider::ShowPropertyPage, _1, wp, boost::ref(odp))); - return 0; - } +int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/) +{ + const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); + const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders(); + + OPTIONSDIALOGPAGE odp = { 0 }; + odp.position = 910000000; + odp.hInstance = g_hInstance; + odp.ptszTitle = _T(QUOTES_PROTOCOL_NAME); + odp.ptszGroup = LPGENT("Network"); + odp.hIcon = Quotes_LoadIconEx(ICON_STR_MAIN); + odp.flags = ODPF_USERINFOTAB | ODPF_TCHAR; + + std::for_each(rapProviders.begin(), rapProviders.end(), boost::bind(&IQuotesProvider::ShowPropertyPage, _1, wp, boost::ref(odp))); + return 0; +} - inline int Quotes_DestroyServiceFunction(HANDLE h) - { - return DestroyServiceFunction(h); - } +inline int Quotes_DestroyServiceFunction(HANDLE h) +{ + return DestroyServiceFunction(h); +} - inline int Quotes_UnhookEvent(HANDLE h) - { - return UnhookEvent(h); - } +inline int Quotes_UnhookEvent(HANDLE h) +{ + return UnhookEvent(h); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) @@ -342,50 +287,45 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) return TRUE; } -extern "C" +EXTERN_C __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) - { - return &Global_pluginInfo; - } + return &Global_pluginInfo; +} - int __declspec(dllexport) Load(void) - { - mir_getLP(&Global_pluginInfo); +EXTERN_C int __declspec(dllexport) Load(void) +{ + mir_getLP(&Global_pluginInfo); - if (false == CModuleInfo::Verify()) - { - return 1; - } + if (false == CModuleInfo::Verify()) + return 1; - Quotes_IconsInit(); - Quotes_InitExtraIcons(); + Quotes_IconsInit(); + Quotes_InitExtraIcons(); - PROTOCOLDESCRIPTOR pd = { 0 }; - pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE; - pd.szName = QUOTES_PROTOCOL_NAME; - pd.type = PROTOTYPE_VIRTUAL; - Proto_RegisterModule(&pd); + PROTOCOLDESCRIPTOR pd = { 0 }; + pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE; + pd.szName = QUOTES_PROTOCOL_NAME; + pd.type = PROTOTYPE_VIRTUAL; + Proto_RegisterModule(&pd); - CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETSTATUS, QuoteProtoFunc_GetStatus); + CreateProtoServiceFunction(QUOTES_PROTOCOL_NAME, PS_GETSTATUS, QuoteProtoFunc_GetStatus); - HookEvent(ME_SYSTEM_MODULESLOADED, QuotesEventFunc_OnModulesLoaded); - HookEvent(ME_DB_CONTACT_DELETED, QuotesEventFunc_OnContactDeleted); - HookEvent(ME_SYSTEM_PRESHUTDOWN, QuotesEventFunc_PreShutdown); - HookEvent(ME_OPT_INITIALISE, QuotesEventFunc_OptInitialise); + HookEvent(ME_SYSTEM_MODULESLOADED, QuotesEventFunc_OnModulesLoaded); + HookEvent(ME_DB_CONTACT_DELETED, QuotesEventFunc_OnContactDeleted); + HookEvent(ME_SYSTEM_PRESHUTDOWN, QuotesEventFunc_PreShutdown); + HookEvent(ME_OPT_INITIALISE, QuotesEventFunc_OptInitialise); - CreateServiceFunction(MS_QUOTES_EXPORT, Quotes_Export); - CreateServiceFunction(MS_QUOTES_IMPORT, Quotes_Import); + CreateServiceFunction(MS_QUOTES_EXPORT, Quotes_Export); + CreateServiceFunction(MS_QUOTES_IMPORT, Quotes_Import); - return 0; - } + return 0; +} - __declspec(dllexport) int Unload(void) - { - WaitForWorkingThreads(); +EXTERN_C __declspec(dllexport) int Unload(void) +{ + WaitForWorkingThreads(); - ::CloseHandle(g_hEventWorkThreadStop); + ::CloseHandle(g_hEventWorkThreadStop); - return 0; - } + return 0; } -- cgit v1.2.3