diff options
Diffstat (limited to 'src')
60 files changed, 141 insertions, 141 deletions
diff --git a/src/core/stdautoaway/src/options.cpp b/src/core/stdautoaway/src/options.cpp index 608f626753..5f176ab467 100644 --- a/src/core/stdautoaway/src/options.cpp +++ b/src/core/stdautoaway/src/options.cpp @@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h" -static const WORD aa_Status[] = { ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND }; +static const uint16_t aa_Status[] = { ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND }; -int IdleGetStatusIndex(WORD status) +int IdleGetStatusIndex(uint16_t status) { for (int j = 0; j < _countof(aa_Status); j++) if (aa_Status[j] == status) diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 1e820ab127..4471a6ddf2 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -79,7 +79,7 @@ struct CMPlugin : public PLUGIN<CMPlugin> CMOption<uint8_t> bIdleCheck, bIdleMethod, bIdleOnSaver, bIdleOnFullScr, bIdleOnLock;
CMOption<uint8_t> bIdlePrivate, bIdleSoundsOff, bIdleOnTerminal, bIdleStatusLock;
CMOption<uint8_t> bAAEnable;
- CMOption<WORD> bAAStatus;
+ CMOption<uint16_t> bAAStatus;
CMOption<DWORD> iIdleTime1st;
};
diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp index 6d72b72b6b..d0db6e96e8 100644 --- a/src/core/stdaway/src/awaymsg.cpp +++ b/src/core/stdaway/src/awaymsg.cpp @@ -90,7 +90,7 @@ public: wchar_t *contactName = Clist_GetContactDisplayName(m_hContact);
char *szProto = Proto_GetBaseAccountName(m_hContact);
- WORD dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
+ uint16_t dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE);
wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0);
wchar_t str[256], format[128];
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 49c9d76abd..24ebb16c9f 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -233,7 +233,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam }
db_set_b(0, "CLC", "ShowIdle", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0));
db_set_b(0, "CLC", "LeftMargin", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0));
- db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
+ db_set_w(0, "CLC", "ScrollTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0));
db_set_b(0, "CLC", "GroupIndent", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0));
db_set_b(0, "CLC", "NoVScrollBar", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0));
db_set_b(0, "CLC", "RowHeight", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0));
@@ -280,7 +280,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, }
}
{
- WORD bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
+ uint16_t bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
CheckDlgButton(hwndDlg, IDC_STRETCHH, bmpUse & CLB_STRETCHH ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_STRETCHV, bmpUse & CLB_STRETCHV ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwndDlg, IDC_TILEH, bmpUse & CLBF_TILEH ? BST_CHECKED : BST_UNCHECKED);
@@ -371,7 +371,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, db_set_s(0, "CLC", "BkBitmap", str);
}
{
- WORD flags = 0;
+ uint16_t flags = 0;
if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH))
flags |= CLB_STRETCHH;
if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHV))
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 536fa29a97..61e29dfbf7 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -153,7 +153,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L db_set_b(0, "CLUI", "MaxSizeHeight", (uint8_t)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE));
db_set_b(0, "CLUI", "AutoSizeUpward", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD));
g_plugin.setByte("AutoHide", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));
- g_plugin.setWord("HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
+ g_plugin.setWord("HideTime", (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0));
g_plugin.setByte("Transparent", (uint8_t)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT));
g_plugin.setByte("Alpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0));
g_plugin.setByte("AutoAlpha", (uint8_t)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0));
diff --git a/src/core/stdcrypt/src/encrypt.cpp b/src/core/stdcrypt/src/encrypt.cpp index 3b8d173229..44bdec84d1 100644 --- a/src/core/stdcrypt/src/encrypt.cpp +++ b/src/core/stdcrypt/src/encrypt.cpp @@ -148,7 +148,7 @@ uint8_t* CStdCrypt::encodeBuffer(const void *src, size_t cbLen, size_t *cbResult return nullptr;
uint8_t *tmpBuf = (uint8_t*)_alloca(cbLen + 2);
- *(PWORD)tmpBuf = (WORD)cbLen;
+ *(PWORD)tmpBuf = (uint16_t)cbLen;
memcpy(tmpBuf + 2, src, cbLen);
cbLen += 2;
size_t rest = cbLen % BLOCK_SIZE;
@@ -199,7 +199,7 @@ void* CStdCrypt::decodeBuffer(const uint8_t *pBuf, size_t bufLen, size_t *cbResu }
result[bufLen] = 0;
- WORD cbLen = *(PWORD)result;
+ uint16_t cbLen = *(PWORD)result;
if (cbLen > bufLen) {
mir_free(result);
return nullptr;
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index 1e6b22b57d..ed445a5907 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -281,7 +281,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dat->hIcon = nullptr; { char *szProto = Proto_GetBaseAccountName(dat->hContact); - WORD status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE); + uint16_t status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE); SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadProtoIcon(szProto, status)); } diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp index 0cf8673da1..0623a7ecd7 100644 --- a/src/core/stdmsg/src/chat_manager.cpp +++ b/src/core/stdmsg/src/chat_manager.cpp @@ -236,8 +236,8 @@ void Load_ChatModule() void Unload_ChatModule() { - db_set_w(0, CHAT_MODULE, "SplitterX", (WORD)g_Settings.iSplitterX); - db_set_w(0, CHAT_MODULE, "SplitterY", (WORD)g_Settings.iSplitterY); + db_set_w(0, CHAT_MODULE, "SplitterX", (uint16_t)g_Settings.iSplitterX); + db_set_w(0, CHAT_MODULE, "SplitterY", (uint16_t)g_Settings.iSplitterY); db_set_dw(0, CHAT_MODULE, "roomx", g_Settings.iX); db_set_dw(0, CHAT_MODULE, "roomy", g_Settings.iY); db_set_dw(0, CHAT_MODULE, "roomwidth", g_Settings.iWidth); diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index d94f9133fc..62936a6fdb 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -529,7 +529,7 @@ public: iLen = SendDlgItemMessage(m_hwnd, IDC_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); db_set_dw(0, CHAT_MODULE, "PopupColorBG", g_Settings.crPUBkgColour = clrBack.GetColor()); db_set_dw(0, CHAT_MODULE, "PopupColorText", g_Settings.crPUTextColour = clrText.GetColor()); diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index 7207ccb9c3..12d06a65cf 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -55,7 +55,7 @@ struct GlobalMessageData CMOption<bool> bUseStatusWinIcon;
CMOption<bool> bLimitAvatarHeight;
- CMOption<WORD> iAvatarHeight;
+ CMOption<uint16_t> iAvatarHeight;
CMOption<DWORD> popupFlags;
CMOption<DWORD> msgTimeout;
@@ -63,7 +63,7 @@ struct GlobalMessageData CMOption<uint8_t> iGap;
CMOption<uint8_t> iLoadHistory;
- CMOption<WORD> nLoadCount, nLoadTime;
+ CMOption<uint16_t> nLoadCount, nLoadTime;
bool bSmileyInstalled = false;
};
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index b5ddbf823d..304ada7afb 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -97,8 +97,8 @@ class CMsgDialog : public CSrmmBaseDialog int m_limitAvatarH = 0;
DWORD m_lastMessage = 0;
HANDLE m_hTimeZone = 0;
- WORD m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;
- WORD m_wMinute = 0;
+ uint16_t m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;
+ uint16_t m_wMinute = 0;
bool m_bIsMeta = false, m_bWindowCascaded = false, m_bNoActivate = false;
public:
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp index 18df3dee7f..2a88e29ba1 100644 --- a/src/core/stdmsg/src/tabs.cpp +++ b/src/core/stdmsg/src/tabs.cpp @@ -597,7 +597,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) TranslateMenu(hSubMenu); if (si != nullptr) { - WORD w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0); + uint16_t w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0); if (w == 0) CheckMenuItem(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND | MF_UNCHECKED); else @@ -614,7 +614,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) if (si != nullptr) { if (!(GetMenuState(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND)&MF_CHECKED)) { if (si->hContact) - db_set_w(si->hContact, si->pszModule, "TabPosition", (WORD)(i + 1)); + db_set_w(si->hContact, si->pszModule, "TabPosition", (uint16_t)(i + 1)); } else db_unset(si->hContact, si->pszModule, "TabPosition"); } diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp index 52bdcd5dbc..e6a1be8e7b 100644 --- a/src/core/stdpopup/src/services.cpp +++ b/src/core/stdpopup/src/services.cpp @@ -304,7 +304,7 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam) char setting[256]; mir_snprintf(setting, "%s/Timeout", pc->pszName); pc->iSeconds = g_plugin.getWord(setting, pc->iSeconds); - if (pc->iSeconds == (WORD)-1) pc->iSeconds = -1; + if (pc->iSeconds == (uint16_t)-1) pc->iSeconds = -1; mir_snprintf(setting, "%s/TextCol", pc->pszName); pc->colorText = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorText); mir_snprintf(setting, "%s/BgCol", pc->pszName); diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp index e6c28b3828..e93a697c24 100644 --- a/src/core/stduserinfo/src/stdinfo.cpp +++ b/src/core/stduserinfo/src/stdinfo.cpp @@ -121,8 +121,8 @@ static void SetValue(HWND hwndDlg, int idCtrl, MCONTACT hContact, char *szModule case DBVT_WORD:
if (special == SVS_COUNTRY) {
- WORD wSave = dbv.wVal;
- if (wSave == (WORD)-1) {
+ uint16_t wSave = dbv.wVal;
+ if (wSave == (uint16_t)-1) {
char szSettingName[100];
mir_snprintf(szSettingName, "%sName", szSetting);
if (!db_get_ws(hContact, szModule, szSettingName, &dbv)) {
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp index ae2d1221bd..173269f7f4 100644 --- a/src/core/stduseronline/src/useronline.cpp +++ b/src/core/stduseronline/src/useronline.cpp @@ -34,7 +34,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) int newStatus = cws->value.wVal;
int oldStatus = g_plugin.getWord(hContact, "OldStatus", ID_STATUS_OFFLINE);
- g_plugin.setWord(hContact, "OldStatus", (WORD)newStatus);
+ g_plugin.setWord(hContact, "OldStatus", (uint16_t)newStatus);
if (Ignore_IsIgnored(hContact, IGNOREEVENT_USERONLINE)) return 0;
if (Contact_IsHidden(hContact)) return 0;
if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) {
diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp index e3bf4f335a..8f7b4d0582 100644 --- a/src/mir_app/src/FontOptions.cpp +++ b/src/mir_app/src/FontOptions.cpp @@ -560,10 +560,10 @@ static void sttSaveFontData(HWND hwndDlg, FontInternal &F) db_set_dw(0, F.dbSettingsGroup, str, F.value.colour);
if (F.flags & FIDF_NOAS) {
mir_snprintf(str, "%sAs", F.setting);
- db_set_w(0, F.dbSettingsGroup, str, (WORD)0x00FF);
+ db_set_w(0, F.dbSettingsGroup, str, (uint16_t)0x00FF);
}
mir_snprintf(str, "%sFlags", F.setting);
- db_set_w(0, F.dbSettingsGroup, str, (WORD)F.flags);
+ db_set_w(0, F.dbSettingsGroup, str, (uint16_t)F.flags);
}
static void RebuildTree(HWND hwndDlg)
diff --git a/src/mir_app/src/MDatabaseCommon.cpp b/src/mir_app/src/MDatabaseCommon.cpp index 698f264065..5f61dd1ad5 100644 --- a/src/mir_app/src/MDatabaseCommon.cpp +++ b/src/mir_app/src/MDatabaseCommon.cpp @@ -406,10 +406,10 @@ LBL_Seek: if (isStatic) { dbv->cchVal--; if (realLen < dbv->cchVal) - dbv->cchVal = WORD(realLen); + dbv->cchVal = uint16_t(realLen); memcpy(dbv->pszVal, decoded, dbv->cchVal); dbv->pszVal[dbv->cchVal] = 0; - dbv->cchVal = WORD(realLen); + dbv->cchVal = uint16_t(realLen); } else { dbv->pszVal = (char *)mir_alloc(1 + realLen); @@ -491,13 +491,13 @@ STDMETHODIMP_(BOOL) MDatabaseCommon::WriteContactSetting(MCONTACT contactID, DBC if (dbcwWork.value.pszVal == nullptr) return 1; - dbcwWork.value.cchVal = (WORD)strlen(dbcwWork.value.pszVal); + dbcwWork.value.cchVal = (uint16_t)strlen(dbcwWork.value.pszVal); if (bIsEncrypted && m_crypto) { size_t len; uint8_t *pResult = m_crypto->encodeString(dbcwWork.value.pszVal, &len); if (pResult != nullptr) { pEncoded = dbcwWork.value.pbVal = pResult; - dbcwWork.value.cpbVal = (WORD)len; + dbcwWork.value.cpbVal = (uint16_t)len; dbcwWork.value.type = DBVT_ENCRYPTED; } } diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h index 37aac65bb0..62a826cb7e 100644 --- a/src/mir_app/src/chat.h +++ b/src/mir_app/src/chat.h @@ -69,7 +69,7 @@ BOOL SM_GiveStatus(const wchar_t *pszID, const char *pszModule, const w void SM_RemoveAll(void);
int SM_RemoveSession(const wchar_t *pszID, const char *pszModule, bool removeContact);
BOOL SM_RemoveUser(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID);
-BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, WORD wStatus);
+BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, uint16_t wStatus);
BOOL SM_SetOffline(const char *pszModule, SESSION_INFO *si);
BOOL SM_SetStatus(const char *pszModule, SESSION_INFO *si, int wStatus);
BOOL SM_TakeStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t *pszStatus);
@@ -79,7 +79,7 @@ SESSION_INFO* SM_FindSession(const wchar_t *pszID, const char *pszModule); SESSION_INFO* SM_FindSessionByIndex(const char *pszModule, int iItem);
STATUSINFO* TM_AddStatus(STATUSINFO **ppStatusList, const wchar_t *pszStatus, int *iCount);
-WORD TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus);
+uint16_t TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus);
BOOL UM_RemoveAll(SESSION_INFO *si);
BOOL UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags);
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp index 33d97cc08c..c34c7de691 100644 --- a/src/mir_app/src/chat_log.cpp +++ b/src/mir_app/src/chat_log.cpp @@ -173,7 +173,7 @@ static int Log_AppendRTF(LOGSTREAMDATA *streamData, bool simpleMode, CMStringA & else if (*line > 0 && *line < 128) {
buf.AppendChar(*line);
}
- else buf.AppendFormat("\\u%u ?", (WORD)*line);
+ else buf.AppendFormat("\\u%u ?", (uint16_t)*line);
}
return textCharsCount;
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp index 7d2d0b3b70..d12fa0f5d4 100644 --- a/src/mir_app/src/chat_manager.cpp +++ b/src/mir_app/src/chat_manager.cpp @@ -371,7 +371,7 @@ BOOL SM_GiveStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *p return TRUE;
}
-BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, WORD wStatus)
+BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, uint16_t wStatus)
{
SESSION_INFO *si = SM_FindSession(pszID, pszModule);
if (si == nullptr)
@@ -416,7 +416,7 @@ BOOL SM_SetStatus(const char *pszModule, SESSION_INFO *si, int wStatus) si->wStatus = wStatus;
if (si->hContact)
- db_set_w(si->hContact, si->pszModule, "Status", (WORD)wStatus);
+ db_set_w(si->hContact, si->pszModule, "Status", (uint16_t)wStatus);
if (g_chatApi.OnSetStatus)
g_chatApi.OnSetStatus(si, wStatus);
@@ -632,7 +632,7 @@ static STATUSINFO* TM_FindStatus(STATUSINFO *pStatusList, const wchar_t *pszStat return nullptr;
}
-WORD TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus)
+uint16_t TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus)
{
if (!pStatusList || !pszStatus)
return 0;
@@ -647,7 +647,7 @@ WORD TM_StringToWord(STATUSINFO *pStatusList, const wchar_t *pszStatus) return 0;
}
-static wchar_t* TM_WordToString(STATUSINFO *pStatusList, WORD Status)
+static wchar_t* TM_WordToString(STATUSINFO *pStatusList, uint16_t Status)
{
if (!pStatusList)
return nullptr;
@@ -717,7 +717,7 @@ void UM_SortUser(SESSION_INFO *si) /////////////////////////////////////////////////////////////////////////////////////////
-USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, WORD wStatus)
+USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *pszNick, uint16_t wStatus)
{
if (pszNick == nullptr)
return nullptr;
@@ -737,8 +737,8 @@ USERINFO* UM_AddUser(SESSION_INFO *si, const wchar_t *pszUID, const wchar_t *psz static int UM_CompareItem(const USERINFO *u1, const USERINFO *u2)
{
- WORD dw1 = u1->Status;
- WORD dw2 = u2->Status;
+ uint16_t dw1 = u1->Status;
+ uint16_t dw2 = u2->Status;
for (int i = 0; i < 8; i++) {
if ((dw1 & 1) && !(dw2 & 1))
@@ -768,7 +768,7 @@ static USERINFO* UM_FindUserFromIndex(SESSION_INFO *si, int index) return nullptr;
}
-static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
{
USERINFO *ui = UM_FindUser(si, pszUID);
if (ui == nullptr)
@@ -778,7 +778,7 @@ static USERINFO* UM_GiveStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD sta return ui;
}
-static USERINFO* UM_SetContactStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_SetContactStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
{
USERINFO *ui = UM_FindUser(si, pszUID);
if (ui == nullptr)
@@ -820,7 +820,7 @@ BOOL UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags) return TRUE;
}
-static USERINFO* UM_TakeStatus(SESSION_INFO *si, const wchar_t *pszUID, WORD status)
+static USERINFO* UM_TakeStatus(SESSION_INFO *si, const wchar_t *pszUID, uint16_t status)
{
USERINFO *ui = UM_FindUser(si, pszUID);
if (ui == nullptr)
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp index b28b31d15a..760377423c 100644 --- a/src/mir_app/src/chat_svc.cpp +++ b/src/mir_app/src/chat_svc.cpp @@ -368,7 +368,7 @@ static void AddUser(GCEVENT *gce) if (si == nullptr)
return;
- WORD status = TM_StringToWord(si->pStatuses, gce->pszStatus.w);
+ uint16_t status = TM_StringToWord(si->pStatuses, gce->pszStatus.w);
USERINFO *ui = g_chatApi.UM_AddUser(si, gce->pszUID.w, gce->pszNick.w, status);
if (ui == nullptr)
@@ -444,7 +444,7 @@ static INT_PTR CALLBACK sttEventStub(void *_param) // Do different things according to type of event
switch (gce.iType) {
case GC_EVENT_SETCONTACTSTATUS:
- return SM_SetContactStatus(gce.pszID.w, gce.pszModule, gce.pszUID.w, (WORD)gce.dwItemData);
+ return SM_SetContactStatus(gce.pszID.w, gce.pszModule, gce.pszUID.w, (uint16_t)gce.dwItemData);
case GC_EVENT_TOPIC:
if (SESSION_INFO *si = SM_FindSession(gce.pszID.w, gce.pszModule)) {
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 709f983806..1231260de1 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -169,7 +169,7 @@ static int ClcIconsChanged(WPARAM, LPARAM) static INT_PTR SetInfoTipHoverTime(WPARAM wParam, LPARAM)
{
- db_set_w(0, "CLC", "InfoTipHoverTime", (WORD)wParam);
+ db_set_w(0, "CLC", "InfoTipHoverTime", (uint16_t)wParam);
Clist_Broadcast(INTM_SETINFOTIPHOVERTIME, wParam, 0);
return 0;
}
@@ -434,7 +434,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam 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));
@@ -465,7 +465,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam case INTM_ICONCHANGED:
{
- WORD status;
+ uint16_t status;
MCONTACT hSelItem = 0;
ClcContact *selcontact = nullptr;
@@ -489,14 +489,14 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0);
Clist_FindItem(hwnd, dat, wParam, &contact);
if (contact) {
- contact->iImage = (WORD)lParam;
+ contact->iImage = (uint16_t)lParam;
Clist_NotifyNewContact(hwnd, wParam);
dat->bNeedsResort = true;
}
}
}
else { // item in list already
- if (contact->iImage == (WORD)lParam)
+ if (contact->iImage == (uint16_t)lParam)
break;
if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {
if (dat->selection >= 0 && g_clistApi.pfnGetRowByIndex(dat, dat->selection, &selcontact, nullptr) != -1)
@@ -504,7 +504,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam Clist_RemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0);
}
else {
- contact->iImage = (WORD)lParam;
+ contact->iImage = (uint16_t)lParam;
if (!Clist_IsHiddenMode(dat, status))
contact->flags |= CONTACTF_ONLINE;
else
@@ -566,7 +566,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam if (szProto == nullptr)
break;
- WORD apparentMode = db_get_w(wParam, szProto, "ApparentMode", 0);
+ uint16_t apparentMode = db_get_w(wParam, szProto, "ApparentMode", 0);
contact->flags &= ~(CONTACTF_INVISTO | CONTACTF_VISTO);
if (apparentMode == ID_STATUS_OFFLINE)
contact->flags |= CONTACTF_INVISTO;
diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index b22ab4c6e5..f4ed57079c 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -68,7 +68,7 @@ ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, DWORD flags compareResult = mir_wstrcmp(pThisField, cc->szText); if (compareResult == 0) { if (pNextField == nullptr && flags != (DWORD)-1) { - cc->groupId = (WORD)groupId; + cc->groupId = (uint16_t)groupId; group = cc->group; group->expanded = (flags & GROUPF_EXPANDED) != 0; group->hideOffline = (flags & GROUPF_HIDEOFFLINE) != 0; @@ -90,7 +90,7 @@ ClcGroup* fnAddGroup(HWND hwnd, ClcData *dat, const wchar_t *szName, DWORD flags ClcContact *cc = g_clistApi.pfnAddItemToGroup(group, i); cc->type = CLCIT_GROUP; mir_wstrncpy(cc->szText, pThisField, _countof(cc->szText)); - cc->groupId = (WORD)(pNextField ? 0 : groupId); + cc->groupId = (uint16_t)(pNextField ? 0 : groupId); cc->group = new ClcGroup(10); cc->group->parent = group; group = cc->group; @@ -194,7 +194,7 @@ ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact cc->pce = pce; if (szProto != nullptr && !Clist_IsHiddenMode(dat, db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE))) cc->flags |= CONTACTF_ONLINE; - WORD apparentMode = szProto != nullptr ? db_get_w(hContact, szProto, "ApparentMode", 0) : 0; + uint16_t apparentMode = szProto != nullptr ? db_get_w(hContact, szProto, "ApparentMode", 0) : 0; if (apparentMode == ID_STATUS_OFFLINE) cc->flags |= CONTACTF_INVISTO; else if (apparentMode == ID_STATUS_ONLINE) @@ -213,7 +213,7 @@ ClcContact* fnAddContactToGroup(ClcData *dat, ClcGroup *group, MCONTACT hContact void fnAddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline) { DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); - WORD status = ID_STATUS_OFFLINE; + uint16_t status = ID_STATUS_OFFLINE; char *szProto = Proto_GetBaseAccountName(hContact); dat->bNeedsResort = true; @@ -600,7 +600,7 @@ void fnSortCLC(HWND hwnd, ClcData *dat, int useInsertionSort) struct SavedContactState_t { MCONTACT hContact; - WORD iExtraImage[EXTRA_ICON_COUNT]; + uint16_t iExtraImage[EXTRA_ICON_COUNT]; int checked; }; diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp index c6d7c4828d..f7321ed37c 100644 --- a/src/mir_app/src/db_ini.cpp +++ b/src/mir_app/src/db_ini.cpp @@ -394,7 +394,7 @@ LBL_NewLine: break;
case 'w':
case 'W':
- db_set_w(0, szSection, szName, (WORD)strtol(szValue + 1, nullptr, 0));
+ db_set_w(0, szSection, szName, (uint16_t)strtol(szValue + 1, nullptr, 0));
break;
case 'd':
case 'D':
diff --git a/src/mir_app/src/dll_sniffer.cpp b/src/mir_app/src/dll_sniffer.cpp index a1bf510baa..4f676d0410 100644 --- a/src/mir_app/src/dll_sniffer.cpp +++ b/src/mir_app/src/dll_sniffer.cpp @@ -143,7 +143,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) uint8_t *pSecStart = ptr + pISH->PointerToRawData - pISH->VirtualAddress;
IMAGE_EXPORT_DIRECTORY *pED = (PIMAGE_EXPORT_DIRECTORY)&pSecStart[expAddr];
DWORD *ptrRVA = (DWORD*)&pSecStart[pED->AddressOfNames];
- WORD *ptrOrdRVA = (WORD*)&pSecStart[pED->AddressOfNameOrdinals];
+ uint16_t *ptrOrdRVA = (uint16_t*)&pSecStart[pED->AddressOfNameOrdinals];
DWORD *ptrFuncList = (DWORD*)&pSecStart[pED->AddressOfFunctions];
MUUID *pIds = nullptr;
@@ -181,7 +181,7 @@ MUUID* GetPluginInterfaces(const wchar_t *ptszFileName, bool &bIsPlugin) // patch version
if (dwVersion) {
uint8_t *pVersionRes = &pSecStart[dwVersion];
- size_t cbLen = *(WORD*)pVersionRes;
+ size_t cbLen = *(uint16_t*)pVersionRes;
mir_ptr<uint8_t> pData((uint8_t*)mir_alloc(cbLen));
memcpy(pData, pVersionRes, cbLen);
diff --git a/src/mir_app/src/ei_options.cpp b/src/mir_app/src/ei_options.cpp index c055785739..dc8a9681f2 100644 --- a/src/mir_app/src/ei_options.cpp +++ b/src/mir_app/src/ei_options.cpp @@ -347,7 +347,7 @@ public: char setting[512]; mir_snprintf(setting, "%d_count", k); - db_set_w(0, EI_MODULE_NAME "Groups", setting, (WORD)group->m_items.getCount()); + db_set_w(0, EI_MODULE_NAME "Groups", setting, (uint16_t)group->m_items.getCount()); for (int j = 0; j < group->m_items.getCount(); j++) { BaseExtraIcon *extra = group->m_items[j]; diff --git a/src/mir_app/src/extracticon.cpp b/src/mir_app/src/extracticon.cpp index 3a563ac7c8..b20e4ad1e8 100644 --- a/src/mir_app/src/extracticon.cpp +++ b/src/mir_app/src/extracticon.cpp @@ -31,21 +31,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // http://msdn.microsoft.com/library/default.asp?url = /library/en-us/winui/winui/windowsuserinterface/resources/introductiontoresources/resourcereference/resourcestructures/newheader.asp
typedef struct
{
- WORD Reserved;
- WORD ResType;
- WORD ResCount;
+ uint16_t Reserved;
+ uint16_t ResType;
+ uint16_t ResCount;
}
NEWHEADER;
#define MAGIC_ICON 0
#define MAGIC_ICO1 1
#define MAGIC_CUR 2
-#define MAGIC_BMP ((WORD)'B'+((WORD)'M'<<8))
+#define MAGIC_BMP ((uint16_t)'B'+((uint16_t)'M'<<8))
-#define MAGIC_ANI1 ((WORD)'R'+((WORD)'I'<<8))
-#define MAGIC_ANI2 ((WORD)'F'+((WORD)'F'<<8))
-#define MAGIC_ANI3 ((WORD)'A'+((WORD)'C'<<8))
-#define MAGIC_ANI4 ((WORD)'O'+((WORD)'N'<<8))
+#define MAGIC_ANI1 ((uint16_t)'R'+((uint16_t)'I'<<8))
+#define MAGIC_ANI2 ((uint16_t)'F'+((uint16_t)'F'<<8))
+#define MAGIC_ANI3 ((uint16_t)'A'+((uint16_t)'C'<<8))
+#define MAGIC_ANI4 ((uint16_t)'O'+((uint16_t)'N'<<8))
#define VER30 0x00030000
@@ -236,7 +236,7 @@ UINT _ExtractIconEx(LPCTSTR lpszFile, int iconIndex, int cxIcon, int cyIcon, HIC // failed to read file signature
DWORD read = 0;
- WORD magic[6];
+ uint16_t magic[6];
if (!ReadFile(hFile, &magic, sizeof(magic), &read, nullptr) || (read != sizeof(magic))) {
CloseHandle(hFile);
return 0;
diff --git a/src/mir_app/src/hotkey_opts.cpp b/src/mir_app/src/hotkey_opts.cpp index 4ccea79193..60e2f57c97 100644 --- a/src/mir_app/src/hotkey_opts.cpp +++ b/src/mir_app/src/hotkey_opts.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_hotkeys.h> #include "skin.h" -static wchar_t* sttHokeyVkToName(WORD vkKey) +static wchar_t* sttHokeyVkToName(uint16_t vkKey) { static wchar_t buf[256] = { 0 }; DWORD code = MapVirtualKey(vkKey, 0) << 16; @@ -459,7 +459,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, { static BOOL initialized = FALSE; static int colWidth = 0; - static WORD currentLanguage = 0; + static uint16_t currentLanguage = 0; HWND hwndHotkey = GetDlgItem(hwndDlg, IDC_LV_HOTKEYS); @@ -547,7 +547,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, case WM_TIMER: if (initialized) { - WORD newLanguage = LOWORD(GetKeyboardLayout(0)); + uint16_t newLanguage = LOWORD(GetKeyboardLayout(0)); if (newLanguage == currentLanguage) break; @@ -638,7 +638,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, if ((LOWORD(wParam) == IDC_HOTKEY) && ((HIWORD(wParam) == EN_KILLFOCUS) || (HIWORD(wParam) == 0))) { LVITEM lvi; THotkeyItem *item; - WORD wHotkey = (WORD)SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_GETHOTKEY, 0, 0); + uint16_t wHotkey = (uint16_t)SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_GETHOTKEY, 0, 0); ShowWindow(GetDlgItem(hwndDlg, IDC_HOTKEY), SW_HIDE); SetFocus(hwndHotkey); diff --git a/src/mir_app/src/hotkeys.cpp b/src/mir_app/src/hotkeys.cpp index 3b4501bb5b..5011732232 100644 --- a/src/mir_app/src/hotkeys.cpp +++ b/src/mir_app/src/hotkeys.cpp @@ -48,7 +48,7 @@ HANDLE hEvChanged = nullptr; static BOOL bModuleInitialized = FALSE;
static HHOOK hhkKeyboard = nullptr;
-WORD GetHotkeyValue(INT_PTR idHotkey)
+uint16_t GetHotkeyValue(INT_PTR idHotkey)
{
for (auto &it : hotkeys)
if (it->idHotkey == idHotkey)
@@ -57,7 +57,7 @@ WORD GetHotkeyValue(INT_PTR idHotkey) return 0;
}
-static void sttWordToModAndVk(WORD w, uint8_t *mod, uint8_t *vk)
+static void sttWordToModAndVk(uint16_t w, uint8_t *mod, uint8_t *vk)
{
*mod = 0;
if (HIBYTE(w) & HOTKEYF_CONTROL) *mod |= MOD_CONTROL;
@@ -337,7 +337,7 @@ int LoadSkinHotkeys(void) char szSetting[100];
mir_snprintf(szSetting, "HK%s", oldSettings[i]);
- WORD key;
+ uint16_t key;
if ((key = db_get_w(0, "Clist", szSetting, 0))) {
db_unset(0, "Clist", szSetting);
db_set_w(0, DBMODULENAME, newSettings[i], key);
diff --git a/src/mir_app/src/langpack.h b/src/mir_app/src/langpack.h index 0ab5d403bb..eddbd7dd29 100644 --- a/src/mir_app/src/langpack.h +++ b/src/mir_app/src/langpack.h @@ -41,7 +41,7 @@ struct LANGPACK_INFO {
wchar_t tszLanguage[64];
LCID Locale;
- WORD codepage;
+ uint16_t codepage;
CMStringA szAuthors, szLastModifiedUsing;
FILETIME ftFileDate;
wchar_t tszFileName[MAX_PATH]; /* just the file name itself */
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 7856789ed4..e357d3df88 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -565,7 +565,7 @@ static INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM) Proto_SetStatus(pa->szModuleName, g_clistApi.currentDesiredStatusMode);
}
NotifyEventHooks(hStatusModeChangeEvent, g_clistApi.currentDesiredStatusMode, 0);
- db_set_w(0, "CList", "Status", (WORD)g_clistApi.currentDesiredStatusMode);
+ db_set_w(0, "CList", "Status", (uint16_t)g_clistApi.currentDesiredStatusMode);
return 1;
}
@@ -817,7 +817,7 @@ void RebuildMenuOrder(void) smep->status = it.iStatus;
{
wchar_t buf[256], hotkeyName[100];
- WORD hotKey = GetHotkeyValue(it.iHotKey);
+ uint16_t hotKey = GetHotkeyValue(it.iHotKey);
HotkeyToName(hotkeyName, _countof(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));
mir_snwprintf(buf, L"%s\t%s", Clist_GetStatusModeDescription(it.iStatus, 0), hotkeyName);
mi.name.w = buf;
@@ -874,7 +874,7 @@ static int sttRebuildHotkeys(WPARAM, LPARAM) continue;
wchar_t buf[256], hotkeyName[100];
- WORD hotKey = GetHotkeyValue(it.iHotKey);
+ uint16_t hotKey = GetHotkeyValue(it.iHotKey);
HotkeyToName(hotkeyName, _countof(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));
mir_snwprintf(buf, L"%s\t%s", Clist_GetStatusModeDescription(it.iStatus, 0), hotkeyName);
Menu_ModifyItem(it.hStatusMenu, buf);
diff --git a/src/mir_app/src/meta_options.cpp b/src/mir_app/src/meta_options.cpp index 8d4e767ab6..d11562c131 100644 --- a/src/mir_app/src/meta_options.cpp +++ b/src/mir_app/src/meta_options.cpp @@ -29,9 +29,9 @@ MetaOptions g_metaOptions; int Meta_WriteOptions()
{
db_set_b(0, META_PROTO, "LockHandle", g_metaOptions.bLockHandle);
- db_set_w(0, META_PROTO, "MenuContactLabel", (WORD)g_metaOptions.menu_contact_label);
- db_set_w(0, META_PROTO, "MenuContactFunction", (WORD)g_metaOptions.menu_function);
- db_set_w(0, META_PROTO, "CListContactName", (WORD)g_metaOptions.clist_contact_name);
+ db_set_w(0, META_PROTO, "MenuContactLabel", (uint16_t)g_metaOptions.menu_contact_label);
+ db_set_w(0, META_PROTO, "MenuContactFunction", (uint16_t)g_metaOptions.menu_function);
+ db_set_w(0, META_PROTO, "CListContactName", (uint16_t)g_metaOptions.clist_contact_name);
db_set_dw(0, META_PROTO, "SetStatusFromOfflineDelay", (DWORD)(g_metaOptions.set_status_from_offline_delay));
return 0;
}
diff --git a/src/mir_app/src/meta_utils.cpp b/src/mir_app/src/meta_utils.cpp index f21b97da3b..f26a0a9e21 100644 --- a/src/mir_app/src/meta_utils.cpp +++ b/src/mir_app/src/meta_utils.cpp @@ -128,7 +128,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, bool set_as_default) db_set_ws(hMeta, META_PROTO, buffer, Clist_GetContactDisplayName(hSub));
// Get the status
- WORD status = db_get_w(hSub, szProto, "Status", ID_STATUS_OFFLINE);
+ uint16_t status = db_get_w(hSub, szProto, "Status", ID_STATUS_OFFLINE);
// write the status
mir_snprintf(buffer, "Status%d", ccDest->nSubs);
@@ -345,7 +345,7 @@ int Meta_HideLinkedContacts(void) // prepare to update metacontact record of subcontat status
char *szProto = Proto_GetBaseAccountName(hContact);
- WORD status = (!szProto) ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
+ uint16_t status = (!szProto) ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
db_set_w(ccMeta->contactID, META_PROTO, buffer, status);
// update metacontact's record of nick for this contact
@@ -518,7 +518,7 @@ void Meta_GetSubNick(MCONTACT hMeta, int i, CMStringW &tszDest) void Meta_FixStatus(DBCachedContact *ccMeta)
{
- WORD status = ID_STATUS_OFFLINE;
+ uint16_t status = ID_STATUS_OFFLINE;
MCONTACT most_online = db_mc_getMostOnline(ccMeta->contactID);
if (most_online) {
diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 320456e9cf..f4ba40f671 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -181,7 +181,7 @@ bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact); void RegisterModule(CMPluginBase*);
void HotkeyToName(wchar_t *buf, int size, uint8_t shift, uint8_t key);
-WORD GetHotkeyValue(INT_PTR idHotkey);
+uint16_t GetHotkeyValue(INT_PTR idHotkey);
HBITMAP ConvertIconToBitmap(HIMAGELIST hIml, int iconId);
MBaseProto* Proto_GetProto(const char *szProtoName);
diff --git a/src/mir_app/src/netlib.h b/src/mir_app/src/netlib.h index d8ed8a3418..59fa02940c 100644 --- a/src/mir_app/src/netlib.h +++ b/src/mir_app/src/netlib.h @@ -95,7 +95,7 @@ struct NetlibConnection : public MZeroedObject NetlibHTTPProxyPacketQueue *pHttpProxyPacketQueue;
int proxyType;
char *szProxyServer;
- WORD wProxyPort;
+ uint16_t wProxyPort;
CMStringA szProxyBuf;
int pollingTimeout;
@@ -114,8 +114,8 @@ struct NetlibBoundPort : public MZeroedObject int handleType;
SOCKET s;
SOCKET s6;
- WORD wPort;
- WORD wExPort;
+ uint16_t wPort;
+ uint16_t wExPort;
NetlibUser *nlu;
NETLIBNEWCONNECTIONPROC pfnNewConnection;
HANDLE hThread;
@@ -186,8 +186,8 @@ bool OpenSsl_Init(); void OpenSsl_Unload();
// netlibupnp.cpp
-bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *extip, bool search);
-void NetlibUPnPDeletePortMapping(WORD extport, char* proto);
+bool NetlibUPnPAddPortMapping(uint16_t intport, char *proto, uint16_t *extport, DWORD *extip, bool search);
+void NetlibUPnPDeletePortMapping(uint16_t extport, char* proto);
void NetlibUPnPCleanup(void*);
void NetlibUPnPInit(void);
void NetlibUPnPDestroy(void);
diff --git a/src/mir_app/src/netlib_bind.cpp b/src/mir_app/src/netlib_bind.cpp index a6d3029e97..62a2042c0c 100644 --- a/src/mir_app/src/netlib_bind.cpp +++ b/src/mir_app/src/netlib_bind.cpp @@ -40,8 +40,8 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn) if (*portn == 0) return false; - WORD num; - Utils_GetRandom(&num, sizeof(WORD)); + uint16_t num; + Utils_GetRandom(&num, sizeof(uint16_t)); *portn = num % *portn; } @@ -82,10 +82,10 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn) if (before && portnum >= *portn) return false; - sin.sin_port = htons((WORD)port); + sin.sin_port = htons((uint16_t)port); bool bV4Mapped = s == INVALID_SOCKET || bind(s, (SOCKADDR*)&sin, sizeof(sin)) == 0; - sin6.sin6_port = htons((WORD)port); + sin6.sin6_port = htons((uint16_t)port); bool bV6Mapped = s6 == INVALID_SOCKET || bind(s6, (PSOCKADDR)&sin6, sizeof(sin6)) == 0; if (bV4Mapped && bV6Mapped) { diff --git a/src/mir_app/src/netlib_http.cpp b/src/mir_app/src/netlib_http.cpp index 11336b7ac7..48d2153710 100644 --- a/src/mir_app/src/netlib_http.cpp +++ b/src/mir_app/src/netlib_http.cpp @@ -159,7 +159,7 @@ void NetlibConnFromUrl(const char *szUrl, bool secur, NETLIBOPENCONNECTION &nloc char* pcolon = strrchr(szHost, ':'); if (pcolon) { *pcolon = '\0'; - nloc.wPort = (WORD)strtol(pcolon+1, nullptr, 10); + nloc.wPort = (uint16_t)strtol(pcolon+1, nullptr, 10); } else nloc.wPort = secur ? 443 : 80; nloc.flags = (secur ? NLOCF_SSL : 0); diff --git a/src/mir_app/src/netlib_opts.cpp b/src/mir_app/src/netlib_opts.cpp index c364314bd1..77f5d55613 100644 --- a/src/mir_app/src/netlib_opts.cpp +++ b/src/mir_app/src/netlib_opts.cpp @@ -68,7 +68,7 @@ static const UINT specifyPortsControls[] = { IDC_STATIC52}; static const wchar_t* szProxyTypes[] = {LPGENW("<mixed>"), L"SOCKS4", L"SOCKS5", L"HTTP", L"HTTPS", L"Internet Explorer"}; -static const WORD oftenProxyPorts[] = {1080, 1080, 1080, 8080, 8080, 8080}; +static const uint16_t oftenProxyPorts[] = {1080, 1080, 1080, 8080, 8080, 8080}; #define M_REFRESHALL (WM_USER+100) #define M_REFRESHENABLING (WM_USER+101) @@ -202,7 +202,7 @@ static void WriteSettingsStructToDb(const char *szSettingsModule, NETLIBUSERSETT db_set_b(0, szSettingsModule, "NLUseProxy", (uint8_t)settings->useProxy); db_set_b(0, szSettingsModule, "NLProxyType", (uint8_t)settings->proxyType); db_set_s(0, szSettingsModule, "NLProxyServer", settings->szProxyServer ? settings->szProxyServer : ""); - db_set_w(0, szSettingsModule, "NLProxyPort", (WORD)settings->wProxyPort); + db_set_w(0, szSettingsModule, "NLProxyPort", (uint16_t)settings->wProxyPort); db_set_b(0, szSettingsModule, "NLUseProxyAuth", (uint8_t)settings->useProxyAuth); db_set_s(0, szSettingsModule, "NLProxyAuthUser", settings->szProxyAuthUser ? settings->szProxyAuthUser : ""); db_set_s(0, szSettingsModule, "NLProxyAuthPassword", settings->szProxyAuthPassword ? settings->szProxyAuthPassword : ""); diff --git a/src/mir_app/src/netlib_security.cpp b/src/mir_app/src/netlib_security.cpp index ed3de5cd15..4ac932190b 100644 --- a/src/mir_app/src/netlib_security.cpp +++ b/src/mir_app/src/netlib_security.cpp @@ -43,8 +43,8 @@ struct NtlmHandleType struct NTLM_String { - WORD len; - WORD allocedSpace; + uint16_t len; + uint16_t allocedSpace; DWORD offset; }; diff --git a/src/mir_app/src/netlib_upnp.cpp b/src/mir_app/src/netlib_upnp.cpp index 862d3989a2..0ccd7b6c6c 100644 --- a/src/mir_app/src/netlib_upnp.cpp +++ b/src/mir_app/src/netlib_upnp.cpp @@ -109,7 +109,7 @@ static SOCKET sock = INVALID_SOCKET; static char szConnHost[256]; static unsigned short sConnPort; -static WORD *portList; +static uint16_t *portList; static unsigned numports, numportsAlloc; static HANDLE portListMutex; @@ -664,7 +664,7 @@ static bool findUPnPGateway(void) return gatewayFound; } -bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *extip, bool search) +bool NetlibUPnPAddPortMapping(uint16_t intport, char *proto, uint16_t *extport, DWORD *extip, bool search) { int res = 0, i = 5; @@ -693,7 +693,7 @@ bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *e if (ip) *extip = ip; if (numports >= numportsAlloc) - mir_realloc(portList, sizeof(WORD)*(numportsAlloc += 10)); + mir_realloc(portList, sizeof(uint16_t)*(numportsAlloc += 10)); portList[numports++] = *extport; } @@ -703,7 +703,7 @@ bool NetlibUPnPAddPortMapping(WORD intport, char *proto, WORD *extport, DWORD *e return res == 200; } -void NetlibUPnPDeletePortMapping(WORD extport, char* proto) +void NetlibUPnPDeletePortMapping(uint16_t extport, char* proto) { if (extport == 0) return; @@ -720,7 +720,7 @@ void NetlibUPnPDeletePortMapping(WORD extport, char* proto) for (i = 0; i < numports; i++) if (portList[i] == extport && --numports > 0) - memmove(&portList[i], &portList[i + 1], (numports - i) * sizeof(WORD)); + memmove(&portList[i], &portList[i + 1], (numports - i) * sizeof(uint16_t)); mir_free(szData); ReleaseMutex(portListMutex); @@ -759,7 +759,7 @@ void NetlibUPnPCleanup(void*) txtParseParam(szData, "QueryStateVariableResponse", "<return>", "<", buf, sizeof(buf))) num = atol(buf); - WORD ports[30]; + uint16_t ports[30]; for (unsigned i = 0; i < num && !Miranda_IsTerminated(); i++) { mir_snprintf(szData, 4096, get_port_mapping, i); @@ -776,7 +776,7 @@ void NetlibUPnPCleanup(void*) continue; if (txtParseParam(szData, "<NewExternalPort", ">", "<", buf, sizeof(buf))) { - WORD mport = (WORD)atol(buf); + uint16_t mport = (uint16_t)atol(buf); if (j >= _countof(ports)) break; @@ -801,7 +801,7 @@ void NetlibUPnPInit(void) { numports = 0; numportsAlloc = 10; - portList = (WORD*)mir_alloc(sizeof(WORD)*numportsAlloc); + portList = (uint16_t*)mir_alloc(sizeof(uint16_t)*numportsAlloc); portListMutex = CreateMutex(nullptr, FALSE, nullptr); } diff --git a/src/mir_app/src/searchresults.cpp b/src/mir_app/src/searchresults.cpp index 7a1b17fb45..4278978600 100644 --- a/src/mir_app/src/searchresults.cpp +++ b/src/mir_app/src/searchresults.cpp @@ -48,7 +48,7 @@ void SaveColumnSizes(HWND hwndResults) mir_snprintf(szSetting, "ColOrder%d", i);
db_set_b(0, "FindAdd", szSetting, (uint8_t)columnOrder[i]);
mir_snprintf(szSetting, "ColWidth%d", i);
- db_set_w(0, "FindAdd", szSetting, (WORD)ListView_GetColumnWidth(hwndResults, i));
+ db_set_w(0, "FindAdd", szSetting, (uint16_t)ListView_GetColumnWidth(hwndResults, i));
}
db_set_b(0, "FindAdd", "SortColumn", (uint8_t)dat->iLastColumnSortIndex);
db_set_b(0, "FindAdd", "SortAscending", (uint8_t)dat->bSortAscending);
diff --git a/src/mir_app/src/skin.h b/src/mir_app/src/skin.h index 7d739e7b9f..6436694728 100644 --- a/src/mir_app/src/skin.h +++ b/src/mir_app/src/skin.h @@ -42,7 +42,7 @@ struct THotkeyItem char *pszService, *pszName; // pszName is valid _only_ for "root" hotkeys
wchar_t *pwszSection, *pwszDescription;
LPARAM lParam;
- WORD DefHotkey, Hotkey;
+ uint16_t DefHotkey, Hotkey;
bool Enabled;
HPLUGIN pPlugin;
ATOM idHotkey;
@@ -52,7 +52,7 @@ struct THotkeyItem bool allowSubHotkeys;
bool OptChanged, OptDeleted, OptNew;
- WORD OptHotkey;
+ uint16_t OptHotkey;
THotkeyType OptType;
bool OptEnabled;
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index ad38733155..97bd6146d9 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -640,7 +640,7 @@ public: SaveTree(); // save the whole tree then CB_ReInitCustomButtons(); - WORD newGap = m_gap.GetPosition(); + uint16_t newGap = m_gap.GetPosition(); if (newGap != db_get_b(0, BB_MODULE_NAME, "ButtonsBarGap", 1)) { WindowList_BroadcastAsync(g_hWindowList, WM_SIZE, 0, 0); db_set_b(0, BB_MODULE_NAME, "ButtonsBarGap", newGap); diff --git a/src/mir_app/src/visibility.cpp b/src/mir_app/src/visibility.cpp index e64d9ed4da..ad3af25f07 100644 --- a/src/mir_app/src/visibility.cpp +++ b/src/mir_app/src/visibility.cpp @@ -106,7 +106,7 @@ static void SetAllContactIcons(HWND hwndList) continue;
DWORD flags;
- WORD status;
+ uint16_t status;
char *szProto = Proto_GetBaseAccountName(hContact);
if (szProto == nullptr) {
flags = 0;
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++) |