From fcbb395dc7ff3edab972b6d4b27dbbfb3305f5d7 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 26 Dec 2021 15:58:40 +0300
Subject: PBYTE -> uint8_t*

---
 src/core/stdclist/src/clcpaint.cpp     | 2 +-
 src/core/stdfile/src/file.cpp          | 4 ++--
 src/core/stdfile/src/fileexistsdlg.cpp | 2 +-
 src/core/stdfile/src/filexferdlg.cpp   | 2 +-
 src/core/stdmsg/src/cmdlist.cpp        | 2 +-
 src/core/stdmsg/src/msglog.cpp         | 2 +-
 src/core/stduihist/src/history.cpp     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index 99d3479f74..8a493e0649 100644
--- a/src/core/stdclist/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
@@ -472,7 +472,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 		bmih.biHeight = -clRect.bottom;
 		bmih.biPlanes = 1;
 		bmih.biWidth = clRect.right;
-		PBYTE bits = (PBYTE)malloc(4 * bmih.biWidth * -bmih.biHeight);
+		uint8_t *bits = (uint8_t*)malloc(4 * bmih.biWidth * -bmih.biHeight);
 		GetDIBits(hdc, hBmpOsb, 0, clRect.bottom, bits, (BITMAPINFO *)& bmih, DIB_RGB_COLORS);
 
 		COLORREF greyColour = GetSysColor(COLOR_3DFACE);
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 74456b11b0..f83af57ab7 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -124,7 +124,7 @@ static int FileEventAdded(WPARAM wParam, LPARAM lParam)
 
 	DBEVENTINFO dbei = {};
 	dbei.cbBlob = sizeof(DWORD);
-	dbei.pBlob = (PBYTE)&dwSignature;
+	dbei.pBlob = (uint8_t*)&dwSignature;
 	db_event_get(lParam, &dbei);
 	if (dbei.flags & (DBEF_SENT | DBEF_READ) || dbei.eventType != EVENTTYPE_FILE || dwSignature == 0)
 		return 0;
@@ -141,7 +141,7 @@ int SRFile_GetRegValue(HKEY hKeyBase, const wchar_t *szSubKey, const wchar_t *sz
 	if (RegOpenKeyEx(hKeyBase, szSubKey, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
 		return 0;
 
-	if (RegQueryValueEx(hKey, szValue, nullptr, nullptr, (PBYTE)szOutput, &cbOut) != ERROR_SUCCESS) {
+	if (RegQueryValueEx(hKey, szValue, nullptr, nullptr, (uint8_t*)szOutput, &cbOut) != ERROR_SUCCESS) {
 		RegCloseKey(hKey);
 		return 0;
 	}
diff --git a/src/core/stdfile/src/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp
index b18cac040f..34e198d55a 100644
--- a/src/core/stdfile/src/fileexistsdlg.cpp
+++ b/src/core/stdfile/src/fileexistsdlg.cpp
@@ -60,7 +60,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const wchar_t *szFilename, int cmd
 				IShellFolder *pFileFolder;
 
 				for (pidl = pCurrentIdl;;) {
-					pidlNext = (ITEMIDLIST *)((PBYTE)pidl + pidl->mkid.cb);
+					pidlNext = (ITEMIDLIST *)((uint8_t*)pidl + pidl->mkid.cb);
 					if (pidlNext->mkid.cb == 0) {
 						pidlFilename = (ITEMIDLIST *)CoTaskMemAlloc(pidl->mkid.cb + sizeof(pidl->mkid.cb));
 						memcpy(pidlFilename, pidl, pidl->mkid.cb + sizeof(pidl->mkid.cb));
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index cd48520cbe..1e6b22b57d 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -83,7 +83,7 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei)
 	dbei.flags |= DBEF_UTF;
 
 	dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);
-	dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob);
+	dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob);
 	*(PDWORD)dbei.pBlob = 0;
 	mir_strcpy((char*)dbei.pBlob + sizeof(DWORD), szFileNames);
 	mir_strcpy((char*)dbei.pBlob + sizeof(DWORD) + mir_strlen(szFileNames) + 1, szMsg);
diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp
index b1953d8553..50c9302f36 100644
--- a/src/core/stdmsg/src/cmdlist.cpp
+++ b/src/core/stdmsg/src/cmdlist.cpp
@@ -94,7 +94,7 @@ void msgQueue_processack(MCONTACT hContact, int id, BOOL success, LPARAM lParam)
 	dbei.szModule = Proto_GetBaseAccountName(hContact);
 	dbei.timestamp = time(0);
 	dbei.cbBlob = (DWORD)(mir_strlen(p->szMsg) + 1);
-	dbei.pBlob = (PBYTE)p->szMsg;
+	dbei.pBlob = (uint8_t*)p->szMsg;
 	dbei.szId = (char *)lParam;
 
 	MessageWindowEvent evt = { id, hContact, &dbei };
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 7905452248..73315ce746 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -409,7 +409,7 @@ void LoadMsgLogIcons(void)
 	HDC hdc = GetDC(nullptr);
 	HBITMAP hBmp = CreateCompatibleBitmap(hdc, bih.biWidth, bih.biHeight);
 	HDC hdcMem = CreateCompatibleDC(hdc);
-	PBYTE pBmpBits = (PBYTE)mir_alloc(widthBytes * bih.biHeight);
+	uint8_t *pBmpBits = (uint8_t*)mir_alloc(widthBytes * bih.biHeight);
 
 	for (int i = 0; i < _countof(pLogIconBmpBits); i++) {
 		HICON hIcon = IcoLib_GetIconByHandle(iconList[i].hIcolib);
diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index bd99a7a685..b7d7558746 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -304,7 +304,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 			int newBlobSize = db_event_getBlobSize(hDbEvent);
 			if (newBlobSize > oldBlobSize) {
-				dbei.pBlob = (PBYTE)mir_realloc(dbei.pBlob, newBlobSize);
+				dbei.pBlob = (uint8_t*)mir_realloc(dbei.pBlob, newBlobSize);
 				oldBlobSize = newBlobSize;
 			}
 			dbei.cbBlob = oldBlobSize;
-- 
cgit v1.2.3