massive warning fix

10 files changed, 40 insertions, 50 deletions

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index ca0c7955d4..c693595013 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -105,7 +105,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa
 		pd.lchIcon = LoadIconEx("window");

 

 	PROTOACCOUNT *pa = Proto_GetAccount(pszProtoName);

-	mir_snwprintf(pd.lpwzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName) : pa->tszAccountName, Clist_GetContactDisplayName(hContact));

+	mir_snwprintf(pd.lpwzContactName, L"%s - %s", (pa == nullptr) ? _A2T(pszProtoName).get() : pa->tszAccountName, Clist_GetContactDisplayName(hContact));

 	wcsncpy_s(pd.lpwzText, TranslateW(szBuf), _TRUNCATE);

 	pd.iSeconds = g_Settings.iPopupTimeout;

 

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 0f0890098c..0ce8f1b1c9 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -283,13 +283,13 @@ static wchar_t* GetPreviewT(WORD eventType, DBEVENTINFO *dbe)
 				if (szDescr && Utils::safe_strlen(szDescr, dbe->cbBlob - sizeof(DWORD) - namelength - 1) > 0) {

 					ptrW tszDescr(DbEvent_GetString(dbe, szDescr));

 					if (tszFileName && tszDescr) {

-						mir_snwprintf(buf, L"%s: %s (%s)", TranslateT("Incoming file"), tszFileName, tszDescr);

+						mir_snwprintf(buf, L"%s: %s (%s)", TranslateT("Incoming file"), tszFileName.get(), tszDescr.get());

 						return mir_wstrdup(buf);

 					}

 				}

 

 				if (tszFileName) {

-					mir_snwprintf(buf, L"%s: %s (%s)", TranslateT("Incoming file"), tszFileName, TranslateT("No description given"));

+					mir_snwprintf(buf, L"%s: %s (%s)", TranslateT("Incoming file"), tszFileName.get(), TranslateT("No description given"));

 					return mir_wstrdup(buf);

 				}

 			}

@@ -441,13 +441,8 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, MCONTACT hContact, MEVENT hEve
 	pdata->eventData[0].tszText[MAX_SECONDLINE - 1] = 0;

 	pdata->nrEventsAlloced = NR_MERGED;

 	pdata->nrMerged = 1;

-

-	// fix for broken popups -- process failures

-	if (PUAddPopupW(&pud) < 0) {

-		mir_free(pdata->eventData);

-		mir_free(pdata);

-	}

-	else arPopupList.insert(pdata);

+	PUAddPopupW(&pud);

+	arPopupList.insert(pdata);

 

 	if (dbe.pBlob)

 		mir_free(dbe.pBlob);

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index cbef09d56a..aea8159720 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -277,7 +277,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				CheckMenuItem(submenu, ID_TRAYCONTEXT_DISABLEALLPOPUPS, MF_BYCOMMAND | (nen_options.iDisable ? MF_CHECKED : MF_UNCHECKED));

 				CheckMenuItem(submenu, ID_TRAYCONTEXT_DON40223, MF_BYCOMMAND | (nen_options.iNoSounds ? MF_CHECKED : MF_UNCHECKED));

 				CheckMenuItem(submenu, ID_TRAYCONTEXT_DON, MF_BYCOMMAND | (nen_options.iNoAutoPopup ? MF_CHECKED : MF_UNCHECKED));

-				EnableMenuItem(submenu, ID_TRAYCONTEXT_HIDEALLMESSAGECONTAINERS, MF_BYCOMMAND | (nen_options.bTraySupport) ? MF_ENABLED : MF_GRAYED);

+				EnableMenuItem(submenu, ID_TRAYCONTEXT_HIDEALLMESSAGECONTAINERS, MF_BYCOMMAND | (nen_options.bTraySupport ? MF_ENABLED : MF_GRAYED));

 				CheckMenuItem(submenu, ID_TRAYCONTEXT_SHOWTHETRAYICON, MF_BYCOMMAND | (nen_options.bTraySupport ? MF_CHECKED : MF_UNCHECKED));

 				BOOL iSelection = TrackPopupMenu(submenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, nullptr);

 				if (iSelection) {

diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index 33dd5f359a..3c3684dc8b 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -497,7 +497,7 @@ void CInfoPanel::RenderIPUIN(const HDC hdc, RECT& rcItem)
 			wchar_t	temp[256];

 			ptrW szVersion(db_get_wsa(m_dat->m_cache->getActiveContact(), m_dat->m_cache->getActiveProto(), "MirVer"));

 			if (szVersion)

-				mir_snwprintf(temp, TranslateT("  Client: %s"), szVersion);

+				mir_snwprintf(temp, TranslateT("  Client: %s"), szVersion.get());

 			else

 				mir_snwprintf(temp, TranslateT("  Client not cached yet"));

 			wcscat_s(szBuf, 256, temp);

diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index 10cf7aaab3..8d7215bddf 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -100,7 +100,7 @@ static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
 			int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, nullptr);

 			if (res != 0) {

 				bufSize = textlenght + mir_wstrlen(arMenuLines[res-1]) + 2;

-				pwszFormatedText.Format(arMenuLines[res-1], pszText);

+				pwszFormatedText.Format(arMenuLines[res-1], pszText.get());

 			}

 

 			for (auto &it : arMenuLines)

@@ -110,7 +110,7 @@ static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
 	else if (textlenght) {

 		SendDlgItemMessage(cbcd->hwndFrom, IDC_SRMM_MESSAGE, EM_GETSELTEXT, 0, (LPARAM)pszText);

 

-		pwszFormatedText.Format(L"[img]%s[/img]", pszText);

+		pwszFormatedText.Format(L"[img]%s[/img]", pszText.get());

 

 		bbd.pwszTooltip = nullptr;

 		bbd.hIcon = nullptr;

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 892a4c1910..456f10b32e 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -294,14 +294,13 @@ int CSendLater::addJob(const char *szSetting, void *lParam)
 		else

 			return 0;

 	}

-	else if (szSetting[0] == 'M') {

+	else {

 		char *szSep = strchr(const_cast<char *>(szSetting), '|');

 		if (!szSep)

 			return 0;

 		*szSep = 0;

 		szOrig_Utf = szSep + 1;

 	}

-	else return 0;

 

 	CSendLaterJob *job = new CSendLaterJob;

 

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index ea6daa21ea..b43c0b1c8a 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -583,21 +583,21 @@ int SendQueue::doSendLater(int iJobIndex, CTabBaseDlg *dat, MCONTACT hContact, b
 		time_t now = time(0);
 		wchar_t tszTimestamp[30];
 		wcsftime(tszTimestamp, _countof(tszTimestamp), L"%Y.%m.%d - %H:%M", _localtime32((__time32_t *)&now));
-		mir_snprintf(szKeyName, "S%d", now);
+		mir_snprintf(szKeyName, "S%d", (int)now);
 		mir_snwprintf(tszHeader, TranslateT("\n(Sent delayed. Original timestamp %s)"), tszTimestamp);
 	}
-	else mir_snwprintf(tszHeader, L"M%d|", time(0));
+	else mir_snwprintf(tszHeader, L"M%d|", (int)time(0));
 
 	T2Utf utf_header(tszHeader);
 	size_t required = mir_strlen(utf_header) + mir_strlen(job->szSendBuffer) + 10;
 	char *tszMsg = reinterpret_cast<char *>(mir_alloc(required));
 
 	if (fIsSendLater) {
-		mir_snprintf(tszMsg, required, "%s%s", job->szSendBuffer, utf_header);
+		mir_snprintf(tszMsg, required, "%s%s", job->szSendBuffer, utf_header.get());
 		db_set_s(hContact ? hContact : job->hContact, "SendLater", szKeyName, tszMsg);
 	}
 	else {
-		mir_snprintf(tszMsg, required, "%s%s", utf_header, job->szSendBuffer);
+		mir_snprintf(tszMsg, required, "%s%s", utf_header.get(), job->szSendBuffer);
 		sendLater->addJob(tszMsg, (void*)hContact);
 	}
 	mir_free(tszMsg);
diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp
index ade164bd21..5f43e104c4 100644
--- a/plugins/TabSRMM/src/sidebar.cpp
+++ b/plugins/TabSRMM/src/sidebar.cpp
@@ -691,18 +691,16 @@ const CSideBarButton* CSideBar::setActiveItem(const CTabBaseDlg *dat)
  * Layout() with the parameter set to false is required to perform the

  * position update.

  */

-void CSideBar::Layout(const RECT *rc, bool fOnlyCalc)

+void CSideBar::Layout()

 {

 	if (!m_isVisible)

 		return;

 

-	RECT	rcWnd;

-

-	rc = &rcWnd;

+	RECT rcWnd;

 	::GetClientRect(m_hwndScrollWnd, &rcWnd);

 

 	if (m_currentLayout->pfnLayout) {

-		m_currentLayout->pfnLayout(this, const_cast<RECT *>(rc));

+		m_currentLayout->pfnLayout(this, &rcWnd);

 		return;

 	}

 

@@ -711,8 +709,8 @@ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc)
 	BOOL 	topEnabled = FALSE, bottomEnabled = FALSE;

 	HWND 	hwnd;

 	LONG 	spaceUsed = 0;

-	DWORD 	dwFlags = SWP_NOZORDER | SWP_NOACTIVATE;

-	LONG	iSpaceAvail = rc->bottom;

+	DWORD dwFlags = SWP_NOZORDER | SWP_NOACTIVATE;

+	LONG	iSpaceAvail = rcWnd.bottom;

 

 	m_firstVisibleOffset = max(0, m_firstVisibleOffset);

 

@@ -734,14 +732,14 @@ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc)
 

 		if (p->isTopAligned()) {

 			if (m_totalItemHeight <= m_firstVisibleOffset) {				// partially visible

-				if (!fOnlyCalc && nullptr != hwnd) /* Wine fix. */

+				if (nullptr != hwnd) /* Wine fix. */

 					hdwp = ::DeferWindowPos(hdwp, hwnd, nullptr, 2, -(m_firstVisibleOffset - m_totalItemHeight),

 						m_elementWidth, height, SWP_SHOWWINDOW | dwFlags);

 				spaceUsed += ((height + 1) - (m_firstVisibleOffset - m_totalItemHeight));

 				m_totalItemHeight += (height + 1);

 			}

 			else {

-				if (!fOnlyCalc && nullptr != hwnd) /* Wine fix. */

+				if (nullptr != hwnd) /* Wine fix. */

 					hdwp = ::DeferWindowPos(hdwp, hwnd, nullptr, 2, spaceUsed, m_elementWidth, height, SWP_SHOWWINDOW | dwFlags);

 				spaceUsed += (height + 1);

 				m_totalItemHeight += (height + 1);

@@ -749,30 +747,28 @@ void CSideBar::Layout(const RECT *rc, bool fOnlyCalc)
 		}

 	}

 	topEnabled = m_firstVisibleOffset > 0;

-	bottomEnabled = (m_totalItemHeight - m_firstVisibleOffset > rc->bottom);

+	bottomEnabled = (m_totalItemHeight - m_firstVisibleOffset > rcWnd.bottom);

 	::EndDeferWindowPos(hdwp);

 

-	if (!fOnlyCalc) {

-		RECT	rcContainer;

-		::GetClientRect(m_pContainer->m_hwnd, &rcContainer);

-

-		LONG dx = m_dwFlags & SIDEBARORIENTATION_LEFT ? m_pContainer->m_tBorder_outer_left :

-			rcContainer.right - m_pContainer->m_tBorder_outer_right - (m_elementWidth + 4);

-

-		::SetWindowPos(m_up->getHwnd(), nullptr, dx, m_pContainer->m_tBorder_outer_top + m_pContainer->m_pMenuBar->getHeight(),

-			m_elementWidth + 4, 14, dwFlags | SWP_SHOWWINDOW);

-		::SetWindowPos(m_down->getHwnd(), nullptr, dx, (rcContainer.bottom - 14 - m_pContainer->m_statusBarHeight - 1),

-			m_elementWidth + 4, 14, dwFlags | SWP_SHOWWINDOW);

-		::EnableWindow(m_up->getHwnd(), topEnabled);

-		::EnableWindow(m_down->getHwnd(), bottomEnabled);

-		::InvalidateRect(m_up->getHwnd(), nullptr, FALSE);

-		::InvalidateRect(m_down->getHwnd(), nullptr, FALSE);

-	}

+	RECT	rcContainer;

+	::GetClientRect(m_pContainer->m_hwnd, &rcContainer);

+

+	LONG dx = m_dwFlags & SIDEBARORIENTATION_LEFT ? m_pContainer->m_tBorder_outer_left :

+		rcContainer.right - m_pContainer->m_tBorder_outer_right - (m_elementWidth + 4);

+

+	::SetWindowPos(m_up->getHwnd(), nullptr, dx, m_pContainer->m_tBorder_outer_top + m_pContainer->m_pMenuBar->getHeight(),

+		m_elementWidth + 4, 14, dwFlags | SWP_SHOWWINDOW);

+	::SetWindowPos(m_down->getHwnd(), nullptr, dx, (rcContainer.bottom - 14 - m_pContainer->m_statusBarHeight - 1),

+		m_elementWidth + 4, 14, dwFlags | SWP_SHOWWINDOW);

+	::EnableWindow(m_up->getHwnd(), topEnabled);

+	::EnableWindow(m_down->getHwnd(), bottomEnabled);

+	::InvalidateRect(m_up->getHwnd(), nullptr, FALSE);

+	::InvalidateRect(m_down->getHwnd(), nullptr, FALSE);

 }

 

 inline void CSideBar::Invalidate()

 {

-	Layout(nullptr);

+	Layout();

 }

 

 void CSideBar::showAll(int showCmd)

@@ -836,7 +832,7 @@ void CSideBar::processScrollerButtons(UINT commandID)
 	else if (commandID == IDC_SIDEBARUP && ::IsWindowEnabled(m_up->getHwnd()))

 		m_firstVisibleOffset = max(0, m_firstVisibleOffset - 10);

 

-	Layout(nullptr);

+	Layout();

 }

 

 void CSideBar::resizeScrollWnd(LONG x, LONG y, LONG, LONG height) const

diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h
index 41a99fe912..424cfd0269 100644
--- a/plugins/TabSRMM/src/sidebar.h
+++ b/plugins/TabSRMM/src/sidebar.h
@@ -135,7 +135,7 @@ public:
 	void                  updateSession(CTabBaseDlg *dat);

 

 	void                  processScrollerButtons(UINT cmd);

-	void                  Layout(const RECT *rc = nullptr, bool fOnlyCalc = false);

+	void                  Layout();

 	void                  setVisible(bool fNewVisibility);

 	void                  showAll(int showCmd);

 

diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index 96729013d1..261cebca55 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -160,7 +160,7 @@ private:
 	UINT  m_uId;

 	HFONT m_hFontCaption;

 	DWORD m_dwFlags;

-	HWND  m_hwnd;

+	HWND  m_hwnd = nullptr;

 	bool  m_fIsModal;

 

 	INT_PTR CALLBACK dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);