Skip to content

W
wine-winehq
Commit 25d66de3 authored by Mikołaj Zalewski's avatar Mikołaj Zalewski Committed by Alexandre Julliard
Browse files
Options

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

parent 16fefcd6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
dlls/comctl32/header.c
View file @ 25d66de3
...@@ -131,17 +131,16 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, HDITEMW *phdi, BOOL ...@@ -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 (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ if (lpItem->pszText)
{ {
LPWSTR pszText; if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW)
if (lpItem->pszText) Free(lpItem->pszText);
{ lpItem->pszText = NULL;
if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) }
Free(lpItem->pszText);
lpItem->pszText = NULL;
}
pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */
{
LPWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString);
if (fUnicode) if (fUnicode)
Str_SetPtrW(&lpItem->pszText, pszText); Str_SetPtrW(&lpItem->pszText, pszText);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment