Changeset 236 for trunk/src/comctl32/treeview.c

Timestamp:

Jun 28, 1999, 5:46:28 PM (26 years ago)

Author:

cbratschi

Message:

bug fixes (unicode) and improvements

File:

• trunk/src/comctl32/treeview.c (modified) (4 diffs)

trunk/src/comctl32/treeview.c

@@ -1 @@
-/* $Id: treeview.c,v 1.5 1999-06-23 19:45:02 achimha Exp $ */
+/* $Id: treeview.c,v 1.6 1999-06-28 15:46:28 cbratschi Exp $ */
 /* Treeview control
  *
@@ -894 +894 @@
   if (tvItem->mask & TVIF_TEXT) {
                 if (tvItem->pszText!=LPSTR_TEXTCALLBACKA) {
-        len=lstrlenA (tvItem->pszText);
-        if (len>wineItem->cchTextMax)
-                        wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+        len = lstrlenA (tvItem->pszText);
+        if (len > wineItem->cchTextMax)
+                        wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, len+1);
         lstrcpynA (wineItem->pszText, tvItem->pszText,len);
                 } else {
@@ -903 +903 @@
                                 wineItem->cchTextMax=0;
                         }
-                wineItem->pszText=LPSTR_TEXTCALLBACKA;
+                wineItem->pszText = LPSTR_TEXTCALLBACKA;
                 }
    }
@@ -1166 +1166 @@
         }
         else if (wineItem->pszText) {
-            lstrcpynA (tvItem->pszText, wineItem->pszText, tvItem->cchTextMax);
+            lstrcpynA (tvItem->pszText, wineItem->pszText, MIN(tvItem->cchTextMax,lstrlenA(wineItem->pszText)));
         }
    }