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 --- plugins/Alarms/src/alarm_win.cpp | 7 ++--- plugins/Alarms/src/frame.cpp | 4 +-- plugins/BASS_interface/src/Main.cpp | 4 +-- plugins/BasicHistory/src/Options.cpp | 8 +++--- plugins/Clist_modern/src/modern_clcopts.cpp | 10 +++---- plugins/Clist_nicer/src/clui.cpp | 39 +++++++++++++-------------- plugins/Console/src/Console.cpp | 8 +++--- plugins/FavContacts/src/services.cpp | 12 ++++----- plugins/HistoryPlusPlus/hpp_options.pas | 2 -- plugins/MyDetails/src/frame.cpp | 19 ++++++++----- plugins/NotesAndReminders/src/options.cpp | 10 +++---- plugins/Ping/src/pingthread.cpp | 4 +-- plugins/Popup/src/font.cpp | 16 +++++------ plugins/Popup/src/notifications.cpp | 8 +++--- plugins/Popup/src/services.cpp | 10 +++---- plugins/QuickSearch/i_ok.inc | 1 - plugins/QuickSearch/sr_frame.pas | 1 - plugins/Scriver/src/msgoptions.cpp | 6 ++--- plugins/SmileyAdd/src/main.cpp | 2 +- plugins/TabSRMM/src/chat_options.cpp | 11 +++----- plugins/TipperYM/src/tipper.cpp | 17 +++--------- plugins/TooltipNotify/src/TooltipNotify.cpp | 6 ++--- plugins/TrafficCounter/src/TrafficCounter.cpp | 4 +-- plugins/Weather/src/weather_mwin.cpp | 10 +++---- plugins/YAPP/src/yapp.cpp | 17 ++++-------- plugins/mRadio/rframeapi.pas | 1 - 26 files changed, 94 insertions(+), 143 deletions(-) (limited to 'plugins') diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index 83cd180c2b..fc4813f962 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -347,29 +347,26 @@ int ReloadFonts(WPARAM, LPARAM) int AlarmWinModulesLoaded(WPARAM, LPARAM) { - title_font_id.cbSize = sizeof(FontIDW); wcsncpy_s(title_font_id.group, LPGENW("Alarms"), _TRUNCATE); wcsncpy_s(title_font_id.name, LPGENW("Title"), _TRUNCATE); strncpy_s(title_font_id.dbSettingsGroup, MODULENAME, _TRUNCATE); - strncpy_s(title_font_id.prefix, "FontTitle", _TRUNCATE); + strncpy_s(title_font_id.setting, "FontTitle", _TRUNCATE); wcsncpy_s(title_font_id.backgroundGroup, LPGENW("Alarms"), _TRUNCATE); wcsncpy_s(title_font_id.backgroundName, LPGENW("Background"), _TRUNCATE); title_font_id.flags = 0; title_font_id.order = 0; g_plugin.addFont(&title_font_id); - window_font_id.cbSize = sizeof(FontIDW); wcsncpy_s(window_font_id.group, LPGENW("Alarms"), _TRUNCATE); wcsncpy_s(window_font_id.name, LPGENW("Window"), _TRUNCATE); strncpy_s(window_font_id.dbSettingsGroup, MODULENAME, _TRUNCATE); - strncpy_s(window_font_id.prefix, "FontWindow", _TRUNCATE); + strncpy_s(window_font_id.setting, "FontWindow", _TRUNCATE); wcsncpy_s(window_font_id.backgroundGroup, LPGENW("Alarms"), _TRUNCATE); wcsncpy_s(window_font_id.backgroundName, LPGENW("Background"), _TRUNCATE); window_font_id.flags = 0; window_font_id.order = 1; g_plugin.addFont(&window_font_id); - bk_colour_id.cbSize = sizeof(ColourIDW); strncpy_s(bk_colour_id.dbSettingsGroup, MODULENAME, _TRUNCATE); wcsncpy_s(bk_colour_id.group, LPGENW("Alarms"), _TRUNCATE); wcsncpy_s(bk_colour_id.name, LPGENW("Background"), _TRUNCATE); diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 744892450d..921ca4f290 100755 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -555,15 +555,13 @@ int CreateFrame() SendMessage(hwnd_plugin, WMU_INITIALIZE, 0, 0); - font_id.cbSize = sizeof(font_id); strncpy_s(font_id.group, LPGEN("Frames"), _TRUNCATE); strncpy_s(font_id.name, LPGEN("Alarm reminders"), _TRUNCATE); strncpy_s(font_id.dbSettingsGroup, MODULENAME, _TRUNCATE); - strncpy_s(font_id.prefix, "Font", _TRUNCATE); + strncpy_s(font_id.setting, "Font", _TRUNCATE); font_id.order = 0; g_plugin.addFont(&font_id); - framebk_colour_id.cbSize = sizeof(ColourID); strncpy_s(framebk_colour_id.dbSettingsGroup, MODULENAME, _TRUNCATE); strncpy_s(framebk_colour_id.group, LPGEN("Frames"), _TRUNCATE); strncpy_s(framebk_colour_id.name, LPGEN("Alarm reminders"), _TRUNCATE); diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 2d2eb55ff0..a55f34fd11 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -454,9 +454,7 @@ void CreateFrame() Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); frame_id = g_plugin.addFrame(&Frame); - ColourIDW colourid = { 0 }; - colourid.cbSize = sizeof(ColourIDW); - + ColourIDW colourid = {}; strcpy_s(colourid.dbSettingsGroup, MODULENAME); strcpy_s(colourid.setting, "ColorFrame"); wcscpy_s(colourid.name, LPGENW("Frame background")); diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index da971082be..293708c2b6 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -231,11 +231,9 @@ const int g_hotkeysSize = _countof(g_HotkeyOptionsList); void Options::Load(void) { - FontIDW fid = { 0 }; - ColourIDW cid = { 0 }; + FontIDW fid = {}; + ColourIDW cid = {}; HOTKEYDESC hid = {}; - fid.cbSize = sizeof(FontIDW); - cid.cbSize = sizeof(ColourIDW); strncpy_s(fid.dbSettingsGroup, "BasicHistory_Fonts", _TRUNCATE); wcsncpy_s(fid.backgroundGroup, L"History", _TRUNCATE); wcsncpy_s(fid.group, LPGENW("History"), _TRUNCATE); @@ -246,7 +244,7 @@ void Options::Load(void) fid.deffontsettings.colour = g_FontOptionsList[i].defColour; fid.deffontsettings.style = g_FontOptionsList[i].defStyle; fid.deffontsettings.charset = DEFAULT_CHARSET; - mir_snprintf(fid.prefix, _countof(fid.prefix), "Font%d", i); + mir_snprintf(fid.setting, _countof(fid.setting), "Font%d", i); wcsncpy_s(fid.name, g_FontOptionsList[i].szDescr, _TRUNCATE); wcsncpy_s(fid.backgroundName, g_FontOptionsList[i].szBackgroundName, _TRUNCATE); fid.flags = FIDF_DEFAULTVALID | FIDF_CLASSGENERAL | g_FontOptionsList[i].flags; diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index e7c74bedeb..586fbbb5fe 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -131,11 +131,8 @@ void RegisterCLUIFonts(void) EffectIDW effectid = {}; char idstr[10]; - fontid.cbSize = sizeof(fontid); - mir_strncpy(fontid.dbSettingsGroup, "CLC", _countof(fontid.dbSettingsGroup)); - - effectid.cbSize = sizeof(effectid); - mir_strncpy(effectid.dbSettingsGroup, "CLC", _countof(effectid.dbSettingsGroup)); + strncpy_s(fontid.dbSettingsGroup, "CLC", _TRUNCATE); + strncpy_s(effectid.dbSettingsGroup, "CLC", _TRUNCATE); int index = 1; for (auto &p : fontOptionsList) { @@ -145,7 +142,7 @@ void RegisterCLUIFonts(void) wcsncpy_s(fontid.group, p.szGroup, _TRUNCATE); wcsncpy_s(fontid.name, p.szDescr, _TRUNCATE); mir_snprintf(idstr, "Font%d", p.fontID); - strncpy_s(fontid.prefix, idstr, _TRUNCATE); + strncpy_s(fontid.setting, idstr, _TRUNCATE); fontid.order = index; fontid.deffontsettings.charset = p.defCharset; @@ -171,7 +168,6 @@ void RegisterCLUIFonts(void) } ColourIDW colourid = {}; - colourid.cbSize = sizeof(colourid); index = 1; for (auto &p : colourOptionsList) { diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index f2ee3b3ae7..affee6a037 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1871,9 +1871,9 @@ static clistFontDescr[] = void FS_RegisterFonts() { - FontIDW fid = { sizeof(fid) }; - wcsncpy(fid.group, LPGENW("Contact list"), _countof(fid.group)); - strncpy(fid.dbSettingsGroup, "CLC", 5); + FontIDW fid = {}; + wcsncpy_s(fid.group, LPGENW("Contact list"), _TRUNCATE); + strncpy_s(fid.dbSettingsGroup, "CLC", _TRUNCATE); fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS | FIDF_APPENDNAME | FIDF_SAVEPOINTSIZE; HDC hdc = GetDC(nullptr); @@ -1890,49 +1890,48 @@ void FS_RegisterFonts() fid.flags &= ~FIDF_CLASSMASK; fid.flags |= clistFontDescr[i].iMask; - wcsncpy(fid.name, clistFontDescr[i].tszName, _countof(fid.name)); + wcsncpy_s(fid.name, clistFontDescr[i].tszName, _TRUNCATE); char idstr[10]; mir_snprintf(idstr, "Font%d", i); - strncpy(fid.prefix, idstr, _countof(fid.prefix)); + strncpy_s(fid.setting, idstr, _TRUNCATE); fid.order = i; g_plugin.addFont(&fid); } ReleaseDC(nullptr, hdc); // and colours - ColourIDW colourid = { 0 }; - colourid.cbSize = sizeof(colourid); + ColourIDW colourid = {}; colourid.order = 0; - strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup)); + strncpy_s(colourid.dbSettingsGroup, "CLC", _TRUNCATE); - strncpy(colourid.setting, "BkColour", sizeof(colourid.setting)); - wcsncpy(colourid.name, LPGENW("Background"), _countof(colourid.name)); - wcsncpy(colourid.group, LPGENW("Contact list"), _countof(colourid.group)); + 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); - strncpy(colourid.dbSettingsGroup, "CLUI", sizeof(colourid.dbSettingsGroup)); - strncpy(colourid.setting, "clr_frameborder", sizeof(colourid.setting)); - wcsncpy(colourid.name, LPGENW("Embedded frames border"), _countof(colourid.name)); + strncpy_s(colourid.dbSettingsGroup, "CLUI", _TRUNCATE); + strncpy_s(colourid.setting, "clr_frameborder", _TRUNCATE); + wcsncpy_s(colourid.name, LPGENW("Embedded frames border"), _TRUNCATE); colourid.order = 1; colourid.defcolour = RGB(40, 40, 40); g_plugin.addColor(&colourid); diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index c9b09e9a14..5b2a737243 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1100,12 +1100,11 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) { CreateServiceFunction(MS_CONSOLE_SHOW_HIDE, ShowHideConsole); - FontIDW fid = { 0 }; - fid.cbSize = sizeof(fid); + FontIDW fid = {}; mir_wstrncpy(fid.group, LPGENW("Console"), _countof(fid.group)); mir_wstrncpy(fid.name, LPGENW("Text"), _countof(fid.name)); mir_strncpy(fid.dbSettingsGroup, "Console", _countof(fid.dbSettingsGroup)); - mir_strncpy(fid.prefix, "ConsoleFont", _countof(fid.prefix)); + mir_strncpy(fid.setting, "ConsoleFont", _countof(fid.setting)); mir_wstrncpy(fid.backgroundGroup, LPGENW("Console"), _countof(fid.backgroundGroup)); mir_wstrncpy(fid.backgroundName, LPGENW("Background"), _countof(fid.backgroundName)); fid.flags = FIDF_DEFAULTVALID; @@ -1118,8 +1117,7 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) HookEvent(ME_FONT_RELOAD, OnFontChange); - ColourIDW cid = { 0 }; - cid.cbSize = sizeof(cid); + ColourIDW cid = {}; mir_wstrncpy(cid.group, LPGENW("Console"), _countof(cid.group)); mir_wstrncpy(cid.name, LPGENW("Background"), _countof(cid.name)); mir_strncpy(cid.dbSettingsGroup, "Console", _countof(cid.dbSettingsGroup)); diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp index 7d91eb4ad8..8137add545 100644 --- a/plugins/FavContacts/src/services.cpp +++ b/plugins/FavContacts/src/services.cpp @@ -158,7 +158,7 @@ int ProcessModulesLoaded(WPARAM, LPARAM) ///////////////////////////////////////////////////////////////////////////////////// - FontIDW fontid = { sizeof(fontid) }; + FontIDW fontid = {}; wcsncpy_s(fontid.group, LPGENW("Favorite Contacts"), _TRUNCATE); strncpy_s(fontid.dbSettingsGroup, "FavContacts", _TRUNCATE); wcsncpy_s(fontid.backgroundGroup, LPGENW("Favorite Contacts"), _TRUNCATE); @@ -171,13 +171,13 @@ int ProcessModulesLoaded(WPARAM, LPARAM) wcsncpy_s(fontid.backgroundName, LPGENW("Background"), _TRUNCATE); wcsncpy_s(fontid.name, LPGENW("Contact name"), _TRUNCATE); - strncpy_s(fontid.prefix, "fntName", _TRUNCATE); + strncpy_s(fontid.setting, "fntName", _TRUNCATE); fontid.deffontsettings.colour = GetSysColor(COLOR_MENUTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; g_plugin.addFont(&fontid); wcsncpy_s(fontid.name, LPGENW("Second line"), _TRUNCATE); - strncpy_s(fontid.prefix, "fntSecond", _TRUNCATE); + strncpy_s(fontid.setting, "fntSecond", _TRUNCATE); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_MENUTEXT), GetSysColor(COLOR_MENU)); fontid.deffontsettings.style = 0; g_plugin.addFont(&fontid); @@ -185,20 +185,20 @@ int ProcessModulesLoaded(WPARAM, LPARAM) wcsncpy_s(fontid.backgroundName, LPGENW("Selected background"), _TRUNCATE); wcsncpy_s(fontid.name, LPGENW("Selected contact name (color)"), _TRUNCATE); - strncpy_s(fontid.prefix, "fntNameSel", _TRUNCATE); + strncpy_s(fontid.setting, "fntNameSel", _TRUNCATE); fontid.deffontsettings.colour = GetSysColor(COLOR_HIGHLIGHTTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; g_plugin.addFont(&fontid); wcsncpy_s(fontid.name, LPGENW("Selected second line (color)"), _TRUNCATE); - strncpy_s(fontid.prefix, "fntSecondSel", _TRUNCATE); + strncpy_s(fontid.setting, "fntSecondSel", _TRUNCATE); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_HIGHLIGHT)); fontid.deffontsettings.style = 0; g_plugin.addFont(&fontid); ///////////////////////////////////////////////////////////////////////////////////// - ColourIDW colourid = { sizeof(colourid) }; + ColourIDW colourid = {}; wcsncpy_s(colourid.group, LPGENW("Favorite Contacts"), _TRUNCATE); strncpy_s(colourid.dbSettingsGroup, "FavContacts", _TRUNCATE); diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas index d638a2a030..d8a442a711 100644 --- a/plugins/HistoryPlusPlus/hpp_options.pas +++ b/plugins/HistoryPlusPlus/hpp_options.pas @@ -264,7 +264,6 @@ procedure RegisterFont(Name:PAnsiChar; Order:integer; const defFont:TFontSetting var fid: TFontID; begin - fid.cbSize := sizeof(fid); fid.group := hppName; fid.dbSettingsGroup := hppDBName; fid.flags := FIDF_DEFAULTVALID+FIDF_ALLOWEFFECTS; @@ -282,7 +281,6 @@ procedure RegisterColor(Name:PAnsiChar; Order:integer; defColor:TColor); var cid: TColourID; begin - cid.cbSize := sizeof(cid); cid.group := hppName; cid.dbSettingsGroup := hppDBName; cid.order := Order; diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 46f69fb83e..cc39049339 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -73,9 +73,7 @@ char font_sizes[] = { 13, 8, 8, 8, 8 }; BYTE font_styles[] = { DBFONTF_BOLD, 0, 0, DBFONTF_ITALIC, DBFONTF_ITALIC }; COLORREF font_colors[] = { RGB(0, 0, 0), RGB(0, 0, 0), RGB(0, 0, 0), RGB(150, 150, 150), RGB(150, 150, 150) }; -static ColourID -bg_colour = { sizeof(bg_colour), LPGEN("My details"), LPGEN("Background"), MODULENAME, "BackgroundColor", 0, GetSysColor(COLOR_BTNFACE) }, -av_colour = { sizeof(av_colour), LPGEN("My details"), LPGEN("Avatar border"), MODULENAME, "AvatarBorderColor", 0, RGB(0, 0, 0) }; +static ColourID bg_colour, av_colour; int CreateFrame(); void FixMainMenu(); @@ -225,22 +223,31 @@ int CreateFrame() { HDC hdc = GetDC(nullptr); + strncpy_s(bg_colour.group, LPGEN("My details"), _TRUNCATE); + strncpy_s(bg_colour.name, LPGEN("Background"), _TRUNCATE); + strncpy_s(bg_colour.dbSettingsGroup, MODULENAME, _TRUNCATE); + strncpy_s(bg_colour.setting, "BackgroundColor", _TRUNCATE); + bg_colour.defcolour = GetSysColor(COLOR_BTNFACE); g_plugin.addColor(&bg_colour); + + strncpy_s(av_colour.group, LPGEN("My details"), _TRUNCATE); + strncpy_s(av_colour.name, LPGEN("Avatar border"), _TRUNCATE); + strncpy_s(av_colour.dbSettingsGroup, MODULENAME, _TRUNCATE); + strncpy_s(av_colour.setting, "AvatarBorderColor", _TRUNCATE); g_plugin.addColor(&av_colour); + ReloadColour(0, 0); HookEvent(ME_COLOUR_RELOAD, ReloadColour); for (int i = 0; i < NUM_FONTS; i++) { memset(&font_id[i], 0, sizeof(font_id[i])); - font_id[i].cbSize = sizeof(FontIDW); mir_wstrncpy(font_id[i].group, LPGENW("My details"), _countof(font_id[i].group)); mir_wstrncpy(font_id[i].name, font_names[i], _countof(font_id[i].name)); mir_strncpy(font_id[i].dbSettingsGroup, MODULENAME, _countof(font_id[i].dbSettingsGroup)); mir_wstrncpy(font_id[i].backgroundName, LPGENW("Background"), _countof(font_id[i].backgroundName)); mir_wstrncpy(font_id[i].backgroundGroup, LPGENW("My details"), _countof(font_id[i].backgroundGroup)); - - mir_strncpy(font_id[i].prefix, font_settings[i], _countof(font_id[i].prefix)); + mir_strncpy(font_id[i].setting, font_settings[i], _countof(font_id[i].setting)); font_id[i].deffontsettings.colour = font_colors[i]; font_id[i].deffontsettings.size = -MulDiv(font_sizes[i], GetDeviceCaps(hdc, LOGPIXELSY), 72); diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp index 3ab3c022a3..6b03a5493e 100644 --- a/plugins/NotesAndReminders/src/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp @@ -226,9 +226,7 @@ void RegisterFontServiceFonts() { char szTemp[100]; - FontID fontid = { 0 }; - fontid.cbSize = sizeof(FontIDW); - + FontID fontid = {}; strncpy(fontid.group, SECTIONNAME, _countof(fontid.group)); strncpy(fontid.backgroundGroup, SECTIONNAME, _countof(fontid.backgroundGroup)); strncpy(fontid.dbSettingsGroup, MODULENAME, _countof(fontid.dbSettingsGroup)); @@ -241,7 +239,7 @@ void RegisterFontServiceFonts() for (int i = 0; i < _countof(fontOptionsList); i++) { fontid.order = i; mir_snprintf(szTemp, "Font%d", i); - strncpy(fontid.prefix, szTemp, _countof(fontid.prefix)); + strncpy(fontid.setting, szTemp, _countof(fontid.setting)); strncpy(fontid.name, fontOptionsList[i].szDescr, _countof(fontid.name)); fontid.deffontsettings.colour = fontOptionsList[i].defColour; @@ -256,9 +254,7 @@ void RegisterFontServiceFonts() g_plugin.addFont(&fontid); } - ColourID colorid = { 0 }; - colorid.cbSize = sizeof(ColourIDW); - + ColourID colorid = {}; strncpy(colorid.group, SECTIONNAME, _countof(colorid.group)); strncpy(colorid.dbSettingsGroup, MODULENAME, _countof(fontid.dbSettingsGroup)); colorid.flags = 0; diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 8823b181be..09eba92fb0 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -895,11 +895,10 @@ void InitList() else ShowWindow(hpwnd, SW_SHOW); } - font_id.cbSize = sizeof(FontIDW); mir_wstrncpy(font_id.group, LPGENW("Ping"), _countof(font_id.group)); mir_wstrncpy(font_id.name, LPGENW("List"), _countof(font_id.name)); mir_strncpy(font_id.dbSettingsGroup, "PING", _countof(font_id.dbSettingsGroup)); - mir_strncpy(font_id.prefix, "Font", _countof(font_id.prefix)); + mir_strncpy(font_id.setting, "Font", _countof(font_id.setting)); mir_wstrncpy(font_id.backgroundGroup, L"Ping", _countof(font_id.backgroundGroup)); mir_wstrncpy(font_id.backgroundName, L"Background", _countof(font_id.backgroundName)); font_id.order = 0; @@ -912,7 +911,6 @@ void InitList() g_plugin.addFont(&font_id); - bk_col_id.cbSize = sizeof(ColourIDW); mir_wstrncpy(bk_col_id.group, L"Ping", _countof(bk_col_id.group)); mir_wstrncpy(bk_col_id.name, L"Background", _countof(bk_col_id.name)); mir_strncpy(bk_col_id.dbSettingsGroup, "PING", _countof(bk_col_id.dbSettingsGroup)); diff --git a/plugins/Popup/src/font.cpp b/plugins/Popup/src/font.cpp index 6570315168..b274615963 100644 --- a/plugins/Popup/src/font.cpp +++ b/plugins/Popup/src/font.cpp @@ -28,8 +28,7 @@ PopupFonts fonts = {}; void InitFonts() { // Fonts - FontIDW fid = { 0 }; - fid.cbSize = sizeof(FontIDW); + FontIDW fid = {}; mir_wstrncpy(fid.group, _A2W(PU_FNT_AND_COLOR), _countof(fid.group)); mir_strncpy(fid.dbSettingsGroup, PU_FNT_AND_COLOR_DB, _countof(fid.dbSettingsGroup)); fid.flags = FIDF_DEFAULTVALID; @@ -40,33 +39,32 @@ void InitFonts() mir_wstrncpy(fid.deffontsettings.szFace, L"Tahoma", _countof(fid.deffontsettings.szFace)); mir_wstrncpy(fid.name, _A2W(PU_FNT_NAME_TITLE), _countof(fid.name)); - mir_snprintf(fid.prefix, PU_FNT_PREFIX, PU_FNT_NAME_TITLE); + mir_snprintf(fid.setting, PU_FNT_PREFIX, PU_FNT_NAME_TITLE); fid.deffontsettings.style = DBFONTF_BOLD; fid.deffontsettings.colour = RGB(0, 0, 0); g_plugin.addFont(&fid); mir_wstrncpy(fid.name, _A2W(PU_FNT_NAME_CLOCK), _countof(fid.name)); - mir_snprintf(fid.prefix, PU_FNT_PREFIX, PU_FNT_NAME_CLOCK); + mir_snprintf(fid.setting, PU_FNT_PREFIX, PU_FNT_NAME_CLOCK); g_plugin.addFont(&fid); mir_wstrncpy(fid.name, _A2W(PU_FNT_NAME_TEXT), _countof(fid.name)); - mir_snprintf(fid.prefix, PU_FNT_PREFIX, PU_FNT_NAME_TEXT); + mir_snprintf(fid.setting, PU_FNT_PREFIX, PU_FNT_NAME_TEXT); fid.deffontsettings.style = 0; g_plugin.addFont(&fid); mir_wstrncpy(fid.name, _A2W(PU_FNT_NAME_ACTION), _countof(fid.name)); - mir_snprintf(fid.prefix, PU_FNT_PREFIX, PU_FNT_NAME_ACTION); + mir_snprintf(fid.setting, PU_FNT_PREFIX, PU_FNT_NAME_ACTION); fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS; fid.deffontsettings.colour = RGB(0, 0, 255); g_plugin.addFont(&fid); mir_wstrncpy(fid.name, _A2W(PU_FNT_NAME_HOVERED_ACTION), _countof(fid.name)); - mir_snprintf(fid.prefix, PU_FNT_PREFIX, PU_FNT_NAME_HOVERED_ACTION); + mir_snprintf(fid.setting, PU_FNT_PREFIX, PU_FNT_NAME_HOVERED_ACTION); fid.deffontsettings.style = DBFONTF_UNDERLINE; g_plugin.addFont(&fid); - ColourIDW cid = { 0 }; - cid.cbSize = sizeof(ColourIDW); + ColourIDW cid = {}; mir_wstrncpy(cid.group, _A2W(PU_FNT_AND_COLOR), _countof(cid.group)); mir_strncpy(cid.dbSettingsGroup, PU_FNT_AND_COLOR_DB, _countof(cid.dbSettingsGroup)); diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index 1e2d97e7bc..fdd18a93cc 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -183,8 +183,7 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification) // ugly hack to make reset always possible SaveNotificationSettings(ptd, "PopupNotifications"); - FontID fontid = { 0 }; - fontid.cbSize = sizeof(fontid); + FontID fontid = {}; mir_snprintf(fontid.group, PU_FNT_AND_COLOR "/%s", notification->lpzGroup); mir_strcpy(fontid.dbSettingsGroup, "PopupNotifications"); fontid.flags = FIDF_DEFAULTVALID; @@ -194,12 +193,11 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification) mir_strncpy(fontid.deffontsettings.szFace, "MS Shell Dlg", _countof(fontid.deffontsettings.szFace)); fontid.deffontsettings.style = 0; mir_snprintf(fontid.name, "%s (colors only)", notification->lpzName); - mir_snprintf(fontid.prefix, "{%s/%s}text", notification->lpzGroup, notification->lpzName); + mir_snprintf(fontid.setting, "{%s/%s}text", notification->lpzGroup, notification->lpzName); fontid.deffontsettings.style = 0; g_plugin.addFont(&fontid); - ColourID colourid = { 0 }; - colourid.cbSize = sizeof(colourid); + ColourID colourid = {}; mir_snprintf(colourid.group, PU_FNT_AND_COLOR"/%s", notification->lpzGroup); mir_strcpy(colourid.dbSettingsGroup, "PopupNotifications"); mir_snprintf(colourid.name, "%s (colors only)", notification->lpzName); diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 960762e556..77ab39de01 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -381,8 +381,7 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam) mir_snprintf(setting, "%s/TextCol", ptd->pupClass.pszName); ptd->pupClass.colorText = (COLORREF)db_get_dw(NULL, PU_MODULCLASS, setting, fonts.clText/*pc->colorText*/); - FontIDW fid = { 0 }; - fid.cbSize = sizeof(FontIDW); + FontIDW fid = {}; mir_snwprintf(fid.group, L"%S/%s", PU_FNT_AND_COLOR, ptd->pszDescription); strncpy_s(fid.dbSettingsGroup, PU_MODULCLASS, _TRUNCATE); fid.flags = FIDF_DEFAULTVALID; @@ -390,8 +389,8 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam) fid.deffontsettings.size = -11; wcsncpy_s(fid.deffontsettings.szFace, L"Verdana", _TRUNCATE); wcsncpy_s(fid.name, _A2W(PU_FNT_NAME_TEXT), _TRUNCATE); - strncpy_s(fid.prefix, setting, _TRUNCATE); - mir_snprintf(fid.prefix, "%s/Text", ptd->pupClass.pszName); // result is "%s/TextCol" + strncpy_s(fid.setting, setting, _TRUNCATE); + mir_snprintf(fid.setting, "%s/Text", ptd->pupClass.pszName); // result is "%s/TextCol" fid.deffontsettings.style = 0; fid.deffontsettings.colour = fonts.clText; g_plugin.addFont(&fid); @@ -400,8 +399,7 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam) mir_snprintf(setting, "%s/BgCol", ptd->pupClass.pszName); ptd->pupClass.colorBack = (COLORREF)db_get_dw(NULL, PU_MODULCLASS, setting, (DWORD)fonts.clBack/*pc->colorBack*/); - ColourIDW cid = { 0 }; - cid.cbSize = sizeof(ColourIDW); + ColourIDW cid = {}; mir_snwprintf(cid.group, L"%S/%s", PU_FNT_AND_COLOR, ptd->pszDescription); wcsncpy_s(cid.name, PU_COL_BACK_NAME, _TRUNCATE); strncpy_s(cid.dbSettingsGroup, PU_MODULCLASS, _TRUNCATE); diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc index 52c0d450c9..49a0729a9c 100644 --- a/plugins/QuickSearch/i_ok.inc +++ b/plugins/QuickSearch/i_ok.inc @@ -44,7 +44,6 @@ var cid:TColourID; i:tqscolor; begin - cid.cbSize:=SizeOf(cid); cid.flags :=0; StrCopy(cid.group,qs_module); StrCopy(cid.dbSettingsGroup,qs_module); diff --git a/plugins/QuickSearch/sr_frame.pas b/plugins/QuickSearch/sr_frame.pas index 76696e462c..1aba1c850a 100644 --- a/plugins/QuickSearch/sr_frame.pas +++ b/plugins/QuickSearch/sr_frame.pas @@ -180,7 +180,6 @@ begin tmp:=SendMessage(wnd,CLM_GETEXSTYLE,0,0); SendMessage(wnd,CLM_SETEXSTYLE,tmp or CLS_EX_SHOWSELALWAYS,0); - cid.cbSize:=SizeOf(cid); cid.flags :=0; StrCopy(cid.group,'QuickSearch'); StrCopy(cid.dbSettingsGroup,qs_module); diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 0379451f63..431d98c9e1 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -86,7 +86,7 @@ int FontServiceFontsChanged(WPARAM, LPARAM) void RegisterFontServiceFonts() { - FontIDW fid = { sizeof(fid) }; + FontIDW fid = {}; wcsncpy_s(fid.group, LPGENW("Messaging"), _TRUNCATE); wcsncpy_s(fid.backgroundGroup, LPGENW("Messaging"), _TRUNCATE); strncpy(fid.dbSettingsGroup, SRMM_MODULE, _countof(fid.dbSettingsGroup)); @@ -96,7 +96,7 @@ void RegisterFontServiceFonts() char szTemp[100]; mir_snprintf(szTemp, "SRMFont%d", i); - strncpy(fid.prefix, szTemp, _countof(fid.prefix)); + strncpy(fid.setting, szTemp, _countof(fid.setting)); wcsncpy(fid.name, fontOptionsList[i].szDescr, _countof(fid.name)); fid.deffontsettings.colour = fontOptionsList[i].defColour; fid.deffontsettings.size = fontOptionsList[i].defSize; @@ -107,7 +107,7 @@ void RegisterFontServiceFonts() g_plugin.addFont(&fid); } - ColourIDW cid = { sizeof(cid) }; + ColourIDW cid = {}; wcsncpy_s(cid.group, LPGENW("Messaging"), _TRUNCATE); strncpy(cid.dbSettingsGroup, SRMM_MODULE, _countof(fid.dbSettingsGroup)); cid.flags = 0; diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 7745910a4f..424618f61f 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -69,7 +69,7 @@ static int ModulesLoaded(WPARAM, LPARAM) g_SmileyCategories.AddAllProtocolsAsCategory(); g_SmileyCategories.ClearAndLoadAll(); - ColourID cid = { sizeof(cid) }; + ColourID cid = {}; strcpy_s(cid.dbSettingsGroup, MODULENAME); strcpy_s(cid.group, MODULENAME); strcpy_s(cid.name, LPGEN("Background color")); diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp index 373450eba7..6b218f16f3 100644 --- a/plugins/TabSRMM/src/chat_options.cpp +++ b/plugins/TabSRMM/src/chat_options.cpp @@ -290,18 +290,15 @@ static wchar_t *chatcolorsnames[] = void RegisterFontServiceFonts() { LOGFONT lf; - FontIDW fid = { 0 }; - ColourIDW cid = { 0 }; - - fid.cbSize = sizeof(FontIDW); - cid.cbSize = sizeof(ColourIDW); + FontIDW fid = {}; + ColourIDW cid = {}; strncpy(fid.dbSettingsGroup, FONTMODULE, _countof(fid.dbSettingsGroup)); for (int i = 0; i < _countof(IM_fontOptionsList); i++) { fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS; LoadMsgDlgFont(FONTSECTION_IM, i, &lf, &fontOptionsList[i].colour, FONTMODULE); - mir_snprintf(fid.prefix, "Font%d", i); + mir_snprintf(fid.setting, "Font%d", i); fid.order = i; wcsncpy(fid.name, fontOptionsList[i].szDescr, _countof(fid.name)); fid.deffontsettings.colour = fontOptionsList[i].colour; @@ -363,7 +360,7 @@ void RegisterFontServiceFonts() wcsncpy(fid.backgroundName, LPGENW("Fields background"), _countof(fid.backgroundName)); for (int i = 0; i < IPFONTCOUNT; i++) { LoadMsgDlgFont(FONTSECTION_IP, i, &lf, &fontOptionsList[i].colour, FONTMODULE); - mir_snprintf(fid.prefix, "Font%d", i + 100); + mir_snprintf(fid.setting, "Font%d", i + 100); fid.order = i + 100; wcsncpy(fid.name, fontOptionsList[i].szDescr, _countof(fid.name)); fid.deffontsettings.colour = fontOptionsList[i].colour; diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 5c8cd820d2..d7fcb2e9a4 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -116,7 +116,6 @@ static int ReloadSkinFolder(WPARAM, LPARAM) static void InitFonts() { - colourBg.cbSize = sizeof(ColourIDW); mir_wstrcpy(colourBg.group, LPGENW("Tooltips")); mir_wstrcpy(colourBg.name, LPGENW("Background")); mir_strcpy(colourBg.dbSettingsGroup, MODULENAME); @@ -125,7 +124,6 @@ static void InitFonts() colourBg.order = 0; g_plugin.addColor(&colourBg); - colourBorder.cbSize = sizeof(ColourIDW); mir_wstrcpy(colourBorder.group, LPGENW("Tooltips")); mir_wstrcpy(colourBorder.name, LPGENW("Border")); mir_strcpy(colourBorder.dbSettingsGroup, MODULENAME); @@ -134,7 +132,6 @@ static void InitFonts() colourBorder.order = 0; g_plugin.addColor(&colourBorder); - colourAvatarBorder.cbSize = sizeof(ColourIDW); mir_wstrcpy(colourAvatarBorder.group, LPGENW("Tooltips")); mir_wstrcpy(colourAvatarBorder.name, LPGENW("Avatar border")); mir_strcpy(colourAvatarBorder.dbSettingsGroup, MODULENAME); @@ -143,7 +140,6 @@ static void InitFonts() colourAvatarBorder.order = 0; g_plugin.addColor(&colourAvatarBorder); - colourDivider.cbSize = sizeof(ColourIDW); mir_wstrcpy(colourDivider.group, LPGENW("Tooltips")); mir_wstrcpy(colourDivider.name, LPGENW("Dividers")); mir_strcpy(colourDivider.dbSettingsGroup, MODULENAME); @@ -152,7 +148,6 @@ static void InitFonts() colourDivider.order = 0; g_plugin.addColor(&colourDivider); - colourSidebar.cbSize = sizeof(ColourIDW); mir_wstrcpy(colourSidebar.group, LPGENW("Tooltips")); mir_wstrcpy(colourSidebar.name, LPGENW("Sidebar")); mir_strcpy(colourSidebar.dbSettingsGroup, MODULENAME); @@ -161,12 +156,11 @@ static void InitFonts() colourSidebar.order = 0; g_plugin.addColor(&colourSidebar); - fontTitle.cbSize = sizeof(FontIDW); fontTitle.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(fontTitle.group, LPGENW("Tooltips")); mir_wstrcpy(fontTitle.name, LPGENW("Title")); mir_strcpy(fontTitle.dbSettingsGroup, MODULENAME); - mir_strcpy(fontTitle.prefix, "FontFirst"); + mir_strcpy(fontTitle.setting, "FontFirst"); mir_wstrcpy(fontTitle.backgroundGroup, LPGENW("Tooltips")); mir_wstrcpy(fontTitle.backgroundName, LPGENW("Background")); fontTitle.order = 0; @@ -177,12 +171,11 @@ static void InitFonts() fontTitle.deffontsettings.colour = RGB(255, 0, 0); fontTitle.flags |= FIDF_DEFAULTVALID; - fontLabels.cbSize = sizeof(FontIDW); fontLabels.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(fontLabels.group, LPGENW("Tooltips")); mir_wstrcpy(fontLabels.name, LPGENW("Labels")); mir_strcpy(fontLabels.dbSettingsGroup, MODULENAME); - mir_strcpy(fontLabels.prefix, "FontLabels"); + mir_strcpy(fontLabels.setting, "FontLabels"); mir_wstrcpy(fontLabels.backgroundGroup, LPGENW("Tooltips")); mir_wstrcpy(fontLabels.backgroundName, LPGENW("Background")); fontLabels.order = 1; @@ -193,12 +186,11 @@ static void InitFonts() fontLabels.deffontsettings.colour = RGB(128, 128, 128); fontLabels.flags |= FIDF_DEFAULTVALID; - fontValues.cbSize = sizeof(FontIDW); fontValues.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(fontValues.group, LPGENW("Tooltips")); mir_wstrcpy(fontValues.name, LPGENW("Values")); mir_strcpy(fontValues.dbSettingsGroup, MODULENAME); - mir_strcpy(fontValues.prefix, "FontValues"); + mir_strcpy(fontValues.setting, "FontValues"); mir_wstrcpy(fontValues.backgroundGroup, LPGENW("Tooltips")); mir_wstrcpy(fontValues.backgroundName, LPGENW("Background")); fontValues.order = 2; @@ -209,12 +201,11 @@ static void InitFonts() fontValues.deffontsettings.colour = RGB(0, 0, 0); fontValues.flags |= FIDF_DEFAULTVALID; - fontTrayTitle.cbSize = sizeof(FontIDW); fontTrayTitle.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(fontTrayTitle.group, LPGENW("Tooltips")); mir_wstrcpy(fontTrayTitle.name, LPGENW("Tray title")); mir_strcpy(fontTrayTitle.dbSettingsGroup, MODULENAME); - mir_strcpy(fontTrayTitle.prefix, "FontTrayTitle"); + mir_strcpy(fontTrayTitle.setting, "FontTrayTitle"); mir_wstrcpy(fontTrayTitle.backgroundGroup, LPGENW("Tooltips")); mir_wstrcpy(fontTrayTitle.backgroundName, LPGENW("Background")); fontTrayTitle.order = 0; diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index ae03ca7685..cde67b2709 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -72,7 +72,7 @@ CTooltipNotify::~CTooltipNotify() void CTooltipNotify::RegisterFonts() { - FontIDW fontId = { sizeof(fontId) }; + FontIDW fontId = {}; wcsncpy(fontId.group, FONTSERV_GROUP, _countof(fontId.group) - 1); strncpy(fontId.dbSettingsGroup, MODULENAME, _countof(fontId.dbSettingsGroup) - 1); fontId.flags = FIDF_DEFAULTVALID; @@ -84,7 +84,7 @@ void CTooltipNotify::RegisterFonts() fontId.order = 0; wcsncpy(fontId.backgroundGroup, FONTSERV_GROUP, _countof(fontId.backgroundGroup) - 1); - ColourIDW colorId = { sizeof(colorId) }; + ColourIDW colorId = {}; wcsncpy(colorId.group, FONTSERV_GROUP, _countof(colorId.group) - 1); strncpy(colorId.dbSettingsGroup, MODULENAME, _countof(colorId.dbSettingsGroup) - 1); colorId.flags = 0; @@ -93,7 +93,7 @@ void CTooltipNotify::RegisterFonts() for (int i = 0; i < _countof(s_fontTable); i++) { wcsncpy(fontId.name, s_fontTable[i].name, _countof(fontId.name) - 1); - strncpy(fontId.prefix, s_fontTable[i].fontPrefix, _countof(fontId.prefix) - 1); + strncpy(fontId.setting, s_fontTable[i].fontPrefix, _countof(fontId.setting) - 1); wcsncpy(fontId.backgroundName, s_fontTable[i].name, _countof(fontId.backgroundName) - 1); ::g_plugin.addFont(&fontId); diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 37e6ac7a85..8e7cb33cc3 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -1086,11 +1086,10 @@ static int TrafficCounterModulesLoaded(WPARAM, LPARAM) OverallInfo.Total.Timer = db_get_dw(NULL, MODULENAME, SETTINGS_TOTAL_ONLINE_TIME, 0); //register traffic font - TrafficFontID.cbSize = sizeof(FontIDW); mir_wstrcpy(TrafficFontID.group, LPGENW("Traffic counter")); mir_wstrcpy(TrafficFontID.name, LPGENW("Font")); mir_strcpy(TrafficFontID.dbSettingsGroup, MODULENAME); - mir_strcpy(TrafficFontID.prefix, "Font"); + mir_strcpy(TrafficFontID.setting, "Font"); TrafficFontID.flags = FIDF_DEFAULTVALID | FIDF_SAVEPOINTSIZE; TrafficFontID.deffontsettings.charset = DEFAULT_CHARSET; TrafficFontID.deffontsettings.colour = GetSysColor(COLOR_BTNTEXT); @@ -1101,7 +1100,6 @@ static int TrafficCounterModulesLoaded(WPARAM, LPARAM) g_plugin.addFont(&TrafficFontID); // Регистрируем цвет фона - TrafficBackgroundColorID.cbSize = sizeof(ColourIDW); mir_wstrcpy(TrafficBackgroundColorID.group, LPGENW("Traffic counter")); mir_wstrcpy(TrafficBackgroundColorID.name, LPGENW("Font")); mir_strcpy(TrafficBackgroundColorID.dbSettingsGroup, MODULENAME); diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index 7208b267df..9c5e098dfd 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -316,8 +316,7 @@ void InitMwin(void) wndclass.lpszClassName = L"WeatherFrame"; RegisterClass(&wndclass); - ColourIDW colourid = { 0 }; - colourid.cbSize = sizeof(ColourIDW); + ColourIDW colourid = {}; mir_strcpy(colourid.dbSettingsGroup, WEATHERPROTONAME); mir_strcpy(colourid.setting, "ColorMwinFrame"); mir_wstrcpy(colourid.name, LPGENW("Frame Background")); @@ -325,13 +324,12 @@ void InitMwin(void) colourid.defcolour = GetSysColor(COLOR_3DFACE); g_plugin.addColor(&colourid); - FontIDW fontid = { 0 }; - fontid.cbSize = sizeof(FontIDW); + FontIDW fontid = {}; fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID; mir_strcpy(fontid.dbSettingsGroup, WEATHERPROTONAME); mir_wstrcpy(fontid.group, _A2W(WEATHERPROTONAME)); mir_wstrcpy(fontid.name, LPGENW("Frame Font")); - mir_strcpy(fontid.prefix, "fnt0"); + mir_strcpy(fontid.setting, "fnt0"); HDC hdc = GetDC(nullptr); fontid.deffontsettings.size = -13; @@ -345,7 +343,7 @@ void InitMwin(void) fontid.deffontsettings.style = DBFONTF_BOLD; mir_wstrcpy(fontid.name, LPGENW("Frame Title Font")); - mir_strcpy(fontid.prefix, "fnt1"); + mir_strcpy(fontid.setting, "fnt1"); g_plugin.addFont(&fontid); for (auto &hContact : Contacts(WEATHERPROTONAME)) diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 041ef7d85a..f3642de98c 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -11,8 +11,8 @@ MNOTIFYLINK *notifyLink = nullptr; // used to work around a bug in neweventnotify and others with the address passed in the GetPluginData function bool ignore_gpd_passed_addy = false; -FontIDW font_id_firstline = {0}, font_id_secondline = {0}, font_id_time = {0}; -ColourIDW colour_id_bg = {0}, colour_id_border = {0}, colour_id_sidebar = {0}, colour_id_titleunderline = {0}; +FontIDW font_id_firstline = {}, font_id_secondline = {}, font_id_time = {}; +ColourIDW colour_id_bg = {}, colour_id_border = {}, colour_id_sidebar = {}, colour_id_titleunderline = {}; COLORREF colBg = GetSysColor(COLOR_3DSHADOW); HFONT hFontFirstLine = nullptr, hFontSecondLine = nullptr, hFontTime = nullptr; @@ -86,40 +86,36 @@ static int TTBLoaded(WPARAM, LPARAM) static void InitFonts() { - font_id_firstline.cbSize = sizeof(FontIDW); font_id_firstline.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(font_id_firstline.group, LPGENW("Popups")); mir_wstrcpy(font_id_firstline.name, LPGENW("First line")); mir_strcpy(font_id_firstline.dbSettingsGroup, MODULENAME); - mir_strcpy(font_id_firstline.prefix, "FontFirst"); + mir_strcpy(font_id_firstline.setting, "FontFirst"); mir_wstrcpy(font_id_firstline.backgroundGroup, L"Popups"); mir_wstrcpy(font_id_firstline.backgroundName, L"Background"); font_id_firstline.order = 0; g_plugin.addFont(&font_id_firstline); - font_id_secondline.cbSize = sizeof(FontIDW); font_id_secondline.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(font_id_secondline.group, LPGENW("Popups")); mir_wstrcpy(font_id_secondline.name, LPGENW("Second line")); mir_strcpy(font_id_secondline.dbSettingsGroup, MODULENAME); - mir_strcpy(font_id_secondline.prefix, "FontSecond"); + mir_strcpy(font_id_secondline.setting, "FontSecond"); mir_wstrcpy(font_id_secondline.backgroundGroup, L"Popups"); mir_wstrcpy(font_id_secondline.backgroundName, L"Background"); font_id_secondline.order = 1; g_plugin.addFont(&font_id_secondline); - font_id_time.cbSize = sizeof(FontIDW); font_id_time.flags = FIDF_ALLOWEFFECTS; mir_wstrcpy(font_id_time.group, LPGENW("Popups")); mir_wstrcpy(font_id_time.name, LPGENW("Time")); mir_strcpy(font_id_time.dbSettingsGroup, MODULENAME); - mir_strcpy(font_id_time.prefix, "FontTime"); + mir_strcpy(font_id_time.setting, "FontTime"); mir_wstrcpy(font_id_time.backgroundGroup, L"Popups"); mir_wstrcpy(font_id_time.backgroundName, L"Background"); font_id_time.order = 2; g_plugin.addFont(&font_id_time); - colour_id_bg.cbSize = sizeof(ColourIDW); mir_wstrcpy(colour_id_bg.group, LPGENW("Popups")); mir_wstrcpy(colour_id_bg.name, LPGENW("Background")); mir_strcpy(colour_id_bg.dbSettingsGroup, MODULENAME); @@ -128,7 +124,6 @@ static void InitFonts() colour_id_bg.order = 0; g_plugin.addColor(&colour_id_bg); - colour_id_border.cbSize = sizeof(ColourIDW); mir_wstrcpy(colour_id_border.group, LPGENW("Popups")); mir_wstrcpy(colour_id_border.name, LPGENW("Border")); mir_strcpy(colour_id_border.dbSettingsGroup, MODULENAME); @@ -137,7 +132,6 @@ static void InitFonts() colour_id_border.order = 1; g_plugin.addColor(&colour_id_border); - colour_id_sidebar.cbSize = sizeof(ColourIDW); mir_wstrcpy(colour_id_sidebar.group, LPGENW("Popups")); mir_wstrcpy(colour_id_sidebar.name, LPGENW("Sidebar")); mir_strcpy(colour_id_sidebar.dbSettingsGroup, MODULENAME); @@ -146,7 +140,6 @@ static void InitFonts() colour_id_sidebar.order = 2; g_plugin.addColor(&colour_id_sidebar); - colour_id_titleunderline.cbSize = sizeof(ColourIDW); mir_wstrcpy(colour_id_titleunderline.group, LPGENW("Popups")); mir_wstrcpy(colour_id_titleunderline.name, LPGENW("Title underline")); mir_strcpy(colour_id_titleunderline.dbSettingsGroup, MODULENAME); diff --git a/plugins/mRadio/rframeapi.pas b/plugins/mRadio/rframeapi.pas index 94d5438ea5..81443dd843 100644 --- a/plugins/mRadio/rframeapi.pas +++ b/plugins/mRadio/rframeapi.pas @@ -236,7 +236,6 @@ begin tmp:=SendMessage(wnd,CLM_GETEXSTYLE,0,0); SendMessage(wnd,CLM_SETEXSTYLE,tmp or CLS_EX_SHOWSELALWAYS,0); - cid.cbSize:=SizeOf(cid); cid.flags :=0; StrCopy(cid.group,cPluginName); StrCopy(cid.dbSettingsGroup,cPluginName); -- cgit v1.2.3