diff options
28 files changed, 114 insertions, 118 deletions
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 23776b5d6f..e515c57fa2 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -888,10 +888,10 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL {
// if overlay - draw overlay icon
// position - on avatar
- int x = szWnd.cx-ICON_WIDTH;
- int y = szWnd.cy-ICON_HEIGHT;
+ int x = szWnd.cx - ICON_WIDTH;
+ int y = szWnd.cy - ICON_HEIGHT;
ske_ImageList_DrawEx(AniAva.overlayIconImageList,
- dat->overlayIconIdx&0xFFFF,
+ dat->overlayIconIdx & 0xFFFF,
tempDC, x, y, ICON_WIDTH, ICON_HEIGHT,
CLR_NONE, CLR_NONE, ILD_NORMAL);
}
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index 1faa3b03f9..f9623affa8 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -814,8 +814,8 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc {
COLORREF colourFg = dat->selBkColour;
int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;
- if (Drawing->iExtraImage[iImage] == 0xFFFF) {
- x += ( x>0 )?dat->extraColumnSpacing:ICON_HEIGHT;
+ if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON) {
+ x += ( x>0 )?dat->extraColumnSpacing : ICON_HEIGHT;
SetRect( &rc, fr_rc.right-x, p_rect.top, fr_rc.right-x+ICON_HEIGHT, p_rect.bottom );
if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );
Drawing->pos_extra[iImage] = rc;
@@ -840,7 +840,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, dx );
Drawing->pos_extra[iImage] = rc;
Drawing->pos_extra[iImage] = rc;
- if (Drawing->iExtraImage[iImage] != 0xFFFF)
+ if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );
}
@@ -1577,7 +1577,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc for ( iImage = 0; iImage < dat->extraColumnsCount ; iImage++ ) {
COLORREF colourFg = dat->selBkColour;
int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;
- if (Drawing->iExtraImage[iImage] == 0xFFFF) {
+ if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON) {
if ( !dat->MetaIgnoreEmptyExtra) {
SetRect( &rc, p_rect.left+x, p_rect.top, p_rect.left+x+ICON_HEIGHT, p_rect.bottom );
x += dat->extraColumnSpacing;
@@ -1604,7 +1604,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc count++;
if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );
Drawing->pos_extra[iImage] = rc;
- if (Drawing->iExtraImage[iImage] != 0xFFFF)
+ if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );
}
@@ -1626,7 +1626,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc {
int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;
if ( eNum < dat->extraColumnsCount )
- if (Drawing->iExtraImage[eNum] != 0xFFFF) {
+ if (Drawing->iExtraImage[eNum] != EMPTY_EXTRA_ICON) {
int mode = 0;
int BlendedInActiveState = dat->dbbBlendInActiveState;
int BlendValue = dat->dbbBlend25 ? ILD_BLEND25 : ILD_BLEND50;
@@ -1648,7 +1648,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc }
if ( dat->text_rtl != 0 ) _RTLRect( &p_rect, free_row_rc.right, 0 );
Drawing->pos_extra[eNum] = p_rect;
- if (Drawing->iExtraImage[eNum] != 0xFFFF)
+ if (Drawing->iExtraImage[eNum] != EMPTY_EXTRA_ICON)
ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[eNum], hdcMem,
p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );
}
@@ -2541,7 +2541,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon RECT rc;
for ( iImage = dat->extraColumnsCount-1 ; iImage >= 0 ; iImage-- ) {
- if ( Drawing->iExtraImage[iImage] != 0xFFFF || !dat->MetaIgnoreEmptyExtra ) {
+ if ( Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra ) {
rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos,
left, dat->extraColumnSpacing, dat->extraColumnSpacing, ICON_HEIGHT, 0 );
if (rc.left < rc.right) {
@@ -3244,7 +3244,7 @@ void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, struct ClcData *dat, ClcContac int mode;
COLORREF colourFg;
_GetBlendMode( dat, Drawing, selected, hottrack, GIM_EXTRAICON_AFFECT, &colourFg, &mode );
- if (Drawing->iExtraImage[iImage] != 0xFFFF)
+ if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)
ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem,
rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );
}
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index 411fa0234a..18defab4bd 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -259,7 +259,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact BOOL hasExtra = FALSE;
int width = 0;
for (int k = 0; k < dat->extraColumnsCount; k++)
- if (contact->iExtraImage[k] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {
+ if (contact->iExtraImage[k] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra) {
hasExtra = TRUE;
if (item != -1) break;
width += (width>0)?dat->extraColumnSpacing:(dat->extraColumnSpacing-2);
@@ -285,7 +285,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact {
int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;
if (eNum < dat->extraColumnsCount)
- if (contact->iExtraImage[eNum] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {
+ if (contact->iExtraImage[eNum] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra) {
gl_RowTabAccess[i]->h = ICON_HEIGHT;
gl_RowTabAccess[i]->w = ICON_HEIGHT;
}
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 8d795092b8..92f655f7a7 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -328,7 +328,7 @@ static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iIm else hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);
while(hItem) {
iOldIcon = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (iOldIcon != 0xFF && iOldIcon != iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
+ if (iOldIcon != EMPTY_EXTRA_ICON && iOldIcon != iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);
}
}
@@ -340,12 +340,12 @@ static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iCo itemType = SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hItem,0);
if (itemType == CLCIT_CONTACT) {
int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage != 0xFF && oldiImage != iImage)
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
}
else if (itemType == CLCIT_INFO) {
int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage != 0xFF && oldiImage != iImage)
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
if (hItem == hItemAll)
SetAllChildIcons(hwndList,hItem,iColumn,iImage);
@@ -354,7 +354,7 @@ static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iCo }
else if (itemType == CLCIT_GROUP) {
int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage != 0xFF && oldiImage != iImage)
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
if (hItem)
@@ -972,7 +972,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP iImage = SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));
if (iImage == nullImage)
iImage = nm->iColumn;
- else if (iImage != 0xFF)
+ else if (iImage != EMPTY_EXTRA_ICON)
iImage = nullImage;
SetIconsForColumn(GetDlgItem(hwndDlg,IDC_CLIST),hItem,hInfoItem,nm->iColumn,iImage);
//SetListGroupIcons(GetDlgItem(hwndDlg,IDC_CLIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hInfoItem,NULL);
diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp index b74f3f7eb6..ea339a5975 100644 --- a/plugins/Clist_mw/src/clcpaint.cpp +++ b/plugins/Clist_mw/src/clcpaint.cpp @@ -487,7 +487,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) //calc if extra icons present
int enabledextraicons = 0;
for (iImage = 0;iImage<dat->extraColumnsCount;iImage++) {
- if (Drawing->iExtraImage[iImage] == 0xFFFF)
+ if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
continue;
enabledextraicons++;
}
@@ -543,7 +543,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) COLORREF colourFg = dat->selBkColour;
int mode = ILD_NORMAL;
- if (Drawing->iExtraImage[iImage] == 0xFFFF)
+ if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
continue;
if (selected) mode = ILD_SELECTED;
@@ -571,7 +571,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) int mode = ILD_NORMAL;
int x;
- if (Drawing->iExtraImage[iImage] == 0xFFFF)
+ if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
continue;
if (hottrack) {
diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp index aca0b80d1f..c7d467e889 100644 --- a/plugins/Clist_mw/src/clcutils.cpp +++ b/plugins/Clist_mw/src/clcutils.cpp @@ -90,9 +90,9 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact cxSmIcon = GetSystemMetrics(SM_CXSMICON);
- for (i = 0;i<dat->extraColumnsCount;i++) {
+ for (i=0; i < dat->extraColumnsCount; i++) {
int x;
- if (hitcontact->iExtraImage[i] == 0xFFFF)
+ if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if ((style & CLS_EX_MULTICOLUMNALIGNLEFT)) {
@@ -106,7 +106,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact if (dat->MetaIgnoreEmptyExtra) {
ir = 0;
for (int j = i;j<dat->extraColumnsCount;j++)
- if (hitcontact->iExtraImage[j] != 0xFFFF)
+ if (hitcontact->iExtraImage[j] != EMPTY_EXTRA_ICON)
ir++;
}
else ir = dat->extraColumnsCount-i;
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h index 1e6bccf2b0..0422ce93fa 100644 --- a/plugins/Clist_mw/src/commonheaders.h +++ b/plugins/Clist_mw/src/commonheaders.h @@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_clistint.h>
#include <m_skin.h>
#include <m_contacts.h>
+#include <m_extraicons.h>
#include "m_genmenu.h"
#include "m_clui.h"
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h index 8fb2a7f6a4..1ffcc2ac76 100644 --- a/plugins/Clist_nicer/src/Include/commonheaders.h +++ b/plugins/Clist_nicer/src/Include/commonheaders.h @@ -84,6 +84,7 @@ #include <m_fontservice.h>
#include <m_metacontacts.h>
#include <m_cln_skinedit.h>
+#include <m_extraicons.h>
#include "extbackg.h"
#include "clc.h"
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 03b9e0141e..15edd69be8 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -1301,7 +1301,7 @@ nodisplay: for (int i = dat->extraColumnsCount-1; i >= 0; i--) {
COLORREF colourFg = dat->selBkColour;
int mode = ILD_NORMAL;
- if (contact->iExtraImage[i] == 0xFFFF)
+ if (contact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (selected)
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 0424afad7a..79a7eda987 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -130,7 +130,7 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact }
cxSmIcon = GetSystemMetrics(SM_CXSMICON);
for (i = 0; i< dat->extraColumnsCount; i++) {
- if (hitcontact->iExtraImage[i] == 0xFFFF)
+ if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (testx >= dat->extraColumnSpacing * (dat->extraColumnsCount - i) && testx < dat->extraColumnSpacing * (dat->extraColumnsCount - i) + cxSmIcon) {
if (flags)
@@ -143,7 +143,7 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact int images_present = 0;
for (i = EXTRA_ICON_COUNT-1; i >= 0; i--) {
- if (hitcontact->iExtraImage[i] == 0xFFFF)
+ if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask))
continue;
@@ -285,7 +285,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **c }
cxSmIcon = GetSystemMetrics(SM_CXSMICON);
for (i = 0; i< dat->extraColumnsCount; i++) {
- if (hitcontact->iExtraImage[i] == 0xFFFF)
+ if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (testx >= clRect.right - dat->extraColumnSpacing * (dat->extraColumnsCount - i) && testx< clRect.right - dat->extraColumnSpacing * (dat->extraColumnsCount - i) + cxSmIcon) {
if (flags)
@@ -299,7 +299,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **c int images_present = 0;
for (i = EXTRA_ICON_COUNT; i >= 0; i--) {
- if (hitcontact->iExtraImage[i] == 0xFFFF)
+ if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (!((1 << i) & cfg::eCache[hitcontact->extraCacheEntry].dwXMask))
continue;
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index e7d5e945bf..957a580a0d 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -260,55 +260,58 @@ static int FillDialog(HWND hwnd) static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iImage)
{
- int typeOfFirst,iOldIcon;
+ int iOldIcon;
HANDLE hItem,hChildItem;
- typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
+ int typeOfFirst = SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);
//check groups
- if (typeOfFirst==CLCIT_GROUP) hItem=hFirstItem;
- else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);
+ if (typeOfFirst == CLCIT_GROUP)
+ hItem = hFirstItem;
+ else
+ hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);
while(hItem) {
- hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
+ hChildItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
if (hChildItem)
- SetAllChildIcons(hwndList,hChildItem,iColumn,iImage);
- hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);
+ SetAllChildIcons(hwndList, hChildItem, iColumn, iImage);
+ hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);
}
//check contacts
- if (typeOfFirst==CLCIT_CONTACT) hItem=hFirstItem;
- else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);
+ if (typeOfFirst == CLCIT_CONTACT)
+ hItem = hFirstItem;
+ else
+ hItem = (HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);
while(hItem) {
- iOldIcon=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (iOldIcon!=0xFF && iOldIcon!=iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
- hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);
+ iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);
+ if (iOldIcon != EMPTY_EXTRA_ICON && iOldIcon != iImage)
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage));
+ hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);
}
}
static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iColumn,int iImage)
{
- int itemType;
-
- itemType=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hItem,0);
- if (itemType==CLCIT_CONTACT) {
- int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage!=0xFF&&oldiImage!=iImage)
- SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
+ int itemType = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hItem, 0);
+ if (itemType == CLCIT_CONTACT) {
+ int oldiImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage));
}
- else if (itemType==CLCIT_INFO) {
+ else if (itemType == CLCIT_INFO) {
int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage!=0xFF&&oldiImage!=iImage)
- SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage));
if (hItem == hItemAll)
- SetAllChildIcons(hwndList,hItem,iColumn,iImage);
+ SetAllChildIcons(hwndList, hItem, iColumn, iImage);
else
- SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage)); //hItemUnknown
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage)); //hItemUnknown
}
- else if (itemType==CLCIT_GROUP) {
+ else if (itemType == CLCIT_GROUP) {
int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);
- if (oldiImage!=0xFF&&oldiImage!=iImage)
- SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));
- hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn,iImage));
+ hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);
if (hItem)
- SetAllChildIcons(hwndList,hItem,iColumn,iImage);
+ SetAllChildIcons(hwndList, hItem, iColumn, iImage);
}
}
@@ -802,7 +805,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP int iImage = SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));
if (iImage == nullImage)
iImage = nm->iColumn;
- else if (iImage!=0xFF)
+ else if (iImage != EMPTY_EXTRA_ICON)
iImage = nullImage;
SetIconsForColumn(GetDlgItem(hwndDlg,IDC_CLIST),hItem,hInfoItem,nm->iColumn,iImage);
break;
diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 3182a41b79..dcb8f33773 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -31,9 +31,8 @@ extern struct CountryListEntry *countries; static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)
{
- int countryNumber=0xFFFF;
- char *pszProto;
- pszProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0);
+ int countryNumber = 0xFFFF;
+ char *pszProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0);
/* ip detect */
if ( db_get_b(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT))
countryNumber=ServiceIpToCountry(DBGetContactSettingDword((HANDLE)wParam,pszProto,"RealIP",0),0);
@@ -42,7 +41,7 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"Country",0);
if (countryNumber == 0 || countryNumber == 0xFFFF)
countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"CompanyCountry",0);
- return (countryNumber == 0)?0xFFFF:countryNumber;
+ return (countryNumber == 0) ? 0xFFFF : countryNumber;
}
/************************* Extra Image ****************************/
diff --git a/plugins/CountryFlags/src/icons.cpp b/plugins/CountryFlags/src/icons.cpp index 5fb6a54a6d..5e2bcae8a7 100644 --- a/plugins/CountryFlags/src/icons.cpp +++ b/plugins/CountryFlags/src/icons.cpp @@ -148,7 +148,7 @@ HICON FASTCALL LoadFlagIcon(int countryNumber) /* create identifier */
char *szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber, 0);
if (szCountry == NULL)
- szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber=0xFFFF, 0);
+ szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber = 0xFFFF, 0);
char szId[20];
wsprintfA(szId, (countryNumber == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countryNumber); /* buffer safe */
diff --git a/plugins/FingerPrintModPlus/src/fingerprint.cpp b/plugins/FingerPrintModPlus/src/fingerprint.cpp index d793f09e17..54db722e3b 100644 --- a/plugins/FingerPrintModPlus/src/fingerprint.cpp +++ b/plugins/FingerPrintModPlus/src/fingerprint.cpp @@ -152,7 +152,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) /* ApplyFingerprintImage
* 1)Try to find appropriate mask
-* 2)Register icon in extraimage list if not yet registered (0xFF)
+* 2)Register icon in extraimage list if not yet registered (EMPTY_EXTRA_ICON)
* 3)Set ExtraImage for contact
*/
@@ -177,7 +177,7 @@ int OnExtraIconClick(WPARAM wParam, LPARAM lParam, LPARAM) /*
* OnExtraIconListRebuild
-* Set all registered indexes in array to 0xFF (unregistered icon)
+* Set all registered indexes in array to EMPTY_EXTRA_ICON (unregistered icon)
*/
int OnExtraIconListRebuild(WPARAM wParam, LPARAM lParam)
{
@@ -1060,7 +1060,7 @@ HANDLE FASTCALL GetIconIndexFromFI(LPTSTR szMirVer) {
short base, overlay, overlay2, overlay3;
GetIconsIndexes(szMirVer, &base, &overlay, &overlay2, &overlay3);
- if (base == -1 || nFICount == 0xFF)
+ if (base == -1 || nFICount == 0xFFFF)
return INVALID_HANDLE_VALUE;
// MAX: 1024 + 256 + 128 + 128
diff --git a/plugins/KeyboardNotify/src/Common.h b/plugins/KeyboardNotify/src/Common.h index de4e3a89eb..406f5c14ad 100644 --- a/plugins/KeyboardNotify/src/Common.h +++ b/plugins/KeyboardNotify/src/Common.h @@ -55,6 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_clc.h>
#include <m_skin.h>
#include <win2k.h>
+#include <m_extraicons.h>
#include "m_kbdnotify.h"
#include <m_metacontacts.h>
diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp index 0265a719fb..4d756e8b05 100644 --- a/plugins/KeyboardNotify/src/ignore.cpp +++ b/plugins/KeyboardNotify/src/ignore.cpp @@ -78,14 +78,14 @@ static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);
if(iconOn[i] && iImage == 0)
iconOn[i] = 0;
- if(iImage != 0xFF)
+ if(iImage != EMPTY_EXTRA_ICON)
childCount[i]++;
}
hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);
}
//set icons
for(i=0; i < SIZEOF(iconOn); i++) {
- SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+3:0):0xFF));
+ SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+3:0):EMPTY_EXTRA_ICON));
if(groupChildCount)
groupChildCount[i] += childCount[i];
}
@@ -117,7 +117,7 @@ static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);
while(hItem) {
iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);
- if(iOldIcon != 0xFF && iOldIcon != iImage)
+ if(iOldIcon != EMPTY_EXTRA_ICON && iOldIcon != iImage)
SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));
hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);
}
@@ -144,7 +144,7 @@ static void SetIconsForColumn(HWND hwndList, HANDLE hItem, HANDLE hItemAll, int itemType = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hItem, 0);
if(itemType == CLCIT_CONTACT) {
int oldiImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);
- if (oldiImage != 0xFF && oldiImage != iImage)
+ if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)
SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));
}
else if(itemType == CLCIT_INFO) {
@@ -180,7 +180,7 @@ static void SaveItemMask(HWND hwndList, HANDLE hContact, HANDLE hItem, const cha for(i=0, mask=0; i < IGNOREEVENT_MAX; i++) {
iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));
- if(iImage && iImage != 0xFF)
+ if(iImage && iImage != EMPTY_EXTRA_ICON)
mask |= 1<<i;
}
DBWriteContactSettingDword(hContact, KEYBDMODULE, pszSetting, mask);
@@ -195,7 +195,7 @@ static void SetAllContactIcons(HWND hwndList) hContact=db_find_first();
do {
hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);
- if(hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == 0xFF) {
+ if(hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == EMPTY_EXTRA_ICON) {
szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
if(szProto == NULL)
protoCaps = 0;
@@ -302,7 +302,7 @@ INT_PTR CALLBACK DlgProcIgnoreOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));
if(iImage == 0)
iImage = nm->iColumn + 3;
- else if(iImage != 0xFF)
+ else if(iImage != EMPTY_EXTRA_ICON)
iImage = 0;
SetIconsForColumn(GetDlgItem(hwndDlg, IDC_LIST), hItem, hItemAll, nm->iColumn, iImage);
}
diff --git a/plugins/NewXstatusNotify/src/common.h b/plugins/NewXstatusNotify/src/common.h index fcab9e4e93..e44291ed75 100644 --- a/plugins/NewXstatusNotify/src/common.h +++ b/plugins/NewXstatusNotify/src/common.h @@ -68,6 +68,7 @@ #include "m_userinfo.h"
#include "m_utils.h"
#include "m_icq.h"
+#include "m_extraicons.h"
#include "m_metacontacts.h"
#include "m_toptoolbar.h"
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index b3841fa4c0..573b631648 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -441,7 +441,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g if (iconOn[i] && image == EXTRA_IMAGE_DOT)
iconOn[i] = 0;
- if (image != EXTRA_IMAGE_BLANK)
+ if (image != EMPTY_EXTRA_ICON)
childCount[i]++;
}
@@ -451,7 +451,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g //set icons
for(int i = 0; i < SIZEOF(iconOn); i++)
{
- SetExtraImage(hwndList, hParentItem, i, childCount[i] ? (iconOn[i] ? i : EXTRA_IMAGE_DOT) : EXTRA_IMAGE_BLANK);
+ SetExtraImage(hwndList, hParentItem, i, childCount[i] ? (iconOn[i] ? i : EXTRA_IMAGE_DOT) : EMPTY_EXTRA_ICON);
if (groupChildCount)
groupChildCount[i] += childCount[i];
}
@@ -484,7 +484,7 @@ void SetAllChildrenIcons(HWND hwndList, HANDLE hFirstItem, int column, int image while(hItem)
{
int oldIcon = GetExtraImage(hwndList, hItem, column);
- if (oldIcon != EXTRA_IMAGE_BLANK && oldIcon != image)
+ if (oldIcon != EMPTY_EXTRA_ICON && oldIcon != image)
SetExtraImage(hwndList, hItem, column, image);
hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);
diff --git a/plugins/NewXstatusNotify/src/indsnd.h b/plugins/NewXstatusNotify/src/indsnd.h index 461201839c..010d973ec7 100644 --- a/plugins/NewXstatusNotify/src/indsnd.h +++ b/plugins/NewXstatusNotify/src/indsnd.h @@ -22,14 +22,13 @@ #ifndef INDSND_H
#define INDSND_H
-#define EXTRA_IMAGE_SOUND 0
-#define EXTRA_IMAGE_POPUP 1
-#define EXTRA_IMAGE_XSTATUS 2
-#define EXTRA_IMAGE_LOGGING 3
-#define EXTRA_IMAGE_DISABLEALL 4
-#define EXTRA_IMAGE_ENABLEALL 5
-#define EXTRA_IMAGE_DOT 6
-#define EXTRA_IMAGE_BLANK 0xFF
+#define EXTRA_IMAGE_SOUND 0
+#define EXTRA_IMAGE_POPUP 1
+#define EXTRA_IMAGE_XSTATUS 2
+#define EXTRA_IMAGE_LOGGING 3
+#define EXTRA_IMAGE_DISABLEALL 4
+#define EXTRA_IMAGE_ENABLEALL 5
+#define EXTRA_IMAGE_DOT 6
#define STATUS_COLUMN 110
diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp index c7a1187717..5e76471ed9 100644 --- a/plugins/Popup/src/opt_contacts.cpp +++ b/plugins/Popup/src/opt_contacts.cpp @@ -90,24 +90,13 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l if(hItem==NULL) break;
if (!(hitFlags&CLCHT_ONITEMEXTRA)) break;
- iImage=SendDlgItemMessage(hwnd,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));
- if (iImage != 0xFF)
- {
+ iImage = SendDlgItemMessage(hwnd,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));
+ if (iImage != EMPTY_EXTRA_ICON) {
for (int i=0; i < 4 /*SIZEOF(sttIcons)*/; ++i)
//hIml element [0] = SKINICON_OTHER_SMALLDOT
//hIml element [1..5] = IcoLib_GetIcon(....) ~ old sttIcons
SendDlgItemMessage(hwnd, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, (i==nm->iColumn)?i+1:0));
}
-/*
- {
- while (hItem=(HANDLE)SendDlgItemMessage(hwnd,IDC_LIST,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem))
- {
- for (int i=0; i < SIZEOF(sttIcons); ++i)
- SendDlgItemMessage(hwnd, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, (i==nm->iColumn)?i+1:0));
- hItem = (HANDLE)SendDlgItemMessage(hwnd,IDC_LIST,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);
- }
- }
-*/
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
}
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index cd682e9b1f..e1f4b700f0 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -361,7 +361,7 @@ VOID SvcFlagsEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) MsgWndData::MsgWndData(HWND hwnd, HANDLE hContact) {
m_hwnd = hwnd;
m_hContact = hContact;
- m_contryID = (int)ServiceDetectContactOriginCountry((WPARAM)m_hContact,0);
+ m_countryID = (int)ServiceDetectContactOriginCountry((WPARAM)m_hContact,0);
FlagsIconUpdate();
}
@@ -376,15 +376,15 @@ MsgWndData::FlagsIconSet() { sid.cbSize = sizeof(sid);
sid.szModule = MODNAMEFLAGS;
/* ensure status icon is registered */
- if ( m_contryID!=0xFFFF || gFlagsOpts.bUseUnknownFlag) {
+ if ( m_countryID!=0xFFFF || gFlagsOpts.bUseUnknownFlag) {
/* copy icon as status icon API will call DestroyIcon() on it */
- hIcon = LoadFlagIcon(m_contryID);
+ hIcon = LoadFlagIcon(m_countryID);
sid.hIcon = (hIcon!=NULL)?CopyIcon(hIcon):NULL;
Skin_ReleaseIcon(hIcon); /* does NULL check */
hIcon = sid.hIcon;
- sid.dwId = (DWORD)m_contryID;
+ sid.dwId = (DWORD)m_countryID;
sid.hIconDisabled = sid.hIcon/*NULL*/;
- sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,m_contryID,0));
+ sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,m_countryID,0));
sid.flags = 0;
if(CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid) !=0) /* not yet registered? */
CallService(MS_MSG_ADDICON,0,(LPARAM)&sid);
@@ -394,7 +394,7 @@ MsgWndData::FlagsIconSet() { sid.hIconDisabled = NULL;
for(int i=0;i<nCountriesCount;++i) {
sid.dwId = (DWORD)countries[i].id;
- sid.flags = (m_contryID==countries[i].id && hIcon!=NULL)? 0:MBF_HIDDEN;
+ sid.flags = (m_countryID==countries[i].id && hIcon!=NULL)? 0:MBF_HIDDEN;
CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid);
}
}
@@ -404,7 +404,7 @@ MsgWndData::FlagsIconUnset() { StatusIconData sid = {0};
sid.cbSize = sizeof(sid);
sid.szModule = MODNAMEFLAGS;
- sid.dwId = (DWORD)m_contryID;
+ sid.dwId = (DWORD)m_countryID;
sid.flags = MBF_HIDDEN;
CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid);
/* can't call MS_MSG_REMOVEICON here as the icon might be
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.h b/plugins/UserInfoEx/src/Flags/svc_flags.h index 3aaa7f884f..fe0da2b933 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.h +++ b/plugins/UserInfoEx/src/Flags/svc_flags.h @@ -51,7 +51,7 @@ class MsgWndData { public:
HANDLE m_hContact;
HWND m_hwnd;
- int m_contryID;
+ int m_countryID;
MsgWndData(HWND hwnd, HANDLE hContact);
~MsgWndData();
@@ -62,7 +62,7 @@ class MsgWndData { gFlagsOpts.bShowStatusIconFlag ? FlagsIconSet():FlagsIconUnset();
};
void ContryIDchange(int ID) {
- m_contryID = ID; FlagsIconUpdate();
+ m_countryID = ID; FlagsIconUpdate();
};
};
diff --git a/plugins/WhoUsesMyFiles/src/resizer.c b/plugins/WhoUsesMyFiles/src/resizer.c index e45d10a453..4fc7906441 100644 --- a/plugins/WhoUsesMyFiles/src/resizer.c +++ b/plugins/WhoUsesMyFiles/src/resizer.c @@ -40,10 +40,12 @@ int ResizeDialog(WPARAM wParam,LPARAM lParam) int procResult;
int extendedDlg,itemCount;
- if(urd->cbSize!=sizeof(UTILRESIZEDIALOG)) return 1;
- pTemplate=(DLGTEMPLATE*)LockResource(LoadResource(urd->hInstance,FindResource(urd->hInstance,urd->lpTemplate,RT_DIALOG)));
- pTemplateEx=(START_OF_DLGTEMPLATEEX*)pTemplate;
- extendedDlg=pTemplateEx->signature==0xFFFF;
+ if(urd->cbSize != sizeof(UTILRESIZEDIALOG))
+ return 1;
+
+ pTemplate = (DLGTEMPLATE*)LockResource(LoadResource(urd->hInstance,FindResource(urd->hInstance,urd->lpTemplate,RT_DIALOG)));
+ pTemplateEx = (START_OF_DLGTEMPLATEEX*)pTemplate;
+ extendedDlg = pTemplateEx->signature == 0xFFFF;
if(extendedDlg && pTemplateEx->dlgVer!=1)
return 1;
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index a78f1fbd37..dd2d0b8a58 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -1418,7 +1418,7 @@ HANDLE CJabberDlgPrivacyLists::CListFindGroupByName(TCHAR *name) void CJabberDlgPrivacyLists::CListResetIcons(HWND, HANDLE hItem, bool hide)
{
for (int i = 0; i < 4; ++i)
- m_clcClist.SetExtraImage(hItem, i, hide ? 0xFF : 0);
+ m_clcClist.SetExtraImage(hItem, i, hide ? EMPTY_EXTRA_ICON : 0);
}
void CJabberDlgPrivacyLists::CListSetupIcons(HWND, HANDLE hItem, int iSlot, DWORD dwProcess, BOOL bAction)
@@ -2152,8 +2152,7 @@ void CJabberDlgPrivacyLists::clcClist_OnClick(CCtrlClc::TEventInfo *evt) if (!(hitFlags&CLCHT_ONITEMEXTRA)) return;
iImage = m_clcClist.GetExtraImage(hItem, evt->info->iColumn);
- if (iImage != 0xFF)
- {
+ if (iImage != EMPTY_EXTRA_ICON) {
if (iImage == 0)
iImage = evt->info->iColumn * 2 + 2;
else if (iImage == evt->info->iColumn * 2 + 2)
diff --git a/protocols/JabberG/src/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp index 39f63ecae7..10e26a0130 100644 --- a/protocols/JabberG/src/ui_utils.cpp +++ b/protocols/JabberG/src/ui_utils.cpp @@ -702,7 +702,7 @@ int CCtrlClc::GetExtraColumns() }
BYTE CCtrlClc::GetExtraImage(HANDLE hItem, int iColumn)
-{ return (BYTE)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & 0xFF);
+{ return (BYTE)(SendMessage(m_hwnd, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, 0)) & EMPTY_EXTRA_ICON);
}
HIMAGELIST CCtrlClc::GetExtraImageList()
diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index ce3a667eaa..a95a61b8fb 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -698,7 +698,7 @@ INT_PTR CALLBACK DlgProcMsnServLists(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR iImage = iImage ? 0 : nmc->iColumn + 1;
SendMessage(nmc->hdr.hwndFrom, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nmc->iColumn, iImage));
- if (iImage && SendMessage(nmc->hdr.hwndFrom,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nmc->iColumn ^ 1, 0)) != 0xFF)
+ if (iImage && SendMessage(nmc->hdr.hwndFrom, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nmc->iColumn ^ 1, 0)) != EMPTY_EXTRA_ICON)
if (nmc->iColumn == 2 || nmc->iColumn == 3)
SendMessage(nmc->hdr.hwndFrom, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nmc->iColumn ^ 1, 0));
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index 705a40b2a0..9e910d8c9c 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -493,7 +493,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint) for (int i = dat->extraColumnsCount-1; i >= 0; i--) {
COLORREF colourFg = dat->selBkColour;
int mode = ILD_NORMAL;
- if (group->cl.items[group->scanIndex]->iExtraImage[i] == 0xFFFF)
+ if (group->cl.items[group->scanIndex]->iExtraImage[i] == EMPTY_EXTRA_ICON)
continue;
if (selected)
diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h index 11522da792..9fabdc2520 100644 --- a/src/core/stdclist/src/commonheaders.h +++ b/src/core/stdclist/src/commonheaders.h @@ -58,6 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_file.h>
#include <m_addcontact.h>
#include <m_icolib.h>
+#include <m_extraicons.h>
#include "clc.h"
#include "version.h"
|