Michael Stefaniuc : comctl32: Use wide-char string literals.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 16:10:22 CST 2020
Module: wine
Branch: master
Commit: f67ef3213c51570d063b51d4a425f5d5b4821eeb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67ef3213c51570d063b51d4a425f5d5b4821eeb
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Nov 18 22:15:07 2020 +0100
comctl32: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/button.c | 2 +-
dlls/comctl32/commctrl.c | 12 ++++++------
dlls/comctl32/listbox.c | 4 ++--
dlls/comctl32/listview.c | 2 +-
dlls/comctl32/status.c | 4 ++--
dlls/comctl32/trackbar.c | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 4f7a3052b10..67bf5ceae48 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -2427,7 +2427,7 @@ static void draw_split_button_dropdown_glyph(const BUTTON_INFO *infoPtr, HDC hdc
/* infoPtr->glyph is a character code from Marlett */
HFONT font, old_font;
LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0,
- { 'M','a','r','l','e','t','t',0 } };
+ L"Marlett" };
if (infoPtr->glyph_size.cy)
{
/* BCSS_STRETCH preserves aspect ratio, uses minimum as size */
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 6056c0e6cf9..cb9c22a3a88 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -124,12 +124,12 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class)
}
classes[] =
{
- { {'B','u','t','t','o','n',0}, BUTTON_Register },
- { {'C','o','m','b','o','B','o','x',0}, COMBO_Register },
- { {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register },
- { {'E','d','i','t',0}, EDIT_Register },
- { {'L','i','s','t','B','o','x',0}, LISTBOX_Register },
- { {'S','t','a','t','i','c',0}, STATIC_Register },
+ { L"Button", BUTTON_Register },
+ { L"ComboBox", COMBO_Register },
+ { L"ComboLBox", COMBOLBOX_Register },
+ { L"Edit", EDIT_Register },
+ { L"ListBox", LISTBOX_Register },
+ { L"Static", STATIC_Register },
};
int min = 0, max = ARRAY_SIZE(classes) - 1;
diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index e6c4b2d6d24..b905beee325 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -1919,8 +1919,8 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib,
/* scan drives */
if (attrib & DDL_DRIVES)
{
- WCHAR buffer[] = {'[','-','a','-',']',0};
- WCHAR root[] = {'A',':','\\',0};
+ WCHAR buffer[] = L"[-a-]";
+ WCHAR root[] = L"A:\\";
int drive;
for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++)
{
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 8e5d6ed4d56..0c80b6164a9 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -4731,7 +4731,7 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N
static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode)
{
WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
- static WCHAR callbackW[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 };
+ static WCHAR callbackW[] = L"(callback)";
DWORD cdsubitemmode = CDRF_DODEFAULT;
RECT *focus, rcBox;
NMLVCUSTOMDRAW nmlvcd;
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index b0cc3377986..0c3a90887c8 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -657,12 +657,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts)
if (infoPtr->hwndToolTip) {
INT nTipCount;
TTTOOLINFOW ti;
- WCHAR wEmpty = 0;
+ WCHAR wEmpty[] = L"";
ZeroMemory (&ti, sizeof(TTTOOLINFOW));
ti.cbSize = sizeof(TTTOOLINFOW);
ti.hwnd = infoPtr->Self;
- ti.lpszText = &wEmpty;
+ ti.lpszText = wEmpty;
nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
if (nTipCount < infoPtr->numParts) {
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index e71edc3b882..353e359111f 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1539,12 +1539,12 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
if (infoPtr->hwndToolTip) {
TTTOOLINFOW ti;
- WCHAR wEmpty = 0;
+ WCHAR wEmpty[] = L"";
ZeroMemory (&ti, sizeof(ti));
ti.cbSize = sizeof(ti);
ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE;
ti.hwnd = hwnd;
- ti.lpszText = &wEmpty;
+ ti.lpszText = wEmpty;
SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti);
}
More information about the wine-cvs
mailing list