mirror of
https://github.com/reactos/reactos.git
synced 2025-06-20 07:36:05 +00:00
[RSHELL]
[SHELL32] [BROWSEUI] * Move undocshell.h to a shared location, and move some shared utility functions into it. * Replace all the COM object constructor functions with generic equivalents. * Fixes a big bunch of "problems" found by Coverity Scan, but I don't have the list of CID at the moment. svn path=/branches/shell-experiments/; revision=64854
This commit is contained in:
parent
609ba8d717
commit
fd029c9779
33 changed files with 362 additions and 938 deletions
|
@ -30,27 +30,7 @@ const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4,
|
|||
extern "C"
|
||||
HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv)
|
||||
{
|
||||
HRESULT hr;
|
||||
#if USE_SYSTEM_MENUDESKBAR
|
||||
hr = CoCreateInstance(CLSID_MenuDeskBar,
|
||||
NULL,
|
||||
CLSCTX_INPROC_SERVER,
|
||||
riid, ppv);
|
||||
#else
|
||||
*ppv = NULL;
|
||||
|
||||
CMenuDeskBar * deskbar = new CComObject<CMenuDeskBar>();
|
||||
|
||||
if (!deskbar)
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
hr = deskbar->QueryInterface(riid, ppv);
|
||||
|
||||
if (FAILED_UNEXPECTEDLY(hr))
|
||||
delete deskbar;
|
||||
|
||||
#endif
|
||||
return hr;
|
||||
return ShellObjectCreator<CMenuDeskBar>(riid, ppv);
|
||||
}
|
||||
|
||||
CMenuDeskBar::CMenuDeskBar() :
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue