From 30aa26c864fa09b974e3c223ccf907421ebc0759 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 10 Apr 2018 13:11:16 +0300
Subject: obsolete compatibility code removed from AVS

---
 plugins/AVS/src/acc.cpp      | 1 -
 plugins/AVS/src/cache.cpp    | 1 -
 plugins/AVS/src/options.cpp  | 2 --
 plugins/AVS/src/poll.cpp     | 1 -
 plugins/AVS/src/services.cpp | 3 ---
 plugins/AVS/src/utils.cpp    | 1 -
 6 files changed, 9 deletions(-)

(limited to 'plugins/AVS/src')

diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp
index 99beff22c7..5d7bb35503 100644
--- a/plugins/AVS/src/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
@@ -573,7 +573,6 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			else {
 				// Draw avatar
 				AVATARDRAWREQUEST avdrq = { 0 };
-				avdrq.cbSize = sizeof(avdrq);
 				avdrq.rcDraw = rc;
 				avdrq.hContact = data->hContact;
 				avdrq.szProto = data->proto;
diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp
index 160f1a3d1b..33e6c877c3 100644
--- a/plugins/AVS/src/cache.cpp
+++ b/plugins/AVS/src/cache.cpp
@@ -126,7 +126,6 @@ void NotifyMetaAware(MCONTACT hContact, CacheNode *node, AVATARCACHEENTRY *ace)
 		node->dwFlags &= ~AVH_MUSTNOTIFY;
 		if (node->szFilename[0] != '\0') {
 			CONTACTAVATARCHANGEDNOTIFICATION cacn = {};
-			cacn.cbSize = sizeof(CONTACTAVATARCHANGEDNOTIFICATION);
 			cacn.hContact = hContact;
 			cacn.format = node->pa_format;
 			wcsncpy_s(cacn.filename, node->szFilename, _TRUNCATE);
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index e02a04cbd8..55de5ed96a 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -347,7 +347,6 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar
 			LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
 			if (dis->CtlType == ODT_BUTTON && dis->CtlID == IDC_PROTOPIC) {
 				AVATARDRAWREQUEST avdrq = { 0 };
-				avdrq.cbSize = sizeof(avdrq);
 				avdrq.hTargetDC = dis->hDC;
 				avdrq.dwFlags |= AVDRQ_PROTOPICT;
 				avdrq.szProto = (g_selectedProto) ? g_selectedProto->szProtoname : 0;
@@ -631,7 +630,6 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 				FillRect(dis->hDC, &avdrq.rcDraw, GetSysColorBrush(COLOR_BTNFACE));
 
 				avdrq.hContact = hContact;
-				avdrq.cbSize = sizeof(avdrq);
 				avdrq.hTargetDC = dis->hDC;
 				avdrq.dwFlags |= AVDRQ_DRAWBORDER;
 				avdrq.clrBorder = GetSysColor(COLOR_BTNTEXT);
diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp
index 03135f35d2..471ca4a41f 100644
--- a/plugins/AVS/src/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
@@ -43,7 +43,6 @@ ACKRESULT_STATUS. This thread only requests the avatar (and maybe add it to the
 static void RequestThread(void *vParam);
 
 extern HANDLE hShutdownEvent;
-extern int DeleteAvatar(MCONTACT hContact);
 extern void MakePathRelative(MCONTACT hContact, wchar_t *path);
 int Proto_GetDelayAfterFail(const char *proto);
 BOOL Proto_IsFetchingWhenProtoNotVisibleAllowed(const char *proto);
diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp
index de0710e82a..c350ebd18a 100644
--- a/plugins/AVS/src/services.cpp
+++ b/plugins/AVS/src/services.cpp
@@ -695,9 +695,6 @@ INT_PTR DrawAvatarPicture(WPARAM, LPARAM lParam)
 	if (r == nullptr || IsBadReadPtr((void *)r, sizeof(AVATARDRAWREQUEST)))
 		return 0;
 
-	if (r->cbSize != sizeof(AVATARDRAWREQUEST))
-		return 0;
-
 	if (r->dwFlags & AVDRQ_PROTOPICT) {
 		if (r->szProto == nullptr)
 			return 0;
diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp
index 0fcfc88c4c..9ecca88089 100644
--- a/plugins/AVS/src/utils.cpp
+++ b/plugins/AVS/src/utils.cpp
@@ -157,7 +157,6 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz
 	BITMAP bminfo;
 	GetObject(ace->hbmPic, sizeof(bminfo), &bminfo);
 
-	ace->cbSize = sizeof(AVATARCACHEENTRY);
 	ace->dwFlags = AVS_BITMAP_VALID;
 	if (hContact != NULL && db_get_b(hContact, "ContactPhoto", "Hidden", 0))
 		ace->dwFlags |= AVS_HIDEONCLIST;
-- 
cgit v1.2.3