Changeset 6063 for trunk/src

Timestamp:

Jun 22, 2001, 9:32:29 AM (24 years ago)

Author:

sandervl

Message:

DT: getitem fix

File:

• trunk/src/comctl32/listview.c (modified) (3 diffs)

trunk/src/comctl32/listview.c

@@ -5278 +5278 @@
 
   lpItem = (LISTVIEW_ITEM *)DPA_GetPtr(hdpaSubItems, 0);
-#ifdef __WIN32OS2__
-  if (lpItem == NULL || lpItem == -1) {
-    dprintf(("WARNING: lpItem (%x) INVALID", lpItem));
-    return FALSE;
-  }
-#else
   if (lpItem == NULL)
     return FALSE;
-#endif
 
   ZeroMemory(&dispInfo, sizeof(NMLVDISPINFOA));
@@ -5358 +5351 @@
   }
 
+#ifdef __WIN32OS2__
+      if ((UINT)*ppszText != -1) {
+        dprintf(("LISTVIEW_GetItemA lpLVItem->mask (%x), dispInfo.item.mask (%x);", lpLVItem->mask, dispInfo.item.mask));
+      }
+#endif
+
   if (dispInfo.item.mask & LVIF_TEXT)
   {
     if ((dispInfo.item.mask & LVIF_DI_SETITEM) && (ppszText != NULL))
     {
+#ifdef __WIN32OS2__
+      dprintf(("LISTVIEW_GetItemA *ppszText (%x), dispInfo.item.pszText (%x);", *ppszText, dispInfo.item.pszText));
+      if ((UINT)*ppszText != -1) {
+        Str_SetPtrA(ppszText, dispInfo.item.pszText);
+      } /* endif */
+#else
       Str_SetPtrA(ppszText, dispInfo.item.pszText);
+#endif
     }
     /* If lpLVItem->pszText==dispInfo.item.pszText a copy is unnecessary, but */
@@ -10924 +10930 @@
     return hedit;
 }
+
+