Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move callproc code into own file and reduce unneccessary system calls to dereference them.

Browse source 
It doesn't fix any bugs but improves performance a bit.
Patch from w3seek, bug 1445.

svn path=/trunk/; revision=21779
This commit is contained in:
Andrew Munger 2006-05-03 04:17:50 +00:00
parent 47e2049ea7
commit 965305ebc8
7 changed files with 176 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/user32/windows/message.c
View file

@ -1001,6 +1001,13 @@ IntCallWindowProcA(BOOL IsAnsiProc,
}
}
static BOOL __inline
IsCallProcHandle(IN WNDPROC lpWndProc)
{
/* FIXME - check for 64 bit architectures... */
return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000;
}
/*
* @implemented
@ -1018,7 +1025,8 @@ CallWindowProcA(WNDPROC lpPrevWndFunc,
if (lpPrevWndFunc == NULL)
lpPrevWndFunc = (WNDPROC)NtUserGetWindowLong(hWnd, GWLP_WNDPROC, TRUE);
if (!NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc,
if (!IsCallProcHandle(lpPrevWndFunc) ||
!NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc,
&wpInfo))
{
return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam);
@ -1047,7 +1055,8 @@ CallWindowProcW(WNDPROC lpPrevWndFunc,
if (lpPrevWndFunc == NULL)
lpPrevWndFunc = (WNDPROC)NtUserGetWindowLong(hWnd, GWLP_WNDPROC, FALSE);
if (!NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc,
if (!IsCallProcHandle(lpPrevWndFunc) ||
!NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc,
&wpInfo))
{
return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam);

9
reactos/subsystems/win32/win32k/include/class.h
View file

@ -4,6 +4,9 @@
#define IS_ATOM(x) \
(((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
WNDPROC
GetCallProcHandle(IN PCALLPROC CallProc);
VOID
DestroyCallProc(IN PDESKTOP Desktop,
IN OUT PCALLPROC CallProc);
@ -18,12 +21,6 @@ CreateCallProc(IN PDESKTOP Desktop,
IN BOOL Unicode,
IN PW32PROCESSINFO pi);
NTSTATUS FASTCALL
InitClassImpl(VOID);
NTSTATUS FASTCALL
CleanupClassImpl(VOID);
BOOL
UserGetCallProcInfo(IN HANDLE hCallProc,
OUT PWNDPROC_INFO wpInfo);

7
reactos/subsystems/win32/win32k/main/dllmain.c
View file

@ -425,13 +425,6 @@ DriverEntry (
return STATUS_UNSUCCESSFUL;
}
Status = InitClassImpl();
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to initialize window class implementation!\n");
return STATUS_UNSUCCESSFUL;
}
Status = InitDesktopImpl();
if (!NT_SUCCESS(Status))
{

156
reactos/subsystems/win32/win32k/ntuser/callproc.c Normal file
View file

@ -0,0 +1,156 @@
/*
* ReactOS W32 Subsystem
* Copyright (C) 1998 - 2006 ReactOS Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: class.c 21596 2006-04-15 10:41:58Z greatlrd $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Window classes
* FILE: subsys/win32k/ntuser/class.c
* PROGRAMER: Thomas Weidenmueller <w3seek@reactos.com>
* REVISION HISTORY:
* 06-06-2001 CSH Created
*/
/* INCLUDES ******************************************************************/
#include <w32k.h>
#define NDEBUG
#include <debug.h>
/* CALLPROC ******************************************************************/
WNDPROC
GetCallProcHandle(IN PCALLPROC CallProc)
{
/* FIXME - check for 64 bit architectures... */
return (WNDPROC)((ULONG_PTR)ObmObjectToHandle(CallProc) | 0xFFFF0000);
}
VOID
DestroyCallProc(IN PDESKTOP Desktop,
IN OUT PCALLPROC CallProc)
{
/* FIXME - use new object manager! */
HANDLE Handle = ObmObjectToHandle(CallProc);
ObmDeleteObject(Handle,
otCallProc);
}
PCALLPROC
CloneCallProc(IN PDESKTOP Desktop,
IN PCALLPROC CallProc)
{
PCALLPROC NewCallProc;
HANDLE Handle;
/* FIXME - use new object manager! */
NewCallProc = (PCALLPROC)ObmCreateObject(gHandleTable,
&Handle,
otCallProc,
sizeof(CALLPROC));
if (NewCallProc != NULL)
{
NewCallProc->pi = CallProc->pi;
NewCallProc->WndProc = CallProc->WndProc;
NewCallProc->Unicode = CallProc->Unicode;
}
return NewCallProc;
}
PCALLPROC
CreateCallProc(IN PDESKTOP Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi)
{
PCALLPROC NewCallProc;
HANDLE Handle;
/* FIXME - use new object manager! */
NewCallProc = (PCALLPROC)ObmCreateObject(gHandleTable,
&Handle,
otCallProc,
sizeof(CALLPROC));
if (NewCallProc != NULL)
{
NewCallProc->pi = pi;
NewCallProc->WndProc = WndProc;
NewCallProc->Unicode = Unicode;
}
return NewCallProc;
}
BOOL
UserGetCallProcInfo(IN HANDLE hCallProc,
OUT PWNDPROC_INFO wpInfo)
{
PCALLPROC CallProc;
/* NOTE: Accessing the WNDPROC_INFO structure may raise an exception! */
/* FIXME - use new object manager! */
CallProc = UserGetObject(gHandleTable,
hCallProc,
otCallProc);
if (CallProc == NULL)
{
return FALSE;
}
if (CallProc->pi != GetW32ProcessInfo())
{
return FALSE;
}
wpInfo->WindowProc = CallProc->WndProc;
wpInfo->IsUnicode = CallProc->Unicode;
return TRUE;
}
BOOL NTAPI
NtUserDereferenceWndProcHandle(IN HANDLE wpHandle,
OUT PWNDPROC_INFO wpInfo)
{
BOOL Ret = FALSE;
UserEnterShared();
_SEH_TRY
{
ProbeForWrite(wpInfo,
sizeof(WNDPROC_INFO),
sizeof(ULONG));
Ret = UserGetCallProcInfo(wpHandle,
wpInfo);
}
_SEH_HANDLE
{
SetLastWin32Error(_SEH_GetExceptionCode());
}
_SEH_END;
UserLeave();
return Ret;
}

132
reactos/subsystems/win32/win32k/ntuser/class.c
View file

@ -33,107 +33,8 @@
#define NDEBUG
#include <debug.h>
/* CALLPROC ******************************************************************/
VOID
DestroyCallProc(IN PDESKTOP Desktop,
IN OUT PCALLPROC CallProc)
{
/* FIXME - use new object manager! */
HANDLE Handle = ObmObjectToHandle(CallProc);
ObmDeleteObject(Handle,
otCallProc);
}
PCALLPROC
CloneCallProc(IN PDESKTOP Desktop,
IN PCALLPROC CallProc)
{
PCALLPROC NewCallProc;
HANDLE Handle;
/* FIXME - use new object manager! */
NewCallProc = (PCALLPROC)ObmCreateObject(gHandleTable,
&Handle,
otCallProc,
sizeof(CALLPROC));
if (NewCallProc != NULL)
{
NewCallProc->pi = CallProc->pi;
NewCallProc->WndProc = CallProc->WndProc;
NewCallProc->Unicode = CallProc->Unicode;
}
return NewCallProc;
}
PCALLPROC
CreateCallProc(IN PDESKTOP Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi)
{
PCALLPROC NewCallProc;
HANDLE Handle;
/* FIXME - use new object manager! */
NewCallProc = (PCALLPROC)ObmCreateObject(gHandleTable,
&Handle,
otCallProc,
sizeof(CALLPROC));
if (NewCallProc != NULL)
{
NewCallProc->pi = pi;
NewCallProc->WndProc = WndProc;
NewCallProc->Unicode = Unicode;
}
return NewCallProc;
}
BOOL
UserGetCallProcInfo(IN HANDLE hCallProc,
OUT PWNDPROC_INFO wpInfo)
{
PCALLPROC CallProc;
/* NOTE: Accessing the WNDPROC_INFO structure may raise an exception! */
/* FIXME - use new object manager! */
CallProc = UserGetObject(gHandleTable,
hCallProc,
otCallProc);
if (CallProc == NULL)
{
return FALSE;
}
if (CallProc->pi != GetW32ProcessInfo())
{
return FALSE;
}
wpInfo->WindowProc = CallProc->WndProc;
wpInfo->IsUnicode = CallProc->Unicode;
return TRUE;
}
/* WINDOWCLASS ***************************************************************/
NTSTATUS FASTCALL
InitClassImpl(VOID)
{
return(STATUS_SUCCESS);
}
NTSTATUS FASTCALL
CleanupClassImpl(VOID)
{
return(STATUS_SUCCESS);
}
static VOID
IntFreeClassMenuName(IN OUT PWINDOWCLASS Class)
{
@ -345,7 +246,7 @@ IntGetClassWndProc(IN PWINDOWCLASS Class,
if (*CallProcPtr != NULL)
{
return (WNDPROC)ObmObjectToHandle(*CallProcPtr);
return GetCallProcHandle(*CallProcPtr);
}
else
{
@ -392,7 +293,7 @@ IntGetClassWndProc(IN PWINDOWCLASS Class,
Class = Class->Next;
}
return (WNDPROC)ObmObjectToHandle(NewCallProc);
return GetCallProcHandle(NewCallProc);
}
}
}
@ -2510,33 +2411,4 @@ NtUserGetWOWClass(DWORD Unknown0,
return(0);
}
BOOL NTAPI
NtUserDereferenceWndProcHandle(IN HANDLE wpHandle,
OUT PWNDPROC_INFO wpInfo)
{
BOOL Ret = FALSE;
UserEnterShared();
_SEH_TRY
{
ProbeForWrite(wpInfo,
sizeof(WNDPROC_INFO),
sizeof(ULONG));
Ret = UserGetCallProcInfo(wpHandle,
wpInfo);
}
_SEH_HANDLE
{
SetLastWin32Error(_SEH_GetExceptionCode());
}
_SEH_END;
UserLeave();
return Ret;
}
/* EOF */

6
reactos/subsystems/win32/win32k/ntuser/window.c
View file

@ -509,7 +509,7 @@ IntGetWindowProc(IN PWINDOW_OBJECT Window,
{
if (Window->CallProc != NULL)
{
return (WNDPROC)ObmObjectToHandle(Window->CallProc);
return GetCallProcHandle(Window->CallProc);
}
else
{
@ -536,7 +536,7 @@ IntGetWindowProc(IN PWINDOW_OBJECT Window,
NewCallProc);
}
return (WNDPROC)ObmObjectToHandle((CallProc == NULL ? NewCallProc : CallProc));
return GetCallProcHandle((CallProc == NULL ? NewCallProc : CallProc));
}
}
}
@ -3464,7 +3464,7 @@ IntSetWindowProc(PWINDOW_OBJECT Window,
}
}
Ret = (WNDPROC)ObmObjectToHandle(Window->CallProc2);
Ret = GetCallProcHandle(Window->CallProc2);
}
}

1
reactos/subsystems/win32/win32k/win32k.rbuild
View file

@ -84,6 +84,7 @@
<compilationunit name="ntuser.c">
<file>accelerator.c</file>
<file>callback.c</file>
<file>callproc.c</file>
<file>caret.c</file>
<file>class.c</file>
<file>clipboard.c</file>