massive warning fix

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index cdaea88e47..cb9afa6e86 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -404,7 +404,7 @@ LBL_Status:
 			ptrW tszXStatusMsg(db_get_wsa(pdnce->hContact, pdnce->szProto, "XStatusMsg"));
 			if (tszXStatusMsg != nullptr && tszXStatusMsg[0] != 0) {
 				wchar_t *tmp = NEWWSTR_ALLOCA(text);
-				mir_snwprintf(text, text_size, L"%s: %s", tmp, tszXStatusMsg);
+				mir_snwprintf(text, text_size, L"%s: %s", tmp, tszXStatusMsg.get());
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -426,7 +426,7 @@ LBL_Status:
 			ptrW tszXStatusName(db_get_wsa(pdnce->hContact, pdnce->szProto, "XStatusName"));
 			if (tszXStatusName != nullptr && tszXStatusName[0] != 0) {
 				wchar_t *tmp = NEWWSTR_ALLOCA(text);
-				mir_snwprintf(text, text_size, L"%s: %s", tszXStatusName, tmp);
+				mir_snwprintf(text, text_size, L"%s: %s", tszXStatusName.get(), tmp);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index ff6ee9fa94..fb968fb775 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -246,7 +246,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 		p->bIsDimmed = 0;

 		if (g_CluiData.bFilterEffective & CLVM_FILTER_PROTOS) {

 			char szTemp[2048];

-			mir_snprintf(szTemp, "%s|", p->szAccountName);

+			mir_snprintf(szTemp, "%s|", p->szAccountName.get());

 			p->bIsDimmed = strstr(g_CluiData.protoFilter, szTemp) ? 0 : 1;

 		}

 

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index ef58779033..b0877304fa 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -500,23 +500,23 @@ static void UpdateFilters()
 		mir_snwprintf(szTemp, TranslateT("Configuring view mode: %s"), szTempBuf);

 		SetDlgItemText(clvmHwnd, IDC_CURVIEWMODE2, szTemp);

 	}

-	mir_snprintf(szSetting, "%c%s_PF", 246, szBuf);

+	mir_snprintf(szSetting, "%c%s_PF", 246, szBuf.get());

 	ptrA szPF(db_get_sa(0, CLVM_MODULE, szSetting));

 	if (szPF == nullptr)

 		return;

 

-	mir_snprintf(szSetting, "%c%s_GF", 246, szBuf);

+	mir_snprintf(szSetting, "%c%s_GF", 246, szBuf.get());

 	ptrW szGF(db_get_wsa(0, CLVM_MODULE, szSetting));

 	if (szGF == nullptr)

 		return;

 

-	mir_snprintf(szSetting, "%c%s_OPT", 246, szBuf);

+	mir_snprintf(szSetting, "%c%s_OPT", 246, szBuf.get());

 	if ((opt = db_get_dw(0, CLVM_MODULE, szSetting, -1)) != -1)

 		SendDlgItemMessage(clvmHwnd, IDC_AUTOCLEARSPIN, UDM_SETPOS, 0, MAKELONG(LOWORD(opt), 0));

 

-	mir_snprintf(szSetting, "%c%s_SM", 246, szBuf);

+	mir_snprintf(szSetting, "%c%s_SM", 246, szBuf.get());

 	DWORD statusMask = db_get_dw(0, CLVM_MODULE, szSetting, 0);

-	mir_snprintf(szSetting, "%c%s_SSM", 246, szBuf);

+	mir_snprintf(szSetting, "%c%s_SSM", 246, szBuf.get());

 	stickyStatusMask = db_get_dw(0, CLVM_MODULE, szSetting, -1);

 	dwFlags = db_get_dw(0, CLVM_MODULE, szBuf, 0);

 	{

@@ -589,7 +589,7 @@ static void UpdateFilters()
 		EnableWindow(GetDlgItem(clvmHwnd, IDC_LASTMSGVALUE), useLastMsg);

 		EnableWindow(GetDlgItem(clvmHwnd, IDC_LASTMESSAGEUNIT), useLastMsg);

 

-		mir_snprintf(szSetting, "%c%s_LM", 246, szBuf);

+		mir_snprintf(szSetting, "%c%s_LM", 246, szBuf.get());

 		DWORD lmdat = db_get_dw(0, CLVM_MODULE, szSetting, 0);

 

 		SetDlgItemInt(clvmHwnd, IDC_LASTMSGVALUE, LOWORD(lmdat), FALSE);