Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER]

Browse source 
-Rename StartMenuBtnCtxMenuCreator to CStartMenuBtnCtxMenu_CreateInstance.
-Rename CreateStartMenuSite to CStartMenuSite_CreateInstance.
-Remove a couple of definitions that were not used.
This commit is contained in:
Giannis Adamopoulos 2018-11-23 19:50:42 +02:00
parent 225c5c4a20
commit 84fa20ec8b
5 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/shell/explorer/precomp.h
View file

@ -170,12 +170,6 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown)
#define ITrayWindow_Lock(p,a) (p)->lpVtbl->Lock(p,a)
#endif
BOOL
RegisterTrayWindowClass(VOID);
VOID
UnregisterTrayWindowClass(VOID);
HRESULT CreateTrayWindow(ITrayWindow ** ppTray);
VOID
@ -309,7 +303,7 @@ HRESULT CTrayBandSite_CreateInstance(IN ITrayWindow *tray, IN IDeskBand* pTaskBa
* startmnu.cpp
*/
HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu);
HRESULT CStartMenuBtnCtxMenu_CreateInstance(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu);
IMenuPopup*
CreateStartMenu(IN ITrayWindow *Tray,
@ -328,7 +322,7 @@ ShowCustomizeClassic(HINSTANCE, HWND);
*/
HRESULT
CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv);
CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv);
/*
* trayntfy.c

2
base/shell/explorer/startctxmnu.cpp
View file

@ -237,7 +237,7 @@ public:
END_COM_MAP()
};
HRESULT StartMenuBtnCtxMenuCreator(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu)
HRESULT CStartMenuBtnCtxMenu_CreateInstance(ITrayWindow * m_TrayWnd, IN HWND m_Owner, IContextMenu ** ppCtxMenu)
{
CStartMenuBtnCtxMenu * mnu = new CComObject<CStartMenuBtnCtxMenu>();
mnu->Initialize(m_TrayWnd, m_Owner);

2
base/shell/explorer/startmnu.cpp
View file

@ -55,7 +55,7 @@ CreateStartMenu(IN ITrayWindow *Tray,
CComPtr<IBandSite> pBs;
DWORD dwBandId = 0;
hr = CreateStartMenuSite(Tray, IID_PPV_ARG(IUnknown, &pSms));
hr = CStartMenuSite_CreateInstance(Tray, IID_PPV_ARG(IUnknown, &pSms));
if (FAILED_UNEXPECTEDLY(hr))
return NULL;

2
base/shell/explorer/startmnusite.cpp
View file

@ -383,7 +383,7 @@ public:
END_COM_MAP()
};
HRESULT CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv)
HRESULT CStartMenuSite_CreateInstance(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv)
{
return ShellObjectCreatorInit<CStartMenuSite>(Tray, riid, ppv);
}

2
base/shell/explorer/traywnd.cpp
View file

@ -2668,7 +2668,7 @@ ChangePos:
if (!(m_StartButton.SendMessage(BM_GETSTATE, 0, 0) & BST_PUSHED))
{
CComPtr<IContextMenu> ctxMenu;
StartMenuBtnCtxMenuCreator(this, m_hWnd, &ctxMenu);
CStartMenuBtnCtxMenu_CreateInstance(this, m_hWnd, &ctxMenu);
TrackCtxMenu(ctxMenu, ppt, hWndExclude, m_Position == ABE_BOTTOM, this);
}
}