WORD -> uint16_t

5 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index cfb17740ce..a195e40644 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -515,9 +515,9 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 				db_set_b(0, CHAT_MODULE, "LoggingEnabled", (uint8_t)g_Settings.bLoggingEnabled);

 

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0);

-				db_set_w(0, CHAT_MODULE, "LogLimit", (WORD)iLen);

+				db_set_w(0, CHAT_MODULE, "LogLimit", (uint16_t)iLen);

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN3, UDM_GETPOS, 0, 0);

-				db_set_w(0, CHAT_MODULE, "LoggingLimit", (WORD)iLen);

+				db_set_w(0, CHAT_MODULE, "LoggingLimit", (uint16_t)iLen);

 

 				SaveBranch(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), branch2, _countof(branch2));

 

@@ -611,7 +611,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar
 

 				iLen = SendDlgItemMessage(hwndDlg, IDC_CHAT_SPIN1, UDM_GETPOS, 0, 0);

 				g_Settings.iPopupTimeout = iLen;

-				db_set_w(0, CHAT_MODULE, "PopupTimeout", (WORD)iLen);

+				db_set_w(0, CHAT_MODULE, "PopupTimeout", (uint16_t)iLen);

 

 				g_Settings.crPUBkgColour = SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0);

 				db_set_dw(0, CHAT_MODULE, "PopupColorBG", (DWORD)SendDlgItemMessage(hwndDlg, IDC_CHAT_BKG, CPM_GETCOLOUR, 0, 0));

diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 1d1fda210b..08d80577bf 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -41,7 +41,7 @@ void CMsgDialog::SetupInfobar()
 	cf2.bCharSet = lf.lfCharSet;

 	wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);

 	cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);

-	cf2.wWeight = (WORD)lf.lfWeight;

+	cf2.wWeight = (uint16_t)lf.lfWeight;

 	cf2.bPitchAndFamily = lf.lfPitchAndFamily;

 	cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;

 	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_NAME, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2);

@@ -55,7 +55,7 @@ void CMsgDialog::SetupInfobar()
 	cf2.bCharSet = lf.lfCharSet;

 	wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);

 	cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);

-	cf2.wWeight = (WORD)lf.lfWeight;

+	cf2.wWeight = (uint16_t)lf.lfWeight;

 	cf2.bPitchAndFamily = lf.lfPitchAndFamily;

 	cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;

 	SendDlgItemMessage(m_hwndInfo, IDC_INFOBAR_STATUS, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2);

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index b9a57e3f00..640060ee22 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1123,7 +1123,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			cf2.bCharSet = lf.lfCharSet;

 			wcsncpy(cf2.szFaceName, lf.lfFaceName, LF_FACESIZE);

 			cf2.dwEffects = ((lf.lfWeight >= FW_BOLD) ? CFE_BOLD : 0) | (lf.lfItalic ? CFE_ITALIC : 0);

-			cf2.wWeight = (WORD)lf.lfWeight;

+			cf2.wWeight = (uint16_t)lf.lfWeight;

 			cf2.bPitchAndFamily = lf.lfPitchAndFamily;

 			cf2.yHeight = abs(lf.lfHeight) * 1440 / g_dat.logPixelSY;

 			m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf2);

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 63130cbd56..06dbefe672 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -114,7 +114,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	MEVENT m_hDbEventFirst, m_hDbEventLast, m_hDbUnreadEventFirst;

 	int    m_minLogBoxHeight, m_minEditBoxHeight;

 	int    m_iShowUnread;

-	WORD   m_wStatus;

+	uint16_t   m_wStatus;

 	DWORD  m_lastMessage;

 	int    m_iMessagesInProgress;

 	int    m_iSendAllConfirm;

diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 93afc9f910..5868e94aa4 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -79,7 +79,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	CMOption<uint8_t> bUseTabs, bLimitTabs, bLimitChatTabs, bLimitNames, bSeparateChats, bTabCloseButton, bHideOneTab, bTabsAtBottom, bSwitchToActive;

 	CMOption<uint8_t> bShowTyping, bShowTypingWin, bShowTypingTray, bShowTypingClist, bShowTypingSwitch;

 	CMOption<uint8_t> iFlashCount, iHistoryMode;

-	CMOption<WORD> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;

+	CMOption<uint16_t> iLimitNames, iLimitTabs, iLimitChatTabs, iLoadCount, iLoadTime, iIndentSize, iAutoResizeLines;

 	CMOption<DWORD> iPopFlags, iMsgTimeout, iActiveAlpha, iInactiveAlpha;

 

 	CMPlugin();