system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 01:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comctl32: Use wide-char string literals.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-11-18 22:15:07 +01:00 committed by Alexandre Julliard
parent 36d8147c13
commit f67ef3213c
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/comctl32/button.c
View file

@ -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 */

12
dlls/comctl32/commctrl.c
View file

@ -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;

4
dlls/comctl32/listbox.c
View file

@ -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]++)
{

2
dlls/comctl32/listview.c
View file

@ -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;

4
dlls/comctl32/status.c
View file

@ -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) {

4
dlls/comctl32/trackbar.c
View file

@ -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);
}