From c1ceb16e6e5957c94232a0ff43fbeca0ff19bf93 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 5 Apr 2017 20:17:13 +0300
Subject: Srmm_MessageStreamCallback isolated inside mir_core and therefore
 removed;

---
 include/m_chat_int.h          |   3 ---
 libs/win32/mir_app.lib        | Bin 118558 -> 118278 bytes
 libs/win64/mir_app.lib        | Bin 113972 -> 113716 bytes
 src/mir_app/src/mir_app.def   |   1 -
 src/mir_app/src/mir_app64.def |   1 -
 src/mir_app/src/srmm_util.cpp |  23 -----------------------
 6 files changed, 28 deletions(-)

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index c57491af82..76c3ee1b9a 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -373,9 +373,6 @@ EXTERN_C MIR_APP_DLL(CHAT_MANAGER*) Chat_GetInterface(CHAT_MANAGER_INITDATA *pDa
 // receives LOGSTREAMDATA* as the first parameter
 EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb);
 
-// receives char** as the first parameter
-EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_MessageStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb);
-
 // sends a message to all SRMM windows
 EXTERN_C MIR_APP_DLL(void) Srmm_Broadcast(UINT, WPARAM, LPARAM);
 
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 77a00dc0d4..47990811ac 100644
Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 597eeb93db..466b663668 100644
Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 156ea679c2..68dbedb446 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -408,7 +408,6 @@ ProtoGetAvatarMimeType @401
 ??3CSrmmBaseDialog@@SAXPAX@Z @410 NONAME
 ?isChat@CSrmmBaseDialog@@QBE_NXZ @411 NONAME
 Srmm_LogStreamCallback @412
-Srmm_MessageStreamCallback @413
 ?RunUserMenu@CSrmmBaseDialog@@IAEXPAUHWND__@@PAUUSERINFO@@ABUtagPOINT@@@Z @414 NONAME
 ?ClearLog@CSrmmBaseDialog@@QAEXXZ @415 NONAME
 ?CloseTab@CSrmmBaseDialog@@UAEXXZ @416 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 11b740223e..5e8ad0beb4 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -408,7 +408,6 @@ ProtoGetAvatarMimeType @401
 ??3CSrmmBaseDialog@@SAXPEAX@Z @410 NONAME
 ?isChat@CSrmmBaseDialog@@QEBA_NXZ @411 NONAME
 Srmm_LogStreamCallback @412
-Srmm_MessageStreamCallback @413
 ?RunUserMenu@CSrmmBaseDialog@@IEAAXPEAUHWND__@@PEAUUSERINFO@@AEBUtagPOINT@@@Z @414 NONAME
 ?ClearLog@CSrmmBaseDialog@@QEAAXXZ @415 NONAME
 ?CloseTab@CSrmmBaseDialog@@UEAAXXZ @416 NONAME
diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp
index 864f8ca00f..ad0abe21a3 100644
--- a/src/mir_app/src/srmm_util.cpp
+++ b/src/mir_app/src/srmm_util.cpp
@@ -50,29 +50,6 @@ MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(DWORD_PTR dwCookie, LPBYTE pb
 	return 0;
 }
 
-MIR_APP_DLL(DWORD) CALLBACK Srmm_MessageStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
-{
-	static DWORD dwRead;
-	char **ppText = (char **)dwCookie;
-
-	if (*ppText == nullptr) {
-		*ppText = (char *)mir_alloc(cb + 2);
-		memcpy(*ppText, pbBuff, cb);
-		*pcb = cb;
-		dwRead = cb;
-		*(*ppText + cb) = '\0';
-	}
-	else {
-		char *p = (char *)mir_realloc(*ppText, dwRead + cb + 2);
-		memcpy(p + dwRead, pbBuff, cb);
-		*ppText = p;
-		*pcb = cb;
-		dwRead += cb;
-		*(*ppText + dwRead) = '\0';
-	}
-	return 0;
-}
-
 MIR_APP_DLL(int) Srmm_GetWindowData(MCONTACT hContact, MessageWindowData &mwd)
 {
 	if (hContact == 0)
-- 
cgit v1.2.3