Author: fireball Date: Wed Oct 27 12:56:36 2010 New Revision: 49304
URL: http://svn.reactos.org/svn/reactos?rev=49304&view=rev Log: - Undef NB_HOOKS to fix compilation with latest trunk. - Check if Process is not NULL in get_process_idle_event request, fixes a crash.
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -28,6 +28,8 @@ #define NDEBUG #include <debug.h>
+#undef NB_HOOKS + struct hook_table;
struct hook
Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32... ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/process.c [iso-8859-1] Wed Oct 27 12:56:36 2010 @@ -50,7 +50,7 @@ { Process = PsGetProcessWin32Process(ProcessObject);
- if (Process->idle_event && ProcessObject != PsGetCurrentProcess()) + if (Process && Process->idle_event && ProcessObject != PsGetCurrentProcess()) { /* Get a handle to the idle event (in another process) */ Status = ObOpenObjectByPointer(Process->idle_event,