December 2009 - Wine-Commits

Owen Rudge : mapi32: Correct the Simple MAPI parameters.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 4194250f6c5c4190b2b17ad6faf282aa5ac0d202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194250f6c5c4190b2b17ad6f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 11:22:28 2009 -0600 mapi32: Correct the Simple MAPI parameters. --- dlls/mapi32/mapi32.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 04be363..8037c9b 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -145,17 +145,17 @@ 205 stub FDecodeID(a)12 206 stub CchOfEncoding(a)4 207 stdcall CbOfEncoded(a)4(ptr) CbOfEncoded -208 stdcall MAPISendDocuments(ptr ptr ptr ptr long) -209 stdcall MAPILogon(long ptr ptr long long ptr) -210 stdcall MAPILogoff(long long long long) -211 stdcall MAPISendMail(long long ptr long long) -212 stdcall MAPISaveMail(ptr ptr ptr long long ptr) -213 stdcall MAPIReadMail(ptr ptr ptr long long ptr) -214 stdcall MAPIFindNext(ptr ptr ptr ptr long long ptr) -215 stdcall MAPIDeleteMail(ptr ptr ptr long long) -217 stdcall MAPIAddress(ptr ptr ptr long ptr long long ptr long ptr ptr) +208 stdcall MAPISendDocuments(ptr str str str long) +209 stdcall MAPILogon(ptr str str long long ptr) +210 stdcall MAPILogoff(ptr ptr long long) +211 stdcall MAPISendMail(ptr ptr ptr long long) +212 stdcall MAPISaveMail(ptr ptr ptr long long str) +213 stdcall MAPIReadMail(ptr ptr str long long ptr) +214 stdcall MAPIFindNext(ptr ptr str str long long ptr) +215 stdcall MAPIDeleteMail(ptr ptr str long long) +217 stdcall MAPIAddress(ptr ptr str long str long ptr long long ptr ptr) 218 stdcall MAPIDetails(ptr ptr ptr long long) -219 stdcall MAPIResolveName(ptr ptr ptr long long ptr) +219 stdcall MAPIResolveName(ptr ptr str long long ptr) 220 stub BMAPISendMail 221 stub BMAPISaveMail 222 stub BMAPIReadMail

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the dialog class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 0cbf191add364fddd669d39793d3f0950a14e5b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbf191add364fddd669d3979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 13:00:23 2009 +0100 user32: Pre-allocate the window procedure for the dialog class. --- dlls/user32/controls.h | 1 + dlls/user32/dialog.c | 4 ++-- dlls/user32/winproc.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 72a65a0..35be645 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -35,6 +35,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, WINPROC_COMBO, + WINPROC_DIALOG, WINPROC_EDIT, WINPROC_LISTBOX, WINPROC_SCROLLBAR, diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b6989a6..1309c09 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -97,8 +97,8 @@ const struct builtin_class_descr DIALOG_builtin_class = { (LPCWSTR)DIALOG_CLASS_ATOM, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ - DefDlgProcA, /* procA */ - DefDlgProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_DIALOG), /* procW */ DLGWINDOWEXTRA, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d2e75a1..89a1ae9 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -66,6 +66,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ + { DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the MDI client class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 53393b0f1c88a33923d30a98d1b65d5130761f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53393b0f1c88a33923d30a98d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 13:01:11 2009 +0100 user32: Pre-allocate the window procedure for the MDI client class. --- dlls/user32/controls.h | 1 + dlls/user32/mdi.c | 24 ++---------------------- dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 35be645..2df4f45 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -38,6 +38,7 @@ enum builtin_winprocs WINPROC_DIALOG, WINPROC_EDIT, WINPROC_LISTBOX, + WINPROC_MDICLIENT, WINPROC_SCROLLBAR, WINPROC_STATIC, NB_BUILTIN_WINPROCS diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index e1910f8..fcfbd27 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -150,8 +150,6 @@ static LONG MDI_ChildActivate( HWND, HWND ); static LRESULT MDI_RefreshMenu(MDICLIENTINFO *); static HWND MDI_MoreWindowsDialog(HWND); -static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); /* -------- Miscellaneous service functions ---------- * @@ -188,8 +186,8 @@ const struct builtin_class_descr MDICLIENT_builtin_class = { mdiclientW, /* name */ 0, /* style */ - MDIClientWndProcA, /* procA */ - MDIClientWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_MDICLIENT), /* procW */ sizeof(MDICLIENTINFO), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ @@ -1272,24 +1270,6 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM } /*********************************************************************** - * MDIClientWndProcA - */ -static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.mdiclient_proc( hwnd, message, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * MDIClientWndProcW - */ -static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.mdiclient_proc( hwnd, message, wParam, lParam, TRUE ); -} - -/*********************************************************************** * DefFrameProcA (USER32.@) */ LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 89a1ae9..d71dca2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -57,6 +57,8 @@ LRESULT WINAPI EditWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) static LRESULT WINAPI EditWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI StaticWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); @@ -69,6 +71,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ + { MDIClientWndProcA, MDIClientWndProcW }, /* WINPROC_MDICLIENT */ { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */ { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ }; @@ -1096,6 +1099,16 @@ static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARA return wow_handlers.listbox_proc( hwnd, msg, wParam, lParam, TRUE ); } +static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.mdiclient_proc( hwnd, msg, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.mdiclient_proc( hwnd, msg, wParam, lParam, TRUE ); +} + static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { return wow_handlers.scrollbar_proc( hwnd, msg, wParam, lParam, FALSE );

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for DefWindowProc.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 1b2ea8b2e9b4ed9c0a185aafefa83ecb394ac06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2ea8b2e9b4ed9c0a185aafe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 13:01:42 2009 +0100 user32: Pre-allocate the window procedure for DefWindowProc. --- dlls/user32/class.c | 3 --- dlls/user32/controls.h | 1 + dlls/user32/winproc.c | 20 +++++--------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 3c211db..e8ca0e5 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -423,9 +423,6 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); - - /* the DefWindowProc winprocs are magic too */ - WINPROC_AllocProc( DefWindowProcA, DefWindowProcW ); } diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2df4f45..9abc997 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -35,6 +35,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, WINPROC_COMBO, + WINPROC_DEFWND, WINPROC_DIALOG, WINPROC_EDIT, WINPROC_LISTBOX, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d71dca2..5bfd407 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -45,7 +45,6 @@ typedef struct tagWINDOWPROC } WINDOWPROC; #define MAX_WINPROCS 4096 -#define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ #define MAX_WINPROC_RECURSION 64 #define WINPROC_PROC16 ((WINDOWPROC *)1) /* placeholder for 16-bit window procs */ @@ -68,6 +67,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ + { DefWindowProcA, DefWindowProcW }, /* WINPROC_DEFWND */ { DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ @@ -76,8 +76,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ }; -static UINT builtin_used = NB_BUILTIN_WINPROCS; -static UINT winproc_used = BUILTIN_WINPROCS; +static UINT winproc_used = NB_BUILTIN_WINPROCS; static CRITICAL_SECTION winproc_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -105,14 +104,14 @@ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW ) { unsigned int i; - for (i = 0; i < builtin_used; i++) + for (i = 0; i < NB_BUILTIN_WINPROCS; i++) { /* match either proc, some apps confuse A and W */ if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue; return &winproc_array[i]; } - for (i = BUILTIN_WINPROCS; i < winproc_used; i++) + for (i = NB_BUILTIN_WINPROCS; i < winproc_used; i++) { if (funcA && winproc_array[i].procA != funcA) continue; if (funcW && winproc_array[i].procW != funcW) continue; @@ -153,16 +152,7 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC funcA, WNDPROC funcW ) /* check if we already have a winproc for that function */ if (!(proc = find_winproc( funcA, funcW ))) { - if (funcA && funcW) - { - assert( builtin_used < BUILTIN_WINPROCS ); - proc = &winproc_array[builtin_used++]; - proc->procA = funcA; - proc->procW = funcW; - TRACE( "allocated %p for builtin %p/%p (%d/%d used)\n", - proc_to_handle(proc), funcA, funcW, builtin_used, BUILTIN_WINPROCS ); - } - else if (winproc_used < MAX_WINPROCS) + if (winproc_used < MAX_WINPROCS) { proc = &winproc_array[winproc_used++]; proc->procA = funcA;

1 0

Owen Rudge : include: Redefine LHANDLE as ULONG_PTR.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 4c8bd544e14c170aa94c3d7c85e12960c91d1ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8bd544e14c170aa94c3d7c8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Dec 16 10:44:20 2009 -0600 include: Redefine LHANDLE as ULONG_PTR. --- dlls/mapi32/sendmail.c | 2 +- include/mapi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index cbbff98..6f1d554 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -402,7 +402,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, HRESULT res; DWORD size; - TRACE( "(0x%08x 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, + TRACE( "(0x%08lx 0x%08lx %p 0x%08x 0x%08x)\n", session, uiparam, message, flags, reserved ); /* Check to see if we have a Simple MAPI provider loaded */ diff --git a/include/mapi.h b/include/mapi.h index 2d335ea..7d19734 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -27,7 +27,7 @@ extern "C" { #ifndef __LHANDLE #define __LHANDLE -typedef ULONG LHANDLE, *LPLHANDLE; +typedef ULONG_PTR LHANDLE, *LPLHANDLE; #endif #define lhSessionNull ((LHANDLE)0)

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the static class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 80a09a7899e6e91981c9fc8bdbc9fafbb8284437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a09a7899e6e91981c9fc8bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 13:00:04 2009 +0100 user32: Pre-allocate the window procedure for the static class. --- dlls/user32/controls.h | 1 + dlls/user32/static.c | 26 ++++---------------------- dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 274e59f..72a65a0 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -38,6 +38,7 @@ enum builtin_winprocs WINPROC_EDIT, WINPROC_LISTBOX, WINPROC_SCROLLBAR, + WINPROC_STATIC, NB_BUILTIN_WINPROCS }; diff --git a/dlls/user32/static.c b/dlls/user32/static.c index b33033a..0f778bb 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -60,8 +60,6 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; @@ -104,8 +102,8 @@ const struct builtin_class_descr STATIC_builtin_class = { staticW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ - StaticWndProcA, /* procA */ - StaticWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_STATIC), /* procW */ STATIC_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -405,6 +403,8 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam LONG full_style = GetWindowLongW( hwnd, GWL_STYLE ); LONG style = full_style & SS_TYPEMASK; + if (!IsWindow( hwnd )) return 0; + switch (uMsg) { case WM_CREATE: @@ -604,24 +604,6 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam return lResult; } -/*********************************************************************** - * StaticWndProcA - */ -static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return wow_handlers.static_proc(hWnd, uMsg, wParam, lParam, FALSE); -} - -/*********************************************************************** - * StaticWndProcW - */ -static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return wow_handlers.static_proc(hWnd, uMsg, wParam, lParam, TRUE); -} - static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) { DRAWITEMSTRUCT dis; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index c9ed557..d2e75a1 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -59,6 +59,8 @@ static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARA static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI StaticWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static WINDOWPROC winproc_array[MAX_WINPROCS] = { @@ -67,6 +69,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] = { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ { ScrollBarWndProcA, ScrollBarWndProcW }, /* WINPROC_SCROLLBAR */ + { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ }; static UINT builtin_used = NB_BUILTIN_WINPROCS; @@ -1102,6 +1105,16 @@ static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPA return wow_handlers.scrollbar_proc( hwnd, msg, wParam, lParam, TRUE ); } +static LRESULT WINAPI StaticWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.static_proc( hwnd, msg, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI StaticWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.static_proc( hwnd, msg, wParam, lParam, TRUE ); +} + /********************************************************************** * UserRegisterWowHandlers (USER32.@)

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the edit class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 6400dabf40ab2015141732c38fab9558fa6836bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6400dabf40ab2015141732c38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:57:40 2009 +0100 user32: Pre-allocate the window procedure for the edit class. --- dlls/user32/controls.h | 1 + dlls/user32/edit.c | 22 ++-------------------- dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 76c714c..37b9bc5 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -35,6 +35,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, WINPROC_COMBO, + WINPROC_EDIT, NB_BUILTIN_WINPROCS }; diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a2ce5f1..3466002 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4971,24 +4971,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B /********************************************************************* - * - * EditWndProc (USER32.@) - */ -LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return wow_handlers.edit_proc(hWnd, uMsg, wParam, lParam, FALSE); -} - -/********************************************************************* - * - * EditWndProcW - */ -static LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return wow_handlers.edit_proc(hWnd, uMsg, wParam, lParam, TRUE); -} - -/********************************************************************* * edit class descriptor */ static const WCHAR editW[] = {'E','d','i','t',0}; @@ -4996,8 +4978,8 @@ const struct builtin_class_descr EDIT_builtin_class = { editW, /* name */ CS_DBLCLKS | CS_PARENTDC, /* style */ - EditWndProcA, /* procA */ - EditWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_EDIT), /* procW */ #ifdef __i386__ sizeof(EDITSTATE *) + sizeof(HLOCAL16), /* extra */ #else diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 32b94b4..a21b4f0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -55,11 +55,14 @@ static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI EditWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI EditWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ + { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ }; static UINT builtin_used = NB_BUILTIN_WINPROCS; @@ -1065,6 +1068,16 @@ static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPA return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); } +LRESULT WINAPI EditWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.edit_proc( hwnd, msg, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI EditWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.edit_proc( hwnd, msg, wParam, lParam, TRUE ); +} + /********************************************************************** * UserRegisterWowHandlers (USER32.@)

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the combobox class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 05cf0ff29f7c178a34c41790a26bd0e48dc12633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cf0ff29f7c178a34c41790a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:57:22 2009 +0100 user32: Pre-allocate the window procedure for the combobox class. --- dlls/user32/combo.c | 30 ++++-------------------------- dlls/user32/controls.h | 1 + dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index c405c1a..948c6a7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -86,9 +86,6 @@ static UINT CBitHeight, CBitWidth; #define COMBO_EDITBUTTONSPACE() 0 #define EDIT_CONTROL_PADDING() 1 -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); - /********************************************************************* * combo class descriptor */ @@ -97,8 +94,8 @@ const struct builtin_class_descr COMBO_builtin_class = { comboboxW, /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ - ComboWndProcA, /* procA */ - ComboWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_COMBO), /* procW */ sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -1839,6 +1836,8 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + if (!IsWindow(hwnd)) return 0; + if( lphc || message == WM_NCCREATE ) switch(message) { @@ -2219,27 +2218,6 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar DefWindowProcA(hwnd, message, wParam, lParam); } -/*********************************************************************** - * ComboWndProcA - * - * This is just a wrapper for the real ComboWndProc which locks/unlocks - * window structs. - */ -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.combo_proc( hwnd, message, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * ComboWndProcW - */ -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); -} - /************************************************************************* * GetComboBoxInfo (USER32.@) */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 501520f..76c714c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -34,6 +34,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, + WINPROC_COMBO, NB_BUILTIN_WINPROCS }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index dd3e234..32b94b4 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -53,10 +53,13 @@ WNDPROC EDIT_winproc_handle = 0; static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ + { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ }; static UINT builtin_used = NB_BUILTIN_WINPROCS; @@ -1052,6 +1055,16 @@ static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.button_proc( hwnd, msg, wParam, lParam, TRUE ); } +static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); +} + /********************************************************************** * UserRegisterWowHandlers (USER32.@)

1 0

Alexandre Julliard : user32: Get rid of the EDIT_winproc_handle variable.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: 87ede8949aa18c67df433f5e16259949bb954a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ede8949aa18c67df433f5e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:58:08 2009 +0100 user32: Get rid of the EDIT_winproc_handle variable. --- dlls/user32/class.c | 7 +++---- dlls/user32/controls.h | 2 -- dlls/user32/win.c | 2 +- dlls/user32/winproc.c | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index f5cdaec..3c211db 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -391,18 +391,17 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local * Register a builtin control class. * This allows having both ASCII and Unicode winprocs for the same class. */ -static WNDPROC register_builtin( const struct builtin_class_descr *descr ) +static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, - descr->style, 0, descr->extra ))) return 0; + descr->style, 0, descr->extra ))) return; classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); classPtr->hbrBackground = descr->brush; classPtr->winproc = WINPROC_AllocProc( descr->procA, descr->procW ); release_class_ptr( classPtr ); - return classPtr->winproc; } @@ -416,7 +415,7 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); register_builtin( &DIALOG_builtin_class ); - EDIT_winproc_handle = register_builtin( &EDIT_builtin_class ); + register_builtin( &EDIT_builtin_class ); register_builtin( &ICONTITLE_builtin_class ); register_builtin( &LISTBOX_builtin_class ); register_builtin( &MDICLIENT_builtin_class ); diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 37b9bc5..8325d8d 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -109,8 +109,6 @@ extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ); -extern WNDPROC EDIT_winproc_handle DECLSPEC_HIDDEN; - /* Class functions */ struct tagCLASS; /* opaque structure */ struct tagWND; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index bb19a4e..dbb8ef2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2081,7 +2081,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod * more tolerant to A/W mismatches. The lack of W->A->W conversion for such a mismatch suggests * that the hack is in GetWindowLongPtr[AW], not in winprocs. */ - if (wndPtr->winproc == EDIT_winproc_handle && (!unicode != !(wndPtr->flags & WIN_ISUNICODE))) + if (wndPtr->winproc == BUILTIN_WINPROC(WINPROC_EDIT) && (!unicode != !(wndPtr->flags & WIN_ISUNICODE))) retvalue = (ULONG_PTR)wndPtr->winproc; else retvalue = (ULONG_PTR)WINPROC_GetProc( wndPtr->winproc, unicode ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index a21b4f0..d0b4e90 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -49,8 +49,6 @@ typedef struct tagWINDOWPROC #define MAX_WINPROC_RECURSION 64 #define WINPROC_PROC16 ((WINDOWPROC *)1) /* placeholder for 16-bit window procs */ -WNDPROC EDIT_winproc_handle = 0; - static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the listbox class.
by Alexandre Julliard Dec. 17, 2009

Dec. 17, 2009

Module: wine Branch: master Commit: c0f3f5a1d254c8093077c94afe71323b61ad7b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f3f5a1d254c8093077c94af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:58:45 2009 +0100 user32: Pre-allocate the window procedure for the listbox class. --- dlls/user32/controls.h | 1 + dlls/user32/listbox.c | 27 ++++----------------------- dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 8325d8d..d5760d6 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -36,6 +36,7 @@ enum builtin_winprocs WINPROC_BUTTON = 0, WINPROC_COMBO, WINPROC_EDIT, + WINPROC_LISTBOX, NB_BUILTIN_WINPROCS }; diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 50fc762..4bc9664 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -128,9 +128,6 @@ typedef enum static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; -static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); - static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); /********************************************************************* @@ -141,8 +138,8 @@ const struct builtin_class_descr LISTBOX_builtin_class = { listboxW, /* name */ CS_DBLCLKS /*| CS_PARENTDC*/, /* style */ - ListBoxWndProcA, /* procA */ - ListBoxWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_LISTBOX), /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -157,8 +154,8 @@ const struct builtin_class_descr COMBOLBOX_builtin_class = { combolboxW, /* name */ CS_DBLCLKS | CS_SAVEBITS, /* style */ - ListBoxWndProcA, /* procA */ - ListBoxWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_LISTBOX), /* procW */ sizeof(LB_DESCR *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -3179,19 +3176,3 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : DefWindowProcA( hwnd, msg, wParam, lParam ); } - -/*********************************************************************** - * ListBoxWndProcA - */ -static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return wow_handlers.listbox_proc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * ListBoxWndProcW - */ -static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return wow_handlers.listbox_proc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d0b4e90..96c4749 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -55,12 +55,15 @@ static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI EditWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI EditWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ + { ListBoxWndProcA, ListBoxWndProcW },/* WINPROC_LISTBOX */ }; static UINT builtin_used = NB_BUILTIN_WINPROCS; @@ -1076,6 +1079,16 @@ static LRESULT WINAPI EditWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM l return wow_handlers.edit_proc( hwnd, msg, wParam, lParam, TRUE ); } +static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.listbox_proc( hwnd, msg, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.listbox_proc( hwnd, msg, wParam, lParam, TRUE ); +} + /********************************************************************** * UserRegisterWowHandlers (USER32.@)

1 0