hhctrl.ocx: Issue a fixme if asked for unsupported toolbar buttons.

Francois Gouget fgouget at free.fr
Thu Sep 1 08:03:44 CDT 2011


---

I just thought it would be a good idea to get a warning when someone 
tries to make use of one of the buttons we don't support.

 dlls/hhctrl.ocx/help.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index d52939d..7bde256 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -785,6 +785,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw
     int nHistBitmaps = 0, nStdBitmaps = 0, nHHBitmaps = 0;
     HWND hToolbar = pHHInfo->WinType.hwndToolBar;
     TBADDBITMAP tbAB;
+    DWORD unsupported;
 
     /* Common bitmaps */
     tbAB.hInst = HINST_COMMCTRL;
@@ -799,6 +800,14 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw
 
     *pdwNumButtons = 0;
 
+    unsupported = dwButtonFlags & (HHWIN_BUTTON_BROWSE_FWD |
+        HHWIN_BUTTON_BROWSE_BCK | HHWIN_BUTTON_NOTES | HHWIN_BUTTON_CONTENTS |
+        HHWIN_BUTTON_INDEX | HHWIN_BUTTON_SEARCH | HHWIN_BUTTON_HISTORY |
+        HHWIN_BUTTON_FAVORITES | HHWIN_BUTTON_JUMP1 | HHWIN_BUTTON_JUMP2 |
+        HHWIN_BUTTON_ZOOM | HHWIN_BUTTON_TOC_NEXT | HHWIN_BUTTON_TOC_PREV);
+    if (unsupported)
+        FIXME("got asked for unsupported buttons: %06x\n", unsupported);
+
     if (dwButtonFlags & HHWIN_BUTTON_EXPAND)
     {
         TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHistBitmaps + HIST_VIEWTREE);
-- 
1.7.5.4



More information about the wine-patches mailing list