From b2fad485cd5b41744ef0cc4a02722c021afd926c Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
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
---
src/modules/chat/manager.cpp | 2 +-
src/modules/clist/clistsettings.cpp | 2 +-
src/modules/clist/genmenuopt.cpp | 2 +-
src/modules/fonts/FontOptions.cpp | 2 +-
src/modules/metacontacts/meta_edit.cpp | 2 +-
src/modules/netlib/netlibssl.cpp | 2 +-
src/modules/options/descbutton.cpp | 2 +-
src/modules/options/headerbar.cpp | 2 +-
src/modules/options/iconheader.cpp | 2 +-
src/modules/plugins/newplugins.cpp | 2 +-
src/modules/skin/sounds.cpp | 2 +-
src/modules/utils/imgconv.cpp | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'src/modules')
diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index 628b5307e3..998698409b 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -909,7 +909,7 @@ static STATUSINFO* TM_AddStatus(STATUSINFO** ppStatusList, const TCHAR *pszStatu
if (!ci.TM_FindStatus(*ppStatusList, pszStatus)) {
STATUSINFO *node = (STATUSINFO*)mir_alloc(sizeof(STATUSINFO));
- ZeroMemory(node, sizeof(STATUSINFO));
+ memset(node, 0, sizeof(STATUSINFO));
replaceStrT(node->pszGroup, pszStatus);
node->hIcon = (HICON)(*iCount);
while ((int)node->hIcon > STATUSICONCOUNT - 1)
diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp
index d981d9e97f..926163e906 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/modules/clist/clistsettings.cpp
@@ -113,7 +113,7 @@ TCHAR* fnGetContactDisplayName(MCONTACT hContact, int mode)
}
CONTACTINFO ci;
- ZeroMemory(&ci, sizeof(ci));
+ memset(&ci, 0, sizeof(ci));
ci.cbSize = sizeof(ci);
ci.hContact = hContact;
if (ci.hContact == NULL)
diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index c20f92a82c..c424554842 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -584,7 +584,7 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
if (iod->name && _tcsstr(iod->name, STR_SEPARATOR))
break;
- ZeroMemory(buf, sizeof(buf));
+ buf[0] = 0;
GetDlgItemText(hwndDlg, IDC_GENMENU_CUSTOMNAME, buf, SIZEOF(buf));
if (iod->name)
mir_free(iod->name);
diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp
index e2bd710ecc..97598e7674 100644
--- a/src/modules/fonts/FontOptions.cpp
+++ b/src/modules/fonts/FontOptions.cpp
@@ -377,7 +377,7 @@ static void sttFsuiCreateSettingsTreeNode(HWND hwndTree, const TCHAR *groupName,
hItem = TreeView_InsertItem(hwndTree, &tvis);
- ZeroMemory(&tvis.item, sizeof(tvis.item));
+ memset(&tvis.item, 0, sizeof(tvis.item));
tvis.item.hItem = hItem;
tvis.item.mask = TVIF_HANDLE|TVIF_STATE;
tvis.item.state = tvis.item.stateMask = db_get_b(NULL, "FontServiceUI", treeItem->paramName, TVIS_EXPANDED);
diff --git a/src/modules/metacontacts/meta_edit.cpp b/src/modules/metacontacts/meta_edit.cpp
index 12f5fdd7b3..0dc9a2e6e4 100644
--- a/src/modules/metacontacts/meta_edit.cpp
+++ b/src/modules/metacontacts/meta_edit.cpp
@@ -251,7 +251,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
int offline_contact_number = db_get_dw(lParam, META_PROTO, "OfflineSend", INVALID_CONTACT_ID);
- ZeroMemory(&g_data, sizeof(g_data));
+ memset(&g_data, 0, sizeof(g_data));
g_data.cc = cc;
g_data.hMeta = lParam;
g_data.num_contacts = cc->nSubs;
diff --git a/src/modules/netlib/netlibssl.cpp b/src/modules/netlib/netlibssl.cpp
index eaf961912b..456670ae8f 100644
--- a/src/modules/netlib/netlibssl.cpp
+++ b/src/modules/netlib/netlibssl.cpp
@@ -118,7 +118,7 @@ static bool AcquireCredentials(void)
TimeStamp tsExpiry;
SECURITY_STATUS scRet;
- ZeroMemory(&SchannelCred, sizeof(SchannelCred));
+ memset(&SchannelCred, 0, sizeof(SchannelCred));
SchannelCred.dwVersion = SCHANNEL_CRED_VERSION;
SchannelCred.grbitEnabledProtocols = SP_PROT_SSL3TLS1_CLIENTS /*| 0xA00 TLS1.1 & 1.2*/;
diff --git a/src/modules/options/descbutton.cpp b/src/modules/options/descbutton.cpp
index 6bd00348aa..4abac86e91 100644
--- a/src/modules/options/descbutton.cpp
+++ b/src/modules/options/descbutton.cpp
@@ -67,7 +67,7 @@ int LoadDescButtonModule()
{
WNDCLASSEX wc;
- ZeroMemory(&wc, sizeof(wc));
+ memset(&wc, 0, sizeof(wc));
wc.cbSize = sizeof(wc);
wc.lpszClassName = MIRANDADESCBUTTONCLASS;
wc.lpfnWndProc = MDescButtonWndProc;
diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp
index c643a4732d..11fce111cb 100644
--- a/src/modules/options/headerbar.cpp
+++ b/src/modules/options/headerbar.cpp
@@ -72,7 +72,7 @@ int LoadHeaderbarModule()
{
WNDCLASSEX wc;
- ZeroMemory(&wc, sizeof(wc));
+ memset(&wc, 0, sizeof(wc));
wc.cbSize = sizeof(wc);
wc.lpszClassName = _T("MHeaderbarCtrl"); //MIRANDAHEADERBARCLASS;
wc.lpfnWndProc = MHeaderbarWndProc;
diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp
index 2d58d47f16..d46816367b 100644
--- a/src/modules/options/iconheader.cpp
+++ b/src/modules/options/iconheader.cpp
@@ -100,7 +100,7 @@ int LoadIcoTabsModule()
{
WNDCLASSEX wc;
- ZeroMemory(&wc, sizeof(wc));
+ memset(&wc, 0, sizeof(wc));
wc.cbSize = sizeof(wc);
wc.lpszClassName = MIRANDAICOTABCLASS;
wc.lpfnWndProc = MIcoTabWndProc;
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index a9264bcca9..2e2885033e 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -312,7 +312,7 @@ void Plugin_Uninit(pluginEntry *p)
KillModuleServices(hInst);
FreeLibrary(hInst);
- ZeroMemory(&p->bpi, sizeof(p->bpi));
+ memset(&p->bpi, 0, sizeof(p->bpi));
}
UnregisterModule(hInst);
if (p == pluginList_crshdmp)
diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp
index 02b09d1127..64a257620e 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/modules/skin/sounds.cpp
@@ -302,7 +302,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
PathToAbsoluteT(strFull, strdir);
OPENFILENAME ofn;
- ZeroMemory(&ofn, sizeof(ofn));
+ memset(&ofn, 0, sizeof(ofn));
if (GetModuleHandle(_T("bass_interface.dll")))
mir_sntprintf(filter, SIZEOF(filter), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%s (*)%c*%c"), TranslateT("Sound files"), 0, 0, TranslateT("All files"), 0, 0);
else
diff --git a/src/modules/utils/imgconv.cpp b/src/modules/utils/imgconv.cpp
index 20550b12c7..287976093a 100644
--- a/src/modules/utils/imgconv.cpp
+++ b/src/modules/utils/imgconv.cpp
@@ -28,7 +28,7 @@ typedef DWORD ARGB;
void InitBitmapInfo(BITMAPINFO &bmi, const SIZE &size)
{
- ZeroMemory(&bmi, sizeof(BITMAPINFO));
+ memset(&bmi, 0, sizeof(BITMAPINFO));
bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biCompression = BI_RGB;
--
cgit v1.2.3