Changeset 7334 for trunk/src/comctl32

Timestamp:

Nov 14, 2001, 1:30:46 PM (24 years ago)

Author:

phaller

Message:

replaced heap alloc by stack alloc

Location:

trunk/src/comctl32

Files:

• comctl32.c (modified) (1 diff)
• listview.c (modified) (2 diffs)

trunk/src/comctl32/comctl32.c

@@ -441 +441 @@
 DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style)
 {
+#ifdef __WIN32OS2__
+    LPSTR p;
+    STACK_strdupWtoA(text, p)
+#else
     LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, text);
+#endif
     DrawStatusTextA (hdc, lprc, p, style);
+#ifndef __WIN32OS2__
     HeapFree (GetProcessHeap (), 0, p );
+#endif
 }
 

trunk/src/comctl32/listview.c

@@ -6763 +6763 @@
       lvca.pszText = LPSTR_TEXTCALLBACKA;
     else
+#ifdef __WIN32OS2__
+    {
+      LPSTR pszText;
+      STACK_strdupWtoA(lpColumn->pszText, pszText)
+      lvca.pszText = pszText;
+    }
+#else
       lvca.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpColumn->pszText);
+#endif
   }
   lres = LISTVIEW_InsertColumnA(hwnd,nColumn,&lvca);
+
+#ifndef __WIN32OS2__
   if (lpColumn->mask & LVCF_TEXT) {
     if (lpColumn->pszText != LPSTR_TEXTCALLBACKW)
       HeapFree(GetProcessHeap(),0,lvca.pszText);
   }
+#endif
   return lres;
 }
@@ -6946 +6957 @@
       lvia.pszText = LPSTR_TEXTCALLBACKA;
     else
+#ifdef __WIN32OS2__
+    {
+      LPSTR pszText;
+      STACK_strdupWtoA(lpLVItem->pszText, pszText)
+      lvia.pszText = pszText;
+    }
+#else
       lvia.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpLVItem->pszText);
+#endif
   }
   lres = LISTVIEW_InsertItemA(hwnd, &lvia);
+#ifndef __WIN32OS2__
   if (lvia.mask & LVIF_TEXT) {
     if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW)
       HeapFree(GetProcessHeap(),0,lvia.pszText);
   }
+#endif
   return lres;
 }