lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-03 01:41:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[EXPLORER][BROWSEUI][SHELL32][NETSHELL] Fix wrong usage of CComPtr

Browse Source
This commit is contained in:
Mark Jansen
2022-09-18 20:59:00 +02:00
parent a414c88dae
commit cd2d284142
13 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
base/shell/explorer/startctxmnu.cpp
View File

@@ -242,8 +242,5 @@ public:
HRESULT CStartMenuBtnCtxMenu_CreateInstance(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu)
{
CStartMenuBtnCtxMenu * mnu = new CComObject<CStartMenuBtnCtxMenu>();
mnu->Initialize(m_TrayWnd, m_Owner);
*ppCtxMenu = mnu;
return S_OK;
return ShellObjectCreatorInit<CStartMenuBtnCtxMenu>(m_TrayWnd, m_Owner, IID_PPV_ARG(IContextMenu, ppCtxMenu));
}

2
base/shell/explorer/tbsite.cpp
View File

@@ -301,8 +301,8 @@ public:
if (ppcm != NULL)
{
m_ContextMenu->AddRef();
*ppcm = m_ContextMenu;
(*ppcm)->AddRef();
}
/* Add the menu items */

1
base/shell/explorer/traywnd.cpp
View File

@@ -2943,7 +2943,6 @@ ChangePos:
{
CComPtr<IContextMenu> ctxMenu;
CStartMenuBtnCtxMenu_CreateInstance(this, m_hWnd, &ctxMenu);
ctxMenu->AddRef();
TrackCtxMenu(ctxMenu, ppt, hWndExclude, m_Position == ABE_BOTTOM, this);
}
}