Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STOBJECT] Revert b7c3398 because it was not the cause of the original problem I wanted to fix (notify structure not completely zeroed-out on the receiver side of the notification).

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-02-04 02:23:28 +01:00
parent 04498f3eb5
commit 5de33ab010
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dll/shellext/stobject/csystray.cpp
View file

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

6
dll/shellext/stobject/hotplug.cpp
View file

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