Changeset 7133 for trunk/src

Timestamp:

Oct 19, 2001, 4:40:11 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/comctl32

Files:

• listview.c (modified) (6 diffs)
• status.c (modified) (1 diff)

trunk/src/comctl32/listview.c

@@ -5230 +5230 @@
   INT* piImage;
   LPSTR* ppszText;
+  LPARAM *plParam;
   HDPA hdpaSubItems;
   LONG lStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -5286 +5287 @@
     piImage=&lpItem->iImage;
     ppszText=&lpItem->pszText;
+    plParam=&lpItem->lParam;
     if ((infoPtr->uCallbackMask != 0) && (lpLVItem->mask & LVIF_STATE))
     {
@@ -5299 +5301 @@
       piImage=&lpSubItem->iImage;
       ppszText=&lpSubItem->pszText;
+      plParam=NULL;
     }
     else
@@ -5304 +5307 @@
       piImage=NULL;
       ppszText=NULL;
+      plParam=NULL;
     }
   }
@@ -5336 +5340 @@
   {
     lpLVItem->iImage = dispInfo.item.iImage;
+    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && piImage)
+    {
+      *piImage = dispInfo.item.iImage;
+    }
   }
   else if (lpLVItem->mask & LVIF_IMAGE)
@@ -5345 +5353 @@
   {
     lpLVItem->lParam = dispInfo.item.lParam;
+    if ((dispInfo.item.mask & LVIF_DI_SETITEM) && plParam)
+    {
+      *plParam = dispInfo.item.lParam;
+    }
   }
   else if (lpLVItem->mask & LVIF_PARAM)

trunk/src/comctl32/status.c

@@ -477 +477 @@
         if (nPart >= infoPtr->numParts)
             return FALSE;
-        part = &infoPtr->parts[nPart];
+        if (infoPtr->simple)
+        part = &infoPtr->part0;
+        else
+        part = &infoPtr->parts[nPart];
     }
 #else
-        part = &infoPtr->parts[nPart];
+        if (infoPtr->simple)
+        part = &infoPtr->part0;
+        else
+        part = &infoPtr->parts[nPart];
 #endif