ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RSHELL]

Browse Source 
* CMenuBand: Improve the code structure.
 * Make the class selection better managed.
Thanks Giannis.
CORE-7881

svn path=/branches/shell-experiments/; revision=62231
This commit is contained in:
David Quintana
2014-02-17 17:16:55 +00:00
parent 3aaf437172
commit d5f6a80f41
3 changed files with 77 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/shell/rshell/CStartMenu.cpp
+4 -46
View File
@@ -125,7 +125,7 @@ private:
case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break;
}
#if 0
#ifndef USE_BUILTIN_MENUBAND
hr = CoCreateInstance(CLSID_MenuBand,
NULL,
CLSCTX_INPROC_SERVER,
@@ -262,7 +262,7 @@ CStartMenu_Constructor(
IShellFolder *shellFolder;
IShellFolder *psfStartMenu;
#if 0
#ifndef USE_BUILTIN_MENUBAND
hr = CoCreateInstance(CLSID_MenuBand,
NULL,
CLSCTX_INPROC_SERVER,
@@ -273,7 +273,7 @@ CStartMenu_Constructor(
if (FAILED(hr))
return hr;
#if 0
#ifndef USE_BUILTIN_MENUSITE
hr = CoCreateInstance(CLSID_MenuBandSite,
NULL,
CLSCTX_INPROC_SERVER,
@@ -284,7 +284,7 @@ CStartMenu_Constructor(
if (FAILED(hr))
return hr;
#if 0
#ifndef USE_BUILTIN_MENUDESKBAR
hr = CoCreateInstance(CLSID_MenuDeskBar,
NULL,
CLSCTX_INPROC_SERVER,
@@ -325,45 +325,3 @@ CStartMenu_Constructor(
return pDeskBar->QueryInterface(riid, ppv);
}
extern "C"
HRESULT
CSubMenu_Constructor(IShellMenu * pShellMenu, REFIID riid, void **ppv)
{
IBandSite* pBandSite;
IDeskBar* pDeskBar;
HRESULT hr;
#if 0
hr = CoCreateInstance(CLSID_MenuBandSite,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARG(IBandSite, &pBandSite));
#else
hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite));
#endif
if (FAILED(hr))
return hr;
#if 0
hr = CoCreateInstance(CLSID_MenuDeskBar,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARG(IDeskBar, &pDeskBar));
#else
hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar));
#endif
if (FAILED(hr))
return hr;
hr = pDeskBar->SetClient(pBandSite);
if (FAILED(hr))
return hr;
hr = pBandSite->AddBand(pShellMenu);
if (FAILED(hr))
return hr;
return pDeskBar->QueryInterface(riid, ppv);
}