* Fixed the context menu for shell items.
* Some more code style improvements.
* Moved the toggles between using system classes and rshell classes into the constructor functions, so the code is easier to read.
CORE-7586

svn path=/branches/shell-experiments/; revision=62752
This commit is contained in:
David Quintana 2014-04-15 10:08:08 +00:00
parent 9b472f38cb
commit ba203171e1
6 changed files with 151 additions and 150 deletions

View file

@ -30,6 +30,12 @@ const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4,
extern "C"
HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
{
#if USE_SYSTEM_MENUDESKBAR
hr = CoCreateInstance(CLSID_MenuDeskBar,
NULL,
CLSCTX_INPROC_SERVER,
riid, ppv);
#else
*ppv = NULL;
CMenuDeskBar * deskbar = new CComObject<CMenuDeskBar>();
@ -43,6 +49,7 @@ HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
deskbar->Release();
return hr;
#endif
}
CMenuDeskBar::CMenuDeskBar() :