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/New_GPG/src/init.cpp | 8 ++++---- plugins/New_GPG/src/main.cpp | 22 +++++++++++----------- plugins/New_GPG/src/options.cpp | 10 +++++----- plugins/New_GPG/src/utilities.cpp | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'plugins/New_GPG/src') diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 4e8c83192c..803f131970 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -187,7 +187,7 @@ extern "C" int __declspec(dllexport) Load() mi.pszService="/LoadPubKey"; hLoadPubKey = Menu_AddContactMenuItem(&mi); - ZeroMemory(&mi,sizeof(mi)); + memset(&mi, 0, sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=-0x7FFFFFFe; mi.flags=CMIF_TCHAR; @@ -196,7 +196,7 @@ extern "C" int __declspec(dllexport) Load() mi.pszService="/ToggleEncryption"; hToggleEncryption = Menu_AddContactMenuItem(&mi); - ZeroMemory(&mi,sizeof(mi)); + memset(&mi, 0, sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=-0x7FFFFFFd; mi.flags=CMIF_TCHAR; @@ -205,7 +205,7 @@ extern "C" int __declspec(dllexport) Load() mi.pszService="/SendKey"; hSendKey = Menu_AddContactMenuItem(&mi); - ZeroMemory(&mi,sizeof(mi)); + memset(&mi, 0, sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=-0x7FFFFFFe; mi.flags=CMIF_TCHAR; @@ -214,7 +214,7 @@ extern "C" int __declspec(dllexport) Load() mi.pszService="/ExportGPGKeys"; hExportGpgKeys = Menu_AddMainMenuItem(&mi); - ZeroMemory(&mi,sizeof(mi)); + memset(&mi, 0, sizeof(mi)); mi.cbSize=sizeof(mi); mi.position=-0x7FFFFFFF; mi.flags=CMIF_TCHAR; diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index de39d4a36e..5a051a1208 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -53,37 +53,37 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR col.fmt = LVCFMT_LEFT; col.cx = 50; ListView_InsertColumn(hwndList, 0, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Email"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 1, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Name"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 250; ListView_InsertColumn(hwndList, 2, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Creation date"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 3, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Expire date"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 4, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Key length"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 5, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Accounts"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; @@ -1665,31 +1665,31 @@ static INT_PTR CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wPar col.fmt = LVCFMT_LEFT; col.cx = 50; ListView_InsertColumn(hwndList, 0, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = _T("Email"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 1, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = _T("Name"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 250; ListView_InsertColumn(hwndList, 2, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = _T("Creation date"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 3, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = _T("Expiration date"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 30; ListView_InsertColumn(hwndList, 4, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = _T("Key length"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 039d91cc35..c3d9a93f69 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -94,25 +94,25 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP col.fmt = LVCFMT_LEFT; col.cx = 60; ListView_InsertColumn(hwndList, 0, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Key ID"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 50; ListView_InsertColumn(hwndList, 1, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Name"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 50; ListView_InsertColumn(hwndList, 2, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Email"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; col.cx = 50; ListView_InsertColumn(hwndList, 3, &col); - ZeroMemory(&col,sizeof(col)); + memset(&col, 0, sizeof(col)); col.pszText = TranslateT("Protocol"); col.mask = LVCF_TEXT | LVCF_WIDTH; col.fmt = LVCFMT_LEFT; @@ -156,7 +156,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP if(db_get_b(hContact, szGPGModuleName, "GPGEncryption", 0)) ListView_SetCheckState(hwndList, iRow, 1); user_data[i] = hContact; - ZeroMemory(&item,sizeof(item)); + memset(&item, 0, sizeof(item)); ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE); ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE); diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 1474502e35..25cd58230b 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1456,7 +1456,7 @@ void ExportGpGKeysFunc(int type) break; } id += " contact_id "; - ZeroMemory(&dbv, sizeof(dbv)); + memset(&dbv, 0, sizeof(dbv)); db_get(hContact, proto, uid, &dbv); switch(dbv.type) { case DBVT_DELETED: -- cgit v1.2.3