ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32 header: Free the old string also when the new one is LPSTR_TEXTCALLBACK.

Browse Source
This commit is contained in:
Mikołaj Zalewski 2006-05-13 21:16:41 +02:00 committed by Alexandre Julliard
parent 16fefcd6d9
commit 25d66de358
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/comctl32/header.c
View File

@ -131,17 +131,16 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, HDITEMW *phdi, BOOL
if (phdi->mask & HDI_TEXT) if (phdi->mask & HDI_TEXT)
{ {
if (lpItem->pszText)
{
if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW)
Free(lpItem->pszText);
lpItem->pszText = NULL;
}
if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */
{ {
LPWSTR pszText; LPWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString);
if (lpItem->pszText)
{
if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW)
Free(lpItem->pszText);
lpItem->pszText = NULL;
}
pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString);
if (fUnicode) if (fUnicode)
Str_SetPtrW(&lpItem->pszText, pszText); Str_SetPtrW(&lpItem->pszText, pszText);
else else