Author: gadamopoulos
Date: Sun Sep 1 16:52:36 2013
New Revision: 59950
URL:
http://svn.reactos.org/svn/reactos?rev=59950&view=rev
Log:
[shell32]
- Stub CMenuDeskBar class
Added:
trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp (with props)
trunk/reactos/dll/win32/shell32/CMenuDeskBar.h (with props)
trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs (with props)
Modified:
trunk/reactos/dll/win32/shell32/CMakeLists.txt
trunk/reactos/dll/win32/shell32/precomp.h
trunk/reactos/dll/win32/shell32/rgs_res.rc
trunk/reactos/dll/win32/shell32/shell32_main.cpp
trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Sep 1 16:52:36 2013
@@ -24,6 +24,7 @@
clipboard.cpp
control.cpp
CMenuBand.cpp
+ CMenuDeskBar.cpp
dataobject.cpp
dde.cpp
debughlp.cpp
Added: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp (added)
+++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp [iso-8859-1] Sun Sep 1 16:52:36
2013
@@ -0,0 +1,141 @@
+
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(
+ POINTL *ppt,
+ RECTL *prcExclude,
+ MP_POPUPFLAGS dwFlags)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(
+ DWORD dwSelectType)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSubMenu(
+ IMenuPopup *pmp,
+ BOOL fSet)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(
+ IUnknown *punkClient)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(
+ IUnknown **ppunkClient)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(
+ RECT *prc)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(
+ HWND *phwnd)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::ContextSensitiveHelp(
+ BOOL fEnterMode)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(
+ IUnknown *pUnkSite)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(
+ REFIID riid,
+ PVOID *ppvSite)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetIconSize(THIS_ DWORD* piIcon)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetBitmap(THIS_ HBITMAP* phBitmap)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Initialize(THIS)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(
+ const GUID *pguidCmdGroup,
+ ULONG cCmds,
+ OLECMD prgCmds[],
+ OLECMDTEXT *pCmdText)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::Exec(
+ const GUID *pguidCmdGroup,
+ DWORD nCmdID,
+ DWORD nCmdexecopt,
+ VARIANT *pvaIn,
+ VARIANT *pvaOut)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(
+ REFGUID guidService,
+ REFIID riid,
+ void **ppvObject)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL
bFocus)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(THIS_ BOOL bActivating, LPMSG
lpMsg)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO(THIS)
+{
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(THIS_ LPMSG lpMsg)
+{
+ return S_OK;
+}
+
Propchange: trunk/reactos/dll/win32/shell32/CMenuDeskBar.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuDes…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMenuDeskBar.h (added)
+++ trunk/reactos/dll/win32/shell32/CMenuDeskBar.h [iso-8859-1] Sun Sep 1 16:52:36 2013
@@ -0,0 +1,75 @@
+
+class CMenuDeskBar:
+ public CComCoClass<CMenuDeskBar, &CLSID_MenuDeskBar>,
+ public CComObjectRootEx<CComMultiThreadModelNoCS>,
+ public IOleCommandTarget,
+ public IServiceProvider,
+ public IInputObjectSite,
+ public IInputObject,
+ public IMenuPopup,
+ public IObjectWithSite,
+ public IBanneredBar,
+ public IInitializeObject
+{
+public:
+
+ // *** IMenuPopup methods ***
+ virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS
dwFlags);
+ virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType);
+ virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp,BOOL fSet);
+
+ // *** IDeskBar methods ***
+ virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient);
+ virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient);
+ virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc);
+
+ // *** IOleWindow methods ***
+ virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd);
+ virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
+
+ // *** IObjectWithSite methods ***
+ virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite);
+ virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid,PVOID *ppvSite);
+
+ // *** IBanneredBar methods ***
+ virtual HRESULT STDMETHODCALLTYPE SetIconSize(THIS_ DWORD iIcon);
+ virtual HRESULT STDMETHODCALLTYPE GetIconSize(THIS_ DWORD* piIcon);
+ virtual HRESULT STDMETHODCALLTYPE SetBitmap(THIS_ HBITMAP hBitmap);
+ virtual HRESULT STDMETHODCALLTYPE GetBitmap(THIS_ HBITMAP* phBitmap);
+
+ // *** IInitializeObject methods ***
+ virtual HRESULT STDMETHODCALLTYPE Initialize(THIS);
+
+ // *** IOleCommandTarget methods ***
+ virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds,
OLECMD prgCmds[], OLECMDTEXT *pCmdText);
+ virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD
nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut);
+
+ // *** IServiceProvider methods ***
+ virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void
**ppvObject);
+
+ // *** IInputObjectSite methods ***
+ virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(THIS_ LPUNKNOWN lpUnknown, BOOL
bFocus);
+
+ // *** IInputObject methods ***
+ virtual HRESULT STDMETHODCALLTYPE UIActivateIO(THIS_ BOOL bActivating, LPMSG lpMsg);
+ virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS);
+ virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(THIS_ LPMSG lpMsg);
+
+DECLARE_REGISTRY_RESOURCEID(IDR_MENUDESKBAR)
+DECLARE_NOT_AGGREGATABLE(CMenuDeskBar)
+DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+BEGIN_COM_MAP(CMenuDeskBar)
+ COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup)
+ COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget)
+ COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider)
+ COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite)
+ COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject)
+ COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IMenuPopup)
+ COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IMenuPopup)
+ COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite)
+ COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar)
+ COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject)
+END_COM_MAP()
+
+};
Propchange: trunk/reactos/dll/win32/shell32/CMenuDeskBar.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/shell32/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sun Sep 1 16:52:36 2013
@@ -72,6 +72,7 @@
#include "filedefext.h"
#include "drvdefext.h"
#include "CMenuBand.h"
+#include "CMenuDeskBar.h"
#include <wine/debug.h>
Added: trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs (added)
+++ trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs [iso-8859-1] Sun Sep 1
16:52:36 2013
@@ -0,0 +1,13 @@
+HKCR
+{
+ NoRemove CLSID
+ {
+ ForceRemove {ECD4FC4F-521C-11D0-B792-00A0C90312E1} = s 'Menu Desk Bar'
+ {
+ InprocServer32 = s '%MODULE%'
+ {
+ val ThreadingModel = s 'Apartment'
+ }
+ }
+ }
+}
Propchange: trunk/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sun Sep 1 16:52:36 2013
@@ -11,6 +11,7 @@
IDR_FONTSFOLDERSHORTCUT REGISTRY
"res/rgs/fontsfoldershortcut.rgs"
IDR_MENUBAND REGISTRY "res/rgs/menuband.rgs"
IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs"
+IDR_MENUDESKBAR REGISTRY "res/rgs/menudeskbar.rgs"
IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs"
IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs"
IDR_NETWORKPLACES REGISTRY "res/rgs/networkplaces.rgs"
Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sun Sep 1 16:52:36
2013
@@ -1369,6 +1369,7 @@
OBJECT_ENTRY(CLSID_StartMenu, CStartMenu)
OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite)
OBJECT_ENTRY(CLSID_MenuBand, CMenuBand)
+ OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar)
END_OBJECT_MAP()
CShell32Module gModule;
Modified: trunk/reactos/dll/win32/shell32/shresdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Sep 1 16:52:36 2013
@@ -538,5 +538,6 @@
#define IDR_FILEDEFEXT 147
#define IDR_DRVDEFEXT 148
#define IDR_MENUBAND 149
+#define IDR_MENUDESKBAR 150
#endif