massive warning fix

author: George Hazan <ghazan@miranda.im> 2019-07-24 20:58:51 +0300
committer: George Hazan <ghazan@miranda.im> 2019-07-24 20:58:58 +0300
commit: ed4897b7ef69e862806a8c07f1fd475262d0c36e (patch)
tree: 414efc6365f455122956eac74b754505c8efaf15 /protocols
parent: 99893bf3aec9f4e9f0c4844c0987d129e1778c7e (diff)
57 files changed, 134 insertions, 137 deletions
diff --git a/protocols/CloudFile/src/http_request.h b/protocols/CloudFile/src/http_request.h
index c74b2ae40c..f63102f1cc 100644
--- a/protocols/CloudFile/src/http_request.h
+++ b/protocols/CloudFile/src/http_request.h
@@ -64,11 +64,7 @@ protected:
 
 		length = mir_strlen(ePair) + 7;
 		char *value = (char*)mir_calloc(length + 1);
-		mir_snprintf(
-			value,
-			length,
-			"Basic %s",
-			ePair);
+		mir_snprintf(value, length, "Basic %s", ePair.get());
 
 		headers = (NETLIBHTTPHEADER*)mir_realloc(headers, sizeof(NETLIBHTTPHEADER)*(headersCount + 1));
 		headers[headersCount].szName = mir_strdup("Authorization");
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index b3388a3268..94b1ed0fb7 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -559,7 +559,7 @@ void CDiscordProto::SendFileThread(void *param)
 		pFileName = p->wszFileName.GetBuffer();
 
 	szBody.Append(szBoundary + "\r\n");
-	szBody.AppendFormat("Content-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n", ptrA(mir_utf8encodeW(pFileName)));
+	szBody.AppendFormat("Content-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n", ptrA(mir_utf8encodeW(pFileName)).get());
 	szBody.AppendFormat("Content-Type: %S\r\n", ProtoGetAvatarMimeType(ProtoGetAvatarFileFormat(p->wszFileName)));
 	szBody.Append("\r\n");
 
diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp
index 2a2c40f71d..7c6c8ad707 100644
--- a/protocols/Gadu-Gadu/src/avatar.cpp
+++ b/protocols/Gadu-Gadu/src/avatar.cpp
@@ -28,7 +28,7 @@
 //
 void GaduProto::getAvatarFilename(MCONTACT hContact, wchar_t *pszDest, int cbLen)
 {
-	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	if (_waccess(pszDest, 0)) {
 		int ret = CreateDirectoryTreeW(pszDest);
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 1ed90ba67c..d1d74dbc57 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -363,7 +363,7 @@ void __cdecl GaduProto::mainthread(void *)
 				showpopup(m_tszUserName, error.c_str(), GG_POPUP_WARNING | GG_POPUP_ALLOW_MSGBOX);
 			}
 			else
-				debugLogA("mainthread() (%x): Loading forwarding host %s and port %d.", pHost, p.external_port, this);
+				debugLogA("mainthread() (%x): Loading forwarding host %s and port %d.", pHost.get(), p.external_port, this);
 
 			if (p.external_addr)
 				p.external_port = m_gaduOptions.forwardPort;
@@ -960,7 +960,7 @@ retry:
 
 				mir_snwprintf(szMsg, L"%s (%s)", szText,
 					*e->event.multilogon_info.sessions[i].name != '\0' ?
-					_A2T(e->event.multilogon_info.sessions[i].name) : TranslateT("Unknown client"));
+					_A2T(e->event.multilogon_info.sessions[i].name).get() : TranslateT("Unknown client"));
 				showpopup(m_tszUserName, szMsg, GG_POPUP_MULTILOGON);
 			}
 			mir_free(iIndexes);
@@ -1217,7 +1217,7 @@ void GaduProto::OnContactDeleted(MCONTACT hContact)
 	if (isChatRoom(hContact) && wszRoomId != NULL && gc_enabled)
 	{
 		GGGC *chat = gc_lookup(wszRoomId);
-		debugLogA("contactdeleted(): Terminating chat %x, id %s from contact list...", chat, wszRoomId);
+		debugLogA("contactdeleted(): Terminating chat %x, id %s from contact list...", chat, wszRoomId.get());
 		if (chat)
 		{
 			// Destroy chat entry
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index ad6f811ade..09a379ecfc 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -168,7 +168,7 @@ void GaduProto::cleanuplastplugin(DWORD version)
 		debugLogA("cleanuplastplugin() 1: version=%d Cleaning junk avatar files from < 0.11.0.2", version);
 
 		wchar_t avatarsPath[MAX_PATH];
-		mir_snwprintf(avatarsPath, L"%s\\%s", VARSW(L"%miranda_avatarcache%"), m_tszUserName);
+		mir_snwprintf(avatarsPath, L"%s\\%s", VARSW(L"%miranda_avatarcache%").get(), m_tszUserName);
 
 		debugLogW(L"cleanuplastplugin() 1: miranda_avatarcache = %s", avatarsPath);
 
diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp
index 2b959d6e9d..8fee1a1798 100644
--- a/protocols/Gadu-Gadu/src/services.cpp
+++ b/protocols/Gadu-Gadu/src/services.cpp
@@ -222,7 +222,7 @@ INT_PTR GaduProto::getavatarinfo(WPARAM wParam, LPARAM lParam)
 		if (AvatarName)
 		{
 			char AvatarNameWithTS[128];
-			mir_snprintf(AvatarNameWithTS, "%s%s", ++AvatarName, AvatarTs);
+			mir_snprintf(AvatarNameWithTS, "%s%s", ++AvatarName, AvatarTs.get());
 			AvatarHash = gg_avatarhash(AvatarNameWithTS);
 		}
 	}
diff --git a/protocols/ICQ-WIM/src/utils.cpp b/protocols/ICQ-WIM/src/utils.cpp
index 10a7874498..55465a77b3 100644
--- a/protocols/ICQ-WIM/src/utils.cpp
+++ b/protocols/ICQ-WIM/src/utils.cpp
@@ -143,7 +143,7 @@ void CIcqProto::Json2string(MCONTACT hContact, const JSONNode &node, const char
 
 void CIcqProto::GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, size_t cbLen)
 {
-	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(pszDest);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 58fabd9362..bb40258434 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -502,7 +502,7 @@ int CJabberProto::ByteSendProxyParse(HNETLIBCONN hConn, JABBER_BYTE_TRANSFER *jb
 			data[4] = 40;
 
 			char szAuthString[256];
-			mir_snprintf(szAuthString, "%s%s%s", jbt->sid, ptrA(JabberPrepareJid(jbt->srcJID)), ptrA(JabberPrepareJid(jbt->dstJID)));
+			mir_snprintf(szAuthString, "%s%s%s", jbt->sid, ptrA(JabberPrepareJid(jbt->srcJID)).get(), ptrA(JabberPrepareJid(jbt->dstJID)).get());
 			debugLogA("Auth: '%s'", szAuthString);
 
 			JabberShaStrBuf buf;
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index c0e3fa6923..d1ff8e9e93 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -178,16 +178,16 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
 	switch (type) {
 	case INFO_BAN:
 		if (m_bGcLogBans)
-			buf.Format(TranslateU("User %s is now banned."), user->m_szResourceName);
+			buf.Format(TranslateU("User %s is now banned."), user->m_szResourceName.get());
 		break;
 
 	case INFO_STATUS:
 		if (m_bGcLogStatuses) {
 			wchar_t *ptszDescr = Clist_GetStatusModeDescription(user->m_iStatus, 0);
 			if (user->m_szStatusMessage)
-				buf.Format(TranslateU("User %s changed status to %s with message: %s"), user->m_szResourceName, ptszDescr, user->m_szStatusMessage);
+				buf.Format(TranslateU("User %s changed status to %s with message: %s"), user->m_szResourceName.get(), ptszDescr, user->m_szStatusMessage.get());
 			else
-				buf.Format(TranslateU("User %s changed status to %s"), user->m_szResourceName, ptszDescr);
+				buf.Format(TranslateU("User %s changed status to %s"), user->m_szResourceName.get(), ptszDescr);
 		}
 		break;
 
@@ -207,7 +207,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
 			case AFFILIATION_OUTCAST:	name = TranslateU("Outcast"); break;
 			}
 			if (name)
-				buf.Format(TranslateU("Affiliation of %s was changed to '%s'."), user->m_szResourceName, name);
+				buf.Format(TranslateU("Affiliation of %s was changed to '%s'."), user->m_szResourceName.get(), name);
 		}
 		break;
 
@@ -222,7 +222,7 @@ void CJabberProto::GcLogShowInformation(JABBER_LIST_ITEM *item, pResourceStatus
 			}
 
 			if (name)
-				buf.Format(TranslateU("Role of %s was changed to '%s'."), user->m_szResourceName, name);
+				buf.Format(TranslateU("Role of %s was changed to '%s'."), user->m_szResourceName.get(), name);
 		}
 		break;
 	}
@@ -839,7 +839,7 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)Skin_LoadProtoIcon(dat->ppro->m_szModuleName, dat->him->m_iStatus), 0);
 
 		char buf[256];
-		mir_snprintf(buf, TranslateU("%s from\n%s"), dat->him->m_szResourceName, dat->item->jid);
+		mir_snprintf(buf, TranslateU("%s from\n%s"), dat->him->m_szResourceName.get(), dat->item->jid);
 		SetDlgItemTextUtf(hwndDlg, IDC_HEADERBAR, buf);
 
 		SetDlgItemTextUtf(hwndDlg, IDC_TXT_NICK, dat->him->m_szResourceName);
@@ -998,7 +998,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			// do not use snprintf to avoid possible problems with % symbol
 			if (char *p = strstr(szMessage, "%s")) {
 				*p = 0;
-				buf.Format("%s%s%s", szMessage, him->m_szResourceName, p + 2);
+				buf.Format("%s%s%s", szMessage.get(), him->m_szResourceName.get(), p + 2);
 			}
 			else buf = szMessage;
 			buf.Replace("%%", "%");
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 936d97c7e9..8bc1189fdf 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -121,7 +121,7 @@ void __cdecl CJabberProto::OnRenameContact(DBCONTACTWRITESETTING *cws, MCONTACT
 
 	ptrA newNick(sttSettingToTchar(cws));
 	if (newNick && mir_strcmp(item->nick, newNick)) {
-		debugLogA("Renaming contact %s: %s -> %s", item->jid, item->nick, newNick);
+		debugLogA("Renaming contact %s: %s -> %s", item->jid, item->nick, newNick.get());
 		AddContactToRoster(item->jid, newNick, item->group);
 	}
 }
@@ -132,7 +132,7 @@ void __cdecl CJabberProto::OnAddContactForever(MCONTACT hContact)
 	if (jid == nullptr)
 		return;
 
-	debugLogA("Add %s permanently to list", jid);
+	debugLogA("Add %s permanently to list", jid.get());
 	ptrA nick(db_get_utfa(hContact, "CList", "MyHandle"));
 	if (nick == nullptr)
 		nick = getUStringA(hContact, "Nick");
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index 1d0f2e007e..7d6d767e52 100644
--- a/protocols/JabberG/src/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
@@ -100,7 +100,7 @@ int CJabberProto::FileReceiveParse(filetransfer *ft, char* buffer, int datalen)
 				break;
 			}
 
-			debugLogA("FT Got: %s", str);
+			debugLogA("FT Got: %s", str.get());
 			if (ft->state == FT_CONNECTING) {
 				// looking for "HTTP/1.1 200 OK"
 				if (sscanf(str, "HTTP/%*d.%*d %d %*s", &code) == 1 && code == 200) {
@@ -292,7 +292,7 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft)
 				}
 
 				char szAddr[256];
-				mir_snprintf(szAddr, "http://%s:%d/%s", myAddr, nlb.wPort, pFileName.c_str());
+				mir_snprintf(szAddr, "http://%s:%d/%s", myAddr.get(), nlb.wPort, pFileName.c_str());
 
 				XmlNodeIq iq("set", ft->szId, MakeJid(ft->jid, ptszResource));
 				TiXmlElement *query = iq << XQUERY(JABBER_FEAT_OOB);
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 7e18ceae1b..d0758f3faf 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -457,7 +457,7 @@ public:
 				break;
 
 			char jid[JABBER_MAX_JID_LEN];
-			mir_snprintf(jid, "%s@%s (%s)", info.m_room, info.m_server, info.m_nick ? info.m_nick : TranslateU("<no nick>"));
+			mir_snprintf(jid, "%s@%s (%s)", info.m_room.get(), info.m_server.get(), info.m_nick ? info.m_nick.get() : TranslateU("<no nick>"));
 			SetDlgItemTextUtf(m_hwnd, IDC_RECENT1 + i, jid);
 		}
 		sttJoinDlgShowRecentItems(m_hwnd, i);
@@ -737,7 +737,7 @@ static VOID CALLBACK JabberGroupchatChangeNickname(void* arg)
 	JABBER_LIST_ITEM *item = param->ppro->ListGetItemPtr(LIST_CHATROOM, param->jid);
 	if (item != nullptr) {
 		CMStringW szBuffer, szTitle;
-		szTitle.Format(TranslateT("Change nickname in <%s>"), item->name ? item->name : Utf2T(item->jid));
+		szTitle.Format(TranslateT("Change nickname in <%s>"), item->name ? item->name : Utf2T(item->jid).get());
 		if (item->nick)
 			szBuffer = Utf2T(item->nick);
 
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index d390839d85..eb528f544b 100755
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -238,7 +238,7 @@ void CJabberProto::OnIqResultGetAuth(const TiXmlElement *iqNode, CJabberIqInfo*)
 		if (XmlFirstChild(queryNode, "digest") != nullptr && m_ThreadInfo->szStreamId) {
 			JabberShaStrBuf buf;
 			char text[200];
-			mir_snprintf(text, "%s%s", m_ThreadInfo->szStreamId, m_ThreadInfo->conn.password);
+			mir_snprintf(text, "%s%s", m_ThreadInfo->szStreamId.get(), m_ThreadInfo->conn.password);
 			query << XCHILD("digest", JabberSha1(text, buf));
 		}
 		else if (XmlFirstChild(queryNode, "password") != nullptr)
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index bdd1684ca2..e2a35eb5c0 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -396,7 +396,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 			}
 
 			CMStringW szTmp;
-			szTmp.Format(L"%s [%s, %d]", Utf2T(r->m_szResourceName), Clist_GetStatusModeDescription(r->m_iStatus, 0), r->m_iPriority);
+			szTmp.Format(L"%s [%s, %d]", Utf2T(r->m_szResourceName).get(), Clist_GetStatusModeDescription(r->m_iStatus, 0), r->m_iPriority);
 			Menu_ModifyItem(m_phMenuResourceItems[i], szTmp, hIcon);
 			DestroyIcon(hIcon);
 		}
@@ -948,7 +948,7 @@ int CJabberProto::OnProcessSrmmIconClick(WPARAM hContact, LPARAM lParam)
 	wchar_t buf[256];
 
 	mir_snwprintf(buf, TranslateT("Last active (%s)"),
-		LI->m_pLastSeenResource ? Utf2T(LI->m_pLastSeenResource->m_szResourceName) : TranslateT("No activity yet, use server's choice"));
+		LI->m_pLastSeenResource ? Utf2T(LI->m_pLastSeenResource->m_szResourceName.get()) : TranslateT("No activity yet, use server's choice"));
 	AppendMenu(hMenu, MF_STRING, MENUITEM_LASTSEEN, buf);
 
 	AppendMenu(hMenu, MF_STRING, MENUITEM_SERVER, TranslateT("Highest priority (server's choice)"));
diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index b6ef4735d9..ed77e4595a 100755
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -135,7 +135,7 @@ BOOL CJabberProto::AddDbPresenceEvent(MCONTACT hContact, BYTE btEventType)
 
 void CJabberProto::GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, size_t cbLen)
 {
-	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(pszDest);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
@@ -290,14 +290,14 @@ void CJabberProto::FormatMirVer(const pResourceStatus &resource, CMStringA &res)
 
 	// no caps info? set MirVer = resource name
 	if (resource->m_pCaps == nullptr) {
-		debugLogA("JabberUpdateMirVer: for rc %s: %s", resource->m_szResourceName, resource->m_szResourceName);
+		debugLogA("JabberUpdateMirVer: for rc %s: %s", resource->m_szResourceName.get(), resource->m_szResourceName.get());
 		if (resource->m_szResourceName)
 			res = resource->m_szResourceName;
 	}
 	// XEP-0115 caps mode
 	else {
 		CJabberClientPartialCaps *pCaps = resource->m_pCaps;
-		debugLogA("JabberUpdateMirVer: for rc %s: %s#%s", resource->m_szResourceName, pCaps->GetNode(), pCaps->GetHash());
+		debugLogA("JabberUpdateMirVer: for rc %s: %s#%s", resource->m_szResourceName.get(), pCaps->GetNode(), pCaps->GetHash());
 
 		// unknown software
 		const char *szDefaultName = GetSoftName(pCaps->GetNode());
@@ -331,7 +331,7 @@ void CJabberProto::FormatMirVer(const pResourceStatus &resource, CMStringA &res)
 
 	if (resource->m_szResourceName && !strstr(res, resource->m_szResourceName))
 		if (strstr(res, "Miranda IM") || strstr(res, "Miranda NG") || m_bShowForeignResourceInMirVer)
-			res.AppendFormat(" [%s]", resource->m_szResourceName);
+			res.AppendFormat(" [%s]", resource->m_szResourceName.get());
 }
 
 void CJabberProto::UpdateMirVer(MCONTACT hContact, const pResourceStatus &r)
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index c8eb921250..c45e89aa23 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -326,7 +326,7 @@ CCtrlEditJid::CCtrlEditJid(CDlgBase* dlg, int ctrlId):
 
 static void sttStoreJidFromUI(CJabberProto *ppro, CCtrlEdit &txtUsername, CCtrlCombo &cbServer)
 {
-	ppro->setWString("jid", CMStringW(FORMAT, L"%s@%s", ptrW(txtUsername.GetText()), ptrW(cbServer.GetText())));
+	ppro->setWString("jid", CMStringW(FORMAT, L"%s@%s", ptrW(txtUsername.GetText()).get(), ptrW(cbServer.GetText()).get()));
 }
 
 class CDlgOptAccount : public CJabberDlgBase
diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index 24bdfe9ce4..ee0e59b825 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -273,7 +273,7 @@ static void SearchReturnResults(CJabberProto *ppro, HANDLE id, LIST<UNIQUE_MAP>
 			Utf2T wszNick(nick);
 			wchar_t buff[200];
 			if (mir_wstrcmpi(wszNick, Results.psr.id.w))
-				mir_snwprintf(buff, L"%s (%s)", wszNick, Results.psr.id.w);
+				mir_snwprintf(buff, L"%s (%s)", wszNick.get(), Results.psr.id.w);
 			else
 				wcsncpy_s(buff, wszNick, _TRUNCATE);
 
diff --git a/protocols/JabberG/src/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp
index 5d807f51d6..3e95bc9a39 100644
--- a/protocols/JabberG/src/jabber_secur.cpp
+++ b/protocols/JabberG/src/jabber_secur.cpp
@@ -197,7 +197,7 @@ char* TMD5Auth::getChallenge(const char *challenge)
 	int cbLen = mir_snprintf(buf, 8000,
 		"username=\"%s\",realm=\"%s\",nonce=\"%s\",cnonce=\"%s\",nc=%08d,"
 		"qop=auth,digest-uri=\"xmpp/%s\",charset=utf-8,response=%08x%08x%08x%08x",
-		info->conn.username, realm, nonce, cnonce, iCallCount, serv,
+		info->conn.username, realm, nonce, cnonce, iCallCount, serv.get(),
 		htonl(digest[0]), htonl(digest[1]), htonl(digest[2]), htonl(digest[3]));
 
 	return mir_base64_encode(buf, cbLen);
@@ -276,7 +276,7 @@ char* TScramAuth::getChallenge(const char *challenge)
 	mir_sha1_finish(&ctx, storedKey);
 
 	char authmsg[4096];
-	int authmsgLen = mir_snprintf(authmsg, "%s,%s,c=biws,r=%s", msg1, chl, snonce);
+	int authmsgLen = mir_snprintf(authmsg, "%s,%s,c=biws,r=%s", msg1, chl.get(), snonce.get());
 
 	BYTE clientSig[MIR_SHA1_HASH_SIZE];
 	HMAC(EVP_sha1(), storedKey, sizeof(storedKey), (BYTE*)authmsg, authmsgLen, clientSig, &len);
@@ -295,7 +295,7 @@ char* TScramAuth::getChallenge(const char *challenge)
 
 	char buf[4096];
 	ptrA encproof(mir_base64_encode(clientProof, sizeof(clientProof)));
-	int cbLen = mir_snprintf(buf, "c=biws,r=%s,p=%s", snonce, encproof);
+	int cbLen = mir_snprintf(buf, "c=biws,r=%s,p=%s", snonce.get(), encproof.get());
 	return mir_base64_encode(buf, cbLen);
 }
 
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index bd146d967a..57e18df43f 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1541,7 +1541,7 @@ void CJabberProto::UpdateJidDbSettings(const char *jid)
 	item->getTemp()->m_iStatus = status;
 	if (nSelectedResource != -1) {
 		pResourceStatus r(item->arResources[nSelectedResource]);
-		debugLogA("JabberUpdateJidDbSettings: updating jid %s to rc %s", item->jid, r->m_szResourceName);
+		debugLogA("JabberUpdateJidDbSettings: updating jid %s to rc %s", item->jid, r->m_szResourceName.get());
 		if (r->m_szStatusMessage)
 			db_set_utf(hContact, "CList", "StatusMsg", r->m_szStatusMessage);
 		else
@@ -1631,7 +1631,7 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 		if (strchr(from, '@') == nullptr) {
 			UI_SAFE_NOTIFY(m_pDlgServiceDiscovery, WM_JABBER_TRANSPORT_REFRESH);
 		}
-		debugLogA("%s (%s) online, set contact status to %s", nick, from, T2Utf(Clist_GetStatusModeDescription(status, 0)));
+		debugLogA("%s (%s) online, set contact status to %s", nick.get(), from, T2Utf(Clist_GetStatusModeDescription(status, 0)).get());
 
 		if (m_bEnableAvatars) {
 			bool bHasAvatar = false, bRemovedAvatar = false;
@@ -1739,7 +1739,7 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 			RebuildInfoFrame();
 		}
 		else {
-			debugLogA("%s (%s) requests authorization", szNick, from);
+			debugLogA("%s (%s) requests authorization", szNick.get(), from);
 			DBAddAuthRequest(from, szNick);
 		}
 		return;
diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index c2956d09af..f7e12316e0 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -971,7 +971,7 @@ void CMsnProto::MSN_SendATH(ThreadData *info)
 				"<user><ssl-compact-ticket>t=%s</ssl-compact-ticket>"
 				"<uic>%s</uic>"
 				"<id>%s</id><alias>%s</alias></user>\r\n",
-				(const char*)authSSLToken ? ptrA(HtmlEncode(authSSLToken)) : "",
+				(const char*)authSSLToken ? ptrA(HtmlEncode(authSSLToken)).get() : "",
 				authUIC,
 				GetMyUsername(NETID_MSN), GetMyUsername(NETID_SKYPE));
 			break;
@@ -982,7 +982,7 @@ void CMsnProto::MSN_SendATH(ThreadData *info)
 				"<uic>%s</uic>"
 				"<ssl-site-name>chatservice.live.com</ssl-site-name>"
 				"</user>\r\n",
-				(const char*)authStrToken ? ptrA(HtmlEncode(authStrToken)) : "",
+				(const char*)authStrToken ? ptrA(HtmlEncode(authStrToken)).get() : "",
 				authUIC);
 			break;
 		}
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index b18124501a..61d6c44e52 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -141,7 +141,7 @@ void CMsnProto::MSN_Kickuser(GCHOOK *gch)
 	GCThreadData *thread = MSN_GetThreadByChatId(gch->ptszID);
 	msnNsThread->sendPacketPayload("DEL", "MSGR\\THREAD", 
 		"<thread><id>%d:%s</id><members><member><mri>%s</mri></member></members></thread>",
-		thread->netId, thread->szEmail, _T2A(gch->ptszUID));
+		thread->netId, thread->szEmail, _T2A(gch->ptszUID).get());
 }
 
 void CMsnProto::MSN_Promoteuser(GCHOOK *gch, const char *pszRole)
@@ -149,7 +149,7 @@ void CMsnProto::MSN_Promoteuser(GCHOOK *gch, const char *pszRole)
 	GCThreadData *thread = MSN_GetThreadByChatId(gch->ptszID);
 	msnNsThread->sendPacketPayload("PUT", "MSGR\\THREAD", 
 		"<thread><id>%d:%s</id><members><member><mri>%s</mri><role>%s</role></member></members></thread>",
-		thread->netId, thread->szEmail, _T2A(gch->ptszUID), pszRole);
+		thread->netId, thread->szEmail, _T2A(gch->ptszUID).get(), pszRole);
 }
 
 const wchar_t *CMsnProto::MSN_GCGetRole(GCThreadData* thread, const char *pszWLID) 
diff --git a/protocols/MSN/src/msn_ieembed.cpp b/protocols/MSN/src/msn_ieembed.cpp
index e094d4f722..c9b4b964a7 100644
--- a/protocols/MSN/src/msn_ieembed.cpp
+++ b/protocols/MSN/src/msn_ieembed.cpp
@@ -376,7 +376,7 @@ IHTMLDocument2* IEEmbed::getDocument()
 
 void IEEmbed::navigate(const wchar_t *url)
 {
-	pWebBrowser->Navigate((WCHAR *)url, nullptr, nullptr, nullptr, nullptr);
+	pWebBrowser->Navigate((BSTR)url, nullptr, nullptr, nullptr, nullptr);
 }
 
 void IEEmbed::navigate(char *url)
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index d38ac42e3c..a52bbbcbe6 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -145,7 +145,7 @@ char* MSN_GetAvatarHash(char* szContext, char** pszUrl)
 // MSN_GetAvatarFileName - gets a file name for an contact's avatar
 void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, size_t cbLen, const wchar_t *ext)
 {
-	size_t tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	size_t tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	if (_waccess(pszDest, 0))
 		CreateDirectoryTreeW(pszDest);
@@ -637,7 +637,7 @@ void CMsnProto::MSN_SetServerStatus(int newStatus)
 			szStatusName,
 			MyOptions.szMachineGuid, myFlags, myFlagsEx, myFlagsExEx,
 			MyOptions.szMachineGuid, szPlace,
-			msgptr?ptrA(HtmlEncode(*msgptr)):"", GetMyUsername(NETID_SKYPE),
+			msgptr ? ptrA(HtmlEncode(*msgptr)).get() : "", GetMyUsername(NETID_SKYPE),
 			MyOptions.szMachineGuid,
 			MyOptions.szMachineGuid);
 		msnNsThread->sendPacketPayload("PUT", "MSGR\\PRESENCE", 
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 24bd25f121..1ab70262a8 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -830,7 +830,8 @@ int CMsnProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hCo
 	msg.Append("<contacts alt=\"[Contacts enclosed. Please upgrade to latest Skype version to receive contacts.]\">");
 	for (int i = 0; i < nContacts; i++) {
 		ptrA wlid(getStringA(hContactsList[i], "wlid"));
-		if (wlid != NULL) msg.AppendFormat("<c t=\"s\" s=\"%s\"/>", wlid);
+		if (wlid != NULL)
+			msg.AppendFormat("<c t=\"s\" s=\"%s\"/>", wlid.get());
 	}
 	msg.Append("</contacts>");
 	seq = msnNsThread->sendMessage('1', tEmail, netId, msg, MSG_CONTACT);
diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index eb5fa20886..6de0e34483 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -146,7 +146,7 @@ bool CMsnProto::MSN_SKYABGetProfiles(const char *pszPOST)
 				ptrA skypename(mir_u2a(ptrW(json_as_string(node))));
 				ptrW value;
 				char szWLId[128];
-				mir_snprintf(szWLId, sizeof(szWLId), "%d:%s", NETID_SKYPE, skypename);
+				mir_snprintf(szWLId, sizeof(szWLId), "%d:%s", NETID_SKYPE, skypename.get());
 				MCONTACT hContact = MSN_HContactFromEmail(szWLId, skypename, false, false);
 
 				if (hContact) {
@@ -192,7 +192,7 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 			ptrA skypename(mir_u2a(ptrW(json_as_string(json_get(item, "username")))));
 			ptrW value;
 			char szWLId[128];
-			mir_snprintf(szWLId, sizeof(szWLId), "%d:%s", NETID_SKYPE, skypename);
+			mir_snprintf(szWLId, sizeof(szWLId), "%d:%s", NETID_SKYPE, skypename.get());
 			MCONTACT hContact = MSN_HContactFromEmail(szWLId, skypename, false, false);
 
 			if (hContact) {
@@ -202,12 +202,13 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 				if (value = get_json_str(item, "gender")) setByte(hContact, "Gender", (BYTE)(_wtoi(value) == 1 ? 'M' : 'F'));
 				if (value = get_json_str(item, "birthday")) {
 					int d, m, y;
-					swscanf(value, L"%d-%d-%d", &y, &m, &d);
-					setWord(hContact, "BirthYear", y);
-					setByte(hContact, "BirthDay", d);
-					setByte(hContact, "BirthMonth", m);
+					if (swscanf(value, L"%d-%d-%d", &y, &m, &d) == 3) {
+						setWord(hContact, "BirthYear", y);
+						setByte(hContact, "BirthDay", d);
+						setByte(hContact, "BirthMonth", m);
+					}
 				}
-				if (value = get_json_str(item, "country")) setString(hContact, "Country", (char*)CallService(MS_UTILS_GETCOUNTRYBYISOCODE, (WPARAM)(char*)_T2A(value), 0));
+				if (value = get_json_str(item, "country")) setString(hContact, "Country", (char*)CallService(MS_UTILS_GETCOUNTRYBYISOCODE, _T2A(value), 0));
 				if (value = get_json_str(item, "province")) setWString(hContact, "State", value);
 				if (value = get_json_str(item, "city")) setWString(hContact, "City", value);
 				if (value = get_json_str(item, "homepage")) setWString(hContact, "Homepage", value);
diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp
index 6a98c797de..3b73664455 100644
--- a/protocols/MSN/src/msn_soapab.cpp
+++ b/protocols/MSN/src/msn_soapab.cpp
@@ -814,7 +814,7 @@ bool CMsnProto::MSN_ABFind(const char* szMethod, const char* szGuid, bool deltas
 				char *szCircleTicket = ezxml_txt(ezxml_get(body, "CircleResult", 0, "CircleTicket", -1));
 				ptrA szCircleTicketEnc(mir_base64_encode(szCircleTicket, mir_strlen(szCircleTicket)));
 				if (szCircleTicketEnc)
-					msnNsThread->sendPacket("USR", "SHA A %s", szCircleTicketEnc);
+					msnNsThread->sendPacket("USR", "SHA A %s", szCircleTicketEnc.get());
 			}
 
 		}
diff --git a/protocols/NewsAggregator/Src/Authentication.cpp b/protocols/NewsAggregator/Src/Authentication.cpp
index 35c5cb36bd..33b080bb6c 100644
--- a/protocols/NewsAggregator/Src/Authentication.cpp
+++ b/protocols/NewsAggregator/Src/Authentication.cpp
@@ -39,7 +39,7 @@ void CreateAuthString(char *auth, MCONTACT hContact, CFeedEditor *pDlg)
 	mir_free(tlogin);
 	mir_free(tpass);
 
-	mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode(str, (size_t)len)));
+	mir_snprintf(auth, 250, "Basic %s", ptrA(mir_base64_encode(str, (size_t)len)).get());
 }
 
 CAuthRequest::CAuthRequest(CFeedEditor *pDlg, MCONTACT hContact) :
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp
index 66f1205f12..d8100fbabe 100644
--- a/protocols/Omegle/src/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
@@ -510,7 +510,7 @@ bool Omegle_client::events()
 				// We got info about count of connected people there
 				ptrW count(json_as_string(json_get(data, "count")));
 				wchar_t strT[255];
-				mir_snwprintf(strT, TranslateT("On whole Omegle are %s strangers online now."), count);
+				mir_snwprintf(strT, TranslateT("On whole Omegle are %s strangers online now."), count.get());
 
 				parent->UpdateChat(nullptr, strT);
 			}
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index f47f031ffb..ace07a8da0 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -24,7 +24,7 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const wchar_t* tszUserN
 	m_hNetlibUser = Netlib_RegisterUser(&nlu);
 
 	RegisterGLibLogger();
-	debugLogW(L"CSametimeProto::CSametimeProto() start  m_szModuleName=[%s], m_tszUserName=[%s]", _A2T(m_szModuleName), m_tszUserName);
+	debugLogW(L"CSametimeProto::CSametimeProto() start  m_szModuleName=[%S], m_tszUserName=[%s]", m_szModuleName, m_tszUserName);
 
 	SametimeInitIcons();
 
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp
index 2e27b39822..2eef58c14a 100644
--- a/protocols/Sametime/src/sametime_session.cpp
+++ b/protocols/Sametime/src/sametime_session.cpp
@@ -501,7 +501,7 @@ int CSametimeProto::LogOut()
 
 int CSametimeProto::OnLogInRedirect(char* newHost)
 {
-	debugLogW(L"OnLogInRedirect() mwSession_LOGIN_REDIR  newHost=[%s]", newHost ? _A2T(newHost) : "(null)");
+	debugLogA("OnLogInRedirect() mwSession_LOGIN_REDIR  newHost=[%s]", newHost ? newHost : "(null)");
 
 	if (!newHost || !mir_strcmp(newHost, options.server_name) || db_get_b(0, m_szModuleName, "ForceLogin", 0) == 1) {
 		debugLogW(L"OnLogInRedirect() forceLogin");
diff --git a/protocols/SkypeWeb/src/requests/asm/files.h b/protocols/SkypeWeb/src/requests/asm/files.h
index 89d42274d3..721aac16b3 100644
--- a/protocols/SkypeWeb/src/requests/asm/files.h
+++ b/protocols/SkypeWeb/src/requests/asm/files.h
@@ -8,7 +8,7 @@ public:
 	{
 		flags &= (~NLHRF_DUMPASTEXT);
 		Headers
-			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken)
+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
 			<< CHAR_VALUE("Content-Type", "text/json");
 
 		JSONNode node, jPermissions, jPermission(JSON_ARRAY);
@@ -30,7 +30,7 @@ public:
 		HttpRequest(REQUEST_PUT, FORMAT, "api.asm.skype.com/v1/objects/%s/content/original", szObject)
 	{
 		Headers
-			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken)
+			<< FORMAT_VALUE("Authorization", "skype_token %s", ppro->m_szApiToken.get())
 			<< CHAR_VALUE("Content-Type", "application/octet-stream");
 
 		pData = (char*)mir_alloc(size);
diff --git a/protocols/SkypeWeb/src/requests/capabilities.h b/protocols/SkypeWeb/src/requests/capabilities.h
index 70ca5f7311..0c4366ce95 100644
--- a/protocols/SkypeWeb/src/requests/capabilities.h
+++ b/protocols/SkypeWeb/src/requests/capabilities.h
@@ -27,7 +27,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 
 		JSONNode privateInfo; privateInfo.set_name("privateInfo");
 		privateInfo << JSONNode("epname", hostname);
diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h
index 1b6b352411..1a7c234539 100644
--- a/protocols/SkypeWeb/src/requests/chatrooms.h
+++ b/protocols/SkypeWeb/src/requests/chatrooms.h
@@ -32,7 +32,7 @@ public:
 
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
 	}
 };
@@ -45,7 +45,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 		JSONNode node;
 		node 
@@ -66,7 +66,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		JSONNode node(JSON_NODE);
@@ -92,7 +92,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 
 		JSONNode node;
 		JSONNode members(JSON_ARRAY); members.set_name("members");
@@ -122,7 +122,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 	}
 };
 
@@ -135,7 +135,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 
 		JSONNode node;
 
@@ -154,7 +154,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 	}
 };
 
@@ -167,7 +167,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 
 		JSONNode node;
 		node << JSONNode(propname, value);
diff --git a/protocols/SkypeWeb/src/requests/endpoint.h b/protocols/SkypeWeb/src/requests/endpoint.h
index fe9c3c6a3e..446b4630dd 100644
--- a/protocols/SkypeWeb/src/requests/endpoint.h
+++ b/protocols/SkypeWeb/src/requests/endpoint.h
@@ -27,7 +27,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("Authentication", "skypetoken=%s", ppro->m_szApiToken);
+			<< FORMAT_VALUE("Authentication", "skypetoken=%s", ppro->m_szApiToken.get());
 
 		Body << VALUE("{}");
 	}
@@ -41,7 +41,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 	}
 };
 
diff --git a/protocols/SkypeWeb/src/requests/history.h b/protocols/SkypeWeb/src/requests/history.h
index 30294dff30..f67718e49b 100644
--- a/protocols/SkypeWeb/src/requests/history.h
+++ b/protocols/SkypeWeb/src/requests/history.h
@@ -31,7 +31,7 @@ public:
 
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
 	}
 
@@ -41,7 +41,7 @@ public:
 
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
 	}
 };
@@ -60,7 +60,7 @@ public:
 
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
 	}
 };
@@ -73,7 +73,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset = UTF-8");
 	}
 };
diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h
index 949704cbea..8ec058ba7a 100644
--- a/protocols/SkypeWeb/src/requests/messages.h
+++ b/protocols/SkypeWeb/src/requests/messages.h
@@ -26,7 +26,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		JSONNode node;
@@ -48,7 +48,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		CMStringA content;
@@ -74,7 +74,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		const char *state = (iState == PROTOTYPE_SELFTYPING_ON) ? "Control/Typing" : "Control/ClearTyping";
@@ -98,7 +98,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		//"lastReadMessageTimestamp;modificationTime;lastReadMessageId"
diff --git a/protocols/SkypeWeb/src/requests/poll.h b/protocols/SkypeWeb/src/requests/poll.h
index 2c306ff958..4bc9da6e43 100644
--- a/protocols/SkypeWeb/src/requests/poll.h
+++ b/protocols/SkypeWeb/src/requests/poll.h
@@ -28,7 +28,7 @@ public:
 		flags |= NLHRF_PERSISTENT;
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 	}
 };
 #endif //_SKYPE_POLL_H_
 \ No newline at end of file
diff --git a/protocols/SkypeWeb/src/requests/status.h b/protocols/SkypeWeb/src/requests/status.h
index c66cbd8ec2..900c4348cf 100644
--- a/protocols/SkypeWeb/src/requests/status.h
+++ b/protocols/SkypeWeb/src/requests/status.h
@@ -26,7 +26,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		JSONNode node(JSON_NODE);
diff --git a/protocols/SkypeWeb/src/requests/subscriptions.h b/protocols/SkypeWeb/src/requests/subscriptions.h
index 979c472639..dc18432208 100644
--- a/protocols/SkypeWeb/src/requests/subscriptions.h
+++ b/protocols/SkypeWeb/src/requests/subscriptions.h
@@ -26,7 +26,7 @@ public:
 	{
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken)
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get())
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
 
 		JSONNode interestedResources(JSON_ARRAY); interestedResources.set_name("interestedResources");
@@ -55,7 +55,7 @@ public:
 		Headers
 			<< CHAR_VALUE("Accept", "application/json, text/javascript")
 			<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8")
-			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken);
+			<< FORMAT_VALUE("RegistrationToken", "registrationToken=%s", ppro->m_szToken.get());
 
 
 		JSONNode node;
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index 56fc8f1869..094e857a56 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -107,7 +107,7 @@ INT_PTR CSkypeProto::SvcGetAvatarInfo(WPARAM, LPARAM lParam)
 
 	if (IsOnline()) {
 		PushRequest(new GetAvatarRequest(szUrl), &CSkypeProto::OnReceiveAvatar, (void*)pai->hContact);
-		debugLogA("Requested to read an avatar from '%s'", szUrl);
+		debugLogA("Requested to read an avatar from '%s'", szUrl.get());
 		return GAIR_WAITFOR;
 	}
 
@@ -125,7 +125,7 @@ INT_PTR CSkypeProto::SvcGetMyAvatar(WPARAM wParam, LPARAM lParam)
 
 void CSkypeProto::GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, size_t cbLen)
 {
-	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%s", VARSW(L"%miranda_avatarcache%"), m_tszUserName);
+	int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%s", VARSW(L"%miranda_avatarcache%").get(), m_tszUserName);
 
 	DWORD dwAttributes = GetFileAttributes(pszDest);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp
index 17cbab0b34..12cf2200ba 100644
--- a/protocols/SkypeWeb/src/skype_files.cpp
+++ b/protocols/SkypeWeb/src/skype_files.cpp
@@ -81,16 +81,16 @@ void CSkypeProto::OnASMObjectUploaded(const NETLIBHTTPREQUEST *response, void *a
 	auto *pTitle = doc.NewElement("Title"); pTitle->SetText(tszFile); pRoot->InsertEndChild(pTitle);
 	auto *pDescr = doc.NewElement("Description"); pDescr->SetText(fup->tszDesc.get()); pRoot->InsertEndChild(pDescr);
 
-	auto *xmlA = doc.NewElement("a"); xmlA->SetText(CMStringA(FORMAT, "https://login.skype.com/login/sso?go=webclient.xmm&docid=%s", fup->uid));
-	xmlA->SetAttribute("href", CMStringA(FORMAT, "https://login.skype.com/login/sso?go=webclient.xmm&docid=%s", fup->uid));
+	auto *xmlA = doc.NewElement("a"); xmlA->SetText(CMStringA(FORMAT, "https://login.skype.com/login/sso?go=webclient.xmm&docid=%s", fup->uid.get()));
+	xmlA->SetAttribute("href", CMStringA(FORMAT, "https://login.skype.com/login/sso?go=webclient.xmm&docid=%s", fup->uid.get()));
 	pRoot->InsertEndChild(xmlA);
 
 	auto *xmlOrigName = doc.NewElement("OriginalName"); xmlOrigName->SetAttribute("v", tszFile); pRoot->InsertEndChild(xmlOrigName);
 	auto *xmlSize = doc.NewElement("FileSize"); xmlSize->SetAttribute("v", (int)fup->size); pRoot->InsertEndChild(xmlSize);
 
 	pRoot->SetAttribute("Type", "File.1");
-	pRoot->SetAttribute("uri", CMStringA(FORMAT, "https://api.asm.skype.com/v1/objects/%s", fup->uid));
-	pRoot->SetAttribute("url_thumbnail", CMStringA(FORMAT, "https://api.asm.skype.com/v1/objects/%s/views/thumbnail", fup->uid));
+	pRoot->SetAttribute("uri", CMStringA(FORMAT, "https://api.asm.skype.com/v1/objects/%s", fup->uid.get()));
+	pRoot->SetAttribute("url_thumbnail", CMStringA(FORMAT, "https://api.asm.skype.com/v1/objects/%s/views/thumbnail", fup->uid.get()));
 
 	tinyxml2::XMLPrinter printer(0, true);
 	doc.Print(&printer);
diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp
index 58b28f3434..684526bdaa 100644
--- a/protocols/SkypeWeb/src/skype_profile.cpp
+++ b/protocols/SkypeWeb/src/skype_profile.cpp
@@ -233,7 +233,7 @@ void CSkypeProto::UpdateProfileDisplayName(const JSONNode &root, MCONTACT hConta
 	if (firstname) {
 		CMStringW nick(firstname);
 		if (lastname)
-			nick.AppendFormat(L" %s", lastname);
+			nick.AppendFormat(L" %s", lastname.get());
 		setWString(hContact, "Nick", nick);
 	}
 	else if (lastname)
diff --git a/protocols/Steam/src/steam_avatars.cpp b/protocols/Steam/src/steam_avatars.cpp
index 828840de94..d01c3b0358 100644
--- a/protocols/Steam/src/steam_avatars.cpp
+++ b/protocols/Steam/src/steam_avatars.cpp
@@ -3,7 +3,7 @@
 wchar_t* CSteamProto::GetAvatarFilePath(MCONTACT hContact)
 {
 	wchar_t path[MAX_PATH];
-	mir_snwprintf(path, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	mir_snwprintf(path, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(path);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
@@ -11,7 +11,7 @@ wchar_t* CSteamProto::GetAvatarFilePath(MCONTACT hContact)
 
 	ptrA steamId(getStringA(hContact, "SteamID"));
 	if (steamId != NULL)
-		mir_snwprintf(path, MAX_PATH, L"%s\\%s.jpg", path, _A2T(steamId));
+		mir_snwprintf(path, MAX_PATH, L"%s\\%S.jpg", path, steamId.get());
 	else
 		return nullptr;
 
diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 63e4c05905..cd576ac374 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -278,7 +278,7 @@ void CSteamProto::ContactIsRemoved(MCONTACT hContact)
 
 		ptrW nick(getWStringA(hContact, "Nick"));
 		wchar_t message[MAX_PATH];
-		mir_snwprintf(message, MAX_PATH, TranslateT("%s has been removed from your contact list"), nick);
+		mir_snwprintf(message, MAX_PATH, TranslateT("%s has been removed from your contact list"), nick.get());
 
 		ShowNotification(message);
 	}
@@ -311,7 +311,7 @@ void CSteamProto::ContactIsAskingAuth(MCONTACT hContact)
 		lastName = mir_strdup("");
 
 	char reason[MAX_PATH];
-	mir_snprintf(reason, Translate("%s has added you to contact list"), nickName);
+	mir_snprintf(reason, Translate("%s has added you to contact list"), nickName.get());
 
 	DB_AUTH_BLOB blob(hContact, nickName, firstName, lastName, steamId, reason);
 
@@ -486,7 +486,7 @@ void CSteamProto::OnGotAvatar(const HttpResponse &response, void *arg)
 
 	if (!response.IsSuccess()) {
 		ptrA steamId(getStringA(ai.hContact, "SteamID"));
-		debugLogA(__FUNCTION__ ": failed to get avatar %s", steamId);
+		debugLogA(__FUNCTION__ ": failed to get avatar %s", steamId.get());
 
 		if (ai.hContact)
 			ProtoBroadcastAck(ai.hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, (HANDLE)& ai, 0);
@@ -517,7 +517,7 @@ void CSteamProto::OnFriendAdded(const HttpResponse &response, void *arg)
 			who = mir_wstrdup(steamId);
 
 		wchar_t message[MAX_PATH];
-		mir_snwprintf(message, L"Error adding friend %s", who);
+		mir_snwprintf(message, L"Error adding friend %s", who.get());
 
 		JSONNode root = JSONNode::parse(response.Content);
 		if (root) {
@@ -531,19 +531,19 @@ void CSteamProto::OnFriendAdded(const HttpResponse &response, void *arg)
 						int errorCode = errors[first].as_int();
 						switch (errorCode) {
 						case 11:
-							mir_snwprintf(message, L"All communication with %s is blocked. Communication is only possible if you have lifted the blocking. To do this, visit the user's Steam Community page.", who);
+							mir_snwprintf(message, L"All communication with %s is blocked. Communication is only possible if you have lifted the blocking. To do this, visit the user's Steam Community page.", who.get());
 							break;
 						case 15:
-							mir_snwprintf(message, L"Request to %s can not be sent. His/her friends list is full.", who);
+							mir_snwprintf(message, L"Request to %s can not be sent. His/her friends list is full.", who.get());
 							break;
 						case 24:
 							mir_wstrcpy(message, L"Your account does not meet the requirements to use this feature. Visit Steam Support to get more information.");
 							break;
 						case 25:
-							mir_snwprintf(message, L"Request to %s can not be sent. Your friends list is full.", who);
+							mir_snwprintf(message, L"Request to %s can not be sent. Your friends list is full.", who.get());
 							break;
 						case 40:
-							mir_snwprintf(message, L"Error adding friend %s. The communication between you and the other Steam member is blocked.", who);
+							mir_snwprintf(message, L"Error adding friend %s. The communication between you and the other Steam member is blocked.", who.get());
 							break;
 						case 84:
 							mir_wstrcpy(message, L"You've been sending too many invitations lately. Please try again in a day or two.");
@@ -634,7 +634,7 @@ void CSteamProto::OnPendingApproved(const JSONNode &root, void *arg)
 	int success = root["success"].as_int();
 	if (success == 0) {
 		json_string error = root["error_text"].as_string();
-		debugLogA(__FUNCTION__ ": failed to approve pending from %s (%s)", steamId, ptrA(mir_utf8decodeA(error.c_str())));
+		debugLogA(__FUNCTION__ ": failed to approve pending from %s (%s)", steamId.get(), ptrA(mir_utf8decodeA(error.c_str())).get());
 	}
 }
 
@@ -648,7 +648,7 @@ void CSteamProto::OnPendingIgnoreded(const JSONNode &root, void *arg)
 	int success = root["success"].as_int();
 	if (success == 0) {
 		json_string error = root["error_text"].as_string();
-		debugLogA(__FUNCTION__ ": failed to ignore pending from %s (%s)", steamId, ptrA(mir_utf8decodeA(error.c_str())));
+		debugLogA(__FUNCTION__ ": failed to ignore pending from %s (%s)", steamId.get(), ptrA(mir_utf8decodeA(error.c_str())).get());
 	}
 }
 
diff --git a/protocols/Steam/src/steam_messages.cpp b/protocols/Steam/src/steam_messages.cpp
index d06eb54de2..b9b37914a3 100644
--- a/protocols/Steam/src/steam_messages.cpp
+++ b/protocols/Steam/src/steam_messages.cpp
@@ -44,7 +44,7 @@ void CSteamProto::OnMessageSent(const HttpResponse &response, void *arg)
 	}
 
 	if (mir_strcmpi(error.c_str(), "OK") != 0) {
-		debugLogA(__FUNCTION__ ": failed to send message for %s (%s)", steamId, error.c_str());
+		debugLogA(__FUNCTION__ ": failed to send message for %s (%s)", steamId.get(), error.c_str());
 		ProtoBroadcastAck(param->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, param->hMessage, _A2T(error.c_str()));
 	}
 	else {
diff --git a/protocols/Tox/src/tox_accounts.cpp b/protocols/Tox/src/tox_accounts.cpp
index ff40c4bb2e..c89f28fb82 100644
--- a/protocols/Tox/src/tox_accounts.cpp
+++ b/protocols/Tox/src/tox_accounts.cpp
@@ -8,7 +8,7 @@ int CToxProto::OnAccountRenamed(WPARAM wParam, LPARAM lParam)
 
 		ptrW newPath(GetToxProfilePath());
 		wchar_t oldPath[MAX_PATH];
-		mir_snwprintf(oldPath, MAX_PATH, L"%s\\%s.tox", VARSW(L"%miranda_userdata%"), m_accountName);
+		mir_snwprintf(oldPath, MAX_PATH, L"%s\\%s.tox", VARSW(L"%miranda_userdata%").get(), m_accountName);
 		_wrename(oldPath, newPath);
 		m_accountName = mir_wstrdup(m_tszUserName);
 	}
diff --git a/protocols/Tox/src/tox_avatars.cpp b/protocols/Tox/src/tox_avatars.cpp
index 0e1aa6aa97..0a255512a0 100644
--- a/protocols/Tox/src/tox_avatars.cpp
+++ b/protocols/Tox/src/tox_avatars.cpp
@@ -3,7 +3,7 @@
 wchar_t* CToxProto::GetAvatarFilePath(MCONTACT hContact)
 {
 	wchar_t *path = (wchar_t*)mir_calloc(MAX_PATH * sizeof(wchar_t) + 1);
-	mir_snwprintf(path, MAX_PATH, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	mir_snwprintf(path, MAX_PATH, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(path);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
@@ -18,7 +18,7 @@ wchar_t* CToxProto::GetAvatarFilePath(MCONTACT hContact)
 	if (hContact && mir_wstrlen(address) > TOX_PUBLIC_KEY_SIZE * 2)
 		address[TOX_PUBLIC_KEY_SIZE * 2] = 0;
 
-	mir_snwprintf(path, MAX_PATH, L"%s\\%s.png", path, address);
+	mir_snwprintf(path, MAX_PATH, L"%s\\%s.png", path, address.get());
 	return path;
 }
 
@@ -214,7 +214,7 @@ void CToxProto::OnGotFriendAvatarInfo(Tox *tox, AvatarTransferParam *transfer)
 	}
 
 	wchar_t path[MAX_PATH];
-	mir_snwprintf(path, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	mir_snwprintf(path, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 	OnFileAllow(tox, transfer->pfts.hContact, transfer, path);
 }
 
diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp
index f1939c2475..659b8d9e2e 100644
--- a/protocols/Tox/src/tox_transfer.cpp
+++ b/protocols/Tox/src/tox_transfer.cpp
@@ -23,7 +23,7 @@ void CToxProto::OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumbe
 
 			ptrW address(proto->getWStringA(hContact, TOX_SETTINGS_ID));
 			wchar_t avatarName[MAX_PATH];
-			mir_snwprintf(avatarName, MAX_PATH, L"%s.png", address);
+			mir_snwprintf(avatarName, MAX_PATH, L"%s.png", address.get());
 
 			AvatarTransferParam *transfer = new AvatarTransferParam(friendNumber, fileNumber, avatarName, fileSize);
 			transfer->pfts.flags |= PFTS_RECEIVING;
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 18b19121df..8cb14eab53 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -441,7 +441,7 @@ bool CVkProto::AutoFillForm(char *pBody, CMStringA &szAction, CMStringA& szResul
 					pPhonePref = strstr(pPhonePref + 1, "<span class=\"field_prefix\">&nbsp;");
 					if (pPhonePref && sscanf(pPhonePref, "<span class=\"field_prefix\">&nbsp;%[^<]", szSufixTel) == 1) {
 						wszTitle.Format(TranslateT("Enter the missing digits between %s and %s of the phone number linked to your account"),
-							ptrW(mir_a2u(szPrefixTel)), ptrW(mir_a2u(szSufixTel)));
+							ptrW(mir_a2u(szPrefixTel)).get(), ptrW(mir_a2u(szSufixTel)).get());
 						MessageBoxW(nullptr, wszTitle, TranslateT("Attention!"), MB_ICONWARNING | MB_OK);
 					}
 				}
diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp
index a2ab5e8dbc..be39afde35 100644
--- a/protocols/VKontakte/src/vk_avatars.cpp
+++ b/protocols/VKontakte/src/vk_avatars.cpp
@@ -104,7 +104,7 @@ INT_PTR CVkProto::SvcGetAvatarInfo(WPARAM, LPARAM lParam)
 		pReq->m_bApiReq = false;
 		Push(pReq);
 
-		debugLogA("Requested to read an avatar from '%s'", szUrl);
+		debugLogA("Requested to read an avatar from '%s'", szUrl.get());
 		return GAIR_WAITFOR;
 	}
 
@@ -130,7 +130,7 @@ INT_PTR CVkProto::SvcGetMyAvatar(WPARAM wParam, LPARAM lParam)
 
 void CVkProto::GetAvatarFileName(MCONTACT hContact, wchar_t *pwszDest, size_t cbLen)
 {
-	int tPathLen = mir_snwprintf(pwszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);
+	int tPathLen = mir_snwprintf(pwszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%").get(), m_szModuleName);
 
 	DWORD dwAttributes = GetFileAttributes(pwszDest);
 	if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index fc9c834ad1..069bbc1142 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -306,7 +306,7 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode &
 
 		if (wszAction == L"chat_create") {
 			CMStringW wszActionText = jnMsg["action_text"].as_mstring();
-			wszBody.AppendFormat(L"%s \"%s\"", TranslateT("create chat"), wszActionText.IsEmpty() ? L" " : wszActionText);
+			wszBody.AppendFormat(L"%s \"%s\"", TranslateT("create chat"), wszActionText.IsEmpty() ? L" " : wszActionText.c_str());
 		}
 		else if (wszAction == L"chat_kick_user") {
 			CMStringW wszActionMid = jnMsg["action_mid"].as_mstring();
@@ -327,10 +327,9 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode &
 						if (cu == nullptr)
 							wszBody.AppendFormat(L"%s (%s)", TranslateT("kick user"), UserProfileUrl(a_uid).c_str());
 						else
-							wszBody.AppendFormat(L"%s %s (%s)", TranslateT("kick user"), cu->m_wszNick, UserProfileUrl(a_uid).c_str());
+							wszBody.AppendFormat(L"%s %s (%s)", TranslateT("kick user"), cu->m_wszNick.get(), UserProfileUrl(a_uid).c_str());
 					}
-					else
-						wszBody = TranslateT("kick user");
+					else wszBody = TranslateT("kick user");
 				}
 			}
 		}
@@ -350,16 +349,15 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode &
 						if (cu == nullptr)
 							wszBody.AppendFormat(L"%s (%s)", TranslateT("invite user"), UserProfileUrl(a_uid).c_str());
 						else
-							wszBody.AppendFormat(L"%s %s (%s)", TranslateT("invite user"), cu->m_wszNick, UserProfileUrl(a_uid).c_str());
+							wszBody.AppendFormat(L"%s %s (%s)", TranslateT("invite user"), cu->m_wszNick.get(), UserProfileUrl(a_uid).c_str());
 					}
-					else
-						wszBody = TranslateT("invite user");
+					else wszBody = TranslateT("invite user");
 				}
 			}
 		}
 		else if (wszAction == L"chat_title_update") {
 			CMStringW wszTitle = jnMsg["action_text"].as_mstring();
-			wszBody.AppendFormat(L"%s \"%s\"", TranslateT("change chat title to"), wszTitle.IsEmpty() ? L" " : wszTitle);
+			wszBody.AppendFormat(L"%s \"%s\"", TranslateT("change chat title to"), wszTitle.IsEmpty() ? L" " : wszTitle.c_str());
 
 			if (!bIsHistory)
 				SetChatTitle(cc, wszTitle);
@@ -852,7 +850,7 @@ void CVkProto::ChatContactTypingThread(void *p)
 			m_ChatsTyping.remove(cp);
 		m_ChatsTyping.insert(param);
 
-		Srmm_SetStatusText(hChatContact, CMStringW(FORMAT, TranslateT("%s is typing a message..."), cu->m_wszNick));
+		Srmm_SetStatusText(hChatContact, CMStringW(FORMAT, TranslateT("%s is typing a message..."), cu->m_wszNick.get()));
 	}
 
 	Sleep(9500);
diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index b661b2e438..642a836173 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -209,7 +209,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 			CMStringW str(FORMAT, TranslateT("Error loading message history for %s from server."), pwszNick);
 
 			MsgPopup(param->hContact, str, TranslateT("Error"), true);
-			debugLogW(L"CVkProto::OnReceiveHistoryMessages error for %s m_iLoadHistoryTask=%d", pwszNick, m_iLoadHistoryTask);
+			debugLogW(L"CVkProto::OnReceiveHistoryMessages error for %s m_iLoadHistoryTask=%d", pwszNick.get(), m_iLoadHistoryTask);
 
 			if (m_iLoadHistoryTask == 0 && m_bNotifyForEndLoadingHistoryAllContact) {
 				MsgPopup(TranslateT("Loading messages for all contacts is completed."), TranslateT("Loading history"));
@@ -334,7 +334,7 @@ void CVkProto::OnReceiveHistoryMessages(NETLIBHTTPREQUEST *reply, AsyncHttpReque
 
 		ptrW pwszNick(db_get_wsa(param->hContact, m_szModuleName, "Nick"));
 		CMStringW str(FORMAT, TranslateT("Loading messages for %s is completed."), pwszNick);
-		debugLogW(L"CVkProto::OnReceiveHistoryMessages for %s m_iLoadHistoryTask=%d", pwszNick, m_iLoadHistoryTask);
+		debugLogW(L"CVkProto::OnReceiveHistoryMessages for %s m_iLoadHistoryTask=%d", pwszNick.get(), m_iLoadHistoryTask);
 
 		if (m_bNotifyForEndLoadingHistory)
 			MsgPopup(param->hContact, str, TranslateT("Loading history"));
diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index 09c5a59878..4a4bad243c 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -55,9 +55,10 @@ void CVkProto::OnReceivePollingInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *
 	if (!m_hPollingThread) {
 		debugLogA("CVkProto::OnReceivePollingInfo m_hPollingThread is nullptr");
 		debugLogA("CVkProto::OnReceivePollingInfo m_pollingTs = '%s' m_pollingKey = '%s' m_pollingServer = '%s'",
-			m_pollingTs ? m_pollingTs : "<nullptr>",
-			m_pollingKey ? m_pollingKey : "<nullptr>",
-			m_pollingServer ? m_pollingServer : "<nullptr>");
+			m_pollingTs ? m_pollingTs.get() : "<nullptr>",
+			m_pollingKey ? m_pollingKey.get() : "<nullptr>",
+			m_pollingServer ? m_pollingServer.get() : "<nullptr>");
+		
 		if (m_pollingTs != nullptr && m_pollingKey != nullptr && m_pollingServer != nullptr) {
 			debugLogA("CVkProto::OnReceivePollingInfo PollingThread starting...");
 			m_hPollingThread = ForkThreadEx(&CVkProto::PollingThread, nullptr, nullptr);
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 1ad8b6abd3..d1198e1a5d 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -643,7 +643,7 @@ int CVkProto::GetInfo(MCONTACT hContact, int)
 void CVkProto::OnContactDeleted(MCONTACT hContact)
 {
 	ptrW pwszNick(db_get_wsa(hContact, m_szModuleName, "Nick"));
-	debugLogW(L"CVkProto::OnContactDeleted %s", pwszNick);
+	debugLogW(L"CVkProto::OnContactDeleted %s", pwszNick.get());
 
 	if (db_get_b(hContact, "CList", "NotOnList") || getBool(hContact, "SilentDelete") || isChatRoom((MCONTACT)hContact))
 		return;
@@ -656,7 +656,7 @@ void CVkProto::OnContactDeleted(MCONTACT hContact)
 	CVkContactDeleteForm dlg(this, param);
 	dlg.DoModal();
 
-	debugLogW(L"CVkProto::OnContactDeleted %s DeleteDialog=%d DeleteFromFriendlist=%d", pwszNick, param->bDeleteDialog,  param->bDeleteFromFriendlist);
+	debugLogW(L"CVkProto::OnContactDeleted %s DeleteDialog=%d DeleteFromFriendlist=%d", pwszNick.get(), param->bDeleteDialog,  param->bDeleteFromFriendlist);
 	if (!(param->bDeleteDialog || param->bDeleteFromFriendlist))
 		return;
 
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index 0014b5ae3b..638d5e2e37 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -883,7 +883,7 @@ INT_PTR __cdecl CVkProto::SvcDeleteFriend(WPARAM hContact, LPARAM flag)
 	if (flag == 0) {
 		CMStringW pwszMsg;
 		ptrW pwszNick(db_get_wsa(hContact, m_szModuleName, "Nick"));
-		pwszMsg.AppendFormat(TranslateT("Are you sure to delete %s from your friend list?"), IsEmpty(pwszNick) ? TranslateT("(Unknown contact)") : pwszNick);
+		pwszMsg.AppendFormat(TranslateT("Are you sure to delete %s from your friend list?"), IsEmpty(pwszNick) ? TranslateT("(Unknown contact)") : pwszNick.get());
 		if (IDNO == MessageBoxW(nullptr, pwszMsg, TranslateT("Attention!"), MB_ICONWARNING | MB_YESNO))
 			return 1;
 	}
diff --git a/protocols/Weather/src/weather_update.cpp b/protocols/Weather/src/weather_update.cpp
index 12736b35be..1701b25868 100644
--- a/protocols/Weather/src/weather_update.cpp
+++ b/protocols/Weather/src/weather_update.cpp
@@ -406,19 +406,19 @@ int GetWeatherData(MCONTACT hContact)
 		// generate update URL
 		switch (i) {
 		case 0:
-			mir_snprintf(loc, Data->UpdateURL, _T2A(id));
+			mir_snprintf(loc, Data->UpdateURL, _T2A(id).get());
 			break;
 
 		case 1:
-			mir_snprintf(loc, Data->UpdateURL2, _T2A(id));
+			mir_snprintf(loc, Data->UpdateURL2, _T2A(id).get());
 			break;
 
 		case 2:
-			mir_snprintf(loc, Data->UpdateURL3, _T2A(id));
+			mir_snprintf(loc, Data->UpdateURL3, _T2A(id).get());
 			break;
 
 		case 3:
-			mir_snprintf(loc, Data->UpdateURL4, _T2A(id));
+			mir_snprintf(loc, Data->UpdateURL4, _T2A(id).get());
 			break;
 
 		default:
diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp
index b225516021..dc25d78161 100644
--- a/protocols/YAMN/src/browser/mailbrowser.cpp
+++ b/protocols/YAMN/src/browser/mailbrowser.cpp
@@ -634,7 +634,7 @@ void DoMailActions(HWND hDlg, CAccount *ActualAccount, struct CMailNumbers *MN,
 
 	if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopupRun + MN->Virtual.PopupRun)) {
 		wchar_t tszMsg[250];
-		mir_snwprintf(tszMsg, TranslateT("%s : %d new mail message(s), %d total"), _A2T(ActualAccount->Name), MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC);
+		mir_snwprintf(tszMsg, TranslateT("%s : %d new mail message(s), %d total"), _A2T(ActualAccount->Name).get(), MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC);
 
 		if (!(nflags & YAMN_ACC_CONTNOEVENT)) {
 			CLISTEVENT evt = {};
author	George Hazan <ghazan@miranda.im>	2019-07-24 20:58:51 +0300
committer	George Hazan <ghazan@miranda.im>	2019-07-24 20:58:58 +0300
commit	ed4897b7ef69e862806a8c07f1fd475262d0c36e (patch)
tree	414efc6365f455122956eac74b754505c8efaf15 /protocols
parent	99893bf3aec9f4e9f0c4844c0987d129e1778c7e (diff)