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/AssocMgr/src/dde.cpp | 4 ++-- plugins/AssocMgr/src/test.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/AssocMgr/src') diff --git a/plugins/AssocMgr/src/dde.cpp b/plugins/AssocMgr/src/dde.cpp index e66cfe8892..f7ede6c5e7 100644 --- a/plugins/AssocMgr/src/dde.cpp +++ b/plugins/AssocMgr/src/dde.cpp @@ -108,7 +108,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM HGLOBAL hCommand; TCHAR *pszCommand; DDEACK ack; - ZeroMemory(&ack,sizeof(ack)); + memset(&ack, 0, sizeof(ack)); if(UnpackDDElParam(msg,lParam,NULL,(PUINT_PTR)&hCommand)) { /* ANSI execute command can't happen for shell */ if(IsWindowUnicode((HWND)wParam)) { @@ -149,7 +149,7 @@ static LRESULT CALLBACK DdeMessageWindow(HWND hwnd,UINT msg,WPARAM wParam,LPARAM { ATOM hSzItem; DDEACK ack; - ZeroMemory(&ack,sizeof(ack)); + memset(&ack, 0, sizeof(ack)); if(UnpackDDElParam(msg,lParam,NULL,(PUINT_PTR)&hSzItem)) { lParam=ReuseDDElParam(lParam,msg,WM_DDE_ACK,*(PUINT)&ack,(UINT)hSzItem); if (!PostMessage((HWND)wParam,WM_DDE_ACK,(WPARAM)hwnd,lParam)) { diff --git a/plugins/AssocMgr/src/test.cpp b/plugins/AssocMgr/src/test.cpp index 29a9f5d8d0..7618ba9f04 100644 --- a/plugins/AssocMgr/src/test.cpp +++ b/plugins/AssocMgr/src/test.cpp @@ -115,7 +115,7 @@ static int ServiceParseAimLink(WPARAM,LPARAM lParam) acs.handleType=HANDLE_SEARCHRESULT; acs.szProto=AIM_PROTOCOL_NAME; acs.psr=&psr; - ZeroMemory(&psr,sizeof(PROTOSEARCHRESULT)); + memset(&psr, 0, sizeof(PROTOSEARCHRESULT)); psr.cbSize=sizeof(PROTOSEARCHRESULT); psr.nick=sn; CallService(MS_ADDCONTACT_SHOW,0,(LPARAM)&acs); @@ -282,7 +282,7 @@ static void AddIcqUser(ICQFILEINFO *info) acs.handleType=HANDLE_SEARCHRESULT; acs.szProto=gpszICQProtoName; acs.psr=(PROTOSEARCHRESULT*)&psr; - ZeroMemory(&psr,sizeof(ICQSEARCHRESULT)); + memset(&psr, 0, sizeof(ICQSEARCHRESULT)); psr.hdr.cbSize=sizeof(ICQSEARCHRESULT); if(info->nick[0]) psr.hdr.nick=info->nick; else psr.hdr.nick=info->uin; @@ -337,7 +337,7 @@ static int IcqOpenFile(WPARAM wParam,LPARAM lParam) TrimString(line); if(IsEmpty(line)) continue; if(line[0]=='[') { - ZeroMemory(&info,sizeof(info)); + memset(&info, 0, sizeof(info)); if (!mir_strcmpi(line,"[ICQ Message User]")) info.type=ICQFILE_MESSAGEUSER; else if (!mir_strcmpi(line,"[ICQ User]")) @@ -434,7 +434,7 @@ static int ServiceParseYmsgrLink(WPARAM wParam,LPARAM lParam) acs.handleType=HANDLE_SEARCHRESULT; acs.szProto=yahooProtocolName; acs.psr=&psr; - ZeroMemory(&psr,sizeof(PROTOSEARCHRESULT)); + memset(&psr, 0, sizeof(PROTOSEARCHRESULT)); psr.cbSize=sizeof(PROTOSEARCHRESULT); psr.nick=id; CallService(MS_ADDCONTACT_SHOW,0,(LPARAM)&acs); @@ -549,7 +549,7 @@ static int ServiceParseMsnimLink(WPARAM wParam,LPARAM lParam) acs.handleType=HANDLE_SEARCHRESULT; acs.szProto=AIM_PROTOCOL_NAME; acs.psr=&psr; - ZeroMemory(&psr,sizeof(PROTOSEARCHRESULT)); + memset(&psr, 0, sizeof(PROTOSEARCHRESULT)); psr.cbSize=sizeof(PROTOSEARCHRESULT); psr.nick=email; psr.email=email; @@ -744,7 +744,7 @@ static int ServiceParseXmppURI(WPARAM wParam,LPARAM lParam) acs.handleType=HANDLE_SEARCHRESULT; acs.szProto=jabberProtoName; acs.psr=&psr; - ZeroMemory(&psr,sizeof(PROTOSEARCHRESULT)); + memset(&psr, 0, sizeof(PROTOSEARCHRESULT)); psr.cbSize=sizeof(PROTOSEARCHRESULT); psr.nick=jid; CallService(MS_ADDCONTACT_SHOW,0,(LPARAM)&acs); -- cgit v1.2.3