From b2fad485cd5b41744ef0cc4a02722c021afd926c Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Mon, 1 Dec 2014 00:07:01 +0000 Subject: ZeroMemory -> memset, few bugs fised git-svn-id: http://svn.miranda-ng.org/main/trunk@11184 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Utils/mir_fonts.cpp | 6 +++--- plugins/Utils/mir_options.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Utils') diff --git a/plugins/Utils/mir_fonts.cpp b/plugins/Utils/mir_fonts.cpp index d43b8ddab4..237eb040f7 100644 --- a/plugins/Utils/mir_fonts.cpp +++ b/plugins/Utils/mir_fonts.cpp @@ -9,7 +9,7 @@ int FontService_RegisterFont(const char *pszDbModule,const char *pszDbName,const TCHAR *pszSection,const TCHAR *pszDescription,int position,BOOL bAllowEffects,LOGFONT *plfDefault,COLORREF clrDefault) { FontIDT fid; - ZeroMemory(&fid,sizeof(fid)); + memset(&fid, 0, sizeof(fid)); fid.cbSize=sizeof(fid); mir_strncpy(fid.dbSettingsGroup,pszDbModule,sizeof(fid.dbSettingsGroup)); /* buffer safe */ mir_strncpy(fid.prefix,pszDbName,sizeof(fid.prefix)); /* buffer safe */ @@ -46,7 +46,7 @@ int FontService_GetFont(const TCHAR *pszSection,const TCHAR *pszDescription,COLO int FontService_RegisterColor(const char *pszDbModule,const char *pszDbName,const TCHAR *pszSection,const TCHAR *pszDescription,COLORREF clrDefault) { ColourIDT cid; - ZeroMemory(&cid,sizeof(cid)); + memset(&cid, 0, sizeof(cid)); cid.cbSize=sizeof(cid); cid.defcolour=clrDefault; mir_strncpy(cid.dbSettingsGroup,pszDbModule,sizeof(cid.dbSettingsGroup)); /* buffer safe */ @@ -60,7 +60,7 @@ int FontService_RegisterColor(const char *pszDbModule,const char *pszDbName,cons int FontService_GetColor(const TCHAR *pszSection,const TCHAR *pszDescription,COLORREF *pclr) { ColourIDT cid; - ZeroMemory(&cid,sizeof(cid)); + memset(&cid, 0, sizeof(cid)); cid.cbSize=sizeof(cid); mir_tstrncpy(cid.group,pszSection,sizeof(cid.group)); /* buffer safe */ mir_tstrncpy(cid.name,pszDescription,sizeof(cid.name)); /* buffer safe */ diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp index d8f90efedf..7d7e9fdbc3 100644 --- a/plugins/Utils/mir_options.cpp +++ b/plugins/Utils/mir_options.cpp @@ -200,12 +200,12 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha ListView_SetExtendedListViewStyle(hwndProtocols, LVS_EX_CHECKBOXES); - ZeroMemory(&lvc, sizeof(lvc)); + memset(&lvc, 0, sizeof(lvc)); lvc.mask = LVCF_FMT; lvc.fmt = LVCFMT_IMAGE | LVCFMT_LEFT; ListView_InsertColumn(hwndProtocols, 0, &lvc); - ZeroMemory(&lvi, sizeof(lvi)); + memset(&lvi, 0, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_PARAM; lvi.iSubItem = 0; lvi.iItem = 1000; -- cgit v1.2.3