From f383381b80a3220c9e3b67e86dae5f218b01e33e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 20 Oct 2012 20:34:46 +0000 Subject: - fix for extra icons in modern - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@2004 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_clistint.h | 2 +- plugins/Clist_modern/src/modern_clc.cpp | 509 ++++++++++----------- plugins/Clist_modern/src/modern_clcopts.cpp | 18 +- plugins/Clist_modern/src/modern_clistevents.cpp | 2 +- plugins/Clist_modern/src/modern_clistmenus.cpp | 2 +- plugins/Clist_modern/src/modern_clistmod.cpp | 396 ++++++++-------- plugins/Clist_modern/src/modern_clisttray.cpp | 4 +- plugins/Clist_modern/src/modern_clui.cpp | 8 +- plugins/Clist_modern/src/modern_cluiframes.cpp | 26 +- plugins/Clist_modern/src/modern_rowtemplateopt.cpp | 6 +- plugins/Clist_modern/src/modern_skineditor.cpp | 14 +- plugins/Clist_modern/src/modern_statusbar.cpp | 2 +- .../Clist_modern/src/modern_statusbar_options.cpp | 2 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 2 +- protocols/IcqOscarJ/src/icq_proto.cpp | 7 +- 15 files changed, 466 insertions(+), 534 deletions(-) diff --git a/include/m_clistint.h b/include/m_clistint.h index d678ba5cf3..4508abc41b 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -102,7 +102,7 @@ struct ClcContactBase BYTE flags; union { struct { - WORD iImage; + int iImage; HANDLE hContact; }; struct { diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 2f79f100c1..40bb4a73cc 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -3,8 +3,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-2008 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -73,7 +73,7 @@ static int clcHookModulesLoaded(WPARAM wParam,LPARAM lParam) HookEvent(ME_MODERNOPT_INITIALIZE,ModernSkinOptInit); if (ServiceExists(MS_MC_DISABLEHIDDENGROUP)) - CallService(MS_MC_DISABLEHIDDENGROUP, (WPARAM)TRUE, (LPARAM)0); + CallService(MS_MC_DISABLEHIDDENGROUP, (WPARAM)TRUE, 0); if (ServiceExists(MS_MC_GETPROTOCOLNAME)) g_szMetaModuleName = (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0); @@ -155,7 +155,7 @@ static int clcHookProtoAck(WPARAM wParam,LPARAM lParam) { return ClcDoProtoAck((HANDLE) wParam,(ACKDATA*) lParam); } -static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam) +static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam) { int i; if (MirandaExiting()) return 0; @@ -172,8 +172,8 @@ static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam) g_pAvatarOverlayIcons[i].listID = ImageList_AddIcon(hAvatarOverlays,hIcon); CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)g_pAvatarOverlayIcons[i].name); - hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)g_pStatusOverlayIcons[i].name); - g_pStatusOverlayIcons[i].listID = ImageList_AddIcon(hAvatarOverlays,hIcon); + hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)g_pStatusOverlayIcons[i].name); + g_pStatusOverlayIcons[i].listID = ImageList_AddIcon(hAvatarOverlays,hIcon); CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)g_pStatusOverlayIcons[i].name); } @@ -195,13 +195,13 @@ static int clcHookSettingChanged(WPARAM wParam,LPARAM lParam) if ( !mir_strcmp(cws->szSetting, "Enabled")) pcli->pfnClcBroadcast( INTM_RELOADOPTIONS, wParam, lParam); } - else if ( !mir_strcmp(cws->szModule, "CListGroups")) + else if ( !mir_strcmp(cws->szModule, "CListGroups")) { pcli->pfnClcBroadcast( INTM_GROUPSCHANGED,wParam,lParam); } else if ( !strcmp(cws->szSetting,"XStatusId") || !strcmp(cws->szSetting,"XStatusName")) { - CLUIServices_ProtocolStatusChanged(0,(LPARAM)cws->szModule); + CLUIServices_ProtocolStatusChanged(0,(LPARAM)cws->szModule); } } else // (HANDLE)wParam != NULL @@ -211,30 +211,30 @@ static int clcHookSettingChanged(WPARAM wParam,LPARAM lParam) pcli->pfnClcBroadcast( INTM_STATUSCHANGED,wParam,0); } else if (g_szMetaModuleName && !strcmp(cws->szModule,g_szMetaModuleName)) - { + { if ( !strcmp(cws->szSetting,"Handle")) { - pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED,0,0); + pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED,0,0); } else if ( !strcmp(cws->szSetting,"Default")) { - pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED,0,0); + pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED,0,0); } } else if ( !strcmp(cws->szModule,"UserInfo")) { if ( !strcmp(cws->szSetting,"Timezone")) - pcli->pfnClcBroadcast( INTM_TIMEZONECHANGED,wParam,0); + pcli->pfnClcBroadcast( INTM_TIMEZONECHANGED,wParam,0); } - else if ( !strcmp(cws->szModule,"CList")) + else if ( !strcmp(cws->szModule,"CList")) { - if ( !strcmp(cws->szSetting,"StatusMsg")) - pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED,wParam,0); + if ( !strcmp(cws->szSetting,"StatusMsg")) + pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED,wParam,0); } - else if ( !strcmp(cws->szModule,"ContactPhoto")) + else if ( !strcmp(cws->szModule,"ContactPhoto")) { - if ( !strcmp(cws->szSetting,"File")) + if ( !strcmp(cws->szSetting,"File")) pcli->pfnClcBroadcast( INTM_AVATARCHANGED,wParam,0); } else @@ -256,11 +256,11 @@ static int clcHookSettingChanged(WPARAM wParam,LPARAM lParam) return 0; } -static int clcHookDbEventAdded(WPARAM wParam,LPARAM lParam) +static int clcHookDbEventAdded(WPARAM wParam,LPARAM lParam) { DBEVENTINFO dbei = {0}; g_CluiData.t_now = time(NULL); - if (wParam && lParam) + if (wParam && lParam) { dbei.cbSize = sizeof(dbei); dbei.pBlob = 0; @@ -305,7 +305,7 @@ static int clcProceedDragToScroll(HWND hwnd, int Y) if (GetCapture() != hwnd) clcExitDragToScroll(); dy = StartDragPos-Y; pos = StartScrollPos+dy; - if (pos < 0) + if (pos < 0) pos = 0; SendMessage(hwnd, WM_VSCROLL,MAKEWPARAM(SB_THUMBTRACK,pos),0); return 1; @@ -321,9 +321,9 @@ static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const int nLastFound = -1; if (index == -1) fReturnAsFound = TRUE; group->scanIndex = 0; - for (;;) + for (;;) { - if (group->scanIndex == group->cl.count) + if (group->scanIndex == group->cl.count) { group = group->parent; if (group == NULL) @@ -331,9 +331,9 @@ static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const group->scanIndex++; continue; } - if (group->cl.items[group->scanIndex]->type != CLCIT_DIVIDER) + if (group->cl.items[group->scanIndex]->type != CLCIT_DIVIDER) { - bool found; + bool found; if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) { found = true; } else if (dat->filterSearch) { @@ -345,12 +345,12 @@ static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const } if (found) { struct ClcGroup *contactGroup = group; - int contactScanIndex = group->scanIndex; + int contactScanIndex = group->scanIndex; int foundindex; for (; group; group = group->parent) pcli->pfnSetGroupExpand(hwnd, dat, group, 1); foundindex = pcli->pfnGetRowsPriorTo(&dat->list, contactGroup, contactScanIndex); - if (fReturnAsFound) + if (fReturnAsFound) return foundindex; else if (nLastFound != -1 && fSearchUp && foundindex == index) return nLastFound; @@ -361,9 +361,9 @@ static int clcSearchNextContact(HWND hwnd, struct ClcData *dat, int index, const group = contactGroup; group->scanIndex = contactScanIndex; } - if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) + if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) { - if ( !(dat->exStyle & CLS_EX_QUICKSEARCHVISONLY) || group->cl.items[group->scanIndex]->group->expanded) + if ( !(dat->exStyle & CLS_EX_QUICKSEARCHVISONLY) || group->cl.items[group->scanIndex]->group->expanded) { group = group->cl.items[group->scanIndex]->group; group->scanIndex = 0; @@ -383,7 +383,7 @@ static BOOL clcItemNotHiddenOffline(struct ClcData * dat, struct ClcGroup* group if ( !group) return FALSE; if ( !contact) return FALSE; if (group->hideOffline) return FALSE; - if (g_CluiData.bFilterEffective) return FALSE; + if (g_CluiData.bFilterEffective) return FALSE; if (CLCItems_IsShowOfflineGroup(group)) return TRUE; @@ -417,10 +417,10 @@ static LRESULT clcOnCreate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPar dat->needsResort = 1; dat->MetaIgnoreEmptyExtra = db_get_b(NULL,"CLC","MetaIgnoreEmptyExtra",SETTING_METAIGNOREEMPTYEXTRA_DEFAULT); - dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_MANUALUPDATE)) && + dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_MANUALUPDATE)) && g_szMetaModuleName && db_get_b(NULL,g_szMetaModuleName,"Enabled",1) && ServiceExists(MS_MC_GETDEFAULTCONTACT); - dat->expandMeta = db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT); + dat->expandMeta = db_get_b(NULL,"CLC","MetaExpanding",SETTING_METAEXPANDING_DEFAULT); dat->useMetaIcon = db_get_b(NULL,"CLC","Meta",SETTING_USEMETAICON_DEFAULT); dat->drawOverlayedStatus = db_get_b(NULL,"CLC","DrawOverlayedStatus",SETTING_DRAWOVERLAYEDSTATUS_DEFAULT); g_CluiData.bSortByOrder[0] = db_get_b(NULL,"CList","SortBy1",SETTING_SORTBY1_DEFAULT); @@ -431,15 +431,15 @@ static LRESULT clcOnCreate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPar dat->menuOwnerType = CLCIT_INVALID; //InitDisplayNameCache(&dat->lCLCContactsCache); //LoadCLCOptions(hwnd,dat); - corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); + corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); LoadCLCOptions(hwnd,dat); if ( dat->contact_time_show || dat->second_line_type == TEXT_CONTACT_TIME || dat->third_line_type == TEXT_CONTACT_TIME ) CLUI_SafeSetTimer( hwnd, TIMERID_INVALIDATE, 5000, NULL ); else KillTimer( hwnd, TIMERID_INVALIDATE ); //if (dat->force_in_dialog) - // pcli->pfnRebuildEntireList(hwnd,dat); - TRACE("Create New ClistControl TO END\r\n"); + // pcli->pfnRebuildEntireList(hwnd,dat); + TRACE("Create New ClistControl TO END\r\n"); return 0; } @@ -456,7 +456,7 @@ static LRESULT clcOnCommand(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa if (hit == -1) return 0; if ( contact->type == CLCIT_CONTACT && CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM) contact->hContact)) return 0; - switch (LOWORD(wParam)) + switch (LOWORD(wParam)) { case POPUP_NEWSUBGROUP: if (contact->type != CLCIT_GROUP) @@ -511,7 +511,7 @@ static LRESULT clcOnSize(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam GetClientRect(hwnd, &rc); if (rc.right == 0) return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam);; - + rc.bottom = max ( dat->row_min_heigh, 1 ); //rc.bottom = 8; //rc.right = 8; @@ -552,26 +552,26 @@ static LRESULT clcOnChar(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam { if (wParam == 27 && dat->szQuickSearch[0] == '\0') //escape and not quick search { - // minimize clist + // minimize clist CListMod_HideWindow(pcli->hwndContactList, SW_HIDE); } return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam); } static LRESULT clcOnPaint(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ +{ HDC hdc; PAINTSTRUCT ps; - if (IsWindowVisible(hwnd)) + if (IsWindowVisible(hwnd)) { if ( !g_CluiData.fLayered || GetParent(hwnd) != pcli->hwndContactList) - { + { hdc = BeginPaint(hwnd,&ps); g_clcPainter.cliPaintClc(hwnd,dat,hdc,&ps.rcPaint); EndPaint(hwnd,&ps); } else CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE,(WPARAM)hwnd,0); } - return DefWindowProc(hwnd, msg, wParam, lParam); + return DefWindowProc(hwnd, msg, wParam, lParam); } static LRESULT clcOnEraseBkGround(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -580,26 +580,26 @@ static LRESULT clcOnEraseBkGround(struct ClcData *dat, HWND hwnd, UINT msg, WPAR } static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ +{ int selMoved = 0; int changeGroupExpand = 0; int pageSize; - if (wParam == VK_CONTROL) + if (wParam == VK_CONTROL) return 0; pcli->pfnHideInfoTip(hwnd,dat); - + KillTimer(hwnd,TIMERID_INFOTIP); KillTimer(hwnd,TIMERID_RENAME); - if (CallService(MS_CLIST_MENUPROCESSHOTKEY,wParam,MPCF_CONTACTMENU)) + if (CallService(MS_CLIST_MENUPROCESSHOTKEY,wParam,MPCF_CONTACTMENU)) return 0; - + RECT clRect; GetClientRect(hwnd,&clRect); pageSize = (dat->rowHeight) ? clRect.bottom/dat->rowHeight : 0; - + switch(wParam) { - case VK_DOWN: + case VK_DOWN: case VK_UP: { if (dat->szQuickSearch[0] != '\0' && dat->selection != -1) //get next contact @@ -622,10 +622,10 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa } else { - if (wParam == VK_DOWN) dat->selection++; - if (wParam == VK_UP) dat->selection--; + if (wParam == VK_DOWN) dat->selection++; + if (wParam == VK_UP) dat->selection--; selMoved = 1; break; - } + } } case VK_PRIOR: dat->selection -= pageSize; selMoved = 1; break; case VK_NEXT: dat->selection += pageSize; selMoved = 1; break; @@ -635,14 +635,14 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa case VK_RIGHT: changeGroupExpand = 2; break; case VK_RETURN: pcli->pfnDoSelectionDefaultAction(hwnd,dat); - SetCapture(hwnd); + SetCapture(hwnd); dat->szQuickSearch[0] = 0; if (dat->filterSearch) pcli->pfnSaveStateAndRebuildList(hwnd, dat); return 0; case VK_F2: cliBeginRenameSelection(hwnd,dat); /*SetCapture(hwnd);*/ return 0; case VK_DELETE: pcli->pfnDeleteFromContactList(hwnd,dat); SetCapture(hwnd);return 0; - case VK_ESCAPE: + case VK_ESCAPE: { if ((dat->dragStage&DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) { @@ -654,29 +654,29 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa return 0; } default: - { + { NMKEY nmkey; nmkey.hdr.hwndFrom = hwnd; nmkey.hdr.idFrom = GetDlgCtrlID(hwnd); nmkey.hdr.code = NM_KEYDOWN; nmkey.nVKey = wParam; nmkey.uFlags = HIWORD(lParam); - - if (SendMessage(GetParent(hwnd),WM_NOTIFY,0,(LPARAM)&nmkey)) + + if (SendMessage(GetParent(hwnd),WM_NOTIFY,0,(LPARAM)&nmkey)) { - SetCapture(hwnd); + SetCapture(hwnd); return 0; } } } - if (changeGroupExpand) + if (changeGroupExpand) { int hit; struct ClcContact *contact; struct ClcGroup *group; //dat->szQuickSearch[0] = 0; hit = cliGetRowByIndex(dat,dat->selection,&contact,&group); - if (hit != -1) + if (hit != -1) { if (contact->type == CLCIT_CONTACT && (contact->isSubcontact || contact->SubAllocated>0)) { @@ -687,23 +687,23 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa } else if ( !contact->isSubcontact && contact->SubAllocated>0) { - if (changeGroupExpand == 1 && !contact->SubExpanded) + if (changeGroupExpand == 1 && !contact->SubExpanded) { dat->selection = cliGetRowsPriorTo(&dat->list,group,-1); - selMoved = 1; + selMoved = 1; } else if (changeGroupExpand == 1 && contact->SubExpanded) { - //Contract + //Contract struct ClcContact * ht = NULL; KillTimer(hwnd,TIMERID_SUBEXPAND); contact->SubExpanded = 0; db_set_b(contact->hContact,"CList","Expanded",0); ht = contact; dat->needsResort = 1; - pcli->pfnSortCLC(hwnd,dat,1); + pcli->pfnSortCLC(hwnd,dat,1); cliRecalcScrollBar(hwnd,dat); - hitcontact = NULL; + hitcontact = NULL; } else if (changeGroupExpand == 2 && contact->SubExpanded) { @@ -718,9 +718,9 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa db_set_b(contact->hContact,"CList","Expanded",1); ht = contact; dat->needsResort = 1; - pcli->pfnSortCLC(hwnd,dat,1); + pcli->pfnSortCLC(hwnd,dat,1); cliRecalcScrollBar(hwnd,dat); - if (ht) + if (ht) { int i=0; struct ClcContact *contact2; @@ -732,7 +732,7 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa } } hitcontact = NULL; - } + } } } @@ -754,26 +754,26 @@ static LRESULT clcOnKeyDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa selMoved = 1; } else - { + { pcli->pfnSetGroupExpand(hwnd,dat,contact->group,0); } } else if (changeGroupExpand == 2) - { + { pcli->pfnSetGroupExpand(hwnd,dat,contact->group,1); dat->selection++; selMoved = 1; } else {SetCapture(hwnd);return 0;} }// - // + // } } } else {SetCapture(hwnd);return 0; } } - if (selMoved) + if (selMoved) { //dat->szQuickSearch[0] = 0; if (dat->selection >= pcli->pfnGetGroupContentsCount(&dat->list,1)) @@ -798,7 +798,7 @@ void clcSetDelayTimer( UINT_PTR uIDEvent, HWND hwnd, int nDelay) int delay = nDelay; if ( delay == -1) { - switch ( uIDEvent ) + switch ( uIDEvent ) { case TIMERID_DELAYEDRESORTCLC: delay = 10; break; case TIMERID_RECALCSCROLLBAR: delay = 10; break; @@ -806,7 +806,7 @@ void clcSetDelayTimer( UINT_PTR uIDEvent, HWND hwnd, int nDelay) default: delay = 100; break; } } - CLUI_SafeSetTimer( hwnd, uIDEvent, delay, NULL ); + CLUI_SafeSetTimer( hwnd, uIDEvent, delay, NULL ); } static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -829,7 +829,7 @@ static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); } case TIMERID_SUBEXPAND: - { + { struct ClcContact * ht = NULL; KillTimer(hwnd,TIMERID_SUBEXPAND); if (hitcontact && dat->expandMeta) @@ -841,7 +841,7 @@ static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara } dat->needsResort = 1; - pcli->pfnSortCLC(hwnd,dat,1); + pcli->pfnSortCLC(hwnd,dat,1); cliRecalcScrollBar(hwnd,dat); if (ht) { int i=0; @@ -849,7 +849,7 @@ static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara struct ClcGroup *group; if (FindItem(hwnd,dat,hitcontact->hContact,&contact,&group,NULL,FALSE)) { - i = cliGetRowsPriorTo(&dat->list,group,GetContactIndex(group,contact)); + i = cliGetRowsPriorTo(&dat->list,group,GetContactIndex(group,contact)); pcli->pfnEnsureVisible(hwnd,dat,i+hitcontact->SubAllocated,0); } } @@ -858,8 +858,8 @@ static LRESULT clcOnTimer(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPara } case TIMERID_DELAYEDRESORTCLC: TRACE("Do sort on Timer\n"); - KillTimer(hwnd,TIMERID_DELAYEDRESORTCLC); - pcli->pfnSortCLC(hwnd,dat,1); + KillTimer(hwnd,TIMERID_DELAYEDRESORTCLC); + pcli->pfnSortCLC(hwnd,dat,1); pcli->pfnInvalidateRect(hwnd,NULL,FALSE); return 0; @@ -889,50 +889,50 @@ static LRESULT clcOnActivate(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wP } static LRESULT clcOnSetCursor(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - int lResult; - - if ( !CLUI_IsInMainWindow(hwnd)) + int lResult; + + if ( !CLUI_IsInMainWindow(hwnd)) return DefWindowProc(hwnd,msg,wParam,lParam); - - if (g_CluiData.nBehindEdgeState>0) + + if (g_CluiData.nBehindEdgeState>0) CLUI_ShowFromBehindEdge(); - - if (g_CluiData.bBehindEdgeSettings) + + if (g_CluiData.bBehindEdgeSettings) CLUI_UpdateTimer(0); - lResult = CLUI_TestCursorOnBorders(); + lResult = CLUI_TestCursorOnBorders(); return lResult ? lResult : DefWindowProc(hwnd,msg,wParam,lParam); } static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - { + { POINT pt; int k = 0; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); ClientToScreen(hwnd,&pt); k = CLUI_SizingOnBorder(pt,0); - if (k) - { + if (k) + { int io = dat->iHotTrack; dat->iHotTrack = 0; - if (dat->exStyle&CLS_EX_TRACKSELECT) + if (dat->exStyle&CLS_EX_TRACKSELECT) { pcli->pfnInvalidateItem(hwnd,dat,io); } - if (k && GetCapture() == hwnd) + if (k && GetCapture() == hwnd) { SendMessage(GetParent(hwnd),WM_PARENTNOTIFY,WM_LBUTTONDOWN,lParam); } return FALSE; } } - { + { struct ClcContact *contact; struct ClcGroup *group; int hit; DWORD hitFlags; - fMouseUpped = FALSE; + fMouseUpped = FALSE; pcli->pfnHideInfoTip(hwnd,dat); KillTimer(hwnd,TIMERID_INFOTIP); KillTimer(hwnd,TIMERID_RENAME); @@ -944,9 +944,9 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM //dat->szQuickSearch[0] = 0; hit = cliHitTest(hwnd,dat,(short)LOWORD(lParam),(short)HIWORD(lParam),&contact,&group,&hitFlags); if (GetFocus() != hwnd) SetFocus(hwnd); - if (hit != -1 && !(hitFlags&CLCHT_NOWHERE)) + if (hit != -1 && !(hitFlags&CLCHT_NOWHERE)) { - if ( hit == dat->selection && hitFlags&CLCHT_ONITEMLABEL && dat->exStyle&CLS_EX_EDITLABELS) + if ( hit == dat->selection && hitFlags&CLCHT_ONITEMLABEL && dat->exStyle&CLS_EX_EDITLABELS) { if ( !(dat->dragStage&DRAGSTAGEF_SKIPRENAME)) { @@ -965,18 +965,18 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM } } if (hit != -1 && !(hitFlags&CLCHT_NOWHERE) && contact->type == CLCIT_CONTACT && contact->SubAllocated && !contact->isSubcontact) - if (hitFlags&CLCHT_ONITEMICON && dat->expandMeta) + if (hitFlags&CLCHT_ONITEMICON && dat->expandMeta) { BYTE doubleClickExpand = db_get_b(NULL,"CLC","MetaDoubleClick",SETTING_METAAVOIDDBLCLICK_DEFAULT); - hitcontact = contact; + hitcontact = contact; HitPoint.x = (short)LOWORD(lParam); HitPoint.y = (short)HIWORD(lParam); fMouseUpped = FALSE; if ((GetKeyState(VK_SHIFT)&0x8000) || (GetKeyState(VK_CONTROL)&0x8000) || (GetKeyState(VK_MENU)&0x8000)) { fMouseUpped = TRUE; - hitcontact = contact; + hitcontact = contact; KillTimer(hwnd,TIMERID_SUBEXPAND); CLUI_SafeSetTimer(hwnd,TIMERID_SUBEXPAND,0,NULL); } @@ -985,13 +985,13 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM hitcontact = NULL; if (hit != -1 && !(hitFlags&CLCHT_NOWHERE) && contact->type == CLCIT_GROUP) - if (hitFlags&CLCHT_ONITEMICON) + if (hitFlags&CLCHT_ONITEMICON) { struct ClcGroup *selgroup; struct ClcContact *selcontact; dat->selection = cliGetRowByIndex(dat,dat->selection,&selcontact,&selgroup); pcli->pfnSetGroupExpand(hwnd,dat,contact->group,-1); - if (dat->selection != -1) + if (dat->selection != -1) { dat->selection = cliGetRowsPriorTo(&dat->list,selgroup,GetContactIndex(selgroup,selcontact)); if (dat->selection == -1) dat->selection = cliGetRowsPriorTo(&dat->list,contact->group,-1); @@ -1004,10 +1004,10 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM { CLUI__cliInvalidateRect(hwnd,NULL,FALSE); UpdateWindow(hwnd); - } + } return TRUE; } - if (hit != -1 && !(hitFlags&CLCHT_NOWHERE) && hitFlags&CLCHT_ONITEMCHECK) + if (hit != -1 && !(hitFlags&CLCHT_NOWHERE) && hitFlags&CLCHT_ONITEMCHECK) { NMCLISTCONTROL nm; contact->flags ^= CONTACTF_CHECKED; @@ -1021,7 +1021,7 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM nm.hItem = ContactToItemHandle(contact,&nm.flags); SendMessage(GetParent(hwnd),WM_NOTIFY,0,(LPARAM)&nm); } - if ( !(hitFlags&(CLCHT_ONITEMICON|CLCHT_ONITEMLABEL|CLCHT_ONITEMCHECK))) + if ( !(hitFlags&(CLCHT_ONITEMICON|CLCHT_ONITEMLABEL|CLCHT_ONITEMCHECK))) { NMCLISTCONTROL nm; nm.hdr.code = NM_CLICK; @@ -1041,7 +1041,7 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM CLUI__cliInvalidateRect(hwnd,NULL,FALSE); UpdateWindow(hwnd); - if (dat->selection != -1 && (contact->type == CLCIT_CONTACT || contact->type == CLCIT_GROUP) && !(hitFlags&(CLCHT_ONITEMEXTRA|CLCHT_ONITEMCHECK|CLCHT_NOWHERE))) + if (dat->selection != -1 && (contact->type == CLCIT_CONTACT || contact->type == CLCIT_GROUP) && !(hitFlags&(CLCHT_ONITEMEXTRA|CLCHT_ONITEMCHECK|CLCHT_NOWHERE))) { SetCapture(hwnd); dat->iDragItem = dat->selection; @@ -1049,8 +1049,8 @@ static LRESULT clcOnLButtonDown(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM dat->dragAutoScrolling = 0; } if (dat->bCompactMode) - { - SendMessage(hwnd,WM_SIZE,0,0); + { + SendMessage(hwnd,WM_SIZE,0,0); } if (dat->selection != -1) pcli->pfnEnsureVisible(hwnd,dat,hit,0); return TRUE; @@ -1068,7 +1068,7 @@ static LRESULT clcOnCaptureChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPA int i; i = dat->iHotTrack; dat->iHotTrack = -1; - pcli->pfnInvalidateItem(hwnd,dat,i); + pcli->pfnInvalidateItem(hwnd,dat,i); pcli->pfnHideInfoTip(hwnd,dat); } } @@ -1084,14 +1084,14 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w CLUI_TestCursorOnBorders(); } if (clcProceedDragToScroll(hwnd, (short)HIWORD(lParam))) - return 0; + return 0; if ( dat->dragStage&DRAGSTAGEF_MAYBERENAME ) { POINT pt; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); - if ( abs(pt.x-dat->ptDragStart.x)>GetSystemMetrics(SM_CXDOUBLECLK) + if ( abs(pt.x-dat->ptDragStart.x)>GetSystemMetrics(SM_CXDOUBLECLK) || abs(pt.y-dat->ptDragStart.y)>GetSystemMetrics(SM_CYDOUBLECLK)) { KillTimer( hwnd, TIMERID_RENAME ); @@ -1132,34 +1132,34 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if (dat->iDragItem == -1) { DWORD flag = 0; int iOldHotTrack = dat->iHotTrack; - + if (dat->hwndRenameEdit != NULL || GetKeyState(VK_MENU)&0x8000 || GetKeyState(VK_F10)&0x8000) return 0; - + dat->iHotTrack = isOutside ? -1 : cliHitTest(hwnd,dat,(short)LOWORD(lParam),(short)HIWORD(lParam),NULL,NULL,&flag); - if (flag&CLCHT_NOWHERE) + if (flag&CLCHT_NOWHERE) dat->iHotTrack = -1; - + if (iOldHotTrack != dat->iHotTrack || isOutside) { - if (iOldHotTrack == -1 && !isOutside) + if (iOldHotTrack == -1 && !isOutside) SetCapture(hwnd); - + if (dat->iHotTrack == -1 || isOutside) ReleaseCapture(); - if (dat->exStyle&CLS_EX_TRACKSELECT) + if (dat->exStyle&CLS_EX_TRACKSELECT) { pcli->pfnInvalidateItem(hwnd,dat,iOldHotTrack); pcli->pfnInvalidateItem(hwnd,dat,dat->iHotTrack); } - + pcli->pfnHideInfoTip(hwnd,dat); } KillTimer(hwnd,TIMERID_INFOTIP); - if (wParam == 0 && dat->hInfoTipItem == NULL) + if (wParam == 0 && dat->hInfoTipItem == NULL) { dat->ptInfoTip.x = (short)LOWORD(lParam); dat->ptInfoTip.y = (short)HIWORD(lParam); @@ -1199,7 +1199,7 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w switch(target) { case DROPTARGET_ONSELF: break; - + case DROPTARGET_ONCONTACT: if (ServiceExists(MS_MC_ADDTOMETA)) { @@ -1215,12 +1215,12 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w } break; - + case DROPTARGET_ONMETACONTACT: - if (ServiceExists(MS_MC_ADDTOMETA)) + if (ServiceExists(MS_MC_ADDTOMETA)) { struct ClcContact *contSour,*contDest; - cliGetRowByIndex(dat,dat->selection,&contDest,NULL); + cliGetRowByIndex(dat,dat->selection,&contDest,NULL); cliGetRowByIndex(dat,dat->iDragItem,&contSour,NULL); if (contSour->type == CLCIT_CONTACT && g_szMetaModuleName && mir_strcmp(contSour->proto,g_szMetaModuleName)) { @@ -1229,7 +1229,7 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w else if (contSour->subcontacts == contDest) hNewCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_DEFAULTSUB)); ///MakeDefault - else + else hNewCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_REGROUP)); } } @@ -1238,7 +1238,7 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if (ServiceExists(MS_MC_ADDTOMETA)) { struct ClcContact *contSour,*contDest; - cliGetRowByIndex(dat,dat->selection,&contDest,NULL); + cliGetRowByIndex(dat,dat->selection,&contDest,NULL); cliGetRowByIndex(dat,dat->iDragItem,&contSour,NULL); if (contSour->type == CLCIT_CONTACT && g_szMetaModuleName && mir_strcmp(contSour->proto,g_szMetaModuleName)) { @@ -1247,7 +1247,7 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w else if (contDest->subcontacts == contSour->subcontacts) break; - else + else hNewCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_REGROUP)); } } @@ -1266,9 +1266,9 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w NMCLISTCONTROL nm; struct ClcContact *contact; - if (pt.x >= 0 && pt.x < clRect.right && ((pt.y < 0 && pt.y>-dat->dragAutoScrollHeight) || (pt.y >= clRect.bottom && pt.y < clRect.bottom+dat->dragAutoScrollHeight))) + if (pt.x >= 0 && pt.x < clRect.right && ((pt.y < 0 && pt.y>-dat->dragAutoScrollHeight) || (pt.y >= clRect.bottom && pt.y < clRect.bottom+dat->dragAutoScrollHeight))) { - if ( !dat->dragAutoScrolling) + if ( !dat->dragAutoScrolling) { if (pt.y < 0) dat->dragAutoScrolling = -1; else dat->dragAutoScrolling = 1; @@ -1290,10 +1290,10 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w break; } default: - { + { struct ClcGroup *group = NULL; cliGetRowByIndex(dat,dat->iDragItem,NULL,&group); - if (group && group->parent) + if (group && group->parent) { struct ClcContact *contSour; cliGetRowByIndex(dat,dat->iDragItem,&contSour,NULL); @@ -1309,41 +1309,41 @@ static LRESULT clcOnMouseMove(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w } static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - if (clcExitDragToScroll()) +{ + if (clcExitDragToScroll()) return 0; fMouseUpped = TRUE; - if (hitcontact != NULL && dat->expandMeta) { + if (hitcontact != NULL && dat->expandMeta) { BYTE doubleClickExpand = db_get_b(NULL,"CLC","MetaDoubleClick",SETTING_METAAVOIDDBLCLICK_DEFAULT); CLUI_SafeSetTimer(hwnd,TIMERID_SUBEXPAND,GetDoubleClickTime()*doubleClickExpand,NULL); } else if (dat->iHotTrack == -1 && dat->iDragItem == -1) ReleaseCapture(); - if (dat->iDragItem == -1) return 0; + if (dat->iDragItem == -1) return 0; SetCursor((HCURSOR)GetClassLongPtr(hwnd,GCLP_HCURSOR)); - if (dat->exStyle & CLS_EX_TRACKSELECT) + if (dat->exStyle & CLS_EX_TRACKSELECT) { DWORD flags; dat->iHotTrack = cliHitTest(hwnd,dat,(short)LOWORD(lParam),(short)HIWORD(lParam),NULL,NULL,&flags); - if (dat->iHotTrack == -1) + if (dat->iHotTrack == -1) ReleaseCapture(); } - else if (hitcontact == NULL) + else if (hitcontact == NULL) ReleaseCapture(); KillTimer(hwnd,TIMERID_DRAGAUTOSCROLL); if (dat->dragStage == (DRAGSTAGE_NOTMOVED|DRAGSTAGEF_MAYBERENAME)) CLUI_SafeSetTimer(hwnd,TIMERID_RENAME,GetDoubleClickTime(),NULL); - else if ((dat->dragStage&DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) + else if ((dat->dragStage&DRAGSTAGEM_STAGE) == DRAGSTAGE_ACTIVE) { POINT pt; - int target; + int target; TCHAR Wording[500]; int res = 0; pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); target = GetDropTargetInformation(hwnd,dat,pt); - switch(target) + switch(target) { case DROPTARGET_ONSELF: break; @@ -1371,7 +1371,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w { handle = (HANDLE)CallService(MS_MC_CONVERTTOMETA,(WPARAM)hDest,0); if ( !handle) return 0; - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } else @@ -1388,8 +1388,8 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w handle = (HANDLE)CallService(MS_MC_CONVERTTOMETA,(WPARAM)hdest,0); if ( !handle) return 0; - CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } } @@ -1402,14 +1402,14 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w struct ClcContact *contDest, *contSour; int res; cliGetRowByIndex(dat,dat->iDragItem,&contSour,NULL); - cliGetRowByIndex(dat,dat->selection,&contDest,NULL); + cliGetRowByIndex(dat,dat->selection,&contDest,NULL); if (contSour->type == CLCIT_CONTACT) { if (g_szMetaModuleName && strcmp(contSour->proto,g_szMetaModuleName)) { if ( !contSour->isSubcontact) - { + { HANDLE handle,hcontact; hcontact = contSour->hContact; handle = contDest->hContact; @@ -1418,14 +1418,14 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if (res == 1) { - if ( !handle) return 0; - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + if ( !handle) return 0; + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } else { if (contSour->subcontacts == contDest) - { + { HANDLE hsour; hsour = contSour->hContact; mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be default ?"),contSour->szText); @@ -1437,7 +1437,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w } } else - { + { HANDLE handle,hcontact,hfrom; hcontact = contSour->hContact; hfrom = contSour->subcontacts->hContact; @@ -1449,8 +1449,8 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if ( !handle) return 0; - CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } } @@ -1463,7 +1463,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w struct ClcContact *contDest, *contSour; int res; cliGetRowByIndex(dat,dat->iDragItem,&contSour,NULL); - cliGetRowByIndex(dat,dat->selection,&contDest,NULL); + cliGetRowByIndex(dat,dat->selection,&contDest,NULL); if (contSour->type == CLCIT_CONTACT) { if (g_szMetaModuleName && strcmp(contSour->proto,g_szMetaModuleName)) @@ -1478,18 +1478,18 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if (res == 1) { - if ( !handle) return 0; - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + if ( !handle) return 0; + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } else { if (contSour->subcontacts != contDest->subcontacts) - { + { HANDLE handle,hcontact,hfrom; hcontact = contSour->hContact; hfrom = contSour->subcontacts->hContact; - handle = contDest->subcontacts->hContact; + handle = contDest->subcontacts->hContact; mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText,contSour->subcontacts->szText,contDest->subcontacts->szText); res = MessageBox(hwnd,Wording,TranslateT("Changing MetaContacts (Moving)"),MB_OKCANCEL|MB_ICONQUESTION); if (res == 1) @@ -1497,8 +1497,8 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if ( !handle) return 0; - CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); - CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); + CallService(MS_MC_REMOVEFROMMETA,(WPARAM)0,(LPARAM)hcontact); + CallService(MS_MC_ADDTOMETA,(WPARAM)hcontact,(LPARAM)handle); } } } @@ -1517,7 +1517,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w TCHAR newName[128] = {0}; int newIndex,i; pcli->pfnGetRowByIndex(dat, dat->iDragItem, &contact, &group); - i = pcli->pfnGetRowByIndex(dat, dat->iInsertionMark, &destcontact, &destgroup); + i = pcli->pfnGetRowByIndex(dat, dat->iInsertionMark, &destcontact, &destgroup); if (i != -1 && group->groupId != destgroup->groupId) { TCHAR * groupName = mir_tstrdup(pcli->pfnGetGroupName(contact->groupId,0)); @@ -1529,7 +1529,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w if (len >= 0) shortGroup = groupName+len+1; else shortGroup = groupName; } - if (shortGroup) + if (shortGroup) { NeedRename = TRUE; if (sourceGrName) @@ -1540,7 +1540,7 @@ static LRESULT clcOnLButtonUp(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM w mir_free(groupName); mir_free(sourceGrName); } - newIndex = CallService(MS_CLIST_GROUPMOVEBEFORE, contact->groupId, (destcontact && i != -1)?destcontact->groupId:0); + newIndex = CallService(MS_CLIST_GROUPMOVEBEFORE, contact->groupId, (destcontact && i != -1)?destcontact->groupId:0); newIndex = newIndex?newIndex:contact->groupId; if (NeedRename) pcli->pfnRenameGroup(newIndex,newName); break; @@ -1570,7 +1570,7 @@ static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa { int i=0; - for (i=0;i <= FONTID_MODERN_MAX;i++) + for (i=0;i <= FONTID_MODERN_MAX;i++) { if (dat->fontModernInfo[i].hFont) DeleteObject(dat->fontModernInfo[i].hFont); dat->fontModernInfo[i].hFont = NULL; @@ -1587,13 +1587,13 @@ static LRESULT clcOnDestroy(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wPa } ImageArray_Clear(&dat->avatar_cache); - mod_DeleteDC(dat->avatar_cache.hdc); - ImageArray_Free(&dat->avatar_cache, FALSE); + mod_DeleteDC(dat->avatar_cache.hdc); + ImageArray_Free(&dat->avatar_cache, FALSE); if (dat->himlHighlight) ImageList_Destroy(dat->himlHighlight); RowHeights_Free(dat); - corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); + corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); xpt_FreeThemeForWindow(hwnd); return 0; } @@ -1642,45 +1642,39 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP int recalcScrollBar = 0, shouldShow; BOOL needRepaint = FALSE; WORD status; - char *szProto; - int nHiddenStatus = 0; - BOOL image_is_special = FALSE; RECT iconRect = {0}; int contacticon = CallService(MS_CLIST_GETCONTACTICON, wParam, 1); HANDLE hSelItem = NULL; struct ClcContact *selcontact = NULL; - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); if (szProto == NULL) status = ID_STATUS_OFFLINE; else status = GetContactCachedStatus((HANDLE) wParam); - image_is_special = (LOWORD(contacticon) != (LOWORD(lParam))); //check only base icons + BOOL image_is_special = (LOWORD(contacticon) != (LOWORD(lParam))); //check only base icons + + int nHiddenStatus = CLVM_GetContactHiddenStatus((HANDLE)wParam, szProto, dat); - nHiddenStatus = CLVM_GetContactHiddenStatus((HANDLE)wParam, szProto, dat); - DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); - bool isVisiblebyFilter = (( ( style & CLS_SHOWHIDDEN ) && nHiddenStatus != -1 ) || !nHiddenStatus ); - bool ifVisibleByClui = !pcli->pfnIsHiddenMode( dat, status ); - bool isVisible = g_CluiData.bFilterEffective&CLVM_FILTER_STATUS ? TRUE : ifVisibleByClui; - bool isIconChanged = CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != LOWORD(lParam); - - shouldShow = isVisiblebyFilter && ( isVisible || isIconChanged ) ; - - // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown - - if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, &group, NULL)) - { - if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) - { + bool isVisiblebyFilter = (( ( style & CLS_SHOWHIDDEN ) && nHiddenStatus != -1 ) || !nHiddenStatus ); + bool ifVisibleByClui = !pcli->pfnIsHiddenMode( dat, status ); + bool isVisible = g_CluiData.bFilterEffective&CLVM_FILTER_STATUS ? TRUE : ifVisibleByClui; + bool isIconChanged = CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != LOWORD(lParam); + + shouldShow = isVisiblebyFilter && ( isVisible || isIconChanged ) ; + + // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown + + if ( !pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, &group, NULL)) { + if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) { if (dat->selection >= 0 && pcli->pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1) hSelItem = pcli->pfnContactToHItem(selcontact); pcli->pfnAddContactToTree(hwnd, dat, (HANDLE) wParam, (style & CLS_CONTACTLIST) == 0, 0); recalcScrollBar = 1; needRepaint = TRUE; pcli->pfnFindItem(hwnd, dat, (HANDLE) wParam, &contact, NULL, NULL); - if (contact) - { + if (contact) { contact->iImage = lParam; contact->image_is_special = image_is_special; pcli->pfnNotifyNewContact(hwnd, (HANDLE) wParam); @@ -1688,17 +1682,14 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP } } } - else - { + else { //item in list already if (contact->iImage == lParam) return 0; if ( !shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE) && clcItemNotHiddenOffline(dat, group, contact)) - { shouldShow = TRUE; - } - if ( !shouldShow && !(style & CLS_NOHIDEOFFLINE) && ((style & CLS_HIDEOFFLINE) || group->hideOffline || g_CluiData.bFilterEffective)) // CLVM changed - { + + if ( !shouldShow && !(style & CLS_NOHIDEOFFLINE) && ((style & CLS_HIDEOFFLINE) || group->hideOffline || g_CluiData.bFilterEffective)) { // CLVM changed if (dat->selection >= 0 && pcli->pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1) hSelItem = pcli->pfnContactToHItem(selcontact); pcli->pfnRemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0); @@ -1706,26 +1697,22 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP recalcScrollBar = 1; dat->needsResort = 1; } - else if (contact) - { + else if (contact) { contact->iImage = lParam; if ( !pcli->pfnIsHiddenMode(dat, status)) contact->flags |= CONTACTF_ONLINE; else - contact->flags &= ~CONTACTF_ONLINE; + contact->flags &= ~CONTACTF_ONLINE; contact->image_is_special = image_is_special; - if ( !image_is_special) //Only if it is status changing - { - dat->needsResort = 1; - needRepaint = TRUE; + if ( !image_is_special) { //Only if it is status changing + dat->needsResort = 1; + needRepaint = TRUE; } else if (dat->m_paintCouter == contact->lastPaintCounter) //if contacts is visible - { - needRepaint = TRUE; - } + needRepaint = TRUE; } - } + if (hSelItem) { struct ClcGroup *selgroup; if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL)) @@ -1733,15 +1720,12 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP else dat->selection = -1; } - // dat->needsResort = 1; - // SortClcByTimer(hwnd); - if (dat->needsResort) - { + + if (dat->needsResort) { TRACE("Sort required\n"); clcSetDelayTimer( TIMERID_DELAYEDRESORTCLC, hwnd ); } - else if (needRepaint) - { + else if (needRepaint) { if (contact && contact->pos_icon.bottom != 0 && contact->pos_icon.right != 0) CLUI__cliInvalidateRect(hwnd,&(contact->pos_icon),FALSE); else @@ -1755,14 +1739,11 @@ static LRESULT clcOnIntmIconChanged(struct ClcData *dat, HWND hwnd, UINT msg, WP static LRESULT clcOnIntmAvatarChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { struct ClcContact *contact; - if (FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) - { - Cache_GetAvatar(dat, contact); - } + if (FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) + Cache_GetAvatar(dat, contact); else if (dat->use_avatar_service && !wParam) - { UpdateAllAvatars(dat); - } + CLUI__cliInvalidateRect(hwnd, NULL, FALSE); return 0; } @@ -1770,29 +1751,28 @@ static LRESULT clcOnIntmAvatarChanged(struct ClcData *dat, HWND hwnd, UINT msg, static LRESULT clcOnIntmTimeZoneChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { struct ClcContact *contact; - if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) + if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) return corecli.pfnContactListControlWndProc(hwnd,msg,wParam,lParam); - if (contact) //!IsBadWritePtr(contact, sizeof(struct ClcContact))) - { + if (contact) { Cache_GetTimezone(dat,contact->hContact); Cache_GetText(dat, contact,1); cliRecalcScrollBar(hwnd,dat); } return 0; } + static LRESULT clcOnIntmNameChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { struct ClcContact *contact; int ret = corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); pcli->pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam); - if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) + if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,FALSE)) return ret; lstrcpyn(contact->szText, pcli->pfnGetContactDisplayName((HANDLE)wParam,0),SIZEOF(contact->szText)); - if (contact)//!IsBadWritePtr(contact, sizeof(struct ClcContact))) - { + if (contact) { Cache_GetText(dat,contact,1); cliRecalcScrollBar(hwnd,dat); } @@ -1816,7 +1796,7 @@ static LRESULT clcOnIntmStatusMsgChanged(struct ClcData *dat, HWND hwnd, UINT ms HANDLE hContact = (HANDLE)wParam; if (hContact == NULL || IsHContactInfo(hContact) || IsHContactGroup(hContact)) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); - if ( !FindItem(hwnd,dat,hContact,&contact,NULL,NULL,FALSE)) + if ( !FindItem(hwnd,dat,hContact,&contact,NULL,NULL,FALSE)) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); if (contact)//!IsBadWritePtr(contact, sizeof(struct ClcContact))) { @@ -1831,25 +1811,25 @@ static LRESULT clcOnIntmNotOnListChanged(struct ClcData *dat, HWND hwnd, UINT ms { DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam; struct ClcContact *contact; - + if ( !FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,TRUE)) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); - - if (contact->type != CLCIT_CONTACT) + + if (contact->type != CLCIT_CONTACT) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); - - if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0) + + if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0) contact->flags &= ~CONTACTF_NOTONLIST; else contact->flags |= CONTACTF_NOTONLIST; - + CLUI__cliInvalidateRect(hwnd,NULL,FALSE); return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); } static LRESULT clcOnIntmScrollBarChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_CONTACTLIST) + if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_CONTACTLIST) { if (dat->noVScrollbar) ShowScrollBar(hwnd, SB_VERT, FALSE); else pcli->pfnRecalcScrollBar(hwnd, dat); @@ -1860,28 +1840,19 @@ static LRESULT clcOnIntmScrollBarChanged(struct ClcData *dat, HWND hwnd, UINT ms static LRESULT clcOnIntmStatusChanged(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { int ret = corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); - if (wParam != 0) - { + if (wParam != 0) { pdisplayNameCacheEntry pdnce = (pdisplayNameCacheEntry)pcli->pfnGetCacheEntry((HANDLE)wParam); - if (pdnce && pdnce->m_cache_cszProto) - { + if (pdnce && pdnce->m_cache_cszProto) { struct ClcContact *contact = NULL; pdnce___SetStatus( pdnce, GetStatusForContact(pdnce->hContact,pdnce->m_cache_cszProto)); - if ( !dat->force_in_dialog && ( - (dat->second_line_show)// && dat->second_line_type == TEXT_STATUS) - || (dat->third_line_show)// && dat->third_line_type == TEXT_STATUS) - )) + if ( !dat->force_in_dialog && (dat->second_line_show || dat->third_line_show)) gtaRenewText(pdnce->hContact); SendMessage(hwnd,INTM_ICONCHANGED, wParam, (LPARAM) CallService(MS_CLIST_GETCONTACTICON, wParam, 1)); - if (FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,TRUE)) - { - if (contact && contact->type == CLCIT_CONTACT) - { - if ( !contact->image_is_special && pdnce___GetStatus( pdnce )>ID_STATUS_OFFLINE) + if (FindItem(hwnd,dat,(HANDLE)wParam,&contact,NULL,NULL,TRUE)) { + if (contact && contact->type == CLCIT_CONTACT) { + if ( !contact->image_is_special && pdnce___GetStatus( pdnce ) > ID_STATUS_OFFLINE) contact->iImage = CallService(MS_CLIST_GETCONTACTICON, wParam, 1); - if (contact->isSubcontact - && contact->subcontacts - && contact->subcontacts->type == CLCIT_CONTACT) + if (contact->isSubcontact && contact->subcontacts && contact->subcontacts->type == CLCIT_CONTACT) pcli->pfnClcBroadcast( INTM_STATUSCHANGED,(WPARAM)contact->subcontacts->hContact,0); //forward status changing to host meta contact } } @@ -1897,7 +1868,7 @@ static LRESULT clcOnIntmStatusChanged(struct ClcData *dat, HWND hwnd, UINT msg, } if (db_get_b(NULL,"CList","PlaceOfflineToRoot",SETTING_PLACEOOFLINETOROOT_DEFAULT)) { - SendMessage(hwnd,CLM_AUTOREBUILD,0,0); + SendMessage(hwnd,CLM_AUTOREBUILD,0,0); } else { @@ -1911,7 +1882,7 @@ static LRESULT clcOnIntmStatusChanged(struct ClcData *dat, HWND hwnd, UINT msg, static LRESULT clcOnIntmReloadOptions(struct ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); + corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); pcli->pfnLoadClcOptions(hwnd,dat); LoadCLCOptions(hwnd,dat); pcli->pfnSaveStateAndRebuildList(hwnd,dat); @@ -1925,7 +1896,7 @@ static LRESULT clcOnIntmReloadOptions(struct ClcData *dat, HWND hwnd, UINT msg, HRESULT ClcLoadModule() { g_himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST,0,0); - + HookEvent(ME_DB_CONTACT_SETTINGCHANGED, clcHookSettingChanged); HookEvent(ME_OPT_INITIALISE, ClcOptInit); hAckHook = (HANDLE)HookEvent(ME_PROTO_ACK, clcHookProtoAck); @@ -1945,23 +1916,23 @@ int ClcUnloadModule() } int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack) -{ +{ if (MirandaExiting()) return 0; - if (ack->type == ACKTYPE_STATUS) - { + if (ack->type == ACKTYPE_STATUS) + { int i; - if (ack->result == ACKRESULT_SUCCESS) + if (ack->result == ACKRESULT_SUCCESS) { - for (i=0; i < pcli->hClcProtoCount; i++) + for (i=0; i < pcli->hClcProtoCount; i++) { - if ( !lstrcmpA(pcli->clcProto[i].szProto, ack->szModule)) + if ( !lstrcmpA(pcli->clcProto[i].szProto, ack->szModule)) { pcli->clcProto[i].dwStatus = (WORD) ack->lParam; if (pcli->clcProto[i].dwStatus >= ID_STATUS_OFFLINE) pcli->pfnTrayIconUpdateBase(pcli->clcProto[i].szProto); if ( !ServiceExists("ExtraIcon/Register")) if (ExtraImage_ExtraIDToColumnNum(EXTRA_ICON_VISMODE) != -1) - ExtraImage_SetAllExtraIcons(pcli->hwndContactTree,(HANDLE)NULL); + ExtraImage_SetAllExtraIcons(pcli->hwndContactTree,(HANDLE)NULL); return 0; } } @@ -1970,23 +1941,23 @@ int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack) else if (ack->type == ACKTYPE_AWAYMSG) { if (ack->result == ACKRESULT_SUCCESS && ack->lParam) { - {//Do not change DB if it is IRC protocol - if (ack->szModule != NULL) + {//Do not change DB if it is IRC protocol + if (ack->szModule != NULL) if (db_get_b(ack->hContact, ack->szModule, "ChatRoom", 0) != 0) return 0; } db_set_ws(ack->hContact,"CList","StatusMsg",(const TCHAR *)ack->lParam); gtaRenewText(ack->hContact); - } + } else { //DBDeleteContactSetting(ack->hContact,"CList","StatusMsg"); //char a = '\0'; - {//Do not change DB if it is IRC protocol - if (ack->szModule != NULL) + {//Do not change DB if it is IRC protocol + if (ack->szModule != NULL) if (db_get_b(ack->hContact, ack->szModule, "ChatRoom", 0) != 0) return 0; } - if (ack->hContact) + if (ack->hContact) { char * val = db_get_sa(ack->hContact,"CList","StatusMsg"); if (val) { @@ -1997,12 +1968,12 @@ int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack) mir_free(val); } } - //pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED,(WPARAM)ack->hContact,&a); + //pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED,(WPARAM)ack->hContact,&a); } } - else if (ack->type == ACKTYPE_AVATAR) + else if (ack->type == ACKTYPE_AVATAR) { - if (ack->result == ACKRESULT_SUCCESS) + if (ack->result == ACKRESULT_SUCCESS) { PROTO_AVATAR_INFORMATIONT *pai = (PROTO_AVATAR_INFORMATIONT*)ack->hProcess; if (pai != NULL && pai->hContact != NULL) @@ -2070,13 +2041,13 @@ int ClcEnterDragToScroll(HWND hwnd, int Y) * Contact list control window procedure */ LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ +{ -#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam); +#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam); struct ClcData *dat = (struct ClcData*)GetWindowLongPtr(hwnd,0); - if (msg >= CLM_FIRST && msg < CLM_LAST) + if (msg >= CLM_FIRST && msg < CLM_LAST) return cli_ProcessExternalMessages(hwnd,dat,msg,wParam,lParam); switch (msg) { diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index f0303ab4a9..54ac3a4923 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -763,11 +763,11 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam, for (i=0; i < SIZEOF(sortby); i++) { item = SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_SETITEMDATA,item,0); item = SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_SETITEMDATA,item,0); item = SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_SETITEMDATA,item,0); } s1 = db_get_b(NULL,"CList","SortBy1",SETTING_SORTBY1_DEFAULT); @@ -889,7 +889,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L db_get(NULL,"CList","PrimaryStatus",&dbv); ProtoEnumAccounts( &count, &accs ); item = SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_ADDSTRING,0,(LPARAM)TranslateT("Global")); - SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETITEMDATA,item,0); for (i=0;i < count;i++) { if ( !IsAccountEnabled( accs[i] ) || CallProtoService(accs[i]->szModuleName,PS_GETCAPS,PFLAGNUM_2,0) == 0) continue; @@ -1029,7 +1029,7 @@ static INT_PTR CALLBACK DlgProcClistBehaviourOpts(HWND hwndDlg, UINT msg, WPARAM TCHAR *hidemode[] = {TranslateT("Hide to tray"), TranslateT("Behind left edge"), TranslateT("Behind right edge")}; for (i=0; i < SIZEOF(hidemode); i++) { item = SendDlgItemMessage(hwndDlg,IDC_HIDEMETHOD,CB_ADDSTRING,0,(LPARAM)(hidemode[i])); - SendDlgItemMessage(hwndDlg,IDC_HIDEMETHOD,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_HIDEMETHOD,CB_SETITEMDATA,item,0); SendDlgItemMessage(hwndDlg,IDC_HIDEMETHOD,CB_SETCURSEL,db_get_b(NULL,"ModernData","HideBehind",SETTING_HIDEBEHIND_DEFAULT),0); } } @@ -1413,7 +1413,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP db_set_dw(NULL,"CLUIFrames","GapBetweenFrames",(DWORD)i1); db_set_dw(NULL,"CLUIFrames","GapBetweenTitleBar",(DWORD)i2); - Sync(CLUIFramesOnClistResize, (WPARAM)pcli->hwndContactList,(LPARAM)0); + Sync(CLUIFramesOnClistResize, (WPARAM)pcli->hwndContactList,0); } db_set_b(NULL,"CList","Transparent",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_TRANSPARENT)); db_set_b(NULL,"CList","Alpha",(BYTE)SendDlgItemMessage(hwndDlg,IDC_TRANSACTIVE,TBM_GETPOS,0,0)); @@ -1926,11 +1926,11 @@ static INT_PTR CALLBACK DlgProcModernOptions(HWND hwndDlg, UINT msg, WPARAM wPar for (i=0; i < SIZEOF(sortby); i++) { item = SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT1,CB_SETITEMDATA,item,0); item = SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT2,CB_SETITEMDATA,item,0); item = SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_ADDSTRING,0,(LPARAM)TranslateTS(sortby[i])); - SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CLSORT3,CB_SETITEMDATA,item,0); } s1 = db_get_b(NULL,"CList","SortBy1",SETTING_SORTBY1_DEFAULT); diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 79de8c29e5..6f07c154c1 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -455,7 +455,7 @@ int EventArea_Create(HWND hCluiWnd) Frame.height = h; Frame.tname = _T("EventArea"); //do not translate Frame.TBtname = TranslateT("Event Area"); - hNotifyFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,(LPARAM)0); + hNotifyFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0); CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)Frame.hWnd,(LPARAM)EventArea_PaintCallbackProc); //$$$$$ register sub for frame CallService(MS_CLIST_FRAMES_UPDATEFRAME,-1,0); EventArea_HideShowNotifyFrame(); diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index ce05642b91..01555535c5 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -36,7 +36,7 @@ INT_PTR CloseAction(WPARAM wParam,LPARAM lParam) int k; g_CluiData.bSTATE = STATE_PREPEARETOEXIT; // workaround for avatar service and other wich destroys service on OK_TOEXIT do - { k = CallService(MS_SYSTEM_OKTOEXIT,(WPARAM)0,(LPARAM)0); + { k = CallService(MS_SYSTEM_OKTOEXIT,(WPARAM)0,0); } while (!k); diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index de45d9a20e..1d1973a8af 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -91,7 +91,7 @@ HICON cliGetIconFromStatusMode(HANDLE hContact, const char *szProto,int status) HICON MainOverlay = (HICON)GetMainStatusOverlay(status); hIcon = ske_CreateJoinedIcon(hXIcon,MainOverlay,(trayOption&4)?192:0); DestroyIcon_protect(hXIcon); - DestroyIcon_protect(MainOverlay); + DestroyIcon_protect(MainOverlay); } else { @@ -109,73 +109,51 @@ HICON cliGetIconFromStatusMode(HANDLE hContact, const char *szProto,int status) // if not ready take normal icon return hIcon; } -////////// By FYR///////////// + int ExtIconFromStatusMode(HANDLE hContact, const char *szProto,int status) { - /*pdisplayNameCacheEntry cacheEntry; - if ((DBGetContactSettingByte(NULL,"CLC","Meta",0) != 1) && szProto != NULL) - { - if (meta_module && mir_strcmp(szProto,meta_module) == 0) - { - hContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(UINT)hContact,0); - if (hContact != 0) - { - szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(UINT)hContact,0); - status = DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE); - } - } - } - cacheEntry = (pdisplayNameCacheEntry)pcli->pfnGetCacheEntry(hContact); - if (cacheEntry->isTransport>0) return GetTrasportStatusIconIndex(cacheEntry->isTransport-1,status); - */ - return pcli->pfnIconFromStatusMode(szProto,status,hContact); + return pcli->pfnIconFromStatusMode(szProto,status,hContact); } -/////////// End by FYR //////// + int cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact) { - int result = -1; - if (hContact && szProto) - { - char * szActProto = (char*)szProto; - char AdvancedService[255] = {0}; - int nActStatus = nStatus; - HANDLE hActContact = hContact; - if ( !db_get_b(NULL,"CLC","Meta",SETTING_USEMETAICON_DEFAULT) && g_szMetaModuleName && !mir_strcmp(szActProto,g_szMetaModuleName)) - { - // substitute params by mostonline contact datas - HANDLE hMostOnlineContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hActContact,0); - if (hMostOnlineContact) - { - pdisplayNameCacheEntry cacheEntry; - cacheEntry = (pdisplayNameCacheEntry)pcli->pfnGetCacheEntry(hMostOnlineContact); - if (cacheEntry && cacheEntry->m_cache_cszProto) - { - szActProto = cacheEntry->m_cache_cszProto; - nActStatus = pdnce___GetStatus( cacheEntry ); - hActContact = hMostOnlineContact; - } - } - } - mir_snprintf(AdvancedService,SIZEOF(AdvancedService),"%s%s",szActProto,"/GetAdvancedStatusIcon"); - - if (ServiceExists(AdvancedService)) - result = CallService(AdvancedService,(WPARAM)hActContact, (LPARAM)0); - - if (result == -1 || !(LOWORD(result))) - { - //Get normal Icon - int basicIcon = corecli.pfnIconFromStatusMode(szActProto,nActStatus,NULL); - if (result != -1 && basicIcon != 1) result |= basicIcon; - else result = basicIcon; - } - } - else - { - result = corecli.pfnIconFromStatusMode(szProto,nStatus,NULL); - } - return result; -} + if (hContact && szProto) { + char *szActProto = (char*)szProto; + char AdvancedService[255] = {0}; + int nActStatus = nStatus; + HANDLE hActContact = hContact; + if ( !db_get_b(NULL,"CLC","Meta",SETTING_USEMETAICON_DEFAULT) && g_szMetaModuleName && !mir_strcmp(szActProto,g_szMetaModuleName)) { + // substitute params by mostonline contact datas + HANDLE hMostOnlineContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hActContact,0); + if (hMostOnlineContact) { + pdisplayNameCacheEntry cacheEntry; + cacheEntry = (pdisplayNameCacheEntry)pcli->pfnGetCacheEntry(hMostOnlineContact); + if (cacheEntry && cacheEntry->m_cache_cszProto) { + szActProto = cacheEntry->m_cache_cszProto; + nActStatus = pdnce___GetStatus( cacheEntry ); + hActContact = hMostOnlineContact; + } + } + } + mir_snprintf(AdvancedService,SIZEOF(AdvancedService),"%s%s",szActProto,"/GetAdvancedStatusIcon"); + + int result = -1; + if (ServiceExists(AdvancedService)) + result = CallService(AdvancedService,(WPARAM)hActContact, 0); + if (result == -1 || !(LOWORD(result))) { + //Get normal Icon + int basicIcon = corecli.pfnIconFromStatusMode(szActProto,nActStatus,NULL); + if (result != -1 && basicIcon != 1) + result |= basicIcon; + else + result = basicIcon; + } + return result; + } + + return corecli.pfnIconFromStatusMode(szProto,nStatus,NULL); +} int GetContactIconC(pdisplayNameCacheEntry cacheEntry) { @@ -188,16 +166,15 @@ int GetContactIconC(pdisplayNameCacheEntry cacheEntry) INT_PTR GetContactIcon(WPARAM wParam,LPARAM lParam) { - char *szProto; int status; - int res; - szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); + char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0); if (szProto == NULL) status = ID_STATUS_OFFLINE; else status = db_get_w((HANDLE) wParam, szProto, "Status", ID_STATUS_OFFLINE); - res = ExtIconFromStatusMode((HANDLE)wParam,szProto,szProto == NULL?ID_STATUS_OFFLINE:status); //by FYR - if (lParam == 0 && res != -1) res &= 0xFFFF; + int res = ExtIconFromStatusMode((HANDLE)wParam,szProto,szProto == NULL?ID_STATUS_OFFLINE:status); //by FYR + if (lParam == 0 && res != -1) + res &= 0xFFFF; return res; } @@ -279,21 +256,19 @@ HRESULT CluiLoadModule() CreateServiceFunction(MS_CLIST_TOGGLESOUNDS,ToggleSounds); CreateServiceFunction(MS_CLIST_SETUSEGROUPS,SetUseGroups); - CreateServiceFunction(MS_CLIST_GETCONTACTICON,GetContactIcon); MySetProcessWorkingSetSize = (BOOL (WINAPI*)(HANDLE,SIZE_T,SIZE_T))GetProcAddress(GetModuleHandle(_T("kernel32")),"SetProcessWorkingSetSize"); hCListImages = ImageList_Create(16, 16, ILC_MASK|ILC_COLOR32, 32, 0); InitCustomMenus(); InitTray(); - { - HINSTANCE hUser = GetModuleHandleA("USER32"); - MyMonitorFromPoint = ( pfnMyMonitorFromPoint )GetProcAddress( hUser,"MonitorFromPoint" ); - MyMonitorFromWindow = ( pfnMyMonitorFromWindow )GetProcAddress( hUser, "MonitorFromWindow" ); - MyGetMonitorInfo = ( pfnMyGetMonitorInfo )GetProcAddress( hUser, "GetMonitorInfoW"); - } - CLUI::InitClui(); + HINSTANCE hUser = GetModuleHandleA("USER32"); + MyMonitorFromPoint = ( pfnMyMonitorFromPoint )GetProcAddress( hUser,"MonitorFromPoint" ); + MyMonitorFromWindow = ( pfnMyMonitorFromWindow )GetProcAddress( hUser, "MonitorFromWindow" ); + MyGetMonitorInfo = ( pfnMyGetMonitorInfo )GetProcAddress( hUser, "GetMonitorInfoW"); + + CLUI::InitClui(); return S_OK; } @@ -314,7 +289,13 @@ __inline DWORD GetDIBPixelColor(int X, int Y, int Width, int Height, int ByteWid return res; } -int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) { +int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) +{ + if (hWnd == NULL) { + SetLastError(0x00000006); //Wrong handle + return -1; + } + RECT rc = { 0 }; POINT pt = { 0 }; register int i=0, @@ -325,153 +306,146 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) { iNotCoveredDots = 0; HWND hAux = 0; - if (hWnd == NULL) { - SetLastError(0x00000006); //Wrong handle - return -1; - } //Some defaults now. The routine is designed for thin and tall windows. if (iStepX <= 0) iStepX = 8; if (iStepY <= 0) iStepY = 16; HWND hwndFocused = GetFocus(); - if (IsIconic(hWnd) || !IsWindowVisible(hWnd)) + if ( IsIconic(hWnd) || !IsWindowVisible(hWnd)) return GWVS_HIDDEN; - else if ( db_get_b(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT) || !db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT)) + + if ( db_get_b(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT) || !db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT)) return GWVS_VISIBLE; - else if ( hwndFocused == pcli->hwndContactList || GetParent(hwndFocused) == pcli->hwndContactList ) + + if ( hwndFocused == pcli->hwndContactList || GetParent(hwndFocused) == pcli->hwndContactList ) return GWVS_VISIBLE; + + int hstep,vstep; + BITMAP bmp; + HBITMAP WindowImage; + int maxx = 0; + int maxy = 0; + int wx = 0; + int dx,dy; + BYTE *ptr = NULL; + HRGN rgn = NULL; + WindowImage = g_CluiData.fLayered?ske_GetCurrentWindowImage():0; + if (WindowImage && g_CluiData.fLayered) + { + GetObject(WindowImage,sizeof(BITMAP),&bmp); + ptr = (BYTE*)bmp.bmBits; + maxx = bmp.bmWidth; + maxy = bmp.bmHeight; + wx = bmp.bmWidthBytes; + } else { - int hstep,vstep; - BITMAP bmp; - HBITMAP WindowImage; - int maxx = 0; - int maxy = 0; - int wx = 0; - int dx,dy; - BYTE *ptr = NULL; - HRGN rgn = NULL; - WindowImage = g_CluiData.fLayered?ske_GetCurrentWindowImage():0; - if (WindowImage && g_CluiData.fLayered) - { - GetObject(WindowImage,sizeof(BITMAP),&bmp); - ptr = (BYTE*)bmp.bmBits; - maxx = bmp.bmWidth; - maxy = bmp.bmHeight; - wx = bmp.bmWidthBytes; - } - else - { - RECT rc; - int i=0; - rgn = CreateRectRgn(0,0,1,1); - GetWindowRect(hWnd,&rc); - GetWindowRgn(hWnd,rgn); - OffsetRgn(rgn,rc.left,rc.top); - GetRgnBox(rgn,&rc); - i = i; - //maxx = rc.right; - //maxy = rc.bottom; - } - GetWindowRect(hWnd, &rc); - { - RECT rcMonitor = {0}; - Docking_GetMonitorRectFromWindow(hWnd,&rcMonitor); - rc.top = rc.top < rcMonitor.top?rcMonitor.top:rc.top; - rc.left = rc.left < rcMonitor.left?rcMonitor.left:rc.left; - rc.bottom = rc.bottom>rcMonitor.bottom?rcMonitor.bottom:rc.bottom; - rc.right = rc.right>rcMonitor.right?rcMonitor.right:rc.right; - } - width = rc.right - rc.left; - height = rc.bottom- rc.top; - dx = -rc.left; - dy = -rc.top; - hstep = width/iStepX; - vstep = height/iStepY; - hstep = hstep>0?hstep:1; - vstep = vstep>0?vstep:1; - - for (i = rc.top; i < rc.bottom; i += vstep) { - pt.y = i; - for (j = rc.left; j < rc.right; j += hstep) { - BOOL po = FALSE; - pt.x = j; - if (rgn) - po = PtInRegion(rgn,j,i); - else - { - DWORD a = (GetDIBPixelColor(j+dx,i+dy,maxx,maxy,wx,ptr)&0xFF000000)>>24; - a = ((a*g_CluiData.bCurrentAlpha)>>8); - po = (a>16); - } - if (po || (!rgn && ptr == 0)) - { - BOOL hWndFound = FALSE; - HWND hAuxOld = NULL; - hAux = WindowFromPoint(pt); - do + RECT rc; + int i=0; + rgn = CreateRectRgn(0,0,1,1); + GetWindowRect(hWnd,&rc); + GetWindowRgn(hWnd,rgn); + OffsetRgn(rgn,rc.left,rc.top); + GetRgnBox(rgn,&rc); + i = i; + //maxx = rc.right; + //maxy = rc.bottom; + } + GetWindowRect(hWnd, &rc); + { + RECT rcMonitor = {0}; + Docking_GetMonitorRectFromWindow(hWnd,&rcMonitor); + rc.top = rc.top < rcMonitor.top?rcMonitor.top:rc.top; + rc.left = rc.left < rcMonitor.left?rcMonitor.left:rc.left; + rc.bottom = rc.bottom>rcMonitor.bottom?rcMonitor.bottom:rc.bottom; + rc.right = rc.right>rcMonitor.right?rcMonitor.right:rc.right; + } + width = rc.right - rc.left; + height = rc.bottom- rc.top; + dx = -rc.left; + dy = -rc.top; + hstep = width/iStepX; + vstep = height/iStepY; + hstep = hstep>0?hstep:1; + vstep = vstep>0?vstep:1; + + for (i = rc.top; i < rc.bottom; i += vstep) { + pt.y = i; + for (j = rc.left; j < rc.right; j += hstep) { + BOOL po = FALSE; + pt.x = j; + if (rgn) + po = PtInRegion(rgn,j,i); + else + { + DWORD a = (GetDIBPixelColor(j+dx,i+dy,maxx,maxy,wx,ptr)&0xFF000000)>>24; + a = ((a*g_CluiData.bCurrentAlpha)>>8); + po = (a>16); + } + + if (po || (!rgn && ptr == 0)) { + BOOL hWndFound = FALSE; + HWND hAuxOld = NULL; + hAux = WindowFromPoint(pt); + do { + if (hAux == hWnd) { + hWndFound = TRUE; + break; + } + //hAux = GetParent(hAux); + hAuxOld = hAux; + hAux = fnGetAncestor(hAux,GA_ROOTOWNER); + if (hAuxOld == hAux) { - if (hAux == hWnd) + TCHAR buf[255]; + GetClassName(hAux,buf,SIZEOF(buf)); + if ( !lstrcmp(buf,CLUIFrameSubContainerClassName)) { hWndFound = TRUE; break; } - //hAux = GetParent(hAux); - hAuxOld = hAux; - hAux = fnGetAncestor(hAux,GA_ROOTOWNER); - if (hAuxOld == hAux) - { - TCHAR buf[255]; - GetClassName(hAux,buf,SIZEOF(buf)); - if ( !lstrcmp(buf,CLUIFrameSubContainerClassName)) - { - hWndFound = TRUE; - break; - } - } - }while(hAux != NULL && hAuxOld != hAux); - - if (hWndFound) //There's window! - iNotCoveredDots++; //Let's count the not covered dots. - iCountedDots++; //Let's keep track of how many dots we checked. + } } + while(hAux != NULL && hAuxOld != hAux); + + if (hWndFound) //There's window! + iNotCoveredDots++; //Let's count the not covered dots. + iCountedDots++; //Let's keep track of how many dots we checked. } } - if (rgn) DeleteObject(rgn); - if ( iCountedDots - iNotCoveredDots < 2) //Every dot was not covered: the window is visible. - return GWVS_VISIBLE; - else if (iNotCoveredDots == 0) //They're all covered! - return GWVS_COVERED; - else //There are dots which are visible, but they are not as many as the ones we counted: it's partially covered. - return GWVS_PARTIALLY_COVERED; } + if (rgn) DeleteObject(rgn); + + if ( iCountedDots - iNotCoveredDots < 2) //Every dot was not covered: the window is visible. + return GWVS_VISIBLE; + + if (iNotCoveredDots == 0) //They're all covered! + return GWVS_COVERED; + + //There are dots which are visible, but they are not as many as the ones we counted: it's partially covered. + return GWVS_PARTIALLY_COVERED; } + BYTE g_bCalledFromShowHide = 0; + int cliShowHide(WPARAM wParam,LPARAM lParam) { BOOL bShow = FALSE; int iVisibleState = GetWindowVisibleState(pcli->hwndContactList,0,0); - int method; - method = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT);; //(0-none, 1-leftedge, 2-rightedge); - if (method) - { + int method = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT);; //(0-none, 1-leftedge, 2-rightedge); + if (method) { if (db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) == 0 && lParam != 1) - { - //hide - CLUI_HideBehindEdge(); - } + CLUI_HideBehindEdge(); //hide else - { CLUI_ShowFromBehindEdge(); - } + bShow = TRUE; iVisibleState = GWVS_HIDDEN; } - if ( !method && db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT)>0) - { + if ( !method && db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT) > 0) { g_CluiData.bBehindEdgeSettings = db_get_b(NULL, "ModernData", "BehindEdge", SETTING_BEHINDEDGE_DEFAULT); CLUI_ShowFromBehindEdge(); g_CluiData.bBehindEdgeSettings = 0; @@ -481,25 +455,23 @@ int cliShowHide(WPARAM wParam,LPARAM lParam) //bShow is FALSE when we enter the switch if no hide behind edge. switch (iVisibleState) { - case GWVS_PARTIALLY_COVERED: - bShow = TRUE; break; - case GWVS_COVERED: //Fall through (and we're already falling) - bShow = TRUE; break; - case GWVS_HIDDEN: - bShow = TRUE; break; - case GWVS_VISIBLE: //This is not needed, but goes for readability. - bShow = FALSE; break; - case -1: //We can't get here, both pcli->hwndContactList and iStepX and iStepY are right. - return 0; + case GWVS_PARTIALLY_COVERED: + bShow = TRUE; break; + case GWVS_COVERED: //Fall through (and we're already falling) + bShow = TRUE; break; + case GWVS_HIDDEN: + bShow = TRUE; break; + case GWVS_VISIBLE: //This is not needed, but goes for readability. + bShow = FALSE; break; + case -1: //We can't get here, both pcli->hwndContactList and iStepX and iStepY are right. + return 0; } - if ((bShow == TRUE || lParam == 1)) - { + if ((bShow == TRUE || lParam == 1)) { Sync( CLUIFrames_ActivateSubContainers, TRUE ); CLUI_ShowWindowMod(pcli->hwndContactList, SW_RESTORE); - if ( !db_get_b(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT)) - { + if ( !db_get_b(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT)) { Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,1); //TO BE PROXIED SetWindowPos(pcli->hwndContactList, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE |SWP_NOACTIVATE); g_bCalledFromShowHide = 1; @@ -507,8 +479,7 @@ int cliShowHide(WPARAM wParam,LPARAM lParam) SetWindowPos(pcli->hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); g_bCalledFromShowHide = 0; } - else - { + else { SetWindowPos(pcli->hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,1); SetForegroundWindow(pcli->hwndContactList); @@ -518,29 +489,20 @@ int cliShowHide(WPARAM wParam,LPARAM lParam) RECT rcWindow; GetWindowRect(pcli->hwndContactList,&rcWindow); if (Utils_AssertInsideScreen(&rcWindow) == 1) - { MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE); - } - - //if (DBGetContactSettingByte(NULL,"CList","OnDesktop",SETTING_ONDESKTOP_DEFAULT)) - // SetWindowPos(pcli->hwndContactList, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - } else { //It needs to be hidden - if (GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) - { + if (GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) { CListMod_HideWindow(pcli->hwndContactList, SW_HIDE); db_set_b(NULL,"CList","State",SETTING_STATE_HIDDEN); } - else - { + else { if (db_get_b(NULL,"CList","Min2Tray",SETTING_MIN2TRAY_DEFAULT)) { CLUI_ShowWindowMod(pcli->hwndContactList, SW_HIDE); db_set_b(NULL,"CList","State",SETTING_STATE_HIDDEN); } - else - { + else { CLUI_ShowWindowMod(pcli->hwndContactList, SW_MINIMIZE); db_set_b(NULL,"CList","State",SETTING_STATE_MINIMIZED); } diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 28963f200d..a93d9475fb 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -435,7 +435,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam) if ((GetAsyncKeyState(VK_CONTROL)&0x8000) && msg->lParam == WM_LBUTTONDOWN && !db_get_b(NULL,"CList","Tray1Click",SETTING_TRAY1CLICK_DEFAULT)) { POINT pt; HMENU hMenu; - hMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,(WPARAM)0,(LPARAM)0); + hMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,(WPARAM)0,0); g_mutex_bOnTrayRightClick = 1; IS_WM_MOUSE_DOWN_IN_TRAY = 1; SetForegroundWindow(msg->hwnd); @@ -453,7 +453,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam) else if (msg->lParam == WM_RBUTTONUP) { POINT pt; HMENU hMenu; - hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDTRAY,(WPARAM)0,(LPARAM)0); + hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDTRAY,(WPARAM)0,0); g_mutex_bOnTrayRightClick = 1; SetForegroundWindow(msg->hwnd); diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index f40beebf46..70a3ece075 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -72,7 +72,7 @@ int CLUI::OnEvent_ModulesLoaded(WPARAM wParam,LPARAM lParam) setlocale(LC_ALL, ""); //fix for case insensitive comparing if (ServiceExists(MS_MC_DISABLEHIDDENGROUP)) - CallService(MS_MC_DISABLEHIDDENGROUP, (WPARAM)TRUE, (LPARAM)0); + CallService(MS_MC_DISABLEHIDDENGROUP, (WPARAM)TRUE, 0); if (ServiceExists(MS_MC_GETPROTOCOLNAME)) g_szMetaModuleName = (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0); @@ -425,7 +425,7 @@ HRESULT CLUI::CreateCLC() Frame.Flags = F_VISIBLE|/*F_SHOWTB|*/F_SHOWTBTIP|F_NO_SUBCONTAINER|F_TCHAR; Frame.tname = LPGENT("My Contacts"); Frame.TBtname = TranslateT("My Contacts"); - hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,(LPARAM)0); + hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0); CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)Frame.hWnd,(LPARAM)CLCPaint::PaintCallbackProc); CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS,MAKEWPARAM(FO_TBTIPNAME,hFrameContactTree),(LPARAM)Translate("My Contacts")); @@ -617,7 +617,7 @@ void CLUI_UpdateLayeredMode() g_CluiData.fLayered = tLayeredFlag; Sync(CLUIFrames_SetLayeredMode, tLayeredFlag,pcli->hwndContactList); CLUI_ChangeWindowMode(); - Sync(CLUIFrames_OnClistResize_mod, (WPARAM)0, (LPARAM)0 ); + Sync(CLUIFrames_OnClistResize_mod, (WPARAM)0, 0 ); if (fWasVisible) ShowWindow(pcli->hwndContactList,SW_SHOW); } } @@ -3079,7 +3079,7 @@ LRESULT CLUI::OnDestroy( UINT msg, WPARAM wParam, LPARAM lParam ) pcli->pfnTrayIconDestroy(m_hWnd); mutex_bAnimationInProgress = 0; - CallService(MS_CLIST_FRAMES_REMOVEFRAME,(WPARAM)hFrameContactTree,(LPARAM)0); + CallService(MS_CLIST_FRAMES_REMOVEFRAME,(WPARAM)hFrameContactTree,0); TRACE("CLUI.c: WM_DESTROY - hFrameContactTree removed\n"); pcli->hwndContactTree = NULL; pcli->hwndStatus = NULL; diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 486ce0f4e7..d031d33ec9 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -1287,7 +1287,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) SetWindowLongPtr(fw.TitleBar.hwnd,GWL_STYLE,(long)style& ~(WS_VSCROLL | WS_HSCROLL)); } - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); SetWindowPos(fw.TitleBar.hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED|SWP_NOACTIVATE); return 0; @@ -1365,7 +1365,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) if ( !CLUIFramesFitInSize()) fw.height = retval; retval = fw.height; if (fw.height != oldHeight && !fw.floating) - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); } else { @@ -1405,7 +1405,7 @@ static int _us_DoSetFrameOptions(WPARAM wParam,LPARAM lParam) return(0); } - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return -1; } @@ -1418,7 +1418,7 @@ static int _us_DoShowAllFrames(WPARAM wParam,LPARAM lParam) for (i=0;i < g_nFramesCount;i++) g_pfwFrames[i].visible = TRUE; - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0; } @@ -1431,7 +1431,7 @@ static int _us_DoShowTitles(WPARAM wParam,LPARAM lParam) for (i=0;i < g_nFramesCount;i++) g_pfwFrames[i].TitleBar.ShowTitleBar = TRUE; - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0; } @@ -1444,7 +1444,7 @@ static int _us_DoHideTitles(WPARAM wParam,LPARAM lParam) for (i=0;i < g_nFramesCount;i++) g_pfwFrames[i].TitleBar.ShowTitleBar = FALSE; - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0; } @@ -1476,7 +1476,7 @@ static int _us_DoShowHideFrame(WPARAM wParam,LPARAM lParam) } if (g_pfwFrames[pos].floating){CLUIFrameResizeFloatingFrame(pos);}; - if ( !g_pfwFrames[pos].floating) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + if ( !g_pfwFrames[pos].floating) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); } return 0; } @@ -1499,7 +1499,7 @@ static int _us_DoShowHideFrameTitle(WPARAM wParam,LPARAM lParam) - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0; @@ -2469,7 +2469,7 @@ int CLUIFrames_ApplyNewSizes(int mode) static int _us_DoUpdateFrame(WPARAM wParam,LPARAM lParam) { if (_fCluiFramesModuleNotStarted) return -1; - if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); return 0;} + if (wParam == -1) { CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); return 0;} if (lParam&FU_FMPOS) CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,1); int pos = id2pos( wParam ); @@ -3087,7 +3087,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam CLUIFrames_SetFrameFloat(Frameid,0); break; } - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); } break; @@ -3220,7 +3220,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam g_pfwFrames[pos].order ); - oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,g_pfwFrames[pos].id),(LPARAM)0); + oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS,MAKEWPARAM(FO_FLAGS,g_pfwFrames[pos].id),0); if ( !(oldflags&F_SHOWTBTIP)) { oldflags |= F_SHOWTBTIP; @@ -3440,7 +3440,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam if (newh>0) { - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); }; break; } @@ -3969,7 +3969,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam,LPARAM lParam) hwndtmp = g_pfwFrames[pos].ContainerWnd; - CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0); + CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); if (hwndtmp) SendMessage(hwndtmp,WM_SIZE,0,0); diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp index cc64f3a522..f3179c982c 100644 --- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp +++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp @@ -403,7 +403,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM for (i=0; i < SIZEOF(types); i++) { item = SendDlgItemMessage(hwndDlg,IDC_CONTTYPE,CB_ADDSTRING,0,(LPARAM)TranslateTS(types[i])); - SendDlgItemMessage(hwndDlg,IDC_CONTTYPE,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_CONTTYPE,CB_SETITEMDATA,item,0); } SendDlgItemMessage(hwndDlg,IDC_CONTTYPE,CB_SETCURSEL,0,0); } @@ -414,7 +414,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM for (i=0; i < SIZEOF(alignment); i++) { item = SendDlgItemMessage(hwndDlg,IDC_HALIGN,CB_ADDSTRING,0,(LPARAM)TranslateTS(alignment[i])); - SendDlgItemMessage(hwndDlg,IDC_HALIGN,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_HALIGN,CB_SETITEMDATA,item,0); } SendDlgItemMessage(hwndDlg,IDC_HALIGN,CB_SETCURSEL,0,0); @@ -426,7 +426,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM for (i=0; i < SIZEOF(alignment); i++) { item = SendDlgItemMessage(hwndDlg,IDC_VALIGN,CB_ADDSTRING,0,(LPARAM)TranslateTS(alignment[i])); - SendDlgItemMessage(hwndDlg,IDC_VALIGN,CB_SETITEMDATA,item,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_VALIGN,CB_SETITEMDATA,item,0); } SendDlgItemMessage(hwndDlg,IDC_VALIGN,CB_SETCURSEL,0,0); } diff --git a/plugins/Clist_modern/src/modern_skineditor.cpp b/plugins/Clist_modern/src/modern_skineditor.cpp index 36763ef5d5..5ab53c9af9 100644 --- a/plugins/Clist_modern/src/modern_skineditor.cpp +++ b/plugins/Clist_modern/src/modern_skineditor.cpp @@ -244,7 +244,7 @@ void SetControls(HWND hwndDlg, char * str) if (mir_bool_strcmpi(buf,"Solid")) Type=1; else if (mir_bool_strcmpi(buf,"Image")) Type=2; else if (mir_bool_strcmpi(buf,"Fragment")) Type=3; - SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_SETCURSEL,(WPARAM)Type,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_SETCURSEL,(WPARAM)Type,0); SetAppropriateGroups(hwndDlg,Type); switch (Type) { @@ -290,7 +290,7 @@ void SetControls(HWND hwndDlg, char * str) else if (mir_bool_strcmpi(buf,"TileVert")) fitmode = FM_TILE_VERT; else if (mir_bool_strcmpi(buf,"TileHorz")) fitmode = FM_TILE_HORZ; else fitmode = 0; - SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,0); } break; @@ -334,7 +334,7 @@ void SetControls(HWND hwndDlg, char * str) else if (mir_bool_strcmpi(buf,"TileVert")) fitmode = FM_TILE_VERT; else if (mir_bool_strcmpi(buf,"TileHorz")) fitmode = FM_TILE_HORZ; else fitmode = 0; - SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,(LPARAM)0); + SendDlgItemMessage(hwndDlg,IDC_FIT,CB_SETCURSEL,(WPARAM)fitmode,0); } break; @@ -370,7 +370,7 @@ int GetShortFileName(char * FullFile) char * MadeString(HWND hwndDlg) { char buf[MAX_PATH*2] = {0}; - int i = SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); + int i = SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_GETCURSEL,(WPARAM)0,0); switch (i) { case 0: @@ -381,7 +381,7 @@ char * MadeString(HWND hwndDlg) BYTE a; DWORD col; a = (BYTE)SendDlgItemMessage(hwndDlg,IDC_SPIN_ALPHA,UDM_GETPOS,0,0); - col = (DWORD)SendDlgItemMessage(hwndDlg,IDC_COLOR,CPM_GETCOLOUR,(WPARAM)0,(LPARAM)0); + col = (DWORD)SendDlgItemMessage(hwndDlg,IDC_COLOR,CPM_GETCOLOUR,(WPARAM)0,0); mir_snprintf(buf,SIZEOF(buf),"Glyph,Solid,%d,%d,%d,%d",GetRValue(col),GetGValue(col),GetBValue(col),a); } break; @@ -592,7 +592,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM { if (HIWORD(wParam) == CBN_SELCHANGE) { - int i = SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_GETCURSEL,(WPARAM)0,(LPARAM)0); + int i = SendDlgItemMessage(hwndDlg,IDC_TYPE,CB_GETCURSEL,(WPARAM)0,0); //if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_TYPE))) SetAppropriateGroups(hwndDlg,i); if (GetFocus() == GetDlgItem(hwndDlg,IDC_TYPE)) @@ -786,7 +786,7 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM pcli->pfnClcBroadcast( INTM_RELOADOPTIONS,0,0); Sync(CLUIFrames_OnClistResize_mod,0,0); ske_RedrawCompleteWindow(); - Sync(CLUIFrames_OnClistResize_mod, (WPARAM)0, (LPARAM)0); + Sync(CLUIFrames_OnClistResize_mod, (WPARAM)0, 0); { HWND hwnd = pcli->hwndContactList; RECT rc = {0}; diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index 5d35f09460..29900cd471 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -989,7 +989,7 @@ HWND StatusBar_Create(HWND parent) Frame.height = h; Frame.tname = _T("Status Bar"); Frame.TBtname = TranslateT("Status Bar"); - hFramehModernStatusBar = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,(LPARAM)0); + hFramehModernStatusBar = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0); CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)Frame.hWnd,(LPARAM)NewStatusPaintCallbackProc); //$$$$$ register sub for frame LoadStatusBarData(); diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp index 7b9ac4b895..82a4cac6eb 100644 --- a/plugins/Clist_modern/src/modern_statusbar_options.cpp +++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp @@ -180,7 +180,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_STATUSBAR_PROTO_LIST),GWLP_USERDATA,(LONG_PTR)dat); SendMessage(hwndComboBox, CB_ADDSTRING, 0, (LPARAM)TranslateT( " << Global>>" )); - SendMessage(hwndComboBox, CB_SETITEMDATA, 0, (LPARAM)0); + SendMessage(hwndComboBox, CB_SETITEMDATA, 0, 0); for (int i=0; i < count; i++ ) { szName = accs[i]->szModuleName; diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 788ef91564..521a3a7eda 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1366,7 +1366,7 @@ void CreateViewModeFrame() frame.align = alBottom; frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU) 0, g_hInst, NULL); g_hwndViewModeFrame = frame.hWnd; - hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,(LPARAM)0); + hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,0); CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS); CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)frame.hWnd,(LPARAM)ViewModePaintCallbackProc); //$$$$$ register sub for frame diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index d1490fac2e..77f86c6133 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -165,11 +165,10 @@ cheekySearchId( -1 ) CreateProtoService(MS_REVOKE_AUTH, &CIcqProto::RevokeAuthorization); CreateProtoService(MS_XSTATUS_SHOWDETAILS, &CIcqProto::ShowXStatusDetails); - - // Custom caps - CreateProtoService(PS_ICQ_ADDCAPABILITY, &CIcqProto::IcqAddCapability); - CreateProtoService(PS_ICQ_CHECKCAPABILITY, &CIcqProto::IcqCheckCapability); + // Custom caps + CreateProtoService(PS_ICQ_ADDCAPABILITY, &CIcqProto::IcqAddCapability); + CreateProtoService(PS_ICQ_CHECKCAPABILITY, &CIcqProto::IcqCheckCapability); HookProtoEvent(ME_SKIN2_ICONSCHANGED, &CIcqProto::OnReloadIcons); -- cgit v1.2.3