[STOBJECT] Fully zero-out the full NOTIFYICONDATA structure (it wasn't zeroed out correctly in MSVC build).

This commit is contained in:
Hermès Bélusca-Maïto 2018-02-04 01:54:55 +01:00
parent af4bdd4388
commit b7c3398f95
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 7 additions and 4 deletions

View file

@ -121,11 +121,12 @@ HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LR
*--*/
HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate)
{
NOTIFYICONDATA nim = { 0 };
NOTIFYICONDATA nim;
TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip);
nim.cbSize = sizeof(NOTIFYICONDATA);
ZeroMemory(&nim, sizeof(nim));
nim.cbSize = sizeof(nim);
nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP;
nim.hIcon = hIcon;
nim.uID = uId;

View file

@ -100,8 +100,10 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList)
*--*/
HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG)
{
NOTIFYICONDATA nim = { 0 };
nim.cbSize = sizeof(NOTIFYICONDATA);
NOTIFYICONDATA nim;
ZeroMemory(&nim, sizeof(nim));
nim.cbSize = sizeof(nim);
nim.uID = uId;
nim.hWnd = pSysTray->GetHWnd();