[ros-diffs] 02/03: [BROWSEUI] CBandSite: Implement SetBandSiteInfo and GetBandSiteInfo Only BSIS_LOCKED, BSIS_NOGRIPPER, BSIS_ALWAYSGRIPPER and BSIS_NOCAPTION supported so far.

[Giannis Adamopoulos]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d4a091b4a3781d82bd05…

commit 6d4a091b4a3781d82bd05334c7a5e30991ea1e1c
Author:     Giannis Adamopoulos <gadamopoulos(a)reactos.org>
AuthorDate: Wed Feb 28 17:16:46 2018 +0200
Commit:     Giannis Adamopoulos <gadamopoulos(a)reactos.org>
CommitDate: Wed Feb 28 17:20:46 2018 +0200

    [BROWSEUI] CBandSite: Implement SetBandSiteInfo and GetBandSiteInfo
    Only BSIS_LOCKED, BSIS_NOGRIPPER, BSIS_ALWAYSGRIPPER and BSIS_NOCAPTION supported so
far.
---
 dll/win32/browseui/shellbars/CBandSite.cpp | 187 ++++++++++++++++-------------
 dll/win32/browseui/shellbars/CBandSite.h   |   2 +
 2 files changed, 104 insertions(+), 85 deletions(-)

diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp
b/dll/win32/browseui/shellbars/CBandSite.cpp
index e807c5d163..13f78a2b94 100644
--- a/dll/win32/browseui/shellbars/CBandSite.cpp
+++ b/dll/win32/browseui/shellbars/CBandSite.cpp
@@ -40,7 +40,9 @@ CBandSiteBase::CBandSiteBase():
     m_cBands(0),
     m_cBandsAllocated(0),
     m_bands(NULL),
-    m_hwndRebar(NULL)
+    m_hwndRebar(NULL),
+    m_dwState(0),
+    m_dwStyle(0)
 {
 }
 
@@ -146,13 +148,13 @@ VOID CBandSiteBase::_BuildBandInfo(struct BandObject *Band,
REBARBANDINFOW *prbi
             prbi->fStyle |= RBBS_BREAK;
         if (Band->dbi.dwModeFlags & DBIMF_TOPALIGN)
             prbi->fStyle |= RBBS_TOPALIGN;
-        if (Band->dbi.dwModeFlags & DBIMF_NOGRIPPER)
+        if ((Band->dbi.dwModeFlags & DBIMF_NOGRIPPER) || (m_dwStyle &
BSIS_NOGRIPPER))
             prbi->fStyle |= RBBS_NOGRIPPER;
-        if (Band->dbi.dwModeFlags & DBIMF_ALWAYSGRIPPER)
+        if ((Band->dbi.dwModeFlags & DBIMF_ALWAYSGRIPPER) || (m_dwStyle &
BSIS_ALWAYSGRIPPER))
             prbi->fStyle |= RBBS_GRIPPERALWAYS;
     }
 
-    if (Band->bHiddenTitle)
+    if (Band->bHiddenTitle  || (m_dwStyle & BSIS_NOCAPTION))
     {
         prbi->fMask |= RBBIM_STYLE;
         prbi->fStyle |= RBBS_HIDETITLE;
@@ -295,27 +297,30 @@ HRESULT CBandSiteBase::_OnContextMenu(HWND hWnd, UINT uMsg, WPARAM
wParam, LPARA
         }
     }
 
-    /* Load the static part of the menu */
-    HMENU hMenuStatic = LoadMenuW(GetModuleHandleW(L"browseui.dll"),
MAKEINTRESOURCEW(IDM_BAND_MENU));
-
-    if (hMenuStatic)
+    if (!(m_dwStyle & BSIS_LOCKED))
     {
-        Shell_MergeMenus(hMenu, hMenuStatic, UINT_MAX, 0, UINT_MAX, MM_DONTREMOVESEPS |
MM_SUBMENUSHAVEIDS);
+        /* Load the static part of the menu */
+        HMENU hMenuStatic = LoadMenuW(GetModuleHandleW(L"browseui.dll"),
MAKEINTRESOURCEW(IDM_BAND_MENU));
 
-        ::DestroyMenu(hMenuStatic);
+        if (hMenuStatic)
+        {
+            Shell_MergeMenus(hMenu, hMenuStatic, UINT_MAX, 0, UINT_MAX, MM_DONTREMOVESEPS
| MM_SUBMENUSHAVEIDS);
 
-        hr = _IsBandDeletable(dwBandID);
-        if (FAILED_UNEXPECTEDLY(hr))
-            return hr;
+            ::DestroyMenu(hMenuStatic);
 
-        /* Remove the close item if it is not deletable */
-        if (hr == S_FALSE || (Band->dbi.dwModeFlags & DBIMF_UNDELETEABLE) != 0)
-            DeleteMenu(hMenu, IDM_BAND_CLOSE, MF_BYCOMMAND);
+            hr = _IsBandDeletable(dwBandID);
+            if (FAILED_UNEXPECTEDLY(hr))
+                return hr;
 
-        if ((Band->dbi.dwMask & DBIM_TITLE) == 0)
-            DeleteMenu(hMenu, IDM_BAND_TITLE, MF_BYCOMMAND);
-        else
-            CheckMenuItem(hMenu, IDM_BAND_TITLE, Band->bHiddenTitle ? MF_UNCHECKED :
MF_CHECKED);
+            /* Remove the close item if it is not deletable */
+            if (hr == S_FALSE || (Band->dbi.dwModeFlags & DBIMF_UNDELETEABLE) !=
0)
+                DeleteMenu(hMenu, IDM_BAND_CLOSE, MF_BYCOMMAND);
+
+            if ((Band->dbi.dwMask & DBIM_TITLE) == 0)
+                DeleteMenu(hMenu, IDM_BAND_TITLE, MF_BYCOMMAND);
+            else
+                CheckMenuItem(hMenu, IDM_BAND_TITLE, Band->bHiddenTitle ? MF_UNCHECKED
: MF_CHECKED);
+        }
     }
 
     /* TODO: Query the menu of our site */
@@ -412,19 +417,21 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk)
         return E_FAIL;
 
     hRet = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &DeskBand));
-    if (!SUCCEEDED(hRet) || DeskBand == NULL)
-        goto Cleanup;
+    if (FAILED_UNEXPECTEDLY(hRet))
+        return hRet;
+
     hRet = punk->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ObjWithSite));
-    if (!SUCCEEDED(hRet) || ObjWithSite == NULL)
-        goto Cleanup;
+    if (FAILED_UNEXPECTEDLY(hRet))
+        return hRet;
+
     hRet = punk->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow));
-    if (!SUCCEEDED(hRet) || OleWindow == NULL)
-        goto Cleanup;
+    if (FAILED_UNEXPECTEDLY(hRet))
+        return hRet;
+
     hRet = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &WndEvtHandler));
-    if (!SUCCEEDED(hRet) || WndEvtHandler == NULL)
-        goto Cleanup;
+    if (FAILED_UNEXPECTEDLY(hRet))
+        return hRet;
 
-    hRet = S_OK;
     if (m_cBandsAllocated > m_cBands)
     {
         /* Search for a free band object */
@@ -447,16 +454,14 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk)
             NewAllocated = 0xFFFF;
         if (NewAllocated == m_cBandsAllocated)
         {
-            hRet = E_OUTOFMEMORY;
-            goto Cleanup;
+            return E_OUTOFMEMORY;
         }
 
 
         NewBand = static_cast<struct BandObject *>(CoTaskMemAlloc(NewAllocated *
sizeof(struct BandObject)));
         if (NewBand == NULL)
         {
-            hRet = E_OUTOFMEMORY;
-            goto Cleanup;
+            return E_OUTOFMEMORY;
         }
 
         /* Copy the old array */
@@ -479,8 +484,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk)
         m_bands = static_cast<struct BandObject *>(CoTaskMemAlloc(8 * sizeof(struct
BandObject)));
         if (m_bands == NULL)
         {
-            hRet = E_OUTOFMEMORY;
-            goto Cleanup;
+            return E_OUTOFMEMORY;
         }
 
         /* Initialize the added bands */
@@ -490,67 +494,65 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk)
         NewBand = &m_bands[0];
     }
 
-    if (SUCCEEDED(hRet))
-    {
-        ASSERT(NewBand != NULL);
+    ASSERT(NewBand != NULL);
 
-        m_cBands++;
-        NewBand->DeskBand = DeskBand.Detach();
-        NewBand->OleWindow = OleWindow.Detach();
-        NewBand->WndEvtHandler = WndEvtHandler.Detach();
+    m_cBands++;
+    NewBand->DeskBand = DeskBand.Detach();
+    NewBand->OleWindow = OleWindow.Detach();
+    NewBand->WndEvtHandler = WndEvtHandler.Detach();
 
-        /* Create the ReBar band */
-        hRet = ObjWithSite->SetSite(static_cast<IOleWindow *>(this));
-        if (SUCCEEDED(hRet))
+    /* Create the ReBar band */
+    hRet = ObjWithSite->SetSite(static_cast<IOleWindow *>(this));
+    if (SUCCEEDED(hRet))
+    {
+        uBand = 0xffffffff;
+        if (SUCCEEDED(_UpdateBand(NewBand)))
         {
-            uBand = 0xffffffff;
-            if (SUCCEEDED(_UpdateBand(NewBand)))
+            if (NewBand->dbi.dwMask & DBIM_MODEFLAGS)
             {
-                if (NewBand->dbi.dwMask & DBIM_MODEFLAGS)
-                {
-                    if (NewBand->dbi.dwModeFlags & DBIMF_ADDTOFRONT)
-                        uBand = 0;
-                }
+                if (NewBand->dbi.dwModeFlags & DBIMF_ADDTOFRONT)
+                    uBand = 0;
             }
+        }
 
-            _BuildBandInfo(NewBand, &rbi);
+        _BuildBandInfo(NewBand, &rbi);
 
-            if (SUCCEEDED(NewBand->OleWindow->GetWindow(&rbi.hwndChild))
&&
-                rbi.hwndChild != NULL)
-            {
-                rbi.fMask |= RBBIM_CHILD;
-                WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild);
-            }
+        if (SUCCEEDED(NewBand->OleWindow->GetWindow(&rbi.hwndChild))
&&
+            rbi.hwndChild != NULL)
+        {
+            rbi.fMask |= RBBIM_CHILD;
+            WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild);
+        }
 
-            if (!SendMessageW(m_hwndRebar, RB_INSERTBANDW, (WPARAM)uBand,
reinterpret_cast<LPARAM>(&rbi)))
-                return E_FAIL;
+        if (!SendMessageW(m_hwndRebar, RB_INSERTBANDW, (WPARAM)uBand,
reinterpret_cast<LPARAM>(&rbi)))
+            return E_FAIL;
 
-            hRet = (HRESULT)((USHORT)_GetBandID(NewBand));
-        }
-        else
-        {
-            WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed:
%x\n", hRet);
+        hRet = (HRESULT)((USHORT)_GetBandID(NewBand));
 
-            /* Remove the band from the ReBar control */
-            _BuildBandInfo(NewBand, &rbi);
-            uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0);
-            if (uBand != (UINT)-1)
+        _UpdateAllBands();
+    }
+    else
+    {
+        WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n",
hRet);
+
+        /* Remove the band from the ReBar control */
+        _BuildBandInfo(NewBand, &rbi);
+        uBand = (UINT)SendMessageW(m_hwndRebar, RB_IDTOINDEX, (WPARAM)rbi.wID, 0);
+        if (uBand != (UINT)-1)
+        {
+            if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0))
             {
-                if (!SendMessageW(m_hwndRebar, RB_DELETEBAND, (WPARAM)uBand, 0))
-                {
-                    ERR("Failed to delete band!\n");
-                }
+                ERR("Failed to delete band!\n");
             }
-            else
-                ERR("Failed to map band id to index!\n");
+        }
+        else
+            ERR("Failed to map band id to index!\n");
 
-            _FreeBand(NewBand);
+        _FreeBand(NewBand);
 
-            hRet = E_FAIL;
-            /* goto Cleanup; */
-        }
+        hRet = E_FAIL;
     }
-Cleanup:
+
     return hRet;
 }
 
@@ -675,14 +677,29 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandObject(DWORD
dwBandID, REFIID ri
 
 HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandSiteInfo(const BANDSITEINFO *pbsinfo)
 {
-    FIXME("(%p, %p)\n", this, pbsinfo);
-    return E_NOTIMPL;
+    if (!pbsinfo)
+        return E_INVALIDARG;
+
+    if ((pbsinfo->dwMask & BSIM_STATE))
+        m_dwState = pbsinfo->dwState;
+    if ((pbsinfo->dwMask & BSIM_STYLE))
+        m_dwStyle = pbsinfo->dwStyle;
+
+    _UpdateAllBands();
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandSiteInfo(BANDSITEINFO *pbsinfo)
 {
-    FIXME("(%p, %p)\n", this, pbsinfo);
-    return E_NOTIMPL;
+    if (!pbsinfo)
+        return E_INVALIDARG;
+
+    if ((pbsinfo->dwMask & BSIM_STATE))
+        pbsinfo->dwState = m_dwState;
+    if ((pbsinfo->dwMask & BSIM_STYLE))
+        pbsinfo->dwStyle = m_dwStyle;
+
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam, LRESULT *plrResult)
diff --git a/dll/win32/browseui/shellbars/CBandSite.h
b/dll/win32/browseui/shellbars/CBandSite.h
index df38f0438b..be2245089e 100644
--- a/dll/win32/browseui/shellbars/CBandSite.h
+++ b/dll/win32/browseui/shellbars/CBandSite.h
@@ -54,6 +54,8 @@ private:
     struct BandObject                       *m_bands;
     HWND                                    m_hwndRebar;
     CComPtr<IOleWindow>                     m_site;
+    DWORD                                   m_dwState; /* BSSF_ flags */
+    DWORD                                   m_dwStyle; /* BSIS_ flags */
 public:
     CBandSiteBase();
     ~CBandSiteBase();