[QCKLNCH]

-Implemented IContextMenu::InvokeCommand()
-Modified IContextMenu::QueryContextMenu() to support CheckMenuItem()
-Minor code cleanup
-Now Quick Launch Supports the 'show text' and 'view' options.
-Tested on xpvm and ros explorer locally on win10, but needs some thorough testing

svn path=/branches/GSoC_2017/shellext/; revision=75257

reactos/dll/shellext/qcklnch/CISFBand.cpp

@@ -18,9 +18,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch);
 //*****************************************************************************************
 // *** CISFBand *** 
 
-CISFBand::CISFBand() : m_hWndTb(NULL), m_BandID(0), m_pidl(NULL) {}
+CISFBand::CISFBand() :
+    m_BandID(0),
+    m_hWndTb(NULL),
+    m_hInstance(NULL),
+    m_pidl(NULL),
+    m_textFlag(true),
+    m_iconFlag(true)
+{
+}
 
-CISFBand::~CISFBand() {}
+CISFBand::~CISFBand() 
+{
+}
 
 // *** CWindowImpl ***
 //Subclassing 
@@ -36,7 +46,8 @@ LRESULT CISFBand::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
 
     int index = SendMessage(m_hWndTb, TB_HITTEST, 0, (LPARAM)&pt);
     bool chk = SendMessage(m_hWndTb, TB_GETBUTTON, abs(index), (LPARAM)&tb);    
-    if(chk) SHInvokeDefaultCommand(m_hWndTb, m_pISF, (LPITEMIDLIST)tb.dwData);    
+    if(chk) 
+        SHInvokeDefaultCommand(m_hWndTb, m_pISF, (LPITEMIDLIST)tb.dwData);    
 
     return 0;
 }
@@ -105,7 +116,8 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
     // Set the image list.
     HIMAGELIST* piml;
     HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); 
-    if (FAILED_UNEXPECTEDLY(hr)) return NULL;
+    if (FAILED_UNEXPECTEDLY(hr)) 
+        return NULL;
     SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)piml);    
 
     //Enumerate objects
@@ -114,7 +126,8 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
     STRRET stret;  
     ULONG count = 0;
     hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pedl);
-    if (FAILED_UNEXPECTEDLY(hr)) return NULL;
+    if (FAILED_UNEXPECTEDLY(hr)) 
+        return NULL;
 
     for (int i=0; pedl->Next(1, &pidl, 0) != S_FALSE; i++, count++)
     {
@@ -154,14 +167,13 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         
         m_hWndTb = CreateSimpleToolbar(hwndParent, m_hInstance);        
         hr = SubclassWindow(m_hWndTb);
-        if (FAILED_UNEXPECTEDLY(hr)) return hr;
+        if (FAILED_UNEXPECTEDLY(hr)) 
+            return hr;
 
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetSite(
+    HRESULT STDMETHODCALLTYPE CISFBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
-        IN REFIID riid,
-        OUT VOID **ppvSite)
     {        
         TRACE("CISFBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
 
@@ -189,15 +201,13 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ContextSensitiveHelp(
+    HRESULT STDMETHODCALLTYPE CISFBand::ContextSensitiveHelp(IN BOOL fEnterMode)
-        IN BOOL fEnterMode)
     {
         /* FIXME: Implement */        
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ShowDW(
+    HRESULT STDMETHODCALLTYPE CISFBand::ShowDW(IN BOOL bShow)
-        IN BOOL bShow)
     {        
         if (m_hWndTb)
         {
@@ -207,8 +217,7 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         return S_OK;       
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::CloseDW(
+    HRESULT STDMETHODCALLTYPE CISFBand::CloseDW(IN DWORD dwReserved)
-        IN DWORD dwReserved)
     {        
         if (m_hWndTb)
         {
@@ -220,20 +229,14 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::ResizeBorderDW(
+    HRESULT STDMETHODCALLTYPE CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) 
-        LPCRECT prcBorder,
-        IUnknown *punkToolbarSite,
-        BOOL fReserved) 
     {
         /* No need to implement this method */
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetBandInfo(  //Need a check
+    HRESULT STDMETHODCALLTYPE CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi)
-        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);
                 
@@ -295,24 +298,21 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 
  /*****************************************************************************/
  // *** IDeskBar ***    
-    HRESULT STDMETHODCALLTYPE CISFBand::SetClient(
+    HRESULT STDMETHODCALLTYPE CISFBand::SetClient(IN IUnknown *punkClient)
-        IN IUnknown *punkClient)
     {
         TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetClient(
+    HRESULT STDMETHODCALLTYPE CISFBand::GetClient(OUT IUnknown **ppunkClient)
-        OUT IUnknown **ppunkClient)
     {
         TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);
 
         return E_NOTIMPL;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::OnPosRectChangeDB(
+    HRESULT STDMETHODCALLTYPE CISFBand::OnPosRectChangeDB(IN RECT *prc)
-        IN RECT *prc)
     {
         TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom);      
 
@@ -321,8 +321,7 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 
 /*****************************************************************************/
 // *** IPersistStream *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetClassID(
+    HRESULT STDMETHODCALLTYPE CISFBand::GetClassID(OUT CLSID *pClassID)
-        OUT CLSID *pClassID)
     {        
         TRACE("CISFBand::GetClassID(0x%p)\n", pClassID);
         /* We're going to return the (internal!) CLSID of the quick launch band */
@@ -338,8 +337,7 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         return S_FALSE;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::Load(
+    HRESULT STDMETHODCALLTYPE CISFBand::Load(IN IStream *pStm)
-        IN IStream *pStm)
     {
         TRACE("CISFBand::Load called\n");
         /* Nothing to do */
@@ -347,17 +345,14 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::Save(
+    HRESULT STDMETHODCALLTYPE CISFBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
-        IN IStream *pStm,
-        IN BOOL fClearDirty)
     {
         /* Nothing to do */
 
         return S_OK;
     }
 
-    HRESULT STDMETHODCALLTYPE CISFBand::GetSizeMax(
+    HRESULT STDMETHODCALLTYPE CISFBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
-        OUT ULARGE_INTEGER *pcbSize)
     {
         TRACE("CISFBand::GetSizeMax called\n");         
 
@@ -366,23 +361,16 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 
 /*****************************************************************************/
 // *** IWinEventHandler *** 
-    HRESULT STDMETHODCALLTYPE CISFBand::ProcessMessage(
+    HRESULT STDMETHODCALLTYPE CISFBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult)
-        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(
+    HRESULT STDMETHODCALLTYPE CISFBand::ContainsWindow(IN HWND hWnd)
-        IN HWND hWnd)
     {        
-        if (hWnd == m_hWndTb ||
+        if (hWnd == m_hWndTb || ::IsChild(m_hWndTb, hWnd))
-            ::IsChild(m_hWndTb, hWnd))
         {
             TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd);
             return S_OK;
@@ -495,66 +483,54 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 
     HRESULT STDMETHODCALLTYPE CISFBand::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
     { 
-       /* BOOL fEx = FALSE;
-        BOOL fUnicode = FALSE;        
-
-        if (pici->cbSize == sizeof(CMINVOKECOMMANDINFOEX))
-        {
-            fEx = TRUE;
-            if ((pici->fMask & CMIC_MASK_UNICODE))
-            {
-                fUnicode = TRUE;
-            }
-        }
-
-        if (!fUnicode && HIWORD(pici->lpVerb))
-        {
-            if (StrCmpIA(pici->lpVerb, m_pszVerb))
-            {
-                return E_FAIL;
-            }
-        }
-
-        else if (fUnicode && HIWORD(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW))
-        {
-            if (StrCmpIW(((CMINVOKECOMMANDINFOEX *)pici)->lpVerbW, m_pwszVerb))
-            {
-                return E_FAIL;
-            }
-        }
-
-        else if (LOWORD(pici->lpVerb) != IDM_DISPLAY)
-        {
-            return E_FAIL;
-        }
-
-        else
-        {
-            ::MessageBox(pici->hwnd,
-                L"The File Name",
-                L"File Name",
-                MB_OK | MB_ICONINFORMATION);
-        }*/
-
         if (!HIWORD(pici->lpVerb))
         {
-            switch (LOWORD(pici->lpVerb) /*- m_idCmdFirst*/)
+            switch (LOWORD(pici->lpVerb))
             {
                 case IDM_LARGE_ICONS:
                 {                    
-                    ::MessageBox(0, L"IDM_LARGE_ICONS", L"Test", MB_OK | MB_ICONINFORMATION);
+                    m_iconFlag = false;
+
+                    HIMAGELIST* piml = (HIMAGELIST*) SendMessage(m_hWndTb, TB_GETIMAGELIST, 0, 0);
+                    HRESULT hr = SHGetImageList(SHIL_LARGE, IID_IImageList, (void**)&piml);
+                    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+                    SendMessage(m_hWndTb, TB_SETIMAGELIST, 0, (LPARAM)piml);
+                    hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
+                    if (FAILED_UNEXPECTEDLY(hr)) return hr;
                     break;
                 }
                 case IDM_SMALL_ICONS:
                 {                    
-                    ::MessageBox(0, L"IDM_SMALL_ICONS", L"Test", MB_OK | MB_ICONINFORMATION);
+                    m_iconFlag = true;
+
+                    HIMAGELIST* piml = (HIMAGELIST*)SendMessage(m_hWndTb, TB_GETIMAGELIST, 0, 0);
+                    HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml);
+                    if (FAILED_UNEXPECTEDLY(hr)) return hr;
+                    SendMessage(m_hWndTb, TB_SETIMAGELIST, 0, (LPARAM)piml);
+                    hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
+                    if (FAILED_UNEXPECTEDLY(hr)) return hr;
                     break;
                 }
                 case IDM_SHOW_TEXT:
                 {                    
-                    ::MessageBox(0, L"IDM_SHOW_TEXT", L"Test", MB_OK | MB_ICONINFORMATION);
+                    if (m_textFlag)
+                    {                        
+                        m_textFlag = false;
+                        SendMessage(m_hWndTb, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS);    
+                        HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
+                        if (FAILED_UNEXPECTEDLY(hr)) return hr;
+                    }
+                    else
+                    {                        
+                        m_textFlag = true; 
+                        SendMessage(m_hWndTb, TB_SETEXTENDEDSTYLE, 0, 0);
+                        HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
+                        if (FAILED_UNEXPECTEDLY(hr)) return hr;
+                    }
                     break;
                 }
+                default:
+                    return E_FAIL;
             }
         }
 
@@ -563,10 +539,24 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
 
     HRESULT STDMETHODCALLTYPE CISFBand::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
     {        
-        m_idCmdFirst = idCmdFirst;
+        HMENU qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDR_POPUPMENU));
-        m_qMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDR_POPUPMENU));
+        UINT idMax = Shell_MergeMenus(hmenu, GetSubMenu(qMenu, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS);
-        m_qMenu = GetSubMenu(m_qMenu, 0);
+        
-        UINT idMax = Shell_MergeMenus(hmenu, m_qMenu, indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS);
+        if(m_textFlag) 
+            CheckMenuItem(hmenu, IDM_SHOW_TEXT, MF_CHECKED);
+        else 
+            CheckMenuItem(hmenu, IDM_SHOW_TEXT, MF_UNCHECKED);
+
+        if (m_iconFlag)
+        {
+            CheckMenuItem(hmenu, IDM_SMALL_ICONS, MF_CHECKED);
+            CheckMenuItem(hmenu, IDM_LARGE_ICONS, MF_UNCHECKED);
+        }
+        else
+        {
+            CheckMenuItem(hmenu, IDM_LARGE_ICONS, MF_CHECKED);
+            CheckMenuItem(hmenu, IDM_SMALL_ICONS, MF_UNCHECKED);
+        }
 
         return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(idMax - idCmdFirst +1));         
     }

reactos/dll/shellext/qcklnch/CISFBand.h

@@ -32,8 +32,8 @@ class CISFBand :
     PCIDLIST_ABSOLUTE m_pidl;    
 
     //Menu      
-    HMENU m_qMenu;
+    BOOL m_textFlag;
-    UINT m_idCmdFirst;
+    BOOL m_iconFlag;
     
 public:
 

reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp

@@ -103,9 +103,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIOWS->SetSite(pUnkSite);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSite(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSite(IN REFIID riid, OUT VOID **ppvSite)
-        IN REFIID riid,
-        OUT VOID **ppvSite)
     {        
         TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
 
@@ -129,8 +127,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->GetWindow(phwnd);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContextSensitiveHelp(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContextSensitiveHelp(IN BOOL fEnterMode)
-        IN BOOL fEnterMode)
     {
         //Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
@@ -140,8 +137,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->ContextSensitiveHelp(fEnterMode);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ShowDW(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ShowDW(IN BOOL bShow)
-        IN BOOL bShow)
     {        
         //Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
@@ -151,8 +147,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->ShowDW(bShow);       
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::CloseDW(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::CloseDW(IN DWORD dwReserved)
-        IN DWORD dwReserved)
     {        
         //Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
@@ -162,10 +157,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->CloseDW(dwReserved);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ResizeBorderDW(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) 
-        LPCRECT prcBorder,
-        IUnknown *punkToolbarSite,
-        BOOL fReserved) 
     {        
         //Internal CISFBand Calls
         CComPtr<IDeskBand> pIDB;
@@ -175,10 +167,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetBandInfo(  //Need a check
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi)
-        IN DWORD dwBandID,
-        IN DWORD dwViewMode,
-        IN OUT DESKBANDINFO *pdbi)
     {        
         TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p)\n", dwBandID, dwViewMode, pdbi);
 
@@ -192,8 +181,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
 
  /*****************************************************************************/
  //IDeskBar   
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient(IN IUnknown *punkClient)
-        IN IUnknown *punkClient)
     {
         TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);
 
@@ -205,8 +193,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->SetClient(punkClient);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient(OUT IUnknown **ppunkClient)
-        OUT IUnknown **ppunkClient)
     {
         TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);
 
@@ -218,8 +205,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIDB->GetClient(ppunkClient);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::OnPosRectChangeDB(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::OnPosRectChangeDB(IN RECT *prc)
-        IN RECT *prc)
     {
         TRACE("IDeskBar::OnPosRectChangeDB(0x%p=(%d,%d,%d,%d))\n", prc, prc->left, prc->top, prc->right, prc->bottom);      
 
@@ -233,8 +219,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
 
 /*****************************************************************************/
 //IPersistStream
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClassID(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClassID(OUT CLSID *pClassID)
-        OUT CLSID *pClassID)
     {        
         TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID);
         
@@ -256,8 +241,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIPS->IsDirty();
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load(IN IStream *pStm)
-        IN IStream *pStm)
     {
         TRACE("CQuickLaunchBand::Load called\n");
         
@@ -269,9 +253,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIPS->Load(pStm);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Save(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Save(IN IStream *pStm, IN BOOL fClearDirty)
-        IN IStream *pStm,
-        IN BOOL fClearDirty)
     {       
         //Internal CISFBand Calls
         CComPtr<IPersistStream> pIPS;
@@ -281,8 +263,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
         return pIPS->Save(pStm, fClearDirty);
     }
 
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSizeMax(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSizeMax(OUT ULARGE_INTEGER *pcbSize)
-        OUT ULARGE_INTEGER *pcbSize)
     {
         TRACE("CQuickLaunchBand::GetSizeMax called\n");        
        
@@ -297,20 +278,14 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
 
 /*****************************************************************************/
 //IWinEventHandler
-    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ProcessMessage(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ProcessMessage(IN HWND hWnd, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam, OUT LRESULT *plrResult)
-        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(
+    HRESULT STDMETHODCALLTYPE CQuickLaunchBand::ContainsWindow(IN HWND hWnd)
-        IN HWND hWnd)
     {
         return E_NOTIMPL;
     }