Changeset 7342 for trunk/src/comctl32
- Timestamp:
- Nov 14, 2001, 7:39:52 PM (24 years ago)
- Location:
- trunk/src/comctl32
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/comctl32/comctl32.c
r7334 r7342 441 441 DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style) 442 442 { 443 #ifdef __WIN32OS2__444 LPSTR p;445 STACK_strdupWtoA(text, p)446 #else447 443 LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, text); 448 #endif449 444 DrawStatusTextA (hdc, lprc, p, style); 450 #ifndef __WIN32OS2__451 445 HeapFree (GetProcessHeap (), 0, p ); 452 #endif453 446 } 454 447 -
trunk/src/comctl32/listview.c
r7334 r7342 6763 6763 lvca.pszText = LPSTR_TEXTCALLBACKA; 6764 6764 else 6765 #ifdef __WIN32OS2__6766 {6767 LPSTR pszText;6768 STACK_strdupWtoA(lpColumn->pszText, pszText)6769 lvca.pszText = pszText;6770 }6771 #else6772 6765 lvca.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpColumn->pszText); 6773 #endif6774 6766 } 6775 6767 lres = LISTVIEW_InsertColumnA(hwnd,nColumn,&lvca); 6776 6777 #ifndef __WIN32OS2__6778 6768 if (lpColumn->mask & LVCF_TEXT) { 6779 6769 if (lpColumn->pszText != LPSTR_TEXTCALLBACKW) 6780 6770 HeapFree(GetProcessHeap(),0,lvca.pszText); 6781 6771 } 6782 #endif6783 6772 return lres; 6784 6773 } … … 6957 6946 lvia.pszText = LPSTR_TEXTCALLBACKA; 6958 6947 else 6959 #ifdef __WIN32OS2__6960 {6961 LPSTR pszText;6962 STACK_strdupWtoA(lpLVItem->pszText, pszText)6963 lvia.pszText = pszText;6964 }6965 #else6966 6948 lvia.pszText = HEAP_strdupWtoA(GetProcessHeap(),0,lpLVItem->pszText); 6967 #endif6968 6949 } 6969 6950 lres = LISTVIEW_InsertItemA(hwnd, &lvia); 6970 #ifndef __WIN32OS2__6971 6951 if (lvia.mask & LVIF_TEXT) { 6972 6952 if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW) 6973 6953 HeapFree(GetProcessHeap(),0,lvia.pszText); 6974 6954 } 6975 #endif6976 6955 return lres; 6977 6956 }
Note:
See TracChangeset
for help on using the changeset viewer.