Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER]

Browse source 
- Fix uninitialized variable use in CTaskSwitchWnd::OnContextMenu

svn path=/trunk/; revision=66353
This commit is contained in:
Thomas Faber 2015-02-19 16:30:37 +00:00
parent 888d828ea7
commit b45c1ca3a8
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/base/shell/explorer/taskswnd.cpp
View file

@ -378,11 +378,11 @@ public:
SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) &hIcon);
if (hIcon)
return hIcon;
hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICONSM);
if (hIcon)
return hIcon;
hIcon = (HICON) GetClassLongPtr(hwnd, GCL_HICON);
return hIcon;
@ -1279,7 +1279,7 @@ public:
}
LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
{
return OnThemeChanged();
}
@ -1353,7 +1353,7 @@ public:
return Ret;
}
LRESULT HandleShellHookMsg(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
BOOL Ret = FALSE;
@ -1526,7 +1526,7 @@ public:
HMENU hmenu = GetSystemMenu(TaskItem->hWnd, FALSE);
if (hmenu)
if (hmenu)
{
POINT pt;
int cmd;
@ -1756,11 +1756,12 @@ public:
LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
LRESULT Ret;
LRESULT Ret = 0;
INT_PTR iBtn = -1;
if (m_TaskBar.m_hWnd != NULL)
{
POINT pt;
INT_PTR iBtn;
pt.x = GET_X_LPARAM(lParam);
pt.y = GET_Y_LPARAM(lParam);
@ -1772,13 +1773,10 @@ public:
{
HandleButtonRightClick(iBtn);
}
else
goto ForwardContextMenuMsg;
}
else
if (iBtn < 0)
{
ForwardContextMenuMsg:
/* Forward message */
/* Not on a taskbar button, so forward message to tray */
Ret = SendMessage(m_Tray->GetHWND(), uMsg, wParam, lParam);
}
return Ret;