From a411a7391bb879db8da398f067245a13c7fa7aee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 25 Jul 2018 23:10:36 +0300 Subject: major code cleaning of all font-related structures --- src/core/stdmsg/src/chat_manager.cpp | 2 +- src/core/stdmsg/src/msgoptions.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/stdmsg') 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; -- cgit v1.2.3