Use the supplied buffer when copying item text.

1282ef94 · Aric Stewart · Alexandre Julliard · d44b4280 · 1282ef94
Commit 1282ef94 authored Feb 08, 2002 by Aric Stewart Committed by Alexandre Julliard Feb 08, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

comboex.c dlls/comctl32/comboex.c +12 -2

No files found.
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -329,8 +329,18 @@ static void
 COMBOEX_CopyItem (COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item, COMBOBOXEXITEMW *cit)
 {
    if (cit->mask & CBEIF_TEXT) {
-        cit->pszText        = item->pszText;
-        cit->cchTextMax     = item->cchTextMax;
+        /*
+         * when given a text buffer actually use that buffer
+         */
+        if (cit->pszText)
+        {
+            lstrcpynW(cit->pszText,item->pszText,cit->cchTextMax);
+        }
+        else
+        {
+            cit->pszText        = item->pszText;
+            cit->cchTextMax     = item->cchTextMax;
+        }
    }
    if (cit->mask & CBEIF_IMAGE)
 	cit->iImage         = item->iImage;