From cddcd7483a7c472598af098e759e5d309024f606 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 26 Dec 2021 20:31:39 +0300
Subject: DWORD -> uint32_t

---
 plugins/MenuItemEx/src/images.cpp  | 10 +++++-----
 plugins/MenuItemEx/src/main.cpp    | 16 ++++++++--------
 plugins/MenuItemEx/src/options.cpp |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'plugins/MenuItemEx')

diff --git a/plugins/MenuItemEx/src/images.cpp b/plugins/MenuItemEx/src/images.cpp
index aa1b7ab5bb..976904482f 100644
--- a/plugins/MenuItemEx/src/images.cpp
+++ b/plugins/MenuItemEx/src/images.cpp
@@ -6,7 +6,7 @@ extern HINSTANCE hinstance;
 void HalfBitmap32Alpha(HBITMAP hBitmap)
 {
 	BITMAP bmp;
-	DWORD dwLen;
+	uint32_t dwLen;
 	uint8_t *p;
 	int x, y;
 
@@ -43,7 +43,7 @@ void HalfBitmap32Alpha(HBITMAP hBitmap)
 //void MakeBmpTransparent(HBITMAP hBitmap)
 //{
 //	BITMAP bmp;
-//	DWORD dwLen;
+//	uint32_t dwLen;
 //	uint8_t *p;
 //
 //	GetObject(hBitmap, sizeof(bmp), &bmp);
@@ -67,7 +67,7 @@ void HalfBitmap32Alpha(HBITMAP hBitmap)
 void CorrectBitmap32Alpha(HBITMAP hBitmap, BOOL force)
 {
 	BITMAP bmp;
-	DWORD dwLen;
+	uint32_t dwLen;
 	uint8_t *p;
 	int x, y;
 	BOOL fixIt;
@@ -117,7 +117,7 @@ HBITMAP CopyBitmapTo32(HBITMAP hBitmap)
 	uint8_t * ptPixels;
 
 	BITMAP bmp;
-	DWORD dwLen;
+	uint32_t dwLen;
 	uint8_t *p;
 
 	GetObject(hBitmap, sizeof(bmp), &bmp);
@@ -221,7 +221,7 @@ BOOL MakeBitmap32(HBITMAP *hBitmap)
 //{
 //	uint8_t *p = NULL;
 //	uint8_t *p1;
-//	DWORD dwLen;
+//	uint32_t dwLen;
 //    int width, height, x, y;
 //    BITMAP bmp;
 //
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 36070f45b1..fee6f9234c 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -208,7 +208,7 @@ BOOL DirectoryExists(MCONTACT hContact)
 {
 	char path[MAX_PATH];
 	CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, (LPARAM)&path);
-	DWORD attr = GetFileAttributesA(path);
+	uint32_t attr = GetFileAttributesA(path);
 	return (attr != -1) && (attr&FILE_ATTRIBUTE_DIRECTORY);
 }
 
@@ -270,8 +270,8 @@ BOOL IPExists(MCONTACT hContact)
 	LPSTR szProto = Proto_GetBaseAccountName(hContact);
 	if (!szProto) return 0;
 
-	DWORD mIP = db_get_dw(hContact, szProto, "IP", 0);
-	DWORD rIP = db_get_dw(hContact, szProto, "RealIP", 0);
+	uint32_t mIP = db_get_dw(hContact, szProto, "IP", 0);
+	uint32_t rIP = db_get_dw(hContact, szProto, "RealIP", 0);
 
 	return (mIP != 0 || rIP != 0);
 }
@@ -488,7 +488,7 @@ static INT_PTR onCopyID(WPARAM hContact, LPARAM)
 
 static INT_PTR onCopyStatusMsg(WPARAM hContact, LPARAM)
 {
-	DWORD flags = g_plugin.getDword("flags", vf_default);
+	uint32_t flags = g_plugin.getDword("flags", vf_default);
 
 	LPSTR module = Proto_GetBaseAccountName(hContact);
 	if (!module)
@@ -527,11 +527,11 @@ static INT_PTR onCopyIP(WPARAM hContact, LPARAM)
 	char *szProto = Proto_GetBaseAccountName(hContact);
 
 	CMStringW wszBuffer;
-	DWORD mIP = db_get_dw(hContact, szProto, "IP", 0);
+	uint32_t mIP = db_get_dw(hContact, szProto, "IP", 0);
 	if (mIP)
 		wszBuffer.AppendFormat(L"External IP: %d.%d.%d.%d\r\n", mIP >> 24, (mIP >> 16) & 0xFF, (mIP >> 8) & 0xFF, mIP & 0xFF);
 
-	DWORD rIP = db_get_dw(hContact, szProto, "RealIP", 0);
+	uint32_t rIP = db_get_dw(hContact, szProto, "RealIP", 0);
 	if (rIP)
 		wszBuffer.AppendFormat(L"Internal IP: %d.%d.%d.%d\r\n", rIP >> 24, (rIP >> 16) & 0xFF, (rIP >> 8) & 0xFF, rIP & 0xFF);
 
@@ -621,7 +621,7 @@ static INT_PTR onIgnore(WPARAM wparam, LPARAM lparam)
 	return 0;
 }
 
-static HGENMENU AddSubmenuItem(HGENMENU hRoot, wchar_t* name, HICON icon, DWORD flag, char* service, int pos, INT_PTR param)
+static HGENMENU AddSubmenuItem(HGENMENU hRoot, wchar_t* name, HICON icon, uint32_t flag, char* service, int pos, INT_PTR param)
 {
 	CMenuItem mi(&g_plugin);
 	mi.root = hRoot;
@@ -649,7 +649,7 @@ static void ModifySubmenuItem(HGENMENU hItem, int checked, int hidden)
 // called when the contact-menu is built
 static int BuildMenu(WPARAM wparam, LPARAM)
 {
-	DWORD flags = g_plugin.getDword("flags", vf_default);
+	uint32_t flags = g_plugin.getDword("flags", vf_default);
 	int j = 0, all = 0, hide = 0;
 	BOOL bIsOnline = FALSE, bShowAll = CTRL_IS_PRESSED;
 	MCONTACT hContact = (MCONTACT)wparam;
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index a334e3f58b..061fa9af49 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -24,7 +24,7 @@ static const checkboxes[] = {
 
 class COptDialog : public CDlgBase
 {
-	DWORD m_flags;
+	uint32_t m_flags;
 
 	CCtrlCheck m_chkVis, m_chkAlpha, m_chkHide, m_chkIgnore, m_chkProtos, m_chkRecvFiles, m_chkCopyIP, m_chkCopyMirver, m_chkStatusMsg,
 		m_chkSMName, m_chkCopyID, m_chkCopyIDName, m_chkShowID, m_chkTrimID, m_chkIgnoreHide;
@@ -76,7 +76,7 @@ public:
 
 	bool OnApply() override
 	{
-		DWORD mod_flags = 0;
+		uint32_t mod_flags = 0;
 
 		for (auto &it : checkboxes) {
 			CCtrlCheck &item = *(CCtrlCheck*)FindControl(it.idc);
-- 
cgit v1.2.3