Author: gadamopoulos
Date: Thu Oct 14 18:53:12 2010
New Revision: 49145
URL: http://svn.reactos.org/svn/reactos?rev=49145&view=rev
Log:
[win32k]
- When we try to call a hook with null hook proc will cause a crash in user32. Add an assertion in win32k in order to catch the problem a bit earlier
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/callback.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Thu Oct 14 18:53:12 2010
@@ -338,6 +338,8 @@
PANSI_STRING asWindowName;
PANSI_STRING asClassName;
PTHREADINFO pti;
+
+ ASSERT(Proc);
pti = PsGetCurrentThreadWin32Thread();
if (pti->TIF_flags & TIF_INCLEANUP)
Author: gadamopoulos
Date: Thu Oct 14 18:36:33 2010
New Revision: 49144
URL: http://svn.reactos.org/svn/reactos?rev=49144&view=rev
Log:
[win32k]
- Disable checking if a hook is active. It is safe to disable it for now because it is just an optimization. If we try to call a hook when it is not active, it will fail anyway when it tries to find the hook. Fixes calling low level hooks
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/hook.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Oct 14 18:36:33 2010
@@ -332,11 +332,13 @@
ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK);
+#if 0
/* FIXME! Check pDeskInfo->fsHooks for global hooks! */
if (!ISITHOOKED(HookId))
{
return 0;
}
+#endif
pti = PsGetCurrentThreadWin32Thread();
if (!pti)