From 2548065ebc5da2a8778cd4f49343b847773ee174 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 15:39:23 +0000 Subject: 'unreferenced formal parameter' warnings fixed git-svn-id: http://svn.miranda-ng.org/main/trunk@14913 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TooltipNotify/src/DbHelpers.cpp | 2 +- plugins/TooltipNotify/src/TooltipNotify.cpp | 729 +++++++++++++--------------- plugins/TooltipNotify/src/Utils.cpp | 2 - plugins/TooltipNotify/src/main.cpp | 4 +- plugins/TooltipNotify/ttnotify.vcxproj | 5 + 5 files changed, 338 insertions(+), 404 deletions(-) (limited to 'plugins/TooltipNotify') diff --git a/plugins/TooltipNotify/src/DbHelpers.cpp b/plugins/TooltipNotify/src/DbHelpers.cpp index ee64d85a3b..4393e44b5a 100644 --- a/plugins/TooltipNotify/src/DbHelpers.cpp +++ b/plugins/TooltipNotify/src/DbHelpers.cpp @@ -6,7 +6,7 @@ typedef std::vector SettingsList; -static int EnumSettingsProc1(const char *pszSetting, LPARAM lParam) +static int EnumSettingsProc1(const char*, LPARAM) { return 0; } diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 08a8e0864f..65eedd0467 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -16,9 +16,9 @@ static const char* SND_OTHER = "ttntfOther"; static const char* SND_TYPING = "ttntfTyping"; static const char* CONTACT_IGNORE_TTNOTIFY = "Ignore"; -static const int ID_TTNTF_STATUS_TYPING = ID_STATUS_INVISIBLE+10; -static const int ID_TTNTF_STATUS_IDLE = ID_STATUS_INVISIBLE+11; -static const int ID_TTNTF_STATUS_NOT_IDLE = ID_STATUS_INVISIBLE+12; +static const int ID_TTNTF_STATUS_TYPING = ID_STATUS_INVISIBLE + 10; +static const int ID_TTNTF_STATUS_IDLE = ID_STATUS_INVISIBLE + 11; +static const int ID_TTNTF_STATUS_NOT_IDLE = ID_STATUS_INVISIBLE + 12; #define FONTSERV_GROUP LPGENT("Tooltip Notify") #define FONTSERV_ONLINE LPGENT("Online") @@ -35,14 +35,14 @@ struct FontEntry char* clrPrefix; }; -static FontEntry s_fontTable[] = +static FontEntry s_fontTable[] = { - ID_STATUS_ONLINE, FONTSERV_ONLINE, "OnlineFont", "OnlineBgColor", - ID_STATUS_OFFLINE, FONTSERV_OFFLINE, "OfflineFont", "OfflineBgColor", - ID_TTNTF_STATUS_TYPING, FONTSERV_TYPING, "TypingFont", "TypingBgColor", - ID_TTNTF_STATUS_IDLE, FONTSERV_IDLE, "IdleFont", "IdleBgColor", - ID_TTNTF_STATUS_NOT_IDLE, FONTSERV_IDLE, "IdleFont", "IdleBgColor", - 0, FONTSERV_OTHER, "OtherFont", "OtherBgColor", + ID_STATUS_ONLINE, FONTSERV_ONLINE, "OnlineFont", "OnlineBgColor", + ID_STATUS_OFFLINE, FONTSERV_OFFLINE, "OfflineFont", "OfflineBgColor", + ID_TTNTF_STATUS_TYPING, FONTSERV_TYPING, "TypingFont", "TypingBgColor", + ID_TTNTF_STATUS_IDLE, FONTSERV_IDLE, "IdleFont", "IdleBgColor", + ID_TTNTF_STATUS_NOT_IDLE, FONTSERV_IDLE, "IdleFont", "IdleBgColor", + 0, FONTSERV_OTHER, "OtherFont", "OtherBgColor", }; CTooltipNotify *CTooltipNotify::s_pInstance = 0; @@ -53,9 +53,9 @@ const char *CTooltipNotify::s_szModuleNameOld = "ttntfmod"; ////////////////////////////////////////////////////////////////////// CTooltipNotify::CTooltipNotify() : - m_bNt50( IsNt50()) +m_bNt50(IsNt50()) { - if (s_pInstance!=0) + if (s_pInstance != 0) throw EAlreadyExists(); s_pInstance = this; @@ -67,38 +67,38 @@ CTooltipNotify::~CTooltipNotify() { EndNotifyAll(); CTooltip::Deinitialize(); - s_pInstance=0; + s_pInstance = 0; } void CTooltipNotify::RegisterFonts() { FontIDT fontId = { sizeof(fontId) }; - _tcsncpy(fontId.group, FONTSERV_GROUP, _countof(fontId.group)-1); - strncpy(fontId.dbSettingsGroup, MODULENAME, _countof(fontId.dbSettingsGroup)-1); + _tcsncpy(fontId.group, FONTSERV_GROUP, _countof(fontId.group) - 1); + strncpy(fontId.dbSettingsGroup, MODULENAME, _countof(fontId.dbSettingsGroup) - 1); fontId.flags = FIDF_DEFAULTVALID; fontId.deffontsettings.colour = DEF_SETTING_TXTCOLOR; fontId.deffontsettings.size = -MulDiv(DEF_SETTING_FONT_SIZE, DEF_LOGPIXELSY, 72); fontId.deffontsettings.style = DEF_SETTING_FONT_STYLE; fontId.deffontsettings.charset = DEF_SETTING_FONT_CHARSET; - _tcsncpy(fontId.deffontsettings.szFace, DEF_SETTING_FONT_FACE, _countof(fontId.deffontsettings.szFace)-1); + _tcsncpy(fontId.deffontsettings.szFace, DEF_SETTING_FONT_FACE, _countof(fontId.deffontsettings.szFace) - 1); fontId.order = 0; - _tcsncpy(fontId.backgroundGroup, FONTSERV_GROUP, _countof(fontId.backgroundGroup)-1); + _tcsncpy(fontId.backgroundGroup, FONTSERV_GROUP, _countof(fontId.backgroundGroup) - 1); ColourIDT colorId = { sizeof(colorId) }; - _tcsncpy(colorId.group, FONTSERV_GROUP, _countof(colorId.group)-1); - strncpy(colorId.dbSettingsGroup, MODULENAME, _countof(colorId.dbSettingsGroup)-1); + _tcsncpy(colorId.group, FONTSERV_GROUP, _countof(colorId.group) - 1); + strncpy(colorId.dbSettingsGroup, MODULENAME, _countof(colorId.dbSettingsGroup) - 1); colorId.flags = 0; colorId.defcolour = DEF_SETTING_BGCOLOR; colorId.order = 0; - for (int i=0; i<_countof(s_fontTable); i++) { - _tcsncpy(fontId.name, s_fontTable[i].name, _countof(fontId.name)-1); - strncpy(fontId.prefix, s_fontTable[i].fontPrefix, _countof(fontId.prefix)-1); - _tcsncpy(fontId.backgroundName, s_fontTable[i].name, _countof(fontId.backgroundName)-1); + for (int i = 0; i < _countof(s_fontTable); i++) { + _tcsncpy(fontId.name, s_fontTable[i].name, _countof(fontId.name) - 1); + strncpy(fontId.prefix, s_fontTable[i].fontPrefix, _countof(fontId.prefix) - 1); + _tcsncpy(fontId.backgroundName, s_fontTable[i].name, _countof(fontId.backgroundName) - 1); ::FontRegisterT(&fontId); - _tcsncpy(colorId.name, s_fontTable[i].name, _countof(colorId.name)-1); - strncpy(colorId.setting, s_fontTable[i].clrPrefix, _countof(colorId.setting)-1); + _tcsncpy(colorId.name, s_fontTable[i].name, _countof(colorId.name) - 1); + strncpy(colorId.setting, s_fontTable[i].clrPrefix, _countof(colorId.setting) - 1); ::ColourRegisterT(&colorId); } } @@ -106,24 +106,21 @@ void CTooltipNotify::RegisterFonts() void CTooltipNotify::GetFont(int iStatus, LOGFONT* lf, COLORREF* text, COLORREF* bg) { TCHAR* fontName = 0; - for(int i=0; i<_countof(s_fontTable); i++) - { - if (s_fontTable[i].status == iStatus) - { + for (int i = 0; i < _countof(s_fontTable); i++) { + if (s_fontTable[i].status == iStatus) { fontName = s_fontTable[i].name; } } - if (fontName == 0) - { - fontName = s_fontTable[_countof(s_fontTable)-1].name; + if (fontName == 0) { + fontName = s_fontTable[_countof(s_fontTable) - 1].name; } // name and group only FontIDT fontId = { sizeof(fontId), FONTSERV_GROUP, 0 }; - _tcsncpy(fontId.name, fontName,_countof(fontId.name)-1); + _tcsncpy(fontId.name, fontName, _countof(fontId.name) - 1); *text = (COLORREF)::CallService(MS_FONT_GETT, (WPARAM)&fontId, (LPARAM)lf); ColourIDT colorId = { sizeof(colorId), FONTSERV_GROUP, 0 }; - _tcsncpy(colorId.name, fontName,_countof(colorId.name)-1); + _tcsncpy(colorId.name, fontName, _countof(colorId.name) - 1); *bg = (COLORREF)::CallService(MS_COLOUR_GETT, (WPARAM)&colorId, 0); } @@ -133,20 +130,19 @@ int CTooltipNotify::ModulesLoaded(WPARAM, LPARAM) LoadSettings(); ValidateSettings(); - if (m_sOptions.bFirstRun) - { + if (m_sOptions.bFirstRun) { db_set_b(NULL, "SkinSoundsOff", SND_ONLINE, 1); db_set_b(NULL, "SkinSoundsOff", SND_OFFLINE, 1); db_set_b(NULL, "SkinSoundsOff", SND_OTHER, 1); db_set_b(NULL, "SkinSoundsOff", SND_TYPING, 1); db_set_b(NULL, MODULENAME, "firstrun", 0); } - + // register fonts - SkinAddNewSound(SND_ONLINE, LPGEN("Tooltip Notify: Online"), "online.wav"); + SkinAddNewSound(SND_ONLINE, LPGEN("Tooltip Notify: Online"), "online.wav"); SkinAddNewSound(SND_OFFLINE, LPGEN("Tooltip Notify: Offline"), "offline.wav"); - SkinAddNewSound(SND_OTHER, LPGEN("Tooltip Notify: Other"), "other.wav"); - SkinAddNewSound(SND_TYPING, LPGEN("Tooltip Notify: Typing"), "typing.wav"); + SkinAddNewSound(SND_OTHER, LPGEN("Tooltip Notify: Other"), "other.wav"); + SkinAddNewSound(SND_TYPING, LPGEN("Tooltip Notify: Typing"), "typing.wav"); RegisterFonts(); @@ -160,7 +156,7 @@ int CTooltipNotify::ProtoContactIsTyping(WPARAM hContact, LPARAM lParam) if (lParam > 0) { STooltipData *pTooltipData = new STooltipData; - pTooltipData->uiTimeout = lParam*1000; + pTooltipData->uiTimeout = lParam * 1000; pTooltipData->hContact = hContact; pTooltipData->iStatus = ID_TTNTF_STATUS_TYPING; @@ -176,29 +172,26 @@ int CTooltipNotify::ProtoContactIsTyping(WPARAM hContact, LPARAM lParam) int CTooltipNotify::ProtoAck(WPARAM, LPARAM lParam) { - ACKDATA *ack=(ACKDATA*)lParam; - if((ack == NULL) || (ack->type != ACKTYPE_STATUS)) return 0; + ACKDATA *ack = (ACKDATA*)lParam; + if ((ack == NULL) || (ack->type != ACKTYPE_STATUS)) return 0; WORD wNewStatus = (WORD)ack->lParam; WORD wOldStatus = (WORD)ack->hProcess; if (wOldStatus == wNewStatus) return 0; //Useless message. char *szProtocol = (char *)ack->szModule; - - if (wNewStatus == ID_STATUS_OFFLINE) - { - BYTE bProtoActive = db_get_b(NULL, MODULENAME, szProtocol, ProtoUserBit|ProtoIntBit); + + if (wNewStatus == ID_STATUS_OFFLINE) { + BYTE bProtoActive = db_get_b(NULL, MODULENAME, szProtocol, ProtoUserBit | ProtoIntBit); bProtoActive &= ~ProtoIntBit; db_set_b(NULL, MODULENAME, szProtocol, bProtoActive); } - else - { - if (wOldStatus < ID_STATUS_ONLINE && wNewStatus > ID_STATUS_OFFLINE) - { - UINT_PTR idTimer = SetTimer(0, 0, m_sOptions.wStartupDelay*1000, ConnectionTimerProcWrapper); + else { + if (wOldStatus < ID_STATUS_ONLINE && wNewStatus > ID_STATUS_OFFLINE) { + UINT_PTR idTimer = SetTimer(0, 0, m_sOptions.wStartupDelay * 1000, ConnectionTimerProcWrapper); ProtoData protoData = { _strdup(szProtocol), idTimer }; m_mapTimerIdProto.push_back(protoData); - } + } } return 0; @@ -209,19 +202,19 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; if (!hContact) return 0; - + bool idle = false; - if (mir_strcmp(cws->szSetting,"Status")==0) + if (mir_strcmp(cws->szSetting, "Status") == 0) idle = false; - else if (mir_strcmp(cws->szSetting,"IdleTS")==0) + else if (mir_strcmp(cws->szSetting, "IdleTS") == 0) idle = true; else return 0; - - if(db_get_b(hContact, "CList", "Hidden", 0)) + + if (db_get_b(hContact, "CList", "Hidden", 0)) return 0; - + const char *pszProto = cws->szModule; - if (db_get_b(NULL, MODULENAME, pszProto, ProtoUserBit|ProtoIntBit) != (ProtoUserBit|ProtoIntBit)) + if (db_get_b(NULL, MODULENAME, pszProto, ProtoUserBit | ProtoIntBit) != (ProtoUserBit | ProtoIntBit)) return 0; if (db_get_b(hContact, "CList", "NotOnList", 0) && m_sOptions.bIgnoreUnknown) @@ -233,41 +226,40 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (idle && !m_sOptions.bIdle) return 0; - WORD wNewStatus = cws->value.wVal; - switch(wNewStatus) - { - case ID_STATUS_OFFLINE: - if (!m_sOptions.bOffline) return 0; - SkinPlaySound(SND_OFFLINE); - break; - - case ID_STATUS_ONLINE: - if(CallService(MS_IGNORE_ISIGNORED,hContact,IGNOREEVENT_USERONLINE) && m_sOptions.bConjSOLN) return 0; - if (!m_sOptions.bOnline) return 0; - SkinPlaySound(SND_ONLINE); - break; - - default: - if (!m_sOptions.bOther) return 0; - SkinPlaySound(SND_OTHER); - break; + WORD wNewStatus = cws->value.wVal; + switch (wNewStatus) { + case ID_STATUS_OFFLINE: + if (!m_sOptions.bOffline) return 0; + SkinPlaySound(SND_OFFLINE); + break; + + case ID_STATUS_ONLINE: + if (CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_USERONLINE) && m_sOptions.bConjSOLN) return 0; + if (!m_sOptions.bOnline) return 0; + SkinPlaySound(SND_ONLINE); + break; + + default: + if (!m_sOptions.bOther) return 0; + SkinPlaySound(SND_OTHER); + break; } STooltipData *pTooltipData = new STooltipData; - pTooltipData->uiTimeout = m_sOptions.wDuration * (wNewStatus==ID_STATUS_ONLINE ? (m_sOptions.bX2+1):1); + pTooltipData->uiTimeout = m_sOptions.wDuration * (wNewStatus == ID_STATUS_ONLINE ? (m_sOptions.bX2 + 1) : 1); pTooltipData->hContact = hContact; - - if (idle) wNewStatus = (wNewStatus!=0 ? ID_TTNTF_STATUS_IDLE : ID_TTNTF_STATUS_NOT_IDLE); + + if (idle) wNewStatus = (wNewStatus != 0 ? ID_TTNTF_STATUS_IDLE : ID_TTNTF_STATUS_NOT_IDLE); pTooltipData->iStatus = wNewStatus; EndNotifyAll(); BeginNotify(pTooltipData); - return 0; + return 0; } -int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam) +int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; @@ -284,10 +276,10 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam) CTooltip *CTooltipNotify::BeginNotify(STooltipData *pTooltipData) { - TCHAR szTooltipText[64] = {0}; + TCHAR szTooltipText[64] = { 0 }; MakeTooltipString(pTooltipData->hContact, pTooltipData->iStatus, szTooltipText, 64); - LOGFONT lf = {0}; + LOGFONT lf = { 0 }; COLORREF textColor = 0; COLORREF bgColor = 0; GetFont(pTooltipData->iStatus, &lf, &textColor, &bgColor); @@ -307,7 +299,7 @@ CTooltip *CTooltipNotify::BeginNotify(STooltipData *pTooltipData) pTooltip->get_Rect(&TooltipRect); if (m_sOptions.bAutoPos || Utils_RestoreWindowPosition(pTooltip->GetHandle(), 0, MODULENAME, "toolwindow", RWPF_NOSIZE | RWPF_NOACTIVATE)) - pTooltip->set_Position(WorkAreaRect.right - 10 - (TooltipRect.right-TooltipRect.left), WorkAreaRect.bottom - 2 - (TooltipRect.bottom-TooltipRect.top)); + pTooltip->set_Position(WorkAreaRect.right - 10 - (TooltipRect.right - TooltipRect.left), WorkAreaRect.bottom - 2 - (TooltipRect.bottom - TooltipRect.top)); UINT_PTR idTimer = SetTimer(0, 0, pTooltipData->uiTimeout, TooltipTimerProcWrapper); pTooltipData->idTimer = idTimer; @@ -344,15 +336,12 @@ void CTooltipNotify::EndNotifyAll() // iterate through active tooltips and // remove one which do not have its timer suspended TooltipsList::reverse_iterator mapRevIter = m_TooltipsList.rbegin(); - while (mapRevIter != m_TooltipsList.rend()) - { + while (mapRevIter != m_TooltipsList.rend()) { STooltipData* pTooltipData = *mapRevIter; - if (EndNotify(pTooltipData)) - { + if (EndNotify(pTooltipData)) { mapRevIter = m_TooltipsList.rbegin(); } - else - { + else { ++mapRevIter; } } @@ -361,12 +350,10 @@ void CTooltipNotify::EndNotifyAll() CTooltipNotify::MapTimerIdProtoIter CTooltipNotify::FindProtoByTimer(UINT idTimer) { for ( - MapTimerIdProtoIter iter = m_mapTimerIdProto.begin(); - iter != m_mapTimerIdProto.end(); - ++iter) - { - if (iter->timerId == idTimer) - { + MapTimerIdProtoIter iter = m_mapTimerIdProto.begin(); + iter != m_mapTimerIdProto.end(); + ++iter) { + if (iter->timerId == idTimer) { return iter; } } @@ -374,15 +361,15 @@ CTooltipNotify::MapTimerIdProtoIter CTooltipNotify::FindProtoByTimer(UINT idTime return m_mapTimerIdProto.end(); } -void CTooltipNotify::OnConnectionTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CTooltipNotify::OnConnectionTimer(HWND, UINT, UINT_PTR idEvent, DWORD) { BOOL bSuccess = KillTimer(0, idEvent); assert(bSuccess); MapTimerIdProtoIter iter = FindProtoByTimer(idEvent); - assert(iter!=m_mapTimerIdProto.end()); - - BYTE bProtoActive = db_get_b(NULL, MODULENAME, iter->proto, ProtoUserBit|ProtoIntBit); + assert(iter != m_mapTimerIdProto.end()); + + BYTE bProtoActive = db_get_b(NULL, MODULENAME, iter->proto, ProtoUserBit | ProtoIntBit); bProtoActive |= ProtoIntBit; db_set_b(NULL, MODULENAME, iter->proto, bProtoActive); @@ -391,10 +378,10 @@ void CTooltipNotify::OnConnectionTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, D } -void CTooltipNotify::OnTooltipTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CTooltipNotify::OnTooltipTimer(HWND, UINT, UINT_PTR idEvent, DWORD) { TooltipsList::iterator iter = FindBy(&STooltipData::idTimer, idEvent); - assert(iter!=m_TooltipsList.end()); + assert(iter != m_TooltipsList.end()); STooltipData* pTooltipData = *iter; EndNotify(pTooltipData); @@ -406,7 +393,7 @@ struct { const char *szOldSetting, *szNewSetting; } -static arSettings[] = +static arSettings[] = { { "xpos", "toolwindowx" }, { "ypos", "toolwindowy" } @@ -414,7 +401,7 @@ static arSettings[] = void CTooltipNotify::MigrateSettings() { - for (int i=0; i < _countof(arSettings); i++) { + for (int i = 0; i < _countof(arSettings); i++) { int val = db_get_w(NULL, MODULENAME, arSettings[i].szOldSetting, -1); if (val != -1) { db_set_w(NULL, MODULENAME, arSettings[i].szNewSetting, val); @@ -426,7 +413,7 @@ void CTooltipNotify::MigrateSettings() ///////////////////////////////////////////////////////////////////////////////////////// void CTooltipNotify::LoadSettings() -{ +{ m_sOptions.bFirstRun = db_get_b(NULL, MODULENAME, "firstrun", DEF_SETTING_FIRSTRUN); m_sOptions.bOffline = db_get_b(NULL, MODULENAME, "offline", DEF_SETTING_OFFLINE); m_sOptions.bOnline = db_get_b(NULL, MODULENAME, "online", DEF_SETTING_ONLINE); @@ -443,9 +430,9 @@ void CTooltipNotify::LoadSettings() m_sOptions.bPrefixProto = db_get_b(NULL, MODULENAME, "prfxproto", DEF_SETTING_PREFIX_PROTO); m_sOptions.bLDblClick = db_get_b(NULL, MODULENAME, "ldblclick", DEF_SETTING_LDBLCLICK); m_sOptions.wDuration = db_get_w(NULL, MODULENAME, "duration", DEF_SETTING_DURATION); - m_sOptions.wStartupDelay = db_get_w(NULL, MODULENAME, "suprconndelay", DEF_SETTING_STARTUP_DELAY); - m_sOptions.bIgnoreUnknown = db_get_b(NULL, MODULENAME, "ignoreunknown", DEF_SETTING_IGNORE_UNKNOWN); - m_sOptions.bIgnoreNew = db_get_b(NULL, MODULENAME, "ignorenew", DEF_SETTING_IGNORE_NEW); + m_sOptions.wStartupDelay = db_get_w(NULL, MODULENAME, "suprconndelay", DEF_SETTING_STARTUP_DELAY); + m_sOptions.bIgnoreUnknown = db_get_b(NULL, MODULENAME, "ignoreunknown", DEF_SETTING_IGNORE_UNKNOWN); + m_sOptions.bIgnoreNew = db_get_b(NULL, MODULENAME, "ignorenew", DEF_SETTING_IGNORE_NEW); } void CTooltipNotify::SaveSettings() @@ -473,27 +460,27 @@ void CTooltipNotify::SaveSettings() void CTooltipNotify::ReadSettingsFromDlg(HWND hDlg) { - m_sOptions.bOffline = (BYTE)(IsDlgButtonChecked(hDlg, IDC_OFFLINE) == BST_CHECKED ? 1:0); - m_sOptions.bOnline = (BYTE)(IsDlgButtonChecked(hDlg, IDC_ONLINE) == BST_CHECKED ? 1:0); - m_sOptions.bOther = (BYTE)(IsDlgButtonChecked(hDlg, IDC_OTHER) == BST_CHECKED ? 1:0); - m_sOptions.bTyping = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TYPING) == BST_CHECKED ? 1:0); - m_sOptions.bIdle = (BYTE)(IsDlgButtonChecked(hDlg, IDC_IDLE) == BST_CHECKED ? 1:0); - m_sOptions.bX2 = (BYTE)(IsDlgButtonChecked(hDlg, IDC_X2) == BST_CHECKED ? 1:0); - m_sOptions.bConjSOLN = (BYTE)(IsDlgButtonChecked(hDlg, IDC_CONJSOLN) == BST_CHECKED ? 1:0); - m_sOptions.bAutoPos = (BYTE)(IsDlgButtonChecked(hDlg, IDC_AUTOPOS) == BST_CHECKED ? 1:0); - m_sOptions.bBallonTip = (BYTE)(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED ? 1:0); - m_sOptions.bTransp = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED ? 1:0); - m_sOptions.bAlpha = (BYTE)SendDlgItemMessage(hDlg,IDC_TRANSPARENCY_SLIDER,TBM_GETPOS,0,0); - m_sOptions.bTranspInput = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED ? 1:0); - m_sOptions.bPrefixProto = (BYTE)(IsDlgButtonChecked(hDlg, IDC_PREFIX_PROTO) == BST_CHECKED ? 1:0); - m_sOptions.bLDblClick = (BYTE)(IsDlgButtonChecked(hDlg, IDC_RB_CLIST) == BST_CHECKED) ? SHOW_HIDE_CLIST:OPEN_MSGDLG; + m_sOptions.bOffline = (BYTE)(IsDlgButtonChecked(hDlg, IDC_OFFLINE) == BST_CHECKED ? 1 : 0); + m_sOptions.bOnline = (BYTE)(IsDlgButtonChecked(hDlg, IDC_ONLINE) == BST_CHECKED ? 1 : 0); + m_sOptions.bOther = (BYTE)(IsDlgButtonChecked(hDlg, IDC_OTHER) == BST_CHECKED ? 1 : 0); + m_sOptions.bTyping = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TYPING) == BST_CHECKED ? 1 : 0); + m_sOptions.bIdle = (BYTE)(IsDlgButtonChecked(hDlg, IDC_IDLE) == BST_CHECKED ? 1 : 0); + m_sOptions.bX2 = (BYTE)(IsDlgButtonChecked(hDlg, IDC_X2) == BST_CHECKED ? 1 : 0); + m_sOptions.bConjSOLN = (BYTE)(IsDlgButtonChecked(hDlg, IDC_CONJSOLN) == BST_CHECKED ? 1 : 0); + m_sOptions.bAutoPos = (BYTE)(IsDlgButtonChecked(hDlg, IDC_AUTOPOS) == BST_CHECKED ? 1 : 0); + m_sOptions.bBallonTip = (BYTE)(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED ? 1 : 0); + m_sOptions.bTransp = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED ? 1 : 0); + m_sOptions.bAlpha = (BYTE)SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_GETPOS, 0, 0); + m_sOptions.bTranspInput = (BYTE)(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED ? 1 : 0); + m_sOptions.bPrefixProto = (BYTE)(IsDlgButtonChecked(hDlg, IDC_PREFIX_PROTO) == BST_CHECKED ? 1 : 0); + m_sOptions.bLDblClick = (BYTE)(IsDlgButtonChecked(hDlg, IDC_RB_CLIST) == BST_CHECKED) ? SHOW_HIDE_CLIST : OPEN_MSGDLG; m_sOptions.wDuration = LOWORD(SendDlgItemMessage(hDlg, IDC_DURATIONSPIN, UDM_GETPOS, 0, 0)); - m_sOptions.wStartupDelay = LOWORD(SendDlgItemMessage(hDlg, IDC_DELAYONCONNSPIN, UDM_GETPOS, 0, 0)); + m_sOptions.wStartupDelay = LOWORD(SendDlgItemMessage(hDlg, IDC_DELAYONCONNSPIN, UDM_GETPOS, 0, 0)); } void CTooltipNotify::WriteSettingsToDlg(HWND hDlg) { - SendDlgItemMessage(hDlg, IDC_DURATIONSPIN, UDM_SETRANGE, 0, MAKELONG(550*36, 550)); + SendDlgItemMessage(hDlg, IDC_DURATIONSPIN, UDM_SETRANGE, 0, MAKELONG(550 * 36, 550)); SendDlgItemMessage(hDlg, IDC_DURATIONSPIN, UDM_SETPOS, 0, MAKELONG(m_sOptions.wDuration, 0)); SendDlgItemMessage(hDlg, IDC_DELAYONCONNSPIN, UDM_SETRANGE, 0, MAKELONG(30, 0)); SendDlgItemMessage(hDlg, IDC_DELAYONCONNSPIN, UDM_SETPOS, 0, MAKELONG(m_sOptions.wStartupDelay, 0)); @@ -511,11 +498,10 @@ void CTooltipNotify::WriteSettingsToDlg(HWND hDlg) CheckDlgButton(hDlg, IDC_TRANSPARENCY, m_sOptions.bTransp ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hDlg, IDC_TRANSP_INPUT, m_sOptions.bTranspInput ? BST_CHECKED : BST_UNCHECKED); - switch(m_sOptions.bLDblClick) - { - case SHOW_HIDE_CLIST: CheckDlgButton(hDlg, IDC_RB_CLIST, BST_CHECKED); break; - case OPEN_MSGDLG: CheckDlgButton(hDlg, IDC_RB_MSGDLG, BST_CHECKED); break; - default: CheckDlgButton(hDlg, IDC_RB_CLIST, BST_CHECKED); break; + switch (m_sOptions.bLDblClick) { + case SHOW_HIDE_CLIST: CheckDlgButton(hDlg, IDC_RB_CLIST, BST_CHECKED); break; + case OPEN_MSGDLG: CheckDlgButton(hDlg, IDC_RB_MSGDLG, BST_CHECKED); break; + default: CheckDlgButton(hDlg, IDC_RB_CLIST, BST_CHECKED); break; } EnableWindow(GetDlgItem(hDlg, IDC_GB_TRANSP), m_bNt50); @@ -523,251 +509,214 @@ void CTooltipNotify::WriteSettingsToDlg(HWND hDlg) EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY_SLIDER), m_sOptions.bTransp && m_bNt50); EnableWindow(GetDlgItem(hDlg, IDC_TRANSPERC), m_sOptions.bTransp && m_bNt50); EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), m_sOptions.bTransp && m_bNt50); - //EnableWindow(GetDlgItem(hDlg, IDC_GB_DBLCLICK), m_sOptions.bTranspInput); EnableWindow(GetDlgItem(hDlg, IDC_RB_CLIST), !m_sOptions.bTranspInput); EnableWindow(GetDlgItem(hDlg, IDC_RB_MSGDLG), !m_sOptions.bTranspInput); - SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_SETRANGE, FALSE, MAKELONG(1,255)); + SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_SETRANGE, FALSE, MAKELONG(1, 255)); SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_SETPOS, TRUE, m_sOptions.bAlpha); } - void CTooltipNotify::ValidateSettings() { - if (m_sOptions.wStartupDelay>30) m_sOptions.wStartupDelay=30; - if (m_sOptions.wDuration>550*36) m_sOptions.wDuration=550*36; - if (m_sOptions.wDuration<550*1) m_sOptions.wDuration=550*1; - if (!m_sOptions.bTransp) m_sOptions.bTranspInput=0; + if (m_sOptions.wStartupDelay > 30) m_sOptions.wStartupDelay = 30; + if (m_sOptions.wDuration > 550 * 36) m_sOptions.wDuration = 550 * 36; + if (m_sOptions.wDuration < 550 * 1) m_sOptions.wDuration = 550 * 1; + if (!m_sOptions.bTransp) m_sOptions.bTranspInput = 0; } - // main options dialog BOOL CTooltipNotify::OptionsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_INITDIALOG: - { - TranslateDialogDefault(hDlg); - WriteSettingsToDlg(hDlg); - SendMessage(hDlg, WM_HSCROLL, 0x12345678, 0); +{ + switch (msg) { + case WM_INITDIALOG: + TranslateDialogDefault(hDlg); + WriteSettingsToDlg(hDlg); + SendMessage(hDlg, WM_HSCROLL, 0x12345678, 0); + return TRUE; + + case WM_VSCROLL: + case WM_HSCROLL: + TCHAR str[10]; + mir_sntprintf(str, _countof(str), _T("%d%%"), 100 * SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_GETPOS, 0, 0) / 255); + SetDlgItemText(hDlg, IDC_TRANSPERC, str); + if (wParam != 0x12345678) + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDC_TRANSPARENCY: + EnableWindow(GetDlgItem(hDlg, IDC_TRANSPERC), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY_SLIDER), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); + CheckDlgButton(hDlg, IDC_TRANSP_INPUT, IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED ? (m_sOptions.bTranspInput ? BST_CHECKED : BST_UNCHECKED) : BST_UNCHECKED); + SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(IDC_TRANSP_INPUT, 0), 0); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; - return TRUE; - } + case IDC_TRANSP_INPUT: + //EnableWindow(GetDlgItem(hDlg,IDC_GB_DBLCLICK), IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT)); + EnableWindow(GetDlgItem(hDlg, IDC_RB_CLIST), !(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_RB_MSGDLG), !(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED)); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; - case WM_VSCROLL: - case WM_HSCROLL: - { - TCHAR str[10]; - mir_sntprintf(str, _countof(str), _T("%d%%"), 100 * SendDlgItemMessage(hDlg, IDC_TRANSPARENCY_SLIDER, TBM_GETPOS, 0, 0) / 255); - SetDlgItemText(hDlg, IDC_TRANSPERC, str); - if(wParam!=0x12345678) SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - return TRUE; - } + case IDC_BALLONTIP: + EnableWindow(GetDlgItem(hDlg, IDC_DURATION), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_X2), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_RB_CLIST), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_RB_MSGDLG), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + EnableWindow(GetDlgItem(hDlg, IDC_AUTOPOS), !(IsDlgButtonChecked(hDlg, IDC_BALLONTIP) == BST_CHECKED)); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_TRANSPARENCY: - EnableWindow(GetDlgItem(hDlg, IDC_TRANSPERC), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); - EnableWindow(GetDlgItem(hDlg, IDC_TRANSPARENCY_SLIDER), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); - EnableWindow(GetDlgItem(hDlg, IDC_TRANSP_INPUT), IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED); - CheckDlgButton(hDlg, IDC_TRANSP_INPUT, IsDlgButtonChecked(hDlg, IDC_TRANSPARENCY) == BST_CHECKED ? (m_sOptions.bTranspInput ? BST_CHECKED : BST_UNCHECKED) : BST_UNCHECKED); - SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(IDC_TRANSP_INPUT, 0), 0); - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - - case IDC_TRANSP_INPUT: - //EnableWindow(GetDlgItem(hDlg,IDC_GB_DBLCLICK), IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT)); - EnableWindow(GetDlgItem(hDlg,IDC_RB_CLIST), !(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_RB_MSGDLG), !(IsDlgButtonChecked(hDlg, IDC_TRANSP_INPUT) == BST_CHECKED)); - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - - case IDC_BALLONTIP: - EnableWindow(GetDlgItem(hDlg,IDC_DURATION),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_X2),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_RB_CLIST),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_RB_MSGDLG),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_TRANSP_INPUT),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - EnableWindow(GetDlgItem(hDlg,IDC_AUTOPOS),!(IsDlgButtonChecked(hDlg,IDC_BALLONTIP)==BST_CHECKED)); - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - - case IDC_DURATION: - if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) return FALSE; - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - - case IDC_DELAYONCONN: - if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) return FALSE; - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - - case IDC_PREVIEW: - { - STooltipData *pTooltipData = new STooltipData; - pTooltipData->uiTimeout = m_sOptions.wDuration * (m_sOptions.bX2 ? (m_sOptions.bX2+1):1); - pTooltipData->hContact = 0; - pTooltipData->iStatus = ID_STATUS_ONLINE; - - EndNotifyAll(); - BeginNotify(pTooltipData); - break; - } - - case IDC_SEL_PROTO: - DialogBox(g_hInstDLL, MAKEINTRESOURCE(IDD_PROTOS), hDlg, CTooltipNotify::ProtosDlgProcWrapper); - break; - - case IDC_IGNORE: - DialogBox(g_hInstDLL, MAKEINTRESOURCE(IDD_CONTACTS), hDlg, CTooltipNotify::ContactsDlgProcWrapper); - break; - - default: - // activate 'apply' button - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - return TRUE; - } - - return TRUE; - } - - case WM_NOTIFY: - { - //Here we have pressed either the OK or the APPLY button. - switch(((LPNMHDR)lParam)->idFrom) + case IDC_DURATION: + if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) return FALSE; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + + case IDC_DELAYONCONN: + if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) return FALSE; + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + + case IDC_PREVIEW: { - case 0: - switch (((LPNMHDR)lParam)->code) - { - case PSN_APPLY: - ReadSettingsFromDlg(hDlg); - SaveSettings(); - return TRUE; - - } // switch code + STooltipData *pTooltipData = new STooltipData; + pTooltipData->uiTimeout = m_sOptions.wDuration * (m_sOptions.bX2 ? (m_sOptions.bX2 + 1) : 1); + pTooltipData->hContact = 0; + pTooltipData->iStatus = ID_STATUS_ONLINE; + + EndNotifyAll(); + BeginNotify(pTooltipData); break; + } - } //switch idFrom + case IDC_SEL_PROTO: + DialogBox(g_hInstDLL, MAKEINTRESOURCE(IDD_PROTOS), hDlg, CTooltipNotify::ProtosDlgProcWrapper); + break; + + case IDC_IGNORE: + DialogBox(g_hInstDLL, MAKEINTRESOURCE(IDD_CONTACTS), hDlg, CTooltipNotify::ContactsDlgProcWrapper); + break; + default: + // activate 'apply' button + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); return TRUE; } - - default: + return TRUE; + + case WM_NOTIFY: + // Here we have pressed either the OK or the APPLY button. + switch (((LPNMHDR)lParam)->idFrom) { + case 0: + switch (((LPNMHDR)lParam)->code) { + case PSN_APPLY: + ReadSettingsFromDlg(hDlg); + SaveSettings(); + return TRUE; + + } // switch code break; + } //switch idFrom + + return TRUE; } return FALSE; - } - // dialog for protocols selecting -BOOL CTooltipNotify::ProtosDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - - case WM_INITDIALOG: - { - TranslateDialogDefault(hDlg); +BOOL CTooltipNotify::ProtosDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) +{ + switch (msg) { - ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, IDC_PROTOS), LVS_EX_CHECKBOXES); - - // enum protocols currently running - int iProtoCount = 0; - PROTOACCOUNT **ppProtos = 0; - Proto_EnumAccounts(&iProtoCount, &ppProtos); + case WM_INITDIALOG: + TranslateDialogDefault(hDlg); + { + ListView_SetExtendedListViewStyle(GetDlgItem(hDlg, IDC_PROTOS), LVS_EX_CHECKBOXES); - // and fill in the list - for (int i=0; i < iProtoCount; i++) - { - LV_ITEM lvi; + // enum protocols currently running + int iProtoCount = 0; + PROTOACCOUNT **ppProtos = 0; + Proto_EnumAccounts(&iProtoCount, &ppProtos); - lvi.mask = LVIF_TEXT; - lvi.iSubItem = 0; - lvi.iItem = i; - lvi.lParam = i; + // and fill in the list + for (int i = 0; i < iProtoCount; i++) { + LV_ITEM lvi; - WCHAR wszProto[128]; - long lLen = MultiByteToWideChar(CP_ACP, 0, ppProtos[i]->szModuleName, - (int)mir_strlen(ppProtos[i]->szModuleName), wszProto, _countof(wszProto)); - wszProto[lLen] = L'\0'; + lvi.mask = LVIF_TEXT; + lvi.iSubItem = 0; + lvi.iItem = i; + lvi.lParam = i; - lvi.pszText = wszProto; + WCHAR wszProto[128]; + long lLen = MultiByteToWideChar(CP_ACP, 0, ppProtos[i]->szModuleName, + (int)mir_strlen(ppProtos[i]->szModuleName), wszProto, _countof(wszProto)); + wszProto[lLen] = L'\0'; - int new_item = ListView_InsertItem(GetDlgItem(hDlg,IDC_PROTOS),&lvi); + lvi.pszText = wszProto; - BYTE bProtoState = db_get_b(NULL, MODULENAME, ppProtos[i]->szModuleName, ProtoUserBit|ProtoIntBit); - BOOL bProtoEnabled = (bProtoState & ProtoUserBit) != 0; - ListView_SetCheckState(GetDlgItem(hDlg,IDC_PROTOS), i, bProtoEnabled); - } + ListView_InsertItem(GetDlgItem(hDlg, IDC_PROTOS), &lvi); - return TRUE; + BYTE bProtoState = db_get_b(NULL, MODULENAME, ppProtos[i]->szModuleName, ProtoUserBit | ProtoIntBit); + BOOL bProtoEnabled = (bProtoState & ProtoUserBit) != 0; + ListView_SetCheckState(GetDlgItem(hDlg, IDC_PROTOS), i, bProtoEnabled); } + } + return TRUE; - - case WM_COMMAND: - { - if (LOWORD(wParam) == IDOK) - { - int proto_count = ListView_GetItemCount(GetDlgItem(hDlg,IDC_PROTOS)); - - for (int i=0; i < proto_count; i++) - { - TCHAR szProto[64]; - - ListView_GetItemText(GetDlgItem(hDlg,IDC_PROTOS), i, 0, szProto, _countof(szProto)); + case WM_COMMAND: + if (LOWORD(wParam) == IDOK) { + int proto_count = ListView_GetItemCount(GetDlgItem(hDlg, IDC_PROTOS)); - char szMultiByteProto[128]; - long lLen = WideCharToMultiByte(CP_ACP, 0, szProto, (int)mir_tstrlen(szProto), - szMultiByteProto, sizeof(szMultiByteProto), NULL, NULL); - szMultiByteProto[lLen] = '\0'; + for (int i = 0; i < proto_count; i++) { + TCHAR szProto[64]; - BYTE bProtoState = db_get_b(NULL, MODULENAME, szMultiByteProto, ProtoUserBit|ProtoIntBit); + ListView_GetItemText(GetDlgItem(hDlg, IDC_PROTOS), i, 0, szProto, _countof(szProto)); + char szMultiByteProto[128]; + long lLen = WideCharToMultiByte(CP_ACP, 0, szProto, (int)mir_tstrlen(szProto), + szMultiByteProto, sizeof(szMultiByteProto), NULL, NULL); + szMultiByteProto[lLen] = '\0'; - BOOL bProtoEnabled = ListView_GetCheckState(GetDlgItem(hDlg,IDC_PROTOS), i); - bProtoState = bProtoEnabled ? bProtoState|ProtoUserBit : bProtoState&~ProtoUserBit; + BYTE bProtoState = db_get_b(NULL, MODULENAME, szMultiByteProto, ProtoUserBit | ProtoIntBit); - db_set_b(NULL, MODULENAME, szMultiByteProto, bProtoState); - - } - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + BOOL bProtoEnabled = ListView_GetCheckState(GetDlgItem(hDlg, IDC_PROTOS), i); + bProtoState = bProtoEnabled ? bProtoState | ProtoUserBit : bProtoState&~ProtoUserBit; - if (LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + db_set_b(NULL, MODULENAME, szMultiByteProto, bProtoState); - return TRUE; } - case WM_CLOSE: EndDialog(hDlg, LOWORD(wParam)); return TRUE; - - default: - break; + } + + if (LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - } // switch (msg) + return TRUE; - return FALSE; + case WM_CLOSE: + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + return FALSE; } void CTooltipNotify::ResetCList(HWND hwndDlg) { - BOOL b = (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_DISABLEGROUPS && - db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)); - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM) b, 0); + BOOL b = (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_DISABLEGROUPS && + db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM)b, 0); SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0); } @@ -775,30 +724,30 @@ void CTooltipNotify::ResetCList(HWND hwndDlg) void CTooltipNotify::LoadList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown) { if (hItemNew && !m_sOptions.bIgnoreNew) - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItemNew, 1); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItemNew, 1); if (hItemUnknown && !m_sOptions.bIgnoreUnknown) - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItemUnknown, 1); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItemUnknown, 1); for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { - HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); + HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); if (hItem && !db_get_b(hContact, MODULENAME, CONTACT_IGNORE_TTNOTIFY, m_sOptions.bIgnoreNew)) - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItem, 1); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 1); } } void CTooltipNotify::SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown) { if (hItemNew) - m_sOptions.bIgnoreNew = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemNew, 0) ? 0 : 1); + m_sOptions.bIgnoreNew = (BYTE)(SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItemNew, 0) ? 0 : 1); if (hItemUnknown) - m_sOptions.bIgnoreUnknown = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemUnknown, 0) ? 0 : 1); + m_sOptions.bIgnoreUnknown = (BYTE)(SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItemUnknown, 0) ? 0 : 1); for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { - HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); + HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); if (hItem) { - BYTE bChecked = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItem, 0)); + BYTE bChecked = (BYTE)(SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)); db_set_b(hContact, MODULENAME, CONTACT_IGNORE_TTNOTIFY, bChecked ? 0 : 1); } } @@ -806,76 +755,65 @@ void CTooltipNotify::SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown // dialog for ignore tooltip notifications -BOOL CTooltipNotify::ContactsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ +BOOL CTooltipNotify::ContactsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) +{ static HANDLE hItemNew, hItemUnknown; - switch (msg) - { - case WM_INITDIALOG: - { - TranslateDialogDefault(hDlg); - - CLCINFOITEM cii = { 0 }; - cii.cbSize = sizeof(cii); - cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX; - cii.pszText = TranslateT("** New contacts **"); - hItemNew = (HANDLE) SendDlgItemMessage(hDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii); - cii.pszText = TranslateT("** Unknown contacts **"); - hItemUnknown = (HANDLE) SendDlgItemMessage(hDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM) & cii); - - ResetCList(hDlg); - LoadList(hDlg, hItemNew, hItemUnknown); - return TRUE; - } - - - case WM_COMMAND: - { - if (LOWORD(wParam) == IDOK) - { - SaveList(hDlg, hItemNew, hItemUnknown); - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - - if (LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } + switch (msg) { + case WM_INITDIALOG: + TranslateDialogDefault(hDlg); + { + CLCINFOITEM cii = { 0 }; + cii.cbSize = sizeof(cii); + cii.flags = CLCIIF_GROUPFONT | CLCIIF_CHECKBOX; + cii.pszText = TranslateT("** New contacts **"); + hItemNew = (HANDLE)SendDlgItemMessage(hDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii); + cii.pszText = TranslateT("** Unknown contacts **"); + hItemUnknown = (HANDLE)SendDlgItemMessage(hDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)& cii); + + ResetCList(hDlg); + LoadList(hDlg, hItemNew, hItemUnknown); + } + return TRUE; - return TRUE; - } + case WM_COMMAND: + if (LOWORD(wParam) == IDOK) { + SaveList(hDlg, hItemNew, hItemUnknown); + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } - case WM_CLOSE: + if (LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; - - default: - break; + } + + return TRUE; - } // switch (msg) + case WM_CLOSE: + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } return FALSE; } -TCHAR *CTooltipNotify::StatusToString(int iStatus, TCHAR *szStatus, int iBufSize) +TCHAR* CTooltipNotify::StatusToString(int iStatus, TCHAR *szStatus, int iBufSize) { if (iStatus >= ID_STATUS_OFFLINE && iStatus <= ID_STATUS_OUTTOLUNCH) mir_tstrncpy(szStatus, pcli->pfnGetStatusModeDescription(iStatus, 0), iBufSize); else { - switch(iStatus) { - case ID_TTNTF_STATUS_TYPING: + switch (iStatus) { + case ID_TTNTF_STATUS_TYPING: mir_tstrncpy(szStatus, TranslateT("Typing"), iBufSize); break; - case ID_TTNTF_STATUS_IDLE: + case ID_TTNTF_STATUS_IDLE: mir_tstrncpy(szStatus, TranslateT("Idle"), iBufSize); break; - case ID_TTNTF_STATUS_NOT_IDLE: + case ID_TTNTF_STATUS_NOT_IDLE: mir_tstrncpy(szStatus, TranslateT("Not Idle"), iBufSize); break; @@ -887,7 +825,7 @@ TCHAR *CTooltipNotify::StatusToString(int iStatus, TCHAR *szStatus, int iBufSize return szStatus; } -TCHAR *CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR *szString, int iBufSize) +TCHAR* CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR *szString, int iBufSize) { TCHAR szStatus[32]; StatusToString(iStatus, szStatus, _countof(szStatus)); @@ -896,9 +834,9 @@ TCHAR *CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR * const TCHAR *szFormatString = m_sOptions.bPrefixProto ? _T("%s%s%s") : _T("%.0s%.0s%s"); const TCHAR* szIs = TranslateT("is"); - const char* szProto = - hContact==0 ? "Proto" : (char*)::GetContactProto(hContact); - const TCHAR* szContactName = + const char* szProto = + hContact == 0 ? "Proto" : (char*)::GetContactProto(hContact); + const TCHAR* szContactName = (TCHAR *)::pcli->pfnGetContactDisplayName(hContact, 0); memset(szString, 0, iBufSize*sizeof(TCHAR)); @@ -911,7 +849,7 @@ TCHAR *CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR * mir_sntprintf(szString, iBufSize - 1, szFormatString, wszProto, _T(": "), szContactName); - TruncateWithDots(szString, iBufSize-1-mir_tstrlen(szStatus)-mir_tstrlen(szIs)-2); // 2 spaces around szIs + TruncateWithDots(szString, iBufSize - 1 - mir_tstrlen(szStatus) - mir_tstrlen(szIs) - 2); // 2 spaces around szIs mir_sntprintf(szString + mir_tstrlen(szString), iBufSize - 1 - mir_tstrlen(szString), _T(" %s %s"), szIs, szStatus); return szString; @@ -920,13 +858,12 @@ TCHAR *CTooltipNotify::MakeTooltipString(MCONTACT hContact, int iStatus, TCHAR * void CTooltipNotify::OnTooltipDblClicked(CTooltip *pTooltip) { - switch(m_sOptions.bLDblClick) - { - case SHOW_HIDE_CLIST: - ::CallService(MS_CLIST_SHOWHIDE,0,0); - break; + switch (m_sOptions.bLDblClick) { + case SHOW_HIDE_CLIST: + ::CallService(MS_CLIST_SHOWHIDE, 0, 0); + break; - case OPEN_MSGDLG: + case OPEN_MSGDLG: { TooltipsList::iterator iter = FindBy(&STooltipData::pTooltip, pTooltip); STooltipData* pTooltipData = *iter; @@ -935,10 +872,10 @@ void CTooltipNotify::OnTooltipDblClicked(CTooltip *pTooltip) break; } - default: - ::CallService(MS_CLIST_SHOWHIDE,0,0); - break; - } + default: + ::CallService(MS_CLIST_SHOWHIDE, 0, 0); + break; + } } @@ -961,7 +898,7 @@ void CTooltipNotify::OnTooltipEndMove(CTooltip *pTooltip) void CTooltipNotify::SuspendTimer(CTooltip *pTooltip) { TooltipsList::iterator iter = FindBy(&STooltipData::pTooltip, pTooltip); - assert(iter!=m_TooltipsList.end()); + assert(iter != m_TooltipsList.end()); STooltipData* pTooltipData = *iter; @@ -974,27 +911,21 @@ void CTooltipNotify::SuspendTimer(CTooltip *pTooltip) void CTooltipNotify::ResumeTimer(CTooltip *pTooltip) { TooltipsList::iterator iter = FindBy(&STooltipData::pTooltip, pTooltip); - assert(iter!=m_TooltipsList.end()); + assert(iter != m_TooltipsList.end()); STooltipData* pTooltipData = *iter; - UINT_PTR idTimer = SetTimer(0, 0, pTooltipData->uiTimeout, TooltipTimerProcWrapper); + UINT_PTR idTimer = SetTimer(0, 0, pTooltipData->uiTimeout, TooltipTimerProcWrapper); pTooltipData->idTimer = idTimer; } template CTooltipNotify::TooltipsList::iterator CTooltipNotify::FindBy(T STooltipData::* field, const T& value) { - for ( - TooltipsList::iterator iter = m_TooltipsList.begin(); - iter != m_TooltipsList.end(); - ++iter) - { + for (TooltipsList::iterator iter = m_TooltipsList.begin(); iter != m_TooltipsList.end(); ++iter) { STooltipData *pTooltipData = *iter; if (pTooltipData->*field == value) - { return iter; - } } return m_TooltipsList.end(); diff --git a/plugins/TooltipNotify/src/Utils.cpp b/plugins/TooltipNotify/src/Utils.cpp index 0142470143..c0d4a25fc8 100644 --- a/plugins/TooltipNotify/src/Utils.cpp +++ b/plugins/TooltipNotify/src/Utils.cpp @@ -8,8 +8,6 @@ BOOL IsNt50() { WORD wOsVersion = LOWORD(GetVersion()); BYTE bMajorVer = LOBYTE(wOsVersion); - BYTE bMinorVer = HIBYTE(wOsVersion); - return (bMajorVer>=5); } diff --git a/plugins/TooltipNotify/src/main.cpp b/plugins/TooltipNotify/src/main.cpp index 24c2e25929..e32673ce22 100644 --- a/plugins/TooltipNotify/src/main.cpp +++ b/plugins/TooltipNotify/src/main.cpp @@ -27,7 +27,7 @@ CLIST_INTERFACE *pcli; // plugin init/deinit routines //================================================================================ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD, LPVOID) { g_hInstDLL = hInstDLL; return TRUE; @@ -48,7 +48,7 @@ static PLUGININFOEX sPluginInfo = {0x5906a545, 0xf31a, 0x4726, {0xb4, 0x8f, 0x3, 0xa0, 0x9f, 0x6, 0x3, 0x18}} }; -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &sPluginInfo; } diff --git a/plugins/TooltipNotify/ttnotify.vcxproj b/plugins/TooltipNotify/ttnotify.vcxproj index 0bfbcded39..f45cf0abf2 100644 --- a/plugins/TooltipNotify/ttnotify.vcxproj +++ b/plugins/TooltipNotify/ttnotify.vcxproj @@ -25,4 +25,9 @@ + + + Sync + + \ No newline at end of file -- cgit v1.2.3