ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Pre-allocate the window procedure for DefWindowProc.

This commit is contained in:
Alexandre Julliard 2009-12-17 13:01:42 +01:00
parent 53393b0f1c
commit 1b2ea8b2e9
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user32/class.c
View File

@ -423,9 +423,6 @@ void CLASS_RegisterBuiltinClasses(void)
register_builtin( &MESSAGE_builtin_class ); register_builtin( &MESSAGE_builtin_class );
register_builtin( &SCROLL_builtin_class ); register_builtin( &SCROLL_builtin_class );
register_builtin( &STATIC_builtin_class ); register_builtin( &STATIC_builtin_class );
/* the DefWindowProc winprocs are magic too */
WINPROC_AllocProc( DefWindowProcA, DefWindowProcW );
} }

1
dlls/user32/controls.h
View File

@ -35,6 +35,7 @@ enum builtin_winprocs
{ {
WINPROC_BUTTON = 0, WINPROC_BUTTON = 0,
WINPROC_COMBO, WINPROC_COMBO,
WINPROC_DEFWND,
WINPROC_DIALOG, WINPROC_DIALOG,
WINPROC_EDIT, WINPROC_EDIT,
WINPROC_LISTBOX, WINPROC_LISTBOX,

20
dlls/user32/winproc.c
View File

@ -45,7 +45,6 @@ typedef struct tagWINDOWPROC
} WINDOWPROC; } WINDOWPROC;
#define MAX_WINPROCS 4096 #define MAX_WINPROCS 4096
#define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */
#define MAX_WINPROC_RECURSION 64 #define MAX_WINPROC_RECURSION 64
#define WINPROC_PROC16 ((WINDOWPROC *)1) /* placeholder for 16-bit window procs */ #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 */ { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */
{ ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */
{ DefWindowProcA, DefWindowProcW }, /* WINPROC_DEFWND */
{ DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */ { DefDlgProcA, DefDlgProcW }, /* WINPROC_DIALOG */
{ EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */ { EditWndProcA, EditWndProcW }, /* WINPROC_EDIT */
{ ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */ { ListBoxWndProcA, ListBoxWndProcW }, /* WINPROC_LISTBOX */
@ -76,8 +76,7 @@ static WINDOWPROC winproc_array[MAX_WINPROCS] =
{ StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */ { StaticWndProcA, StaticWndProcW }, /* WINPROC_STATIC */
}; };
static UINT builtin_used = NB_BUILTIN_WINPROCS; static UINT winproc_used = NB_BUILTIN_WINPROCS;
static UINT winproc_used = BUILTIN_WINPROCS;
static CRITICAL_SECTION winproc_cs; static CRITICAL_SECTION winproc_cs;
static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION_DEBUG critsect_debug =
@ -105,14 +104,14 @@ static inline WINDOWPROC *find_winproc( WNDPROC funcA, WNDPROC funcW )
{ {
unsigned int i; 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 */ /* match either proc, some apps confuse A and W */
if (funcA && winproc_array[i].procA != funcA && winproc_array[i].procW != funcA) continue; 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; if (funcW && winproc_array[i].procA != funcW && winproc_array[i].procW != funcW) continue;
return &winproc_array[i]; 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 (funcA && winproc_array[i].procA != funcA) continue;
if (funcW && winproc_array[i].procW != funcW) 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 */ /* check if we already have a winproc for that function */
if (!(proc = find_winproc( funcA, funcW ))) if (!(proc = find_winproc( funcA, funcW )))
{ {
if (funcA && funcW) if (winproc_used < MAX_WINPROCS)
{
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)
{ {
proc = &winproc_array[winproc_used++]; proc = &winproc_array[winproc_used++];
proc->procA = funcA; proc->procA = funcA;