Modified: trunk/reactos/include/ntos/ntdef.h
Modified: trunk/reactos/include/ntos/zw.h
Modified: trunk/reactos/ntoskrnl/ke/timer.c
Modified: trunk/reactos/ntoskrnl/ke/wait.c
Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c
--- trunk/reactos/include/ntos/ntdef.h 2005-01-01 00:42:18 UTC (rev 12672)
+++ trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:03:31 UTC (rev 12673)
@@ -11,7 +11,9 @@
#ifndef __INCLUDE_NTDEF_H
#define __INCLUDE_NTDEF_H
-#define EX_MAXIMUM_WAIT_OBJECTS (64)
+#ifndef _USE_W32API
+#define MAXIMUM_WAIT_OBJECTS (64)
+#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define TYPE_ALIGNMENT(t) __alignof(t)
--- trunk/reactos/include/ntos/zw.h 2005-01-01 00:42:18 UTC (rev 12672)
+++ trunk/reactos/include/ntos/zw.h 2005-01-01 01:03:31 UTC (rev 12673)
@@ -1,4 +1,4 @@
-/* $Id: zw.h,v 1.40 2004/12/30 08:05:10 hyperion Exp $
+/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -5241,7 +5241,7 @@
STDCALL
NtDelayExecution(
IN ULONG Alertable,
- IN TIME *Interval
+ IN LARGE_INTEGER *Interval
);
/*
--- trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 00:42:18 UTC (rev 12672)
+++ trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 01:03:31 UTC (rev 12673)
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.93 2004/12/24 17:06:58 navaraf Exp $
+/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -138,7 +138,7 @@
NTSTATUS STDCALL
NtDelayExecution(IN ULONG Alertable,
- IN TIME* Interval)
+ IN LARGE_INTEGER* Interval)
{
NTSTATUS Status;
LARGE_INTEGER Timeout;
--- trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 00:42:18 UTC (rev 12672)
+++ trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 01:03:31 UTC (rev 12673)
@@ -492,7 +492,7 @@
DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) "
"PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread());
- ASSERT(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS);
+ ASSERT(0 < Count && Count <= MAXIMUM_WAIT_OBJECTS);
CurrentThread = KeGetCurrentThread();
@@ -510,7 +510,7 @@
}
else
{
- if (Count > EX_MAXIMUM_WAIT_OBJECTS)
+ if (Count > MAXIMUM_WAIT_OBJECTS)
{
DPRINT("(%s:%d) Too many objects!\n", __FILE__, __LINE__);
return (STATUS_UNSUCCESSFUL);
@@ -762,8 +762,8 @@
IN BOOLEAN Alertable,
IN PLARGE_INTEGER UnsafeTime)
{
- KWAIT_BLOCK WaitBlockArray[EX_MAXIMUM_WAIT_OBJECTS];
- PVOID ObjectPtrArray[EX_MAXIMUM_WAIT_OBJECTS];
+ KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS];
+ PVOID ObjectPtrArray[MAXIMUM_WAIT_OBJECTS];
NTSTATUS Status;
ULONG i, j;
KPROCESSOR_MODE WaitMode;
@@ -772,7 +772,7 @@
DPRINT("NtWaitForMultipleObjects(Count %lu Object[] %x, Alertable %d, "
"Time %x)\n", Count,Object,Alertable,Time);
- if (Count > EX_MAXIMUM_WAIT_OBJECTS)
+ if (Count > MAXIMUM_WAIT_OBJECTS)
return STATUS_UNSUCCESSFUL;
if (0 == Count)
return STATUS_INVALID_PARAMETER;
--- trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 00:42:18 UTC (rev 12672)
+++ trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 01:03:31 UTC (rev 12673)
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: rangelist.c,v 1.3 2004/10/22 16:30:58 navaraf Exp $
+/* $Id$
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries