major code cleaning of all font-related structures

3 files changed, 21 insertions, 25 deletions

diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp
index e7729d616b..adcca0412e 100644
--- a/src/core/stdclist/src/clcfonts.cpp
+++ b/src/core/stdclist/src/clcfonts.cpp
@@ -51,10 +51,10 @@ static int FS_FontsChanged(WPARAM, LPARAM)
 

 void RegisterCListFonts()

 {

-	FontIDW fontid = { sizeof(fontid) };

+	FontIDW fontid = {};

 	fontid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWREREGISTER | FIDF_APPENDNAME | FIDF_NOAS | FIDF_SAVEPOINTSIZE | FIDF_ALLOWEFFECTS;

-	strncpy(fontid.dbSettingsGroup, "CLC", sizeof(fontid.dbSettingsGroup));

-	wcsncpy(fontid.group, LPGENW("Contact list"), _countof(fontid.group));

+	strncpy_s(fontid.dbSettingsGroup, "CLC", _TRUNCATE);

+	wcsncpy_s(fontid.group, LPGENW("Contact list"), _TRUNCATE);

 

 	HDC hdc = GetDC(nullptr);

 	for (int i = 0; i < _countof(clistFontDescr); i++) {

@@ -70,42 +70,38 @@ void RegisterCListFonts()
 		fontid.flags &= ~FIDF_CLASSMASK;

 		fontid.flags |= clistFontDescr[i].iMask;

 

-		wcsncpy(fontid.name, clistFontDescr[i].tszName, _countof(fontid.name));

+		wcsncpy_s(fontid.name, clistFontDescr[i].tszName, _TRUNCATE);

 

-		char idstr[10];

-		mir_snprintf(idstr, "Font%d", i);

-		strncpy(fontid.prefix, idstr, _countof(fontid.prefix));

+		mir_snprintf(fontid.setting, "Font%d", i);

 		fontid.order = i;

 		g_plugin.addFont(&fontid);

 	}

 	ReleaseDC(nullptr, hdc);

 

 	// and colours

-	ColourIDW colourid = { 0 };

-	colourid.cbSize = sizeof(ColourIDW);

-	colourid.order = 0;

-	strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup));

-

-	strncpy(colourid.setting, "BkColour", sizeof(colourid.setting));

-	wcsncpy(colourid.name, LPGENW("Background"), _countof(colourid.name));

-	wcsncpy(colourid.group, LPGENW("Contact list"), _countof(colourid.group));

+	ColourIDW colourid = {};

+	strncpy_s(colourid.dbSettingsGroup, "CLC", _TRUNCATE);

+

+	strncpy_s(colourid.setting, "BkColour", _TRUNCATE);

+	wcsncpy_s(colourid.name, LPGENW("Background"), _TRUNCATE);

+	wcsncpy_s(colourid.group, LPGENW("Contact list"), _TRUNCATE);

 	colourid.defcolour = CLCDEFAULT_BKCOLOUR;

 	g_plugin.addColor(&colourid);

 

-	strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting));

-	wcsncpy(colourid.name, LPGENW("Selected text"), _countof(colourid.name));

+	strncpy_s(colourid.setting, "SelTextColour", _TRUNCATE);

+	wcsncpy_s(colourid.name, LPGENW("Selected text"), _TRUNCATE);

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_SELTEXTCOLOUR;

 	g_plugin.addColor(&colourid);

 

-	strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting));

-	wcsncpy(colourid.name, LPGENW("Hottrack text"), _countof(colourid.name));

+	strncpy_s(colourid.setting, "HotTextColour", _TRUNCATE);

+	wcsncpy_s(colourid.name, LPGENW("Hottrack text"), _TRUNCATE);

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_HOTTEXTCOLOUR;

 	g_plugin.addColor(&colourid);

 

-	strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting));

-	wcsncpy(colourid.name, LPGENW("Quicksearch text"), _countof(colourid.name));

+	strncpy_s(colourid.setting, "QuickSearchColour", _TRUNCATE);

+	wcsncpy_s(colourid.name, LPGENW("Quicksearch text"), _TRUNCATE);

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_QUICKSEARCHCOLOUR;

 	g_plugin.addColor(&colourid);

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 84afc895b4..18626e3f28 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -146,7 +146,7 @@ static void OnLoadSettings()
 
 static void RegisterFonts()
 {
-	ColourIDW colourid = { sizeof(colourid) };
+	ColourIDW colourid = {};
 	strncpy(colourid.dbSettingsGroup, CHAT_MODULE, sizeof(colourid.dbSettingsGroup));
 	wcsncpy(colourid.group, LPGENW("Message sessions") L"/" LPGENW("Chat module"), _countof(colourid.group));
 
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index d8c88d0327..98cd0e55b2 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -95,7 +95,7 @@ bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF * colour)
 

 void RegisterSRMMFonts(void)

 {

-	FontIDW fontid = { sizeof(fontid) };

+	FontIDW fontid = {};

 	fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID;

 	for (int i = 0; i < _countof(fontOptionsList); i++) {

 		strncpy_s(fontid.dbSettingsGroup, SRMMMOD, _TRUNCATE);

@@ -104,7 +104,7 @@ void RegisterSRMMFonts(void)
 

 		char idstr[10];

 		mir_snprintf(idstr, "SRMFont%d", i);

-		strncpy_s(fontid.prefix, idstr, _TRUNCATE);

+		strncpy_s(fontid.setting, idstr, _TRUNCATE);

 		fontid.order = i;

 

 		fontid.flags &= ~FIDF_CLASSMASK;

@@ -120,7 +120,7 @@ void RegisterSRMMFonts(void)
 		g_plugin.addFont(&fontid);

 	}

 

-	ColourIDW colourid = { sizeof(colourid) };

+	ColourIDW colourid = {};

 	strncpy_s(colourid.dbSettingsGroup, SRMMMOD, _TRUNCATE);

 	strncpy_s(colourid.setting, SRMSGSET_BKGCOLOUR, _TRUNCATE);

 	colourid.defcolour = SRMSGDEFSET_BKGCOLOUR;