[ros-diffs] [ssawant] 75260: [QCKLNCH] -Whitespace fixes -Minor suggestions fixed. -Minor refactors and some code fixes. CR-122 (https://code.reactos.org/cru/CR-122#details)

Author: ssawant
Date: Sat Jul  1 20:22:13 2017
New Revision: 75260

URL: http://svn.reactos.org/svn/reactos?rev=75260&view=rev
Log:
[QCKLNCH]
-Whitespace fixes
-Minor suggestions fixed.
-Minor refactors and some code fixes.

CR-122 (https://code.reactos.org/cru/CR-122#details)

Modified:
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h
    branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.cpp	[iso-8859-1] Sat
Jul  1 20:22:13 2017
@@ -33,7 +33,7 @@
 }
 
 // *** CWindowImpl ***
-//Subclassing 
+// Subclassing 
 
 LRESULT CISFBand::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
bHandled)
 {
@@ -100,7 +100,7 @@
     return 0;
 }
 
-//ToolbarTest
+// ToolbarTest
 HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 {
     // Declare and initialize local constants.     
@@ -120,7 +120,7 @@
         return NULL;
     SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)piml);    
 
-    //Enumerate objects
+    // Enumerate objects
     CComPtr<IEnumIDList> pedl;    
     LPITEMIDLIST pidl = NULL;
     STRRET stret;  
@@ -150,7 +150,7 @@
 /*****************************************************************************/
 
 // *** IObjectWithSite *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::SetSite(IUnknown *pUnkSite)
+    STDMETHODIMP CISFBand::SetSite(IUnknown *pUnkSite)
     {
         HRESULT hr;
         HWND hwndParent;
@@ -173,7 +173,7 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
+    STDMETHODIMP CISFBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
     {        
         TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
 
@@ -190,7 +190,7 @@
 
 /*****************************************************************************/
 // *** IDeskBand *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetWindow(OUT HWND *phwnd)
+    STDMETHODIMP CISFBand::GetWindow(OUT HWND *phwnd)
     {
         if (!m_hWndTb)
             return E_FAIL;
@@ -201,13 +201,13 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ContextSensitiveHelp(IN BOOL fEnterMode)
+    STDMETHODIMP CISFBand::ContextSensitiveHelp(IN BOOL fEnterMode)
     {
         /* FIXME: Implement */        
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ShowDW(IN BOOL bShow)
+    STDMETHODIMP CISFBand::ShowDW(IN BOOL bShow)
     {        
         if (m_hWndTb)
         {
@@ -217,7 +217,7 @@
         return S_OK;       
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::CloseDW(IN DWORD dwReserved)
+    STDMETHODIMP CISFBand::CloseDW(IN DWORD dwReserved)
     {        
         if (m_hWndTb)
         {
@@ -229,14 +229,14 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown
*punkToolbarSite, BOOL fReserved) 
+    STDMETHODIMP CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite,
BOOL fReserved) 
     {
         /* No need to implement this method */
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD
dwViewMode, IN OUT DESKBANDINFO *pdbi)
+    STDMETHODIMP CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT
DESKBANDINFO *pdbi)
     {        
         TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID,
dwViewMode, pdbi, m_hWndTb);
                 
@@ -298,21 +298,21 @@
 
  /*****************************************************************************/
  // *** IDeskBar ***    
-    HRESULT STDMETHODCALLTYPE CISFBand::SetClient(IN IUnknown *punkClient)
+    STDMETHODIMP CISFBand::SetClient(IN IUnknown *punkClient)
     {
         TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetClient(OUT IUnknown **ppunkClient)
+    STDMETHODIMP CISFBand::GetClient(OUT IUnknown **ppunkClient)
     {
         TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::OnPosRectChangeDB(IN RECT *prc)
+    STDMETHODIMP CISFBand::OnPosRectChangeDB(IN RECT *prc)
     {
         TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc,
prc->left, prc->top, prc->right, prc->bottom);      
 
@@ -321,7 +321,7 @@
 
 /*****************************************************************************/
 // *** IPersistStream *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetClassID(OUT CLSID *pClassID)
+    STDMETHODIMP CISFBand::GetClassID(OUT CLSID *pClassID)
     {        
         TRACE("CISFBand::GetClassID(0x%p)\n", pClassID);
         /* We're going to return the (internal!) CLSID of the quick launch band */
@@ -330,14 +330,14 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::IsDirty()
+    STDMETHODIMP CISFBand::IsDirty()
     {
         /* The object hasn't changed since the last save! */
 
         return S_FALSE;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::Load(IN IStream *pStm)
+    STDMETHODIMP CISFBand::Load(IN IStream *pStm)
     {
         TRACE("CISFBand::Load called\n");
         /* Nothing to do */
@@ -345,14 +345,14 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
+    STDMETHODIMP CISFBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
     {
         /* Nothing to do */
 
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
+    STDMETHODIMP CISFBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
     {
         TRACE("CISFBand::GetSizeMax called\n");         
 
@@ -361,14 +361,14 @@
 
 /*****************************************************************************/
 // *** IWinEventHandler *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN
WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult)
+    STDMETHODIMP CISFBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM wParam,
IN LPARAM lParam, OUT LRESULT *plrResult)
     {
         TRACE("CISFBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p,
0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult);
         
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ContainsWindow(IN HWND hWnd)
+    STDMETHODIMP CISFBand::ContainsWindow(IN HWND hWnd)
     {        
         if (hWnd == m_hWndTb || ::IsChild(m_hWndTb, hWnd))
         {
@@ -379,28 +379,28 @@
         return S_FALSE;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam, LRESULT *theResult)
+    STDMETHODIMP CISFBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
LRESULT *theResult)
     {          
          UNIMPLEMENTED;
                  
          return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::IsWindowOwner(HWND hWnd)
+    STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd)
     {        
         return (hWnd == m_hWndTb) ? S_OK : S_FALSE;        
     }  
 
 /*****************************************************************************/
 // *** IOleCommandTarget methods ***
-    HRESULT STDMETHODCALLTYPE CISFBand::QueryStatus(const GUID *pguidCmdGroup, ULONG
cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+    STDMETHODIMP CISFBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD
prgCmds [], OLECMDTEXT *pCmdText)
     {        
         UNIMPLEMENTED;
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID,
DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+    STDMETHODIMP CISFBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD
nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
     {       
         if (IsEqualIID(*pguidCmdGroup, IID_IBandSite))
         {
@@ -419,12 +419,12 @@
 
 /*****************************************************************************/
 // *** IShellFolderBand ***
-    HRESULT STDMETHODCALLTYPE CISFBand::GetBandInfoSFB(PBANDINFOSFB pbi)
-    {
-        return E_NOTIMPL;
-    }
-
-    HRESULT STDMETHODCALLTYPE CISFBand::InitializeSFB(IShellFolder *psf,
PCIDLIST_ABSOLUTE pidl)
+    STDMETHODIMP CISFBand::GetBandInfoSFB(PBANDINFOSFB pbi)
+    {
+        return E_NOTIMPL;
+    }
+
+    STDMETHODIMP CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl)
     {
         LPITEMIDLIST pidlRoot;
         SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidlRoot);
@@ -443,14 +443,14 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::SetBandInfoSFB( PBANDINFOSFB pbi)
+    STDMETHODIMP CISFBand::SetBandInfoSFB( PBANDINFOSFB pbi)
     {
         return E_NOTIMPL;
     }
 
 /*****************************************************************************/
 // *** IContextMenu ***
-    HRESULT STDMETHODCALLTYPE CISFBand::GetCommandString(UINT_PTR idCmd, UINT uFlags,
UINT *pwReserved, LPSTR pszName, UINT cchMax)
+    STDMETHODIMP CISFBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT
*pwReserved, LPSTR pszName, UINT cchMax)
     {        
         /*HRESULT hr = E_INVALIDARG;
 
@@ -481,7 +481,7 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
+    STDMETHODIMP CISFBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
     { 
         if (!HIWORD(pici->lpVerb))
         {
@@ -537,9 +537,9 @@
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu,
UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
-    {        
-        HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(),
MAKEINTRESOURCE(IDR_POPUPMENU));
+    STDMETHODIMP CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst,
UINT idCmdLast, UINT uFlags)
+    {        
+        HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(),
MAKEINTRESOURCE(IDM_POPUPMENU));
         UINT idMax = Shell_MergeMenus(hmenu, GetSubMenu(qMenu, 0), indexMenu, idCmdFirst,
idCmdLast, MM_SUBMENUSHAVEIDS);
         
         if(m_textFlag) 
@@ -562,7 +562,7 @@
     }
 
 /*****************************************************************************/
-//C Constructor
+// C Constructor
     extern "C"
     HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv)
     {

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CISFBand.h	[iso-8859-1] Sat
Jul  1 20:22:13 2017
@@ -7,7 +7,7 @@
  */
 #pragma once
 
-//COM class for cisfband
+// COM class for cisfband
 class CISFBand :
     public CWindowImpl<CISFBand>,
     public CComCoClass<CISFBand>,
@@ -21,17 +21,17 @@
     public IShellFolderBand,
     public IContextMenu
 {
-    //band
+    // band
     DWORD m_BandID;
     CComPtr<IUnknown> m_Site;
 
-    //Toolbar
+    // Toolbar
     HWND m_hWndTb;
     HINSTANCE m_hInstance;
     CComPtr<IShellFolder> m_pISF;     
     PCIDLIST_ABSOLUTE m_pidl;    
 
-    //Menu      
+    // Menu      
     BOOL m_textFlag;
     BOOL m_iconFlag;
     
@@ -40,90 +40,90 @@
     CISFBand();
     virtual ~CISFBand();
 
-//Personal Methods
+// Personal Methods
     HWND CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst);
     LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     LRESULT OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
     
-//IObjectWithSite
-
-    virtual HRESULT STDMETHODCALLTYPE GetSite(
-      /*[in]*/  REFIID riid,
-      /*[out]*/ void   **ppvSite
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE SetSite(
-      /*[in]*/ IUnknown *pUnkSite
+// IObjectWithSite
+
+    virtual STDMETHODIMP GetSite(
+        IN  REFIID riid,
+        OUT void   **ppvSite
+    );
+
+    virtual STDMETHODIMP SetSite(
+        IN IUnknown *pUnkSite
     );
  
-//IDeskBand
-
-    virtual HRESULT STDMETHODCALLTYPE GetWindow(
+// IDeskBand
+
+    virtual STDMETHODIMP GetWindow(
         OUT HWND *phwnd
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(
+    virtual STDMETHODIMP ContextSensitiveHelp(
         IN BOOL fEnterMode
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ShowDW(
+    virtual STDMETHODIMP ShowDW(
         IN BOOL bShow
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE CloseDW(
+    virtual STDMETHODIMP CloseDW(
         IN DWORD dwReserved
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(
+    virtual STDMETHODIMP ResizeBorderDW(
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
         BOOL fReserved
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE GetBandInfo(
+    virtual STDMETHODIMP GetBandInfo(
         IN DWORD dwBandID,
         IN DWORD dwViewMode,
         IN OUT DESKBANDINFO *pdbi
     );    
 
-//IDeskBar
-
-    virtual HRESULT STDMETHODCALLTYPE GetClient(
-      /*[out]*/ IUnknown **ppunkClient
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(
-      /*[in]*/ LPRECT prc
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE SetClient(
-      /*[in, optional]*/ IUnknown *punkClient
-    );
-
-//IPersistStream
-
-    virtual HRESULT STDMETHODCALLTYPE GetClassID(
-      /*[out]*/ OUT CLSID *pClassID
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE GetSizeMax(
-      /*[out]*/ ULARGE_INTEGER *pcbSize
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE IsDirty();
-
-    virtual HRESULT STDMETHODCALLTYPE Load(
-      /*[in]*/ IStream *pStm
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE Save(
-      /*[in]*/ IStream *pStm,
-      /*[in]*/ BOOL    fClearDirty
-    );
-
-//IWinEventHandler
-
-    virtual HRESULT STDMETHODCALLTYPE ProcessMessage(
+// IDeskBar
+
+    virtual STDMETHODIMP GetClient(
+        OUT IUnknown **ppunkClient
+    );
+
+    virtual STDMETHODIMP OnPosRectChangeDB(
+        IN LPRECT prc
+    );
+
+    virtual STDMETHODIMP SetClient(
+        IN OPTIONAL IUnknown *punkClient
+    );
+
+// IPersistStream
+
+    virtual STDMETHODIMP GetClassID(
+        OUT CLSID *pClassID
+    );
+
+    virtual STDMETHODIMP GetSizeMax(
+        OUT ULARGE_INTEGER *pcbSize
+    );
+
+    virtual STDMETHODIMP IsDirty();
+
+    virtual STDMETHODIMP Load(
+        IN IStream *pStm
+    );
+
+    virtual STDMETHODIMP Save(
+        IN IStream *pStm,
+        IN BOOL    fClearDirty
+    );
+
+// IWinEventHandler
+
+    virtual STDMETHODIMP ProcessMessage(
         IN HWND hWnd,
         IN UINT uMsg,
         IN WPARAM wParam,
@@ -131,11 +131,11 @@
         OUT LRESULT *plrResult
     );
 
-    virtual HRESULT STDMETHODCALLTYPE ContainsWindow(
+    virtual STDMETHODIMP ContainsWindow(
         IN HWND hWnd
     );
 
-    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(
+    virtual STDMETHODIMP OnWinEvent(
         HWND hWnd, 
         UINT uMsg, 
         WPARAM wParam, 
@@ -143,43 +143,43 @@
         LRESULT *theResult
     );
 
-    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(
+    virtual STDMETHODIMP IsWindowOwner(
         HWND hWnd
     );
 
-//IOleCommandTarget
-
-    virtual HRESULT STDMETHODCALLTYPE Exec(
-      /*[in]*/      const GUID    *pguidCmdGroup,
-      /*[in]*/            DWORD   nCmdID,
-      /*[in]*/            DWORD   nCmdexecopt,
-      /*[in]*/            VARIANT *pvaIn,
-      /*[in, out]*/       VARIANT *pvaOut
-    );
-
-    virtual HRESULT STDMETHODCALLTYPE QueryStatus(
-      /*[in]*/      const GUID       *pguidCmdGroup,
-      /*[in]*/            ULONG      cCmds,
-      /*[in, out]*/       OLECMD     prgCmds[],
-      /*[in, out]*/       OLECMDTEXT *pCmdText
-    );
-
-//IShellFolderBand
-    virtual HRESULT STDMETHODCALLTYPE GetBandInfoSFB( 
+// IOleCommandTarget
+
+    virtual STDMETHODIMP Exec(
+        IN const GUID *pguidCmdGroup,
+        IN DWORD nCmdID,
+        IN DWORD nCmdexecopt,
+        IN VARIANT *pvaIn,
+        IN OUT VARIANT *pvaOut
+    );
+
+    virtual STDMETHODIMP QueryStatus(
+        IN const GUID *pguidCmdGroup,
+        IN ULONG cCmds,
+        IN OUT OLECMD prgCmds[],
+        IN OUT OLECMDTEXT *pCmdText
+    );
+
+// IShellFolderBand
+    virtual STDMETHODIMP GetBandInfoSFB( 
         PBANDINFOSFB pbi
     );
 
-    virtual HRESULT STDMETHODCALLTYPE InitializeSFB(
+    virtual STDMETHODIMP InitializeSFB(
         IShellFolder      *psf,
         PCIDLIST_ABSOLUTE pidl
     );
 
-    virtual HRESULT STDMETHODCALLTYPE SetBandInfoSFB(
+    virtual STDMETHODIMP SetBandInfoSFB(
         PBANDINFOSFB pbi
     );
 
-//IContextMenu
-    virtual HRESULT STDMETHODCALLTYPE GetCommandString(
+// IContextMenu
+    virtual STDMETHODIMP GetCommandString(
         UINT_PTR idCmd,
         UINT uFlags,
         UINT *pwReserved,
@@ -187,11 +187,11 @@
         UINT cchMax
     );
 
-    virtual HRESULT STDMETHODCALLTYPE InvokeCommand(
+    virtual STDMETHODIMP InvokeCommand(
         LPCMINVOKECOMMANDINFO pici
     );
 
-    virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(
+    virtual STDMETHODIMP QueryContextMenu(
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
@@ -221,6 +221,6 @@
     END_COM_MAP()    
 };
 
-//C Constructor
+// C Constructor
 extern "C"
 HRESULT WINAPI CISFBand_CreateInstance(REFIID riid, void** ppv);

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt	[iso-8859-1]
Sat Jul  1 20:22:13 2017
@@ -14,11 +14,13 @@
 
 spec2def(qcklnch.dll qcklnch.spec)
 
-add_library(qcklnch SHARED    
-    qcklnch.cpp
-    qcklnch.rc    
+add_library(qcklnch SHARED   
+    qcklnch.rc
+    qcklnch.cpp    
     CQuickLaunchBand.cpp
-    CISFBand.cpp    
+    CISFBand.cpp
+    CQuickLaunchBand.h
+    CISFBand.h    
     ${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def)
 
 set_module_type(qcklnch win32dll UNICODE)

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
---
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp	[iso-8859-1]
(original)
+++
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp	[iso-8859-1]
Sat Jul  1 20:22:13 2017
@@ -13,7 +13,7 @@
 // {260CB95D-4544-44F6-A079-575BAA60B72F}
 static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0, 0x79,
0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } };
 
-//Componenet Category Registration
+// Componenet Category Registration
     HRESULT RegisterComCat()
     {
         CComPtr<ICatRegister> pcr;
@@ -38,7 +38,7 @@
         return hr;
     }
 
-//Pidl Browser
+// Pidl Browser
     LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL)
     {
         LPITEMIDLIST pidlRoot = NULL;
@@ -61,14 +61,14 @@
         return pidlSelected;
     }
 
-//CQuickLaunchBand
+// CQuickLaunchBand
 
     CQuickLaunchBand::CQuickLaunchBand() {}
 
     CQuickLaunchBand::~CQuickLaunchBand() {}
 
 /*****************************************************************************/
-//ATL Construct
+// ATL Construct
 
     HRESULT CQuickLaunchBand::FinalConstruct()
     {
@@ -90,12 +90,12 @@
         return hr;
     }
 
-//IObjectWithSite
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetSite(IUnknown *pUnkSite)
+// IObjectWithSite
+    STDMETHODIMP CQuickLaunchBand::SetSite(IUnknown *pUnkSite)
     { 
         TRACE("CQuickLaunchBand::SetSite(0x%p)\n", pUnkSite);
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IObjectWithSite> pIOWS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IObjectWithSite,
(void**)&pIOWS);
         if (FAILED(hr)) return hr; 
@@ -103,11 +103,11 @@
         return pIOWS->SetSite(pUnkSite);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID
**ppvSite)
+    STDMETHODIMP CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
     {        
         TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IObjectWithSite> pIOWS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IObjectWithSite,
(void**)&pIOWS);
         if (FAILED(hr)) return hr;
@@ -116,10 +116,10 @@
     }
 
 /*****************************************************************************/
-//IDeskBand
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetWindow(OUT HWND *phwnd)
-    {
-        //Internal CISFBand Calls
+// IDeskBand
+    STDMETHODIMP CQuickLaunchBand::GetWindow(OUT HWND *phwnd)
+    {
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -127,9 +127,9 @@
         return pIDB->GetWindow(phwnd);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode)
-    {
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode)
+    {
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -137,9 +137,9 @@
         return pIDB->ContextSensitiveHelp(fEnterMode);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ShowDW(IN BOOL bShow)
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::ShowDW(IN BOOL bShow)
+    {        
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -147,9 +147,9 @@
         return pIDB->ShowDW(bShow);       
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::CloseDW(IN DWORD dwReserved)
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::CloseDW(IN DWORD dwReserved)
+    {        
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -157,9 +157,9 @@
         return pIDB->CloseDW(dwReserved);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder,
IUnknown *punkToolbarSite, BOOL fReserved) 
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown
*punkToolbarSite, BOOL fReserved) 
+    {        
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -167,11 +167,11 @@
         return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD
dwViewMode, IN OUT DESKBANDINFO *pdbi)
+    STDMETHODIMP CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN
OUT DESKBANDINFO *pdbi)
     {        
         TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p)\n", dwBandID,
dwViewMode, pdbi);
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -180,12 +180,12 @@
     }    
 
  /*****************************************************************************/
- //IDeskBar   
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient(IN IUnknown *punkClient)
+ // IDeskBar   
+    STDMETHODIMP CQuickLaunchBand::SetClient(IN IUnknown *punkClient)
     {
         TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IDeskBar> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -193,11 +193,11 @@
         return pIDB->SetClient(punkClient);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient(OUT IUnknown **ppunkClient)
+    STDMETHODIMP CQuickLaunchBand::GetClient(OUT IUnknown **ppunkClient)
     {
         TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IDeskBar> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -205,11 +205,11 @@
         return pIDB->GetClient(ppunkClient);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::OnPosRectChangeDB(IN RECT *prc)
+    STDMETHODIMP CQuickLaunchBand::OnPosRectChangeDB(IN RECT *prc)
     {
         TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc,
prc->left, prc->top, prc->right, prc->bottom);      
 
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IDeskBar> pIDB;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB);
         if (FAILED(hr)) return hr;
@@ -218,12 +218,12 @@
     }
 
 /*****************************************************************************/
-//IPersistStream
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClassID(OUT CLSID *pClassID)
+// IPersistStream
+    STDMETHODIMP CQuickLaunchBand::GetClassID(OUT CLSID *pClassID)
     {        
         TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID);
         
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream,
(void**)&pIPS);
         if (FAILED(hr)) return hr;
@@ -231,9 +231,9 @@
         return pIPS->GetClassID(pClassID);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::IsDirty()
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::IsDirty()
+    {        
+        // Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream,
(void**)&pIPS);
         if (FAILED(hr)) return hr;
@@ -241,11 +241,11 @@
         return pIPS->IsDirty();
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load(IN IStream *pStm)
+    STDMETHODIMP CQuickLaunchBand::Load(IN IStream *pStm)
     {
         TRACE("CQuickLaunchBand::Load called\n");
         
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream,
(void**)&pIPS);
         if (FAILED(hr)) return hr;
@@ -253,9 +253,9 @@
         return pIPS->Load(pStm);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL
fClearDirty)
+    STDMETHODIMP CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
     {       
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream,
(void**)&pIPS);
         if (FAILED(hr)) return hr;
@@ -263,11 +263,11 @@
         return pIPS->Save(pStm, fClearDirty);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
+    STDMETHODIMP CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
     {
         TRACE("CQuickLaunchBand::GetSizeMax called\n");        
        
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream,
(void**)&pIPS);
         if (FAILED(hr)) return hr;
@@ -277,22 +277,22 @@
     
 
 /*****************************************************************************/
-//IWinEventHandler
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ProcessMessage(IN HWND hWnd, IN UINT
uMsg, IN WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult)
+// IWinEventHandler
+    STDMETHODIMP CQuickLaunchBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM
wParam, IN LPARAM lParam, OUT LRESULT *plrResult)
     {
         TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p,
0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult);
                 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContainsWindow(IN HWND hWnd)
+    STDMETHODIMP CQuickLaunchBand::ContainsWindow(IN HWND hWnd)
     {
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM
wParam, LPARAM lParam, LRESULT *theResult)
+    STDMETHODIMP CQuickLaunchBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
lParam, LRESULT *theResult)
     {         
-         //Internal CISFBand Calls
+         // Internal CISFBand Calls
          CComPtr<IWinEventHandler> pWEH;
          HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler,
(void**)&pWEH);
          if (FAILED(hr)) return hr;
@@ -300,9 +300,9 @@
          return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::IsWindowOwner(HWND hWnd)
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::IsWindowOwner(HWND hWnd)
+    {        
+        // Internal CISFBand Calls
         CComPtr<IWinEventHandler> pWEH;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler,
(void**)&pWEH);
         if (FAILED(hr)) return hr;
@@ -312,9 +312,9 @@
     
 /*****************************************************************************/
 // *** IOleCommandTarget methods ***
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup,
ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText)
-    {        
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds,
OLECMD prgCmds [], OLECMDTEXT *pCmdText)
+    {        
+        // Internal CISFBand Calls
         CComPtr<IOleCommandTarget> pOCT;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget,
(void**)&pOCT);
         if (FAILED(hr)) return hr;
@@ -322,9 +322,9 @@
         return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD
nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
+    STDMETHODIMP CQuickLaunchBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD
nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
     {       
-        //Internal CISFBand Calls
+        // Internal CISFBand Calls
         CComPtr<IOleCommandTarget> pOCT;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget,
(void**)&pOCT);
         if (FAILED(hr)) return hr;
@@ -334,9 +334,9 @@
 
 /*****************************************************************************/
 // *** IContextMenu ***
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT
uFlags, UINT *pwReserved, LPSTR pszName, UINT cchMax)
-    {
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::GetCommandString(UINT_PTR idCmd, UINT uFlags, UINT
*pwReserved, LPSTR pszName, UINT cchMax)
+    {
+        // Internal CISFBand Calls
         CComPtr<IContextMenu> pICM;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM);
         if (FAILED(hr)) return hr;
@@ -344,9 +344,9 @@
         return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO
pici)
-    {
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
+    {
+        // Internal CISFBand Calls
         CComPtr<IContextMenu> pICM;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM);
         if (FAILED(hr)) return hr;
@@ -354,9 +354,9 @@
         return pICM->InvokeCommand(pici);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT
indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
-    {
-        //Internal CISFBand Calls
+    STDMETHODIMP CQuickLaunchBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT
idCmdFirst, UINT idCmdLast, UINT uFlags)
+    {
+        // Internal CISFBand Calls
         CComPtr<IContextMenu> pICM;
         HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM);
         if (FAILED(hr)) return hr;

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
---
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h	[iso-8859-1]
(original)
+++
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h	[iso-8859-1]
Sat Jul  1 20:22:13 2017
@@ -9,11 +9,11 @@
 
 extern const GUID CLSID_QuickLaunchBand;
 
-//Component category registration
+// Component category registration
 HRESULT RegisterComCat();
 HRESULT UnregisterComCat();
 
-//COM class for quick launch
+// COM class for quick launch
 class CQuickLaunchBand :
     public CComCoClass<CQuickLaunchBand, &CLSID_QuickLaunchBand>,
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
@@ -33,89 +33,89 @@
     CQuickLaunchBand();
     virtual ~CQuickLaunchBand();
 
-//ATL construct
+// ATL construct
 
     HRESULT FinalConstruct();
 
-//IObjectWithSite
+// IObjectWithSite
 
-    virtual HRESULT STDMETHODCALLTYPE GetSite(
-      /*[in]*/  REFIID riid,
-      /*[out]*/ void   **ppvSite
+    virtual STDMETHODIMP GetSite(
+        IN  REFIID riid,
+        OUT void   **ppvSite
     );
 
-    virtual HRESULT STDMETHODCALLTYPE SetSite(
-      /*[in]*/ IUnknown *pUnkSite
+    virtual STDMETHODIMP SetSite(
+        IN IUnknown *pUnkSite
     );
  
-//IDeskBand
+// IDeskBand
 
-    virtual HRESULT STDMETHODCALLTYPE GetWindow(
+    virtual STDMETHODIMP GetWindow(
         OUT HWND *phwnd
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(
+    virtual STDMETHODIMP ContextSensitiveHelp(
         IN BOOL fEnterMode
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ShowDW(
+    virtual STDMETHODIMP ShowDW(
         IN BOOL bShow
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE CloseDW(
+    virtual STDMETHODIMP CloseDW(
         IN DWORD dwReserved
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(
+    virtual STDMETHODIMP ResizeBorderDW(
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
         BOOL fReserved
     );    
 
-    virtual HRESULT STDMETHODCALLTYPE GetBandInfo(
+    virtual STDMETHODIMP GetBandInfo(
         IN DWORD dwBandID,
         IN DWORD dwViewMode,
         IN OUT DESKBANDINFO *pdbi
     );    
 
-//IDeskBar
+// IDeskBar
 
-    virtual HRESULT STDMETHODCALLTYPE GetClient(
-      /*[out]*/ IUnknown **ppunkClient
+    virtual STDMETHODIMP GetClient(
+        OUT IUnknown **ppunkClient
     );
 
-    virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(
-      /*[in]*/ LPRECT prc
+    virtual STDMETHODIMP OnPosRectChangeDB(
+        IN LPRECT prc
     );
 
-    virtual HRESULT STDMETHODCALLTYPE SetClient(
-      /*[in, optional]*/ IUnknown *punkClient
+    virtual STDMETHODIMP SetClient(
+        IN OPTIONAL IUnknown *punkClient
     );
 
-//IPersistStream
+// IPersistStream
 
-    virtual HRESULT STDMETHODCALLTYPE GetClassID(
-      /*[out]*/ OUT CLSID *pClassID
+    virtual STDMETHODIMP GetClassID(
+        OUT CLSID *pClassID
     );
 
-    virtual HRESULT STDMETHODCALLTYPE GetSizeMax(
-      /*[out]*/ ULARGE_INTEGER *pcbSize
+    virtual STDMETHODIMP GetSizeMax(
+        OUT ULARGE_INTEGER *pcbSize
     );
 
-    virtual HRESULT STDMETHODCALLTYPE IsDirty();
+    virtual STDMETHODIMP IsDirty();
 
-    virtual HRESULT STDMETHODCALLTYPE Load(
-      /*[in]*/ IStream *pStm
+    virtual STDMETHODIMP Load(
+        IN IStream *pStm
     );
 
-    virtual HRESULT STDMETHODCALLTYPE Save(
-      /*[in]*/ IStream *pStm,
-      /*[in]*/ BOOL    fClearDirty
+    virtual STDMETHODIMP Save(
+        IN IStream *pStm,
+        IN BOOL    fClearDirty
     );
 
-//IWinEventHandler
+// IWinEventHandler
 
-    virtual HRESULT STDMETHODCALLTYPE ProcessMessage(
+    virtual STDMETHODIMP ProcessMessage(
         IN HWND hWnd,
         IN UINT uMsg,
         IN WPARAM wParam,
@@ -123,11 +123,11 @@
         OUT LRESULT *plrResult
     );
 
-    virtual HRESULT STDMETHODCALLTYPE ContainsWindow(
+    virtual STDMETHODIMP ContainsWindow(
         IN HWND hWnd
     );
 
-    virtual HRESULT STDMETHODCALLTYPE OnWinEvent(
+    virtual STDMETHODIMP OnWinEvent(
         HWND hWnd, 
         UINT uMsg, 
         WPARAM wParam, 
@@ -135,29 +135,29 @@
         LRESULT *theResult
     );
 
-    virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(
+    virtual STDMETHODIMP IsWindowOwner(
         HWND hWnd
     );
 
-//IOleCommandTarget
+// IOleCommandTarget
 
-    virtual HRESULT STDMETHODCALLTYPE Exec(
-      /*[in]*/      const GUID    *pguidCmdGroup,
-      /*[in]*/            DWORD   nCmdID,
-      /*[in]*/            DWORD   nCmdexecopt,
-      /*[in]*/            VARIANT *pvaIn,
-      /*[in, out]*/       VARIANT *pvaOut
+    virtual STDMETHODIMP Exec(
+        IN const GUID *pguidCmdGroup,
+        IN DWORD nCmdID,
+        IN DWORD nCmdexecopt,
+        IN VARIANT *pvaIn,
+        IN OUT VARIANT *pvaOut
     );
 
-    virtual HRESULT STDMETHODCALLTYPE QueryStatus(
-      /*[in]*/      const GUID       *pguidCmdGroup,
-      /*[in]*/            ULONG      cCmds,
-      /*[in, out]*/       OLECMD     prgCmds[],
-      /*[in, out]*/       OLECMDTEXT *pCmdText
+    virtual STDMETHODIMP QueryStatus(
+        IN const GUID *pguidCmdGroup,
+        IN ULONG cCmds,
+        IN OUT OLECMD prgCmds[],
+        IN OUT OLECMDTEXT *pCmdText
     );
 
-//IContextMenu
-    virtual HRESULT STDMETHODCALLTYPE GetCommandString(
+// IContextMenu
+    virtual STDMETHODIMP GetCommandString(
         UINT_PTR idCmd,
         UINT uFlags,
         UINT *pwReserved,
@@ -165,11 +165,11 @@
         UINT cchMax
     );
 
-    virtual HRESULT STDMETHODCALLTYPE InvokeCommand(
+    virtual STDMETHODIMP InvokeCommand(
         LPCMINVOKECOMMANDINFO pici
     );
 
-    virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(
+    virtual STDMETHODIMP QueryContextMenu(
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp	[iso-8859-1] Sat
Jul  1 20:22:13 2017
@@ -18,11 +18,6 @@
 
 HINSTANCE  g_hInstance;
 CComModule g_Module;
-
-void *operator new (size_t, void *buf)
-{
-    return buf;
-}
 
 STDAPI_(BOOL)
 DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
@@ -46,22 +41,20 @@
 DllRegisterServer(void)
 {
     HRESULT hr = g_Module.DllRegisterServer(FALSE);
-
     if (FAILED(hr)) 
         return hr;
-    else
-        return RegisterComCat();
+    
+    return RegisterComCat();
 }
 
 STDAPI
 DllUnregisterServer(void)
 {
     HRESULT hr = UnregisterComCat();
-
     if (FAILED(hr))
         return hr;
-    else
-        return g_Module.DllUnregisterServer(FALSE);
+    
+    return g_Module.DllUnregisterServer(FALSE);
 }
 
 STDAPI

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc	[iso-8859-1] Sat
Jul  1 20:22:13 2017
@@ -7,7 +7,7 @@
 
 IDR_QCKLNCH REGISTRY "rgs/qcklnch.rgs"
 
-IDR_POPUPMENU MENUEX DISCARDABLE
+IDM_POPUPMENU MENUEX DISCARDABLE
 BEGIN
     POPUP ""
     BEGIN      

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/resource.h	[iso-8859-1] Sat
Jul  1 20:22:13 2017
@@ -1,8 +1,8 @@
 #pragma once
 
-#define IDR_QCKLNCH 1001
-#define IDR_POPUPMENU 2000
+#define IDR_QCKLNCH     1001
+#define IDM_POPUPMENU   2000
 #define IDM_LARGE_ICONS 1
 #define IDM_SMALL_ICONS 2
-#define IDM_SHOW_TEXT 3
-#define IDM_VIEW_MENU 4
+#define IDM_SHOW_TEXT   3
+#define IDM_VIEW_MENU   4

Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/…
==============================================================================
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs	[iso-8859-1]
(original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs	[iso-8859-1]
Sat Jul  1 20:22:13 2017
@@ -1,13 +1,13 @@
 HKCR
 {
-	NoRemove CLSID
+    NoRemove CLSID
 	{
-		ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'Quick Launch'
-		{
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Apartment'
-			}
-		}
-	}
+        ForceRemove {260CB95D-4544-44F6-A079-575BAA60B72F} = s 'Quick Launch'
+        {
+            InprocServer32 = s '%MODULE%'
+            {
+                val ThreadingModel = s 'Apartment'
+            }
+        }
+    }
 }