mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 20:28:26 +00:00
comctl32: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
36d8147c13
commit
f67ef3213c
|
@ -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 */
|
/* infoPtr->glyph is a character code from Marlett */
|
||||||
HFONT font, old_font;
|
HFONT font, old_font;
|
||||||
LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0,
|
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)
|
if (infoPtr->glyph_size.cy)
|
||||||
{
|
{
|
||||||
/* BCSS_STRETCH preserves aspect ratio, uses minimum as size */
|
/* BCSS_STRETCH preserves aspect ratio, uses minimum as size */
|
||||||
|
|
|
@ -124,12 +124,12 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class)
|
||||||
}
|
}
|
||||||
classes[] =
|
classes[] =
|
||||||
{
|
{
|
||||||
{ {'B','u','t','t','o','n',0}, BUTTON_Register },
|
{ L"Button", BUTTON_Register },
|
||||||
{ {'C','o','m','b','o','B','o','x',0}, COMBO_Register },
|
{ L"ComboBox", COMBO_Register },
|
||||||
{ {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register },
|
{ L"ComboLBox", COMBOLBOX_Register },
|
||||||
{ {'E','d','i','t',0}, EDIT_Register },
|
{ L"Edit", EDIT_Register },
|
||||||
{ {'L','i','s','t','B','o','x',0}, LISTBOX_Register },
|
{ L"ListBox", LISTBOX_Register },
|
||||||
{ {'S','t','a','t','i','c',0}, STATIC_Register },
|
{ L"Static", STATIC_Register },
|
||||||
};
|
};
|
||||||
|
|
||||||
int min = 0, max = ARRAY_SIZE(classes) - 1;
|
int min = 0, max = ARRAY_SIZE(classes) - 1;
|
||||||
|
|
|
@ -1919,8 +1919,8 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib,
|
||||||
/* scan drives */
|
/* scan drives */
|
||||||
if (attrib & DDL_DRIVES)
|
if (attrib & DDL_DRIVES)
|
||||||
{
|
{
|
||||||
WCHAR buffer[] = {'[','-','a','-',']',0};
|
WCHAR buffer[] = L"[-a-]";
|
||||||
WCHAR root[] = {'A',':','\\',0};
|
WCHAR root[] = L"A:\\";
|
||||||
int drive;
|
int drive;
|
||||||
for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++)
|
for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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)
|
static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode)
|
||||||
{
|
{
|
||||||
WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' };
|
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;
|
DWORD cdsubitemmode = CDRF_DODEFAULT;
|
||||||
RECT *focus, rcBox;
|
RECT *focus, rcBox;
|
||||||
NMLVCUSTOMDRAW nmlvcd;
|
NMLVCUSTOMDRAW nmlvcd;
|
||||||
|
|
|
@ -657,12 +657,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts)
|
||||||
if (infoPtr->hwndToolTip) {
|
if (infoPtr->hwndToolTip) {
|
||||||
INT nTipCount;
|
INT nTipCount;
|
||||||
TTTOOLINFOW ti;
|
TTTOOLINFOW ti;
|
||||||
WCHAR wEmpty = 0;
|
WCHAR wEmpty[] = L"";
|
||||||
|
|
||||||
ZeroMemory (&ti, sizeof(TTTOOLINFOW));
|
ZeroMemory (&ti, sizeof(TTTOOLINFOW));
|
||||||
ti.cbSize = sizeof(TTTOOLINFOW);
|
ti.cbSize = sizeof(TTTOOLINFOW);
|
||||||
ti.hwnd = infoPtr->Self;
|
ti.hwnd = infoPtr->Self;
|
||||||
ti.lpszText = &wEmpty;
|
ti.lpszText = wEmpty;
|
||||||
|
|
||||||
nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
|
nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
|
||||||
if (nTipCount < infoPtr->numParts) {
|
if (nTipCount < infoPtr->numParts) {
|
||||||
|
|
|
@ -1539,12 +1539,12 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
|
||||||
|
|
||||||
if (infoPtr->hwndToolTip) {
|
if (infoPtr->hwndToolTip) {
|
||||||
TTTOOLINFOW ti;
|
TTTOOLINFOW ti;
|
||||||
WCHAR wEmpty = 0;
|
WCHAR wEmpty[] = L"";
|
||||||
ZeroMemory (&ti, sizeof(ti));
|
ZeroMemory (&ti, sizeof(ti));
|
||||||
ti.cbSize = sizeof(ti);
|
ti.cbSize = sizeof(ti);
|
||||||
ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE;
|
ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE;
|
||||||
ti.hwnd = hwnd;
|
ti.hwnd = hwnd;
|
||||||
ti.lpszText = &wEmpty;
|
ti.lpszText = wEmpty;
|
||||||
|
|
||||||
SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti);
|
SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue