system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 02:46:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

user32: Store the builtin class names in Unicode.

Browse source
This commit is contained in:
Alexandre Julliard 2007-11-01 12:55:00 +01:00
parent c23ce884f7
commit bfe88a00f8
13 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/user32/button.c
View file

@ -159,9 +159,10 @@ static WORD checkBoxWidth = 0, checkBoxHeight = 0;
/*********************************************************************
* button class descriptor
*/
static const WCHAR buttonW[] = {'B','u','t','t','o','n',0};
const struct builtin_class_descr BUTTON_builtin_class =
{
"Button", /* name */
buttonW, /* name */
CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
ButtonWndProcA, /* procA */
ButtonWndProcW, /* procW */

2
dlls/user32/class.c
View file

@ -371,7 +371,7 @@ static WNDPROC register_builtin( const struct builtin_class_descr *descr )
ATOM atom;
CLASS *classPtr;
if (!(atom = GlobalAddAtomA( descr->name ))) return 0;
if (!(atom = GlobalAddAtomW( descr->name ))) return 0;
if (!(classPtr = CLASS_RegisterClass( atom, user32_module, FALSE,
descr->style, 0, descr->extra ))) return 0;

3
dlls/user32/combo.c
View file

@ -93,9 +93,10 @@ static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM
/*********************************************************************
* combo class descriptor
*/
static const WCHAR comboboxW[] = {'C','o','m','b','o','B','o','x',0};
const struct builtin_class_descr COMBO_builtin_class =
{
"ComboBox", /* name */
comboboxW, /* name */
CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */
ComboWndProcA, /* procA */
ComboWndProcW, /* procW */

2
dlls/user32/controls.h
View file

@ -34,7 +34,7 @@
/* Built-in class descriptor */
struct builtin_class_descr
{
LPCSTR name; /* class name */
LPCWSTR name; /* class name */
UINT style; /* class style */
WNDPROC procA; /* ASCII window procedure */
WNDPROC procW; /* Unicode window procedure */

2
dlls/user32/desktop.c
View file

@ -46,7 +46,7 @@ static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LP
*/
const struct builtin_class_descr DESKTOP_builtin_class =
{
(LPCSTR)DESKTOP_CLASS_ATOM, /* name */
(LPCWSTR)DESKTOP_CLASS_ATOM, /* name */
CS_DBLCLKS, /* style */
NULL, /* procA (winproc is Unicode only) */
DesktopWndProc, /* procW */

2
dlls/user32/dialog.c
View file

@ -95,7 +95,7 @@ typedef struct
*/
const struct builtin_class_descr DIALOG_builtin_class =
{
(LPCSTR)DIALOG_CLASS_ATOM, /* name */
(LPCWSTR)DIALOG_CLASS_ATOM, /* name */
CS_SAVEBITS | CS_DBLCLKS, /* style */
DefDlgProcA, /* procA */
DefDlgProcW, /* procW */

3
dlls/user32/edit.c
View file

@ -294,9 +294,10 @@ LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
/*********************************************************************
* edit class descriptor
*/
static const WCHAR editW[] = {'E','d','i','t',0};
const struct builtin_class_descr EDIT_builtin_class =
{
"Edit", /* name */
editW, /* name */
CS_DBLCLKS | CS_PARENTDC, /* style */
EditWndProcA, /* procA */
EditWndProcW, /* procW */

2
dlls/user32/icontitle.c
View file

@ -45,7 +45,7 @@ static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPAR
*/
const struct builtin_class_descr ICONTITLE_builtin_class =
{
(LPCSTR)ICONTITLE_CLASS_ATOM, /* name */
(LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */
0, /* style */
NULL, /* procA (winproc is Unicode only) */
IconTitleWndProc, /* procW */

6
dlls/user32/listbox.c
View file

@ -136,9 +136,10 @@ static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect );
/*********************************************************************
* listbox class descriptor
*/
static const WCHAR listboxW[] = {'L','i','s','t','B','o','x',0};
const struct builtin_class_descr LISTBOX_builtin_class =
{
"ListBox", /* name */
listboxW, /* name */
CS_DBLCLKS /*| CS_PARENTDC*/, /* style */
ListBoxWndProcA, /* procA */
ListBoxWndProcW, /* procW */
@ -151,9 +152,10 @@ const struct builtin_class_descr LISTBOX_builtin_class =
/*********************************************************************
* combolbox class descriptor
*/
static const WCHAR combolboxW[] = {'C','o','m','b','o','L','B','o','x',0};
const struct builtin_class_descr COMBOLBOX_builtin_class =
{
"ComboLBox", /* name */
combolboxW, /* name */
CS_DBLCLKS | CS_SAVEBITS, /* style */
ListBoxWndProcA, /* procA */
ListBoxWndProcW, /* procW */

3
dlls/user32/mdi.c
View file

@ -184,9 +184,10 @@ static void MDI_PostUpdate(HWND hwnd, MDICLIENTINFO* ci, WORD recalc)
/*********************************************************************
* MDIClient class descriptor
*/
static const WCHAR mdiclientW[] = {'M','D','I','C','l','i','e','n','t',0};
const struct builtin_class_descr MDICLIENT_builtin_class =
{
"MDIClient", /* name */
mdiclientW, /* name */
0, /* style */
MDIClientWndProcA, /* procA */
MDIClientWndProcW, /* procW */

2
dlls/user32/menu.c
View file

@ -189,7 +189,7 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFO
*/
const struct builtin_class_descr MENU_builtin_class =
{
(LPCSTR)POPUPMENU_CLASS_ATOM, /* name */
(LPCWSTR)POPUPMENU_CLASS_ATOM, /* name */
CS_DROPSHADOW | CS_SAVEBITS | CS_DBLCLKS, /* style */
NULL, /* procA (winproc is Unicode only) */
PopupMenuWndProc, /* procW */

3
dlls/user32/scroll.c
View file

@ -114,9 +114,10 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPA
/*********************************************************************
* scrollbar class descriptor
*/
static const WCHAR scrollbarW[] = {'S','c','r','o','l','l','B','a','r',0};
const struct builtin_class_descr SCROLL_builtin_class =
{
"ScrollBar", /* name */
scrollbarW, /* name */
CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */
NULL, /* procA (winproc is Unicode only) */
ScrollBarWndProc, /* procW */

3
dlls/user32/static.c
View file

@ -100,9 +100,10 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] =
/*********************************************************************
* static class descriptor
*/
static const WCHAR staticW[] = {'S','t','a','t','i','c',0};
const struct builtin_class_descr STATIC_builtin_class =
{
"Static", /* name */
staticW, /* name */
CS_DBLCLKS | CS_PARENTDC, /* style */
StaticWndProcA, /* procA */
StaticWndProcW, /* procW */