From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 26 Dec 2021 17:06:04 +0300
Subject: WORD -> uint16_t
---
src/mir_core/src/Windows/CCtrlButton.cpp | 2 +-
src/mir_core/src/Windows/CCtrlCheck.cpp | 2 +-
src/mir_core/src/Windows/CCtrlColor.cpp | 2 +-
src/mir_core/src/Windows/CCtrlCombo.cpp | 2 +-
src/mir_core/src/Windows/CCtrlEdit.cpp | 2 +-
src/mir_core/src/Windows/CCtrlHyperlink.cpp | 2 +-
src/mir_core/src/Windows/CCtrlListBox.cpp | 2 +-
src/mir_core/src/Windows/CCtrlRichEdit.cpp | 2 +-
src/mir_core/src/Windows/CCtrlSlider.cpp | 2 +-
src/mir_core/src/Windows/CCtrlSpin.cpp | 6 +++---
src/mir_core/src/Windows/CDbLink.cpp | 2 +-
src/mir_core/src/Windows/CDlgBase.cpp | 4 ++--
src/mir_core/src/Windows/CProgress.cpp | 8 ++++----
src/mir_core/src/Windows/resizer.cpp | 6 +++---
src/mir_core/src/db.cpp | 6 +++---
src/mir_core/src/utils.cpp | 2 +-
16 files changed, 26 insertions(+), 26 deletions(-)
(limited to 'src/mir_core')
diff --git a/src/mir_core/src/Windows/CCtrlButton.cpp b/src/mir_core/src/Windows/CCtrlButton.cpp
index d86ba2e0ad..d1d78e21cd 100644
--- a/src/mir_core/src/Windows/CCtrlButton.cpp
+++ b/src/mir_core/src/Windows/CCtrlButton.cpp
@@ -29,7 +29,7 @@ CCtrlButton::CCtrlButton(CDlgBase* wnd, int idCtrl)
: CCtrlBase(wnd, idCtrl)
{}
-BOOL CCtrlButton::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlButton::OnCommand(HWND, uint16_t, uint16_t idCode)
{
if (idCode == BN_CLICKED)
OnClick(this);
diff --git a/src/mir_core/src/Windows/CCtrlCheck.cpp b/src/mir_core/src/Windows/CCtrlCheck.cpp
index 0315e1601b..7eda4f73d6 100644
--- a/src/mir_core/src/Windows/CCtrlCheck.cpp
+++ b/src/mir_core/src/Windows/CCtrlCheck.cpp
@@ -31,7 +31,7 @@ CCtrlCheck::CCtrlCheck(CDlgBase *dlg, int ctrlId)
m_bNotifiable = true;
}
-BOOL CCtrlCheck::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlCheck::OnCommand(HWND, uint16_t, uint16_t)
{
NotifyChange();
return TRUE;
diff --git a/src/mir_core/src/Windows/CCtrlColor.cpp b/src/mir_core/src/Windows/CCtrlColor.cpp
index dcd841b213..47a49308df 100644
--- a/src/mir_core/src/Windows/CCtrlColor.cpp
+++ b/src/mir_core/src/Windows/CCtrlColor.cpp
@@ -29,7 +29,7 @@ CCtrlColor::CCtrlColor(CDlgBase *dlg, int ctrlId) :
CCtrlData(dlg, ctrlId)
{}
-BOOL CCtrlColor::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlColor::OnCommand(HWND, uint16_t, uint16_t)
{
NotifyChange();
return TRUE;
diff --git a/src/mir_core/src/Windows/CCtrlCombo.cpp b/src/mir_core/src/Windows/CCtrlCombo.cpp
index f481b1554d..f4b37a0b31 100644
--- a/src/mir_core/src/Windows/CCtrlCombo.cpp
+++ b/src/mir_core/src/Windows/CCtrlCombo.cpp
@@ -29,7 +29,7 @@ CCtrlCombo::CCtrlCombo(CDlgBase *dlg, int ctrlId)
: CCtrlData(dlg, ctrlId)
{}
-BOOL CCtrlCombo::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlCombo::OnCommand(HWND, uint16_t, uint16_t idCode)
{
switch (idCode) {
case CBN_CLOSEUP: OnCloseup(this); break;
diff --git a/src/mir_core/src/Windows/CCtrlEdit.cpp b/src/mir_core/src/Windows/CCtrlEdit.cpp
index 4395af9419..6d1ac26ddd 100644
--- a/src/mir_core/src/Windows/CCtrlEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlEdit.cpp
@@ -29,7 +29,7 @@ CCtrlEdit::CCtrlEdit(CDlgBase *dlg, int ctrlId)
: CCtrlData(dlg, ctrlId)
{}
-BOOL CCtrlEdit::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlEdit::OnCommand(HWND, uint16_t, uint16_t idCode)
{
if (idCode == EN_CHANGE)
NotifyChange();
diff --git a/src/mir_core/src/Windows/CCtrlHyperlink.cpp b/src/mir_core/src/Windows/CCtrlHyperlink.cpp
index f63e87ed8e..c081972066 100644
--- a/src/mir_core/src/Windows/CCtrlHyperlink.cpp
+++ b/src/mir_core/src/Windows/CCtrlHyperlink.cpp
@@ -32,7 +32,7 @@ CCtrlHyperlink::CCtrlHyperlink(CDlgBase* wnd, int idCtrl, const char* url)
OnClick = Callback(this, &CCtrlHyperlink::Default_OnClick);
}
-BOOL CCtrlHyperlink::OnCommand(HWND, WORD, WORD)
+BOOL CCtrlHyperlink::OnCommand(HWND, uint16_t, uint16_t)
{
OnClick(this);
return FALSE;
diff --git a/src/mir_core/src/Windows/CCtrlListBox.cpp b/src/mir_core/src/Windows/CCtrlListBox.cpp
index 71519a96ca..b575ebe069 100644
--- a/src/mir_core/src/Windows/CCtrlListBox.cpp
+++ b/src/mir_core/src/Windows/CCtrlListBox.cpp
@@ -29,7 +29,7 @@ CCtrlListBox::CCtrlListBox(CDlgBase *dlg, int ctrlId)
: CCtrlBase(dlg, ctrlId)
{}
-BOOL CCtrlListBox::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlListBox::OnCommand(HWND, uint16_t, uint16_t idCode)
{
switch (idCode) {
case LBN_DBLCLK: OnDblClick(this); break;
diff --git a/src/mir_core/src/Windows/CCtrlRichEdit.cpp b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
index 44d965a682..3f0f96fc1c 100644
--- a/src/mir_core/src/Windows/CCtrlRichEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
@@ -171,7 +171,7 @@ struct CREOleCallback : public IRichEditOleCallback
{ return E_NOTIMPL; }
STDMETHOD(GetDragDropEffect)(BOOL, DWORD, LPDWORD)
{ return S_OK; }
- STDMETHOD(GetContextMenu)(WORD, LPOLEOBJECT, CHARRANGE*, HMENU*)
+ STDMETHOD(GetContextMenu)(uint16_t, LPOLEOBJECT, CHARRANGE*, HMENU*)
{ return E_INVALIDARG; }
};
diff --git a/src/mir_core/src/Windows/CCtrlSlider.cpp b/src/mir_core/src/Windows/CCtrlSlider.cpp
index 4adbd45506..04c2e0c112 100644
--- a/src/mir_core/src/Windows/CCtrlSlider.cpp
+++ b/src/mir_core/src/Windows/CCtrlSlider.cpp
@@ -33,7 +33,7 @@ CCtrlSlider::CCtrlSlider(CDlgBase *dlg, int ctrlId, int wMax, int wMin) :
m_bNotifiable = true;
}
-BOOL CCtrlSlider::OnCommand(HWND, WORD, WORD idCode)
+BOOL CCtrlSlider::OnCommand(HWND, uint16_t, uint16_t idCode)
{
if (idCode == WM_HSCROLL) {
NotifyChange();
diff --git a/src/mir_core/src/Windows/CCtrlSpin.cpp b/src/mir_core/src/Windows/CCtrlSpin.cpp
index bf75a67c91..381555dcd9 100644
--- a/src/mir_core/src/Windows/CCtrlSpin.cpp
+++ b/src/mir_core/src/Windows/CCtrlSpin.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/////////////////////////////////////////////////////////////////////////////////////////
// CCtrlSpin class
-CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId, WORD wMax, WORD wMin) :
+CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId, uint16_t wMax, uint16_t wMin) :
CCtrlData(dlg, ctrlId),
m_wMin(wMin),
m_wMax(wMax),
@@ -70,12 +70,12 @@ void CCtrlSpin::OnReset()
SetPosition(LoadInt());
}
-WORD CCtrlSpin::GetPosition()
+uint16_t CCtrlSpin::GetPosition()
{
return m_wCurr;
}
-void CCtrlSpin::SetPosition(WORD wPos)
+void CCtrlSpin::SetPosition(uint16_t wPos)
{
SendMsg(UDM_SETPOS, 0, m_wCurr = wPos);
}
diff --git a/src/mir_core/src/Windows/CDbLink.cpp b/src/mir_core/src/Windows/CDbLink.cpp
index b8719fd677..4712550170 100644
--- a/src/mir_core/src/Windows/CDbLink.cpp
+++ b/src/mir_core/src/Windows/CDbLink.cpp
@@ -68,7 +68,7 @@ void CDbLink::SaveInt(DWORD value)
{
switch (m_type) {
case DBVT_BYTE: db_set_b(0, m_szModule, m_szSetting, (uint8_t)value); break;
- case DBVT_WORD: db_set_w(0, m_szModule, m_szSetting, (WORD)value); break;
+ case DBVT_WORD: db_set_w(0, m_szModule, m_szSetting, (uint16_t)value); break;
case DBVT_DWORD: db_set_dw(0, m_szModule, m_szSetting, value); break;
}
}
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp
index 99854ac47d..2a1dfd4140 100644
--- a/src/mir_core/src/Windows/CDlgBase.cpp
+++ b/src/mir_core/src/Windows/CDlgBase.cpp
@@ -279,8 +279,8 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
case WM_COMMAND:
{
HWND hwndCtrl = (HWND)lParam;
- WORD idCtrl = LOWORD(wParam);
- WORD idCode = HIWORD(wParam);
+ uint16_t idCtrl = LOWORD(wParam);
+ uint16_t idCode = HIWORD(wParam);
if (CCtrlBase *ctrl = FindControl(idCtrl)) {
BOOL result = ctrl->OnCommand(hwndCtrl, idCtrl, idCode);
if (result != FALSE)
diff --git a/src/mir_core/src/Windows/CProgress.cpp b/src/mir_core/src/Windows/CProgress.cpp
index acc4773aff..f00126b854 100644
--- a/src/mir_core/src/Windows/CProgress.cpp
+++ b/src/mir_core/src/Windows/CProgress.cpp
@@ -30,22 +30,22 @@ CCtrlProgress::CCtrlProgress(CDlgBase *wnd, int idCtrl)
{
}
-void CCtrlProgress::SetRange(WORD max, WORD min)
+void CCtrlProgress::SetRange(uint16_t max, uint16_t min)
{
SendMsg(PBM_SETRANGE, 0, MAKELPARAM(min, max));
}
-void CCtrlProgress::SetPosition(WORD value)
+void CCtrlProgress::SetPosition(uint16_t value)
{
SendMsg(PBM_SETPOS, value, 0);
}
-void CCtrlProgress::SetStep(WORD value)
+void CCtrlProgress::SetStep(uint16_t value)
{
SendMsg(PBM_SETSTEP, value, 0);
}
-WORD CCtrlProgress::Move(WORD delta)
+uint16_t CCtrlProgress::Move(uint16_t delta)
{
return delta == 0
? SendMsg(PBM_STEPIT, 0, 0)
diff --git a/src/mir_core/src/Windows/resizer.cpp b/src/mir_core/src/Windows/resizer.cpp
index a8a6be41e4..1c4ed5631e 100644
--- a/src/mir_core/src/Windows/resizer.cpp
+++ b/src/mir_core/src/Windows/resizer.cpp
@@ -37,12 +37,12 @@ struct START_OF_DLGITEMTEMPLATEEX
struct START_OF_DLGTEMPLATEEX
{
- WORD dlgVer;
- WORD signature;
+ uint16_t dlgVer;
+ uint16_t signature;
DWORD helpID;
DWORD exStyle;
DWORD style;
- WORD cDlgItems;
+ uint16_t cDlgItems;
short x, y, cx, cy;
};
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 2b2b41ebcd..439f5313c4 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -126,7 +126,7 @@ MIR_CORE_DLL(int) db_get_w(MCONTACT hContact, const char *szModule, const char *
switch(dbv.type) {
case DBVT_BYTE: return dbv.bVal;
case DBVT_WORD: return dbv.wVal;
- case DBVT_DWORD: return WORD(dbv.dVal);
+ case DBVT_DWORD: return uint16_t(dbv.dVal);
}
g_pCurrDb->FreeVariant(&dbv);
}
@@ -290,7 +290,7 @@ MIR_CORE_DLL(INT_PTR) db_set_b(MCONTACT hContact, const char *szModule, const ch
return g_pCurrDb->WriteContactSetting(hContact, &cws);
}
-MIR_CORE_DLL(INT_PTR) db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, WORD val)
+MIR_CORE_DLL(INT_PTR) db_set_w(MCONTACT hContact, const char *szModule, const char *szSetting, uint16_t val)
{
if (g_pCurrDb == nullptr) return 1;
@@ -358,7 +358,7 @@ MIR_CORE_DLL(INT_PTR) db_set_blob(MCONTACT hContact, const char *szModule, const
cws.szModule = szModule;
cws.szSetting = szSetting;
cws.value.type = DBVT_BLOB;
- cws.value.cpbVal = (WORD)len;
+ cws.value.cpbVal = (uint16_t)len;
cws.value.pbVal = (unsigned char*)val;
return g_pCurrDb->WriteContactSetting(hContact, &cws);
}
diff --git a/src/mir_core/src/utils.cpp b/src/mir_core/src/utils.cpp
index 0d773d10bc..0e6dfec6ab 100644
--- a/src/mir_core/src/utils.cpp
+++ b/src/mir_core/src/utils.cpp
@@ -558,7 +558,7 @@ MIR_CORE_DLL(bool) Utils_IsRtl(const wchar_t *pszwText)
{
#ifdef _MSC_VER
size_t iLen = mir_wstrlen(pszwText);
- mir_ptr<WORD> infoTypeC2((WORD*)mir_calloc(sizeof(WORD) * (iLen + 2)));
+ mir_ptr<uint16_t> infoTypeC2((uint16_t*)mir_calloc(sizeof(uint16_t) * (iLen + 2)));
GetStringTypeW(CT_CTYPE2, pszwText, (int)iLen, infoTypeC2);
for (size_t i = 0; i < iLen; i++)
--
cgit v1.2.3