[tkreuzer] 38713: exchange members for ansi and unicode WNDPROC in builtin_class_descr. Reduces diff to wine a bit more.
Author: tkreuzer Date: Sun Jan 11 18:36:14 2009 New Revision: 38713
URL: http://svn.reactos.org/svn/reactos?rev=38713&view=rev Log: exchange members for ansi and unicode WNDPROC in builtin_class_descr. Reduces diff to wine a bit more.
Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/regcontrol.h trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c
Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/b... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -150,23 +150,13 @@ */ const struct builtin_class_descr BUTTON_builtin_class = { -#ifdef __REACTOS__ L"Button", /* name */ - CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - ButtonWndProcW, /* procW */ - ButtonWndProcA, /* procA */ - NB_EXTRA_BYTES, /* extra */ - (LPWSTR)IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "Button", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ ButtonWndProcA, /* procA */ ButtonWndProcW, /* procW */ NB_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/c... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -82,23 +82,13 @@ */ const struct builtin_class_descr COMBO_builtin_class = { -#ifdef __REACTOS__ L"ComboBox", /* name */ - CS_PARENTDC | CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS, /* style */ - (WNDPROC) ComboWndProcW, /* procW */ - (WNDPROC) ComboWndProcA, /* procA */ - sizeof(HEADCOMBO *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ComboBox", /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ ComboWndProcA, /* procA */ ComboWndProcW, /* procW */ sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/e... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -295,23 +295,13 @@ */ const struct builtin_class_descr EDIT_builtin_class = { -#ifdef __REACTOS__ L"Edit", /* name */ - CS_DBLCLKS | CS_PARENTDC, /* style */ - (WNDPROC)EditWndProcW, /* procW */ - (WNDPROC)EditWndProcA, /* procA */ - sizeof(EDITSTATE *), /* extra */ - (LPWSTR)IDC_IBEAM, /* cursor */ - 0 /* brush */ -#else - "Edit", /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ sizeof(EDITSTATE *), /* extra */ IDC_IBEAM, /* cursor */ 0 /* brush */ -#endif };
Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/i... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -37,15 +37,6 @@ */ const struct builtin_class_descr ICONTITLE_builtin_class = { -#ifdef __REACTOS__ - ICONTITLE_CLASS_ATOM, /* name */ - 0, /* style */ - IconTitleWndProc, /* procW */ - NULL, /* procA (winproc is Unicode only) */ - 0, /* extra */ - IDC_ARROW, /* cursor */ - 0 /* brush */ -#else ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ @@ -53,7 +44,6 @@ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/l... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -149,23 +149,13 @@ */ const struct builtin_class_descr LISTBOX_builtin_class = { -#ifdef __REACTOS__ L"ListBox", /* name */ - CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ - (WNDPROC)ListBoxWndProcW, /* procW */ - (WNDPROC)ListBoxWndProcA, /* procA */ - sizeof(LB_DESCR *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ListBox", /* name */ CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
@@ -174,23 +164,13 @@ */ const struct builtin_class_descr COMBOLBOX_builtin_class = { -#ifdef __REACTOS__ L"ComboLBox", /* name */ - CS_DBLCLKS | CS_SAVEBITS, /* style */ - (WNDPROC)ListBoxWndProcW, /* procW */ - (WNDPROC)ListBoxWndProcA, /* procA */ - sizeof(LB_DESCR *), /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ - 0 /* brush */ -#else - "ComboLBox", /* name */ CS_DBLCLKS | CS_SAVEBITS, /* style */ ListBoxWndProcA, /* procA */ ListBoxWndProcW, /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
#ifndef __REACTOS__
Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/s... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -82,8 +82,8 @@ { L"ScrollBar", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ + ScrollBarWndProcA, /* procA */ ScrollBarWndProcW, /* procW */ - ScrollBarWndProcA, /* procA */ 0, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */
Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/s... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -97,23 +97,13 @@ */ const struct builtin_class_descr STATIC_builtin_class = { -#ifdef __REACTOS__ L"Static", /* name */ - CS_DBLCLKS | CS_PARENTDC, /* style */ - (WNDPROC) StaticWndProcW, /* procW */ - (WNDPROC) StaticWndProcA, /* procA */ - STATIC_EXTRA_BYTES, /* extra */ - (LPCWSTR) IDC_ARROW, /* cursor */ /* FIXME Wine uses IDC_ARROWA */ - 0 /* brush */ -#else - "Static", /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ StaticWndProcA, /* procA */ StaticWndProcW, /* procW */ STATIC_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ -#endif };
static __inline void set_ui_state( HWND hwnd, LONG flags )
Modified: trunk/reactos/dll/win32/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/re... ============================================================================== --- trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -19,8 +19,8 @@ { LPCWSTR name; /* class name */ UINT style; /* class style */ + WNDPROC procA; /* Ansi window procedure */ WNDPROC procW; /* Unicode window procedure */ - WNDPROC procA; /* Ansi window procedure */ INT extra; /* window extra bytes */ LPCWSTR cursor; /* cursor name */ HBRUSH brush; /* brush or system color */
Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/di... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -128,8 +128,8 @@ { DIALOG_CLASS_ATOMW, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ + (WNDPROC) DefDlgProcA, /* procA */ (WNDPROC) DefDlgProcW, /* procW */ - (WNDPROC) DefDlgProcA, /* procA */ DLGWINDOWEXTRA, /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ 0 /* brush */
Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/md... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -203,8 +203,8 @@ { L"MDIClient", /* name */ 0, /* style */ + MDIClientWndProcA, /* procA */ MDIClientWndProcW, /* procW */ - MDIClientWndProcA, /* procA */ sizeof(MDICLIENTINFO), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */
Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/me... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jan 11 18:36:14 2009 @@ -80,8 +80,8 @@ { POPUPMENU_CLASS_ATOMW, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ + (WNDPROC) NULL, /* FIXME - procA */ (WNDPROC) PopupMenuWndProcW, /* FIXME - procW */ - (WNDPROC) NULL, /* FIXME - procA */ sizeof(MENUINFO *), /* extra */ (LPCWSTR) IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_MENU + 1) /* brush */
-
tkreuzer＠svn.reactos.org