[EXPLORER]

-Rename StartMenuBtnCtxMenuCreator to CStartMenuBtnCtxMenu_CreateInstance.
-Rename CreateStartMenuSite to CStartMenuSite_CreateInstance.
-Remove a couple of definitions that were not used.

diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h
index ea56448..0f49ee6 100644 (file)
--- a/base/shell/explorer/precomp.h
+++ b/base/shell/explorer/precomp.h
@@ -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

diff --git a/base/shell/explorer/startctxmnu.cpp b/base/shell/explorer/startctxmnu.cpp
index ba5b766..4c3d7ca 100644 (file)
--- a/base/shell/explorer/startctxmnu.cpp
+++ b/base/shell/explorer/startctxmnu.cpp
@@ -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);

diff --git a/base/shell/explorer/startmnu.cpp b/base/shell/explorer/startmnu.cpp
index a3355f2..d306010 100644 (file)
--- a/base/shell/explorer/startmnu.cpp
+++ b/base/shell/explorer/startmnu.cpp
@@ -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;
 

diff --git a/base/shell/explorer/startmnusite.cpp b/base/shell/explorer/startmnusite.cpp
index 1e36125..215ed8c 100644 (file)
--- a/base/shell/explorer/startmnusite.cpp
+++ b/base/shell/explorer/startmnusite.cpp
@@ -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);
 }

diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp
index 63ece92..ebea58e 100644 (file)
--- a/base/shell/explorer/traywnd.cpp
+++ b/base/shell/explorer/traywnd.cpp
@@ -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);
             }
         }