commit 3228b4d1c3a0edca8ac061dc7882ea0255355684
author Erich Hoover <ehoover@mines.edu> Tue Sep 27 20:00:10 2011 -0600
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 28 11:00:15 2011 +0200
tree a388145abfe872da07bd1baaa8c3f6abc9eb2391
parent 988307e87b67560ece29cb3c4c94e978fc8cfc46

hhctrl.ocx: Use the correct values for current_tab when some tabs are disabled.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index d710d3b..fb9ea08 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -448,6 +448,7 @@
 static LRESULT OnTabChange(HWND hwnd)
 {
     HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA);
+    int tab_id, tab_index, i;
 
     TRACE("%p\n", hwnd);
 
@@ -457,7 +458,23 @@
     if(info->tabs[info->current_tab].hwnd)
         ShowWindow(info->tabs[info->current_tab].hwnd, SW_HIDE);
 
-    info->current_tab = SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0);
+    tab_id = (int) SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0);
+    /* convert the ID of the tab to an index in our tab list */
+    tab_index = -1;
+    for (i=0; i<TAB_NUMTABS; i++)
+    {
+        if (info->tabs[i].id == tab_id)
+        {
+            tab_index = i;
+            break;
+        }
+    }
+    if (tab_index == -1)
+    {
+        FIXME("Tab ID %d does not correspond to a valid index in the tab list.\n", tab_id);
+        return 0;
+    }
+    info->current_tab = tab_index;
 
     if(info->tabs[info->current_tab].hwnd)
         ShowWindow(info->tabs[info->current_tab].hwnd, SW_SHOW);