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/Popup/src/config.cpp | 6 +++--- plugins/Popup/src/opt_skins.cpp | 2 +- plugins/Popup/src/popup_gdiplus.cpp | 2 +- plugins/Popup/src/popup_wnd2.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 377fe2880d..33374c027f 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -69,7 +69,7 @@ HRESULT (WINAPI *MyDwmEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurB // common funcs void LoadOptions() { - ZeroMemory(&PopupOptions, sizeof(PopupOptions)); + memset(&PopupOptions, 0, sizeof(PopupOptions)); #if defined(_DEBUG) PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE); #endif @@ -98,7 +98,7 @@ void PopupPreview() POPUPDATA2 ppd = {0}; - ZeroMemory(&ppd, sizeof(ppd)); + memset(&ppd, 0, sizeof(ppd)); ppd.cbSize = sizeof(ppd); ppd.flags = PU2_TCHAR; @@ -108,7 +108,7 @@ void PopupPreview() CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY); if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause - ZeroMemory(&ppd, sizeof(ppd)); + memset(&ppd, 0, sizeof(ppd)); ppd.cbSize = sizeof(ppd); ppd.flags = PU2_TCHAR; ppd.lptzTitle = lptzTitle2; diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index ce95fadc2c..2edb58f93e 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -72,7 +72,7 @@ static void updatePreviewImage(HWND hwndBox) gPreviewOk = false; POPUPDATA2 ppd; - ZeroMemory(&ppd, sizeof(ppd)); + memset(&ppd, 0, sizeof(ppd)); ppd.cbSize = sizeof(ppd); ppd.flags = PU2_TCHAR; ppd.lchIcon = LoadSkinnedIcon(SKINICON_STATUS_ONLINE); diff --git a/plugins/Popup/src/popup_gdiplus.cpp b/plugins/Popup/src/popup_gdiplus.cpp index f024eaa31e..9a4b4ed96f 100644 --- a/plugins/Popup/src/popup_gdiplus.cpp +++ b/plugins/Popup/src/popup_gdiplus.cpp @@ -76,7 +76,7 @@ HBITMAP SkinEngine_CreateDIB32(int cx, int cy) } BITMAPINFO RGB32BitsBITMAPINFO; - ZeroMemory(&RGB32BitsBITMAPINFO,sizeof(BITMAPINFO)); + memset(&RGB32BitsBITMAPINFO, 0, sizeof(BITMAPINFO)); RGB32BitsBITMAPINFO.bmiHeader.biSize=sizeof(BITMAPINFOHEADER); RGB32BitsBITMAPINFO.bmiHeader.biWidth=cx;//bm.bmWidth; RGB32BitsBITMAPINFO.bmiHeader.biHeight=cy;//bm.bmHeight; diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 16fcc7ed6d..5c61d32e65 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -103,7 +103,7 @@ bool LoadPopupWnd2() MSGERROR(msg); } - ZeroMemory(&wcl, sizeof(wcl)); + memset(&wcl, 0, sizeof(wcl)); wcl.cbSize = sizeof(wcl); wcl.lpfnWndProc = MenuHostWndProc; wcl.style = 0; -- cgit v1.2.3