Module: wine Branch: master Commit: 6dbe2b5348c8bb553de5642550ea5d33f171a4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbe2b5348c8bb553de564255...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon May 4 14:11:57 2020 +0300
comctl32/header: Use wide string literals.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/comctl32/header.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c70960484a..085549fed6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,7 @@ static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(const HEADER_INFO *infoPtr, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(const HEADER_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, const RECT *rect);
-static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static const WCHAR themeClass[] = L"Header";
static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,9 +146,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI
if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - static const WCHAR emptyString[] = {0}; - - LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + const WCHAR *pszText = phdi->pszText != NULL ? phdi->pszText : L""; if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else