From ab3d423b1dc514e9db61c170ca14bab49e5280cb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 26 Jan 2024 23:34:30 +0300
Subject: major atavism, PROTORECVEVENT, died with its own set of constants

---
 protocols/ICQCorp/src/protocol.cpp | 59 ++++++++++++--------------------------
 1 file changed, 18 insertions(+), 41 deletions(-)

(limited to 'protocols/ICQCorp/src/protocol.cpp')

diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp
index cb24b1ddf4..576bf6eb76 100644
--- a/protocols/ICQCorp/src/protocol.cpp
+++ b/protocols/ICQCorp/src/protocol.cpp
@@ -1984,18 +1984,10 @@ void ICQ::addMessage(ICQUser *u, char *m, time_t t)
 {
 	Netlib_Logf(hNetlibUser, "message: %s\n", m);
 
-	PROTORECVEVENT pre;
-	pre.flags = 0;
-	pre.timestamp = t;
-	pre.szMessage = (char*)m;
-	pre.lParam = 0;
-
-	CCSDATA ccs;
-	ccs.hContact = u->hContact;
-	ccs.szProtoService = PSR_MESSAGE;
-	ccs.wParam = 0;
-	ccs.lParam = (LPARAM)&pre;
-	Proto_ChainRecv(0, &ccs);
+	DB::EventInfo dbei;
+	dbei.timestamp = t;
+	dbei.pBlob = m;
+	ProtoChainRecvMsg(u->hContact, dbei);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2004,17 +1996,12 @@ void ICQ::addAwayMsg(ICQUser *u, char *m, unsigned long theSequence, time_t t)
 {
 	Netlib_Logf(hNetlibUser, "away msg: %s\n", m);
 
-	PROTORECVEVENT pre;
-	pre.flags = 0;
-	pre.timestamp = t;
-	pre.szMessage = (char*)m;
-	pre.lParam = theSequence;
-
-	CCSDATA ccs;
-	ccs.hContact = u->hContact;
-	ccs.szProtoService = PSR_AWAYMSG;
-	ccs.wParam = u->statusVal;
-	ccs.lParam = (LPARAM)&pre;
+	DB::EventInfo dbei;
+	dbei.timestamp = t;
+	dbei.pBlob = m;
+	dbei.cbBlob = theSequence;
+
+	CCSDATA ccs = { u->hContact, PSR_AWAYMSG, u->statusVal, (LPARAM)&dbei };
 	Proto_ChainRecv(0, &ccs);
 }
 
@@ -2029,26 +2016,16 @@ void ICQ::addFileReq(ICQUser *u, char *m, char *filename, unsigned long size, un
 	icqTransfers.push_back(transfer);
 
 	// Send chain event
-	char *szBlob = new char[sizeof(uint32_t) + mir_strlen(filename) + mir_strlen(m) + 2];
-
-	*(PDWORD)szBlob = (UINT_PTR)transfer;
-	mir_strcpy(szBlob + sizeof(uint32_t), filename);
-	mir_strcpy(szBlob + sizeof(uint32_t) + mir_strlen(filename) + 1, m);
-
-	PROTORECVEVENT pre;
-	pre.flags = 0;
-	pre.timestamp = t;
-	pre.szMessage = szBlob;
-	pre.lParam = theSequence;
-
-	CCSDATA ccs;
-	ccs.hContact = u->hContact;
-	ccs.szProtoService = PSR_FILE;
-	ccs.wParam = 0;
-	ccs.lParam = (LPARAM)&pre;
+	DB::FILE_BLOB blob(transfer, filename, m);
+
+	DB::EventInfo dbei;
+	dbei.timestamp = t;
+	blob.write(dbei);
+
+	CCSDATA ccs = { u->hContact, PSR_FILE, 0, (LPARAM)&dbei };
 	Proto_ChainRecv(0, &ccs);
 
-	delete[] szBlob;
+	mir_free(dbei.pBlob);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3