Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Separate logger wrappers from the actual implementations.
* Fix some warnings.
CORE-7586

svn path=/branches/shell-experiments/; revision=62252
This commit is contained in:
David Quintana 2014-02-19 00:20:45 +00:00
parent f1281f1369
commit ea49280564
7 changed files with 1188 additions and 923 deletions
Download patch file Download diff file Expand all files Collapse all files

16
base/shell/rshell/CStartMenu.cpp
View file

@ -17,10 +17,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "precomp.h"
//#define TEST_TRACKPOPUPMENU_SUBMENUS
#include "precomp.h"
/* NOTE: The following constants *MUST NOT* be changed because
they're hardcoded and need to be the exact values
@ -136,7 +136,7 @@ private:
case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break;
}
#ifndef USE_BUILTIN_MENUBAND
#if USE_SYSTEM_MENUBAND
hr = CoCreateInstance(CLSID_MenuBand,
NULL,
CLSCTX_INPROC_SERVER,
@ -271,18 +271,20 @@ CStartMenu_Constructor(REFIID riid, void **ppv)
IShellFolder *shellFolder;
IShellFolder *psfStartMenu;
#ifndef USE_BUILTIN_MENUBAND
#if USE_SYSTEM_MENUBAND
hr = CoCreateInstance(CLSID_MenuBand,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARG(IShellMenu, &pShellMenu));
#elif WRAP_MENUBAND
hr = CMenuBand_Wrapper(IID_PPV_ARG(IShellMenu, &pShellMenu));
#else
hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu));
#endif
if (FAILED(hr))
return hr;
#ifndef USE_BUILTIN_MENUSITE
#if USE_SYSTEM_MENUSITE
hr = CoCreateInstance(CLSID_MenuBandSite,
NULL,
CLSCTX_INPROC_SERVER,
@ -293,11 +295,13 @@ CStartMenu_Constructor(REFIID riid, void **ppv)
if (FAILED(hr))
return hr;
#ifndef USE_BUILTIN_MENUDESKBAR
#if USE_SYSTEM_MENUDESKBAR
hr = CoCreateInstance(CLSID_MenuDeskBar,
NULL,
CLSCTX_INPROC_SERVER,
IID_PPV_ARG(IDeskBar, &pDeskBar));
#elif WRAP_MENUDESKBAR
hr = CMenuDeskBar_Wrapper(IID_PPV_ARG(IDeskBar, &pDeskBar));
#else
hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar));
#endif
@ -311,7 +315,7 @@ CStartMenu_Constructor(REFIID riid, void **ppv)
pCallback->AddRef(); // CreateInstance returns object with 0 ref count */
pCallback->Initialize(pShellMenu, pBandSite, pDeskBar);
pShellMenu->Initialize(pCallback, -1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL);
pShellMenu->Initialize(pCallback, (UINT)-1, 0, SMINIT_TOPLEVEL | SMINIT_VERTICAL);
if (FAILED(hr))
return hr;