WORD -> uint16_t

12 files changed, 45 insertions, 45 deletions

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 9d2925add7..15843bf7c4 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -273,7 +273,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 	case INTM_GROUPCHANGED:

 		{

-			WORD iExtraImage[EXTRA_ICON_COUNT];

+			uint16_t iExtraImage[EXTRA_ICON_COUNT];

 			uint8_t flags = 0;

 			if (!Clist_FindItem(hwnd, dat, wParam, &contact))

 				memset(iExtraImage, 0xFF, sizeof(iExtraImage));

@@ -307,7 +307,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 		{

 			int recalcScrollBar = 0;

 			MCONTACT hContact = wParam;

-			WORD status = ID_STATUS_OFFLINE;

+			uint16_t status = ID_STATUS_OFFLINE;

 			int  contactRemoved = 0;

 			MCONTACT hSelItem = NULL;

 			ClcContact *selcontact = nullptr;

@@ -330,7 +330,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					recalcScrollBar = 1;

 					Clist_FindItem(hwnd, dat, hContact, &contact);

 					if (contact) {

-						contact->iImage = (WORD)lParam;

+						contact->iImage = (uint16_t)lParam;

 						Clist_NotifyNewContact(hwnd, hContact);

 					}

 				}

@@ -338,7 +338,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			else {

 				// item in list already

 				DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);

-				if (contact->iImage == (WORD)lParam)

+				if (contact->iImage == (uint16_t)lParam)

 					break;

 				if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline || cfg::dat.bFilterEffective)) {        // CLVM changed

 					if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1)

@@ -348,7 +348,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					recalcScrollBar = 1;

 				}

 				else {

-					contact->iImage = (WORD)lParam;

+					contact->iImage = (uint16_t)lParam;

 					if (!Clist_IsHiddenMode(dat, status))

 						contact->flags |= CONTACTF_ONLINE;

 					else

@@ -473,7 +473,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 	case INTM_STATUSCHANGED:

 		if (Clist_FindItem(hwnd, dat, wParam, &contact)) {

-			WORD wStatus = db_get_w(wParam, contact->pce->szProto, "Status", ID_STATUS_OFFLINE);

+			uint16_t wStatus = db_get_w(wParam, contact->pce->szProto, "Status", ID_STATUS_OFFLINE);

 			if (cfg::dat.bNoOfflineAvatars && wStatus != ID_STATUS_OFFLINE && contact->wStatus == ID_STATUS_OFFLINE) {

 				contact->wStatus = wStatus;

 				if (cfg::dat.bAvatarServiceAvail && contact->ace == nullptr)

diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h
index f838cfea96..aa2bba2455 100644
--- a/plugins/Clist_nicer/src/clc.h
+++ b/plugins/Clist_nicer/src/clc.h
@@ -128,7 +128,7 @@ struct ClcContact : public ClcContactBase
 	MCONTACT	hSubContact;

 	char    *metaProto;

 	DWORD    codePage;

-	WORD     wStatus;

+	uint16_t     wStatus;

 	int      avatarLeft, extraIconRightBegin;

 	int      isRtl;

 	DWORD    cFlags;

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index b8c69babfe..64df6d5f09 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -226,7 +226,7 @@ uint8_t GetCachedStatusMsg(TExtraCache *p, char *szProto)
 		db_free(&dbv);

 

 	if (p->bStatusMsgValid != STATUSMSG_NOTFOUND) {

-		WORD infoTypeC2[12];

+		uint16_t infoTypeC2[12];

 		memset(infoTypeC2, 0, sizeof(infoTypeC2));

 		int iLen = min((int)mir_wstrlen(p->statusMsg), 10);

 		GetStringTypeW(CT_CTYPE2, p->statusMsg, iLen, infoTypeC2);

@@ -262,7 +262,7 @@ void ReloadExtraInfo(MCONTACT hContact)
 

 void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact)

 {

-	WORD infoTypeC2[12];

+	uint16_t infoTypeC2[12];

 	wchar_t *szText;

 	TExtraCache *p;

 

@@ -291,7 +291,7 @@ void RTL_DetectAndSet(ClcContact *contact, MCONTACT hContact)
 

 void RTL_DetectGroupName(ClcContact *group)

 {

-	WORD infoTypeC2[12];

+	uint16_t infoTypeC2[12];

 

 	group->isRtl = 0;

 

@@ -389,7 +389,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData
 		DWORD dwLocalMask = db_get_dw(hContact, "CLVM", cfg::dat.current_viewmode, 0);

 		if (dwLocalMask != 0) {

 			if (cfg::dat.bFilterEffective & CLVM_FILTER_STICKYSTATUS) {

-				WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

+				uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 				return !((1 << (wStatus - ID_STATUS_OFFLINE)) & HIWORD(dwLocalMask));

 			}

 			return 0;

@@ -419,7 +419,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData
 	}

 

 	if (cfg::dat.bFilterEffective & CLVM_FILTER_STATUS) {

-		WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

+		uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 		filterResult = (cfg::dat.filterFlags & CLVM_GROUPSTATUS_OP) ? ((filterResult | ((1 << (wStatus - ID_STATUS_OFFLINE)) & cfg::dat.statusMaskFilter ? 1 : 0))) : (filterResult & ((1 << (wStatus - ID_STATUS_OFFLINE)) & cfg::dat.statusMaskFilter ? 1 : 0));

 	}

 

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 8851f896e5..3d92dbf738 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -317,7 +317,7 @@ public:
 		db_set_dw(0, "CLC", "avatarradius", cfg::dat.avatarRadius);

 

 		cfg::dat.avatarSize = GetDlgItemInt(m_hwnd, IDC_AVATARHEIGHT, &translated, FALSE);

-		g_plugin.setWord("AvatarSize", (WORD)cfg::dat.avatarSize);

+		g_plugin.setWord("AvatarSize", (uint16_t)cfg::dat.avatarSize);

 

 		cfg::dat.bNoOfflineAvatars = IsDlgButtonChecked(m_hwnd, IDC_NOAVATARSOFFLINE) ? TRUE : FALSE;

 		g_plugin.setByte("NoOfflineAV", (uint8_t)cfg::dat.bNoOfflineAvatars);

diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 84b3418f35..0939582f85 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -182,7 +182,7 @@ HDC hdcAV;
 

 LONG g_maxAV_X = 200, g_maxAV_Y = 200;

 

-static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, WORD cstatus, int rowHeight, DWORD dwFlags)

+static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, uint16_t cstatus, int rowHeight, DWORD dwFlags)

 {

 	float dScale = 0.;

 	float newHeight, newWidth;

@@ -461,7 +461,7 @@ set_bg_l:
 

 	RECT rc;

 	rc.left = 0;

-	WORD cstatus = contact->wStatus;

+	uint16_t cstatus = contact->wStatus;

 

 	/***** BACKGROUND DRAWING *****/

 	// contacts

@@ -829,13 +829,13 @@ bgskipped:
 		rc2.bottom = rc2.top + rowHeight;

 

 		if (av_left) {

-			leftOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

+			leftOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

 			rcContent.left += leftOffset;

 			leftX += leftOffset;

 		}

 		else {

 			rc2.left = (rcContent.right - cfg::dat.avatarSize) + 1;

-			rightOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

+			rightOffset += DrawAvatar(hdcMem, &rc2, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

 			rcContent.right -= (rightOffset);

 		}

 	}

@@ -1014,10 +1014,10 @@ bgskipped:
 					RECT rcAvatar = rcContent;

 

 					rcAvatar.left = rcContent.right - (cfg::dat.avatarSize - 1);

-					DrawAvatar(hdcMem, &rcAvatar, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

+					DrawAvatar(hdcMem, &rcAvatar, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

 					rcContent.right -= (cfg::dat.avatarSize + 2);

 				}

-				else rcContent.left += DrawAvatar(hdcMem, &rcContent, contact, y, dat, (WORD)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

+				else rcContent.left += DrawAvatar(hdcMem, &rcContent, contact, y, dat, (uint16_t)(iImage ? cstatus : 0), rowHeight, cEntry->dwDFlags);

 			}

 			else if (dwFlags & CLUI_FRAME_ALWAYSALIGNNICK && !avatar_done && av_local_wanted)

 				rcContent.left += (dwFlags & (CLUI_FRAME_AVATARSLEFT | CLUI_FRAME_AVATARSRIGHT | CLUI_FRAME_AVATARSRIGHTWITHNICK) ? 0 : cfg::dat.avatarSize + 2);

diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index a0741a8c15..2dca2ce3c9 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -92,8 +92,8 @@ public:
 	{

 		g_plugin.setByte("AlwaysMulti", (uint8_t)BST_UNCHECKED == IsDlgButtonChecked(m_hwnd, IDC_ALWAYSMULTI));

 		g_plugin.setByte("TrayIcon", (uint8_t)(chkDontCycle.GetState() ? SETTING_TRAYICON_SINGLE : (chkCycle.GetState() ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI)));

-		g_plugin.setWord("CycleTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

-		g_plugin.setWord("IconFlashTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

+		g_plugin.setWord("CycleTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0));

+		g_plugin.setWord("IconFlashTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_BLINKSPIN, UDM_GETPOS, 0, 0));

 		g_plugin.setByte("DisableTrayFlash", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_DISABLEBLINK));

 		g_plugin.setByte("AutoApplyLastViewMode", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_APPLYLASTVIEWMODE));

 

@@ -254,7 +254,7 @@ public:
 

 		cfgSetFlag(m_hwnd, IDC_FULLROWSELECT, CLUI_FULLROWSELECT);

 

-		db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));

+		db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));

 		db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(m_hwnd, IDC_NOSCROLLBAR) ? 1 : 0));

 		cfg::dat.bDblClkAvatars = IsDlgButtonChecked(m_hwnd, IDC_DBLCLKAVATARS) ? TRUE : FALSE;

 		db_set_b(0, "CLC", "dblclkav", (uint8_t)cfg::dat.bDblClkAvatars);

@@ -447,7 +447,7 @@ public:
 		db_set_b(0, "CLUI", "MaxSizeHeight", (uint8_t)GetDlgItemInt(m_hwnd, IDC_MAXSIZEHEIGHT, nullptr, FALSE));

 		db_set_b(0, "CLUI", "AutoSizeUpward", (uint8_t)IsDlgButtonChecked(m_hwnd, IDC_AUTOSIZEUPWARD));

 		g_plugin.setByte("AutoHide", chkAutoHide.GetState());

-		g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(m_hwnd, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

+		g_plugin.setWord("HideTime", (uint16_t)SendDlgItemMessage(m_hwnd, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));

 

 		g_plugin.setByte("Transparent", cfg::dat.isTransparent = chkTransparent.GetState());

 		g_plugin.setByte("Alpha", cfg::dat.alpha = (uint8_t)SendDlgItemMessage(m_hwnd, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));

@@ -577,7 +577,7 @@ public:
 			db_free(&dbv);

 		}

 

-		WORD bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);

+		uint16_t bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);

 		CheckDlgButton(m_hwnd, IDC_STRETCHH, bmpUse & CLB_STRETCHH ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_STRETCHV, bmpUse & CLB_STRETCHV ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(m_hwnd, IDC_TILEH, bmpUse & CLBF_TILEH ? BST_CHECKED : BST_UNCHECKED);

@@ -601,7 +601,7 @@ public:
 		else

 			db_set_s(0, "CLC", "BkBitmap", str);

 

-		WORD flags = 0;

+		uint16_t flags = 0;

 		if (IsDlgButtonChecked(m_hwnd, IDC_STRETCHH))

 			flags |= CLB_STRETCHH;

 		if (IsDlgButtonChecked(m_hwnd, IDC_STRETCHV))

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 276010e810..93f9bcb289 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -418,8 +418,8 @@ void SetDBButtonStates(MCONTACT hPassedContact)
 					break;
 				}
 			case DBVT_WORD: {
-					WORD val = db_get_w(hFinalContact, szModule, szSetting, 0);
-					result = (val == *((WORD *)&buttonItem->bValuePush));
+					uint16_t val = db_get_w(hFinalContact, szModule, szSetting, 0);
+					result = (val == *((uint16_t *)&buttonItem->bValuePush));
 					break;
 				}
 			case DBVT_DWORD:
@@ -1387,7 +1387,7 @@ skipbg:
 											db_set_b(finalhContact, szModule, szSetting, pValue[0]);
 											break;
 										case DBVT_WORD:
-											db_set_w(finalhContact, szModule, szSetting, *((WORD *)&pValue[0]));
+											db_set_w(finalhContact, szModule, szSetting, *((uint16_t *)&pValue[0]));
 											break;
 										case DBVT_DWORD:
 											db_set_dw(finalhContact, szModule, szSetting, *((DWORD *)&pValue[0]));
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp
index 02bb548c61..daaa90863d 100644
--- a/plugins/Clist_nicer/src/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/cluiframes.cpp
@@ -430,18 +430,18 @@ int DBStoreFrameSettingsAtPos(int pos, int Frameid)
 	db_set_b(0, CLUIFrameModule, buf.Format("Visible%d", pos), (uint8_t)btoint(Frames[Frameid].visible));
 	db_set_b(0, CLUIFrameModule, buf.Format("TBVisile%d", pos), (uint8_t)btoint(Frames[Frameid].TitleBar.ShowTitleBar));
 
-	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", pos), (WORD)Frames[Frameid].height);
-	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (WORD)Frames[Frameid].HeightWhenCollapsed);
-	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", pos), (WORD)Frames[Frameid].align);
+	db_set_w(0, CLUIFrameModule, buf.Format("Height%d", pos), (uint16_t)Frames[Frameid].height);
+	db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (uint16_t)Frames[Frameid].HeightWhenCollapsed);
+	db_set_w(0, CLUIFrameModule, buf.Format("Align%d", pos), (uint16_t)Frames[Frameid].align);
 	//FloatingPos
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", pos), (WORD)Frames[Frameid].FloatingPos.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", pos), (WORD)Frames[Frameid].FloatingPos.y);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", pos), (WORD)Frames[Frameid].FloatingSize.x);
-	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", pos), (WORD)Frames[Frameid].FloatingSize.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", pos), (uint16_t)Frames[Frameid].FloatingPos.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", pos), (uint16_t)Frames[Frameid].FloatingPos.y);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", pos), (uint16_t)Frames[Frameid].FloatingSize.x);
+	db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", pos), (uint16_t)Frames[Frameid].FloatingSize.y);
 
 	db_set_b(0, CLUIFrameModule, buf.Format("Floating%d", pos), (uint8_t)btoint(Frames[Frameid].floating));
 	db_set_b(0, CLUIFrameModule, buf.Format("UseBorder%d", pos), (uint8_t)btoint(Frames[Frameid].UseBorder));
-	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", pos), (WORD)Frames[Frameid].order);
+	db_set_w(0, CLUIFrameModule, buf.Format("Order%d", pos), (uint16_t)Frames[Frameid].order);
 
 	db_set_b(0, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned);
 	return 0;
@@ -500,7 +500,7 @@ int CLUIFramesStoreFrameSettings(int Frameid)
 	}
 
 	DBStoreFrameSettingsAtPos(storpos, Frameid);
-	db_set_w(0, CLUIFrameModule, "StoredFrames", (WORD)maxstored);
+	db_set_w(0, CLUIFrameModule, "StoredFrames", (uint16_t)maxstored);
 	return 0;
 }
 
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp
index 67e699a49b..26f9fffd6b 100644
--- a/plugins/Clist_nicer/src/config.cpp
+++ b/plugins/Clist_nicer/src/config.cpp
@@ -143,7 +143,7 @@ void API::Ex_CopyEditToClipboard(HWND hWnd)
 

 INT_PTR CALLBACK API::Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM)

 {

-	WORD wNotifyCode, wID;

+	uint16_t wNotifyCode, wID;

 

 	switch (uMsg) {

 	case WM_INITDIALOG: {

diff --git a/plugins/Clist_nicer/src/coolscroll.cpp b/plugins/Clist_nicer/src/coolscroll.cpp
index 01e1e3eede..9c713f9544 100644
--- a/plugins/Clist_nicer/src/coolscroll.cpp
+++ b/plugins/Clist_nicer/src/coolscroll.cpp
@@ -334,7 +334,7 @@ static COLORREF GetSBBackColor(void)
 //

 static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg)

 {

-	static WORD wCheckPat[8] = 

+	static uint16_t wCheckPat[8] = 

 	{ 

 		0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 

 	};

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 697ef85f7c..9b4e383781 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1130,8 +1130,8 @@ static void BTN_ReadItem(char *itemName, char *file)
 				}

 			case 'w':

 				{

-					WORD value = (WORD)atol(&szBuffer[1]);

-					*((WORD *)&pValue[0]) = value;

+					uint16_t value = (uint16_t)atol(&szBuffer[1]);

+					*((uint16_t *)&pValue[0]) = value;

 					tmpItem.type = DBVT_WORD;

 					break;

 				}

@@ -1440,12 +1440,12 @@ void extbk_import(char *file, HWND hwndDlg)
 			mir_snprintf(szKey, "Font%dFlags", n);

 			data = 0;

 			GetPrivateProfileStructA(szSection, "Flags", &data, 4, file);

-			db_set_dw(0, "CLC", szKey, (WORD)data);

+			db_set_dw(0, "CLC", szKey, (uint16_t)data);

 

 			mir_snprintf(szKey, "Font%dAs", n);

 			data = 0;

 			GetPrivateProfileStructA(szSection, "SameAs", &data, 2, file);

-			db_set_dw(0, "CLC", szKey, (WORD)data);

+			db_set_dw(0, "CLC", szKey, (uint16_t)data);

 		}

 	}

 	i = 0;

@@ -1464,7 +1464,7 @@ void extbk_import(char *file, HWND hwndDlg)
 				db_set_dw(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, data);

 				break;

 			case 2:

-				db_set_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (WORD)data);

+				db_set_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (uint16_t)data);

 				break;

 			}

 			i++;

diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 5c95d1f8d6..c0b38de014 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -89,7 +89,7 @@ extern HIMAGELIST hCListImages;
 

 extern CLIST_INTERFACE coreCli;

 

-typedef  int  (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, WORD cstatus, int rowHeight);

+typedef  int  (__cdecl *pfnDrawAvatar)(HDC hdcOrig, HDC hdcMem, RECT *rc, ClcContact *contact, int y, struct ClcData *dat, int selected, uint16_t cstatus, int rowHeight);

 

 BOOL __forceinline GetItemByStatus(int status, StatusItems_t *retitem);