commit 98658699020ab3bb04da2a2d2959c7cd709fa7a4
author Mikołaj Zalewski <mikolaj@zalewski.pl> Sat May 13 21:07:54 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon May 15 14:40:08 2006 +0200
tree 821212479f014ae49f80e576ee0ff941d5555b9d
parent e718939ebdce7e077636e6bee5dfc6dfaf4cdab4

comctl32: header: Don't check lpItem for NULL in GetItemT.

dlls/comctl32/header.c

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index cddf740..cab8cc7 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -892,20 +892,20 @@
     lpItem = &infoPtr->items[nItem];
 
     if (phdi->mask & HDI_BITMAP)
-	phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0;
+        phdi->hbm = lpItem->hbm;
 
     if (phdi->mask & HDI_FORMAT)
-	phdi->fmt = (lpItem != NULL) ? lpItem->fmt : 0;
+        phdi->fmt = lpItem->fmt;
 
     if (phdi->mask & HDI_WIDTH)
-	phdi->cxy = (lpItem != NULL) ? lpItem->cxy : 0;
+        phdi->cxy = lpItem->cxy;
 
     if (phdi->mask & HDI_LPARAM)
-	phdi->lParam = (lpItem != NULL) ? lpItem->lParam : 0;
+        phdi->lParam = lpItem->lParam;
 
     if (phdi->mask & HDI_IMAGE) 
     {
-        phdi->iImage = (lpItem != NULL) ? lpItem->iImage : 0;
+        phdi->iImage = lpItem->iImage;
         if (lpItem->iImage == I_IMAGECALLBACK) 
         {
             HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode);
@@ -913,12 +913,11 @@
     }
 
     if (phdi->mask & HDI_ORDER)
-	phdi->iOrder = (lpItem != NULL) ? lpItem->iOrder : 0;
+        phdi->iOrder = lpItem->iOrder;
 
     if (phdi->mask & HDI_TEXT)
     {
-        if (lpItem == NULL) *phdi->pszText = 0;  /* null pointer check */
-        else if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */
+        if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */
         {
             HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, phdi, lpItem, bUnicode);
         }