[PATCH 09/10] Fix DRAWITEMSTRUCT filling when large enough extra item data is used

[Nikolay Sivov]

---
 dlls/comctl32/tab.c       |   20 ++++++--------
 dlls/comctl32/tests/tab.c |   62 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 0ecbb63..28c8bfd 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -1728,7 +1728,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
   /*
    * if owner draw, tell the owner to draw
    */
-  if ((infoPtr->dwStyle & TCS_OWNERDRAWFIXED) && GetParent(infoPtr->hwnd))
+  if ((infoPtr->dwStyle & TCS_OWNERDRAWFIXED) && IsWindow(infoPtr->hwndNotify))
   {
     DRAWITEMSTRUCT dis;
     UINT id;
@@ -1741,14 +1741,9 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
         drawRect->left += 1;
     }
 
-    /*
-     * get the control id
-     */
     id = (UINT)GetWindowLongPtrW( infoPtr->hwnd, GWLP_ID );
 
-    /*
-     * put together the DRAWITEMSTRUCT
-     */
+    /* fill DRAWITEMSTRUCT */
     dis.CtlType    = ODT_TAB;
     dis.CtlID      = id;
     dis.itemID     = iItem;
@@ -1761,11 +1756,14 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect
     dis.hwndItem = infoPtr->hwnd;
     dis.hDC      = hdc;
     CopyRect(&dis.rcItem,drawRect);
-    dis.itemData = (ULONG_PTR)TAB_GetItem(infoPtr, iItem)->extra;
 
-    /*
-     * send the draw message
-     */
+    /* when extra data fits ULONG_PTR, store it directly */
+    if (infoPtr->cbInfo > sizeof(LPARAM))
+        dis.itemData =  (ULONG_PTR) TAB_GetItem(infoPtr, iItem)->extra;
+    else
+        dis.itemData = *(ULONG_PTR*)TAB_GetItem(infoPtr, iItem)->extra;
+
+    /* draw notification */
     SendMessageW( infoPtr->hwndNotify, WM_DRAWITEM, id, (LPARAM)&dis );
   }
   else
diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 5f466a7..ecec1c7 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -63,6 +63,7 @@
 
 static HFONT hFont;
 static HWND parent_wnd;
+static DRAWITEMSTRUCT g_drawitem;
 
 static struct msg_sequence *sequences[NUM_MSG_SEQUENCES];
 
@@ -338,6 +339,10 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam
         add_message(sequences, PARENT_SEQ_INDEX, &msg);
     }
 
+    /* dump sent structure data */
+    if (message == WM_DRAWITEM)
+        g_drawitem = *(DRAWITEMSTRUCT*)lParam;
+
     defwndproc_counter++;
     ret = DefWindowProcA(hwnd, message, wParam, lParam);
     defwndproc_counter--;
@@ -1236,6 +1241,62 @@ static void test_TCM_SETITEMEXTRA(void)
     DestroyWindow(hTab);
 }
 
+static void test_TCS_OWNERDRAWFIXED(void)
+{
+    HWND hTab;
+    TCITEMA item;
+    BOOL ret;
+
+    hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH|TCS_OWNERDRAWFIXED, TCIF_TEXT|TCIF_IMAGE, 4);
+    ok(hTab != NULL, "Failed to create tab control\n");
+
+    ok(GetParent(hTab) == NULL, "got %p, expected null parent\n", GetParent(hTab));
+
+    /* set some item data */
+    item.mask = TCIF_PARAM;
+    item.lParam = 0xdeadbeef;
+    ret = SendMessageA(hTab, TCM_SETITEMA, 0, (LPARAM)&item);
+    ok(ret == TRUE, "got %d\n", ret);
+
+    memset(&g_drawitem, 0, sizeof(g_drawitem));
+
+    ShowWindow(hTab, SW_SHOW);
+    RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW);
+
+    ok(g_drawitem.itemData == 0xdeadbeef, "got %lx, expected 0xdeadbeef\n", g_drawitem.itemData);
+
+    DestroyWindow(hTab);
+
+    /* now with custom extra data length */
+    hTab = CreateWindowA(
+	WC_TABCONTROLA,
+	"TestTab",
+	WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TCS_FOCUSNEVER | TCS_FIXEDWIDTH | TCS_OWNERDRAWFIXED,
+        10, 10, 300, 100,
+        parent_wnd, NULL, NULL, 0);
+
+    ok(GetParent(hTab) == NULL, "got %p, expected null parent\n", GetParent(hTab));
+
+    ret = SendMessageA(hTab, TCM_SETITEMEXTRA, sizeof(LPARAM)+1, 0);
+    ok(ret == TRUE, "got %d\n", ret);
+
+    /* set some item data */
+    item.mask = TCIF_PARAM;
+    item.lParam = 0xdeadbeef;
+
+    ret = SendMessageA(hTab, TCM_INSERTITEMA, 0, (LPARAM)&item);
+    ok(ret == 0, "got %d\n", ret);
+
+    memset(&g_drawitem, 0, sizeof(g_drawitem));
+
+    ShowWindow(hTab, SW_SHOW);
+    RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW);
+
+    ok(*(ULONG_PTR*)g_drawitem.itemData == 0xdeadbeef, "got %lx, expected 0xdeadbeef\n", g_drawitem.itemData);
+
+    DestroyWindow(hTab);
+}
+
 START_TEST(tab)
 {
     LOGFONTA logfont;
@@ -1280,6 +1341,7 @@ START_TEST(tab)
     test_delete_selection();
     test_removeimage();
     test_TCM_SETITEMEXTRA();
+    test_TCS_OWNERDRAWFIXED();
 
     DestroyWindow(parent_wnd);
 }
-- 
1.5.6.5



--------------060604010704010307040407--