Fix my previous NtDelayExecution patch. Fix Cc function prototypes which were incorrect, and remove useless file. Modified: trunk/reactos/include/ddk/ccfuncs.h Modified: trunk/reactos/include/defines.h Modified: trunk/reactos/include/ntos/ntdef.h Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Deleted: trunk/reactos/ntoskrnl/cc/misc.c Modified: trunk/reactos/ntoskrnl/cc/pin.c _____
Modified: trunk/reactos/include/ddk/ccfuncs.h --- trunk/reactos/include/ddk/ccfuncs.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/ddk/ccfuncs.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,7 +1,7 @@
#ifndef _NTOS_CCFUNCS_H #define _NTOS_CCFUNCS_H -/* $Id: ccfuncs.h,v 1.10 2004/08/21 20:18:07 tamlin Exp $ */ +/* $Id$ */
#ifdef __cplusplus extern "C" { @@ -62,7 +62,7 @@ IN BOOLEAN Retrying );
-BOOLEAN +VOID STDCALL CcFastCopyRead ( IN PFILE_OBJECT FileObject, @@ -73,11 +73,11 @@ OUT PIO_STATUS_BLOCK IoStatus );
-BOOLEAN +VOID STDCALL CcFastCopyWrite ( IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, + IN ULONG FileOffset, IN ULONG Length, IN PVOID Buffer ); @@ -191,7 +191,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb );
@@ -201,7 +201,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ); @@ -223,7 +223,7 @@ IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN BOOLEAN Zero, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ); @@ -251,7 +251,7 @@ IN PVOID Bcb );
-VOID +PVOID STDCALL CcRemapBcb ( IN PVOID Bcb _____
Modified: trunk/reactos/include/defines.h --- trunk/reactos/include/defines.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/defines.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -2243,7 +2243,6 @@
#define WAIT_IO_COMPLETION (0xc0L) #define WAIT_ABANDONED (0x80L) #define WAIT_FAILED (0xffffffffL) -#define MAXIMUM_WAIT_OBJECTS (0x40) #define MAXIMUM_SUSPEND_COUNT (0x7f)
/* MultiByteToWideChar */ _____
Modified: trunk/reactos/include/ntos/ntdef.h --- trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -11,7 +11,7 @@
#ifndef __INCLUDE_NTDEF_H #define __INCLUDE_NTDEF_H
-#ifndef _USE_W32API +#ifndef __USE_W32API #define MAXIMUM_WAIT_OBJECTS (64) #endif
_____
Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.72 2004/11/05 12:26:55 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -447,7 +447,7 @@ SleepEx(DWORD dwMilliseconds, BOOL bAlertable) { - TIME Interval; + LARGE_INTEGER Interval; NTSTATUS errCode;
if (dwMilliseconds != INFINITE) _____
Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-01 01:51:05 UTC (rev 12675) @@ -356,7 +356,6 @@
cc/fs.o \ cc/pin.o \ cc/mdl.o \ - cc/misc.o \ cc/view.o
# Kernel Debugger Support (Kd) _____
Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -60,7 +60,7 @@
/* * @unimplemented */ -VOID +PVOID STDCALL CcRemapBcb ( IN PVOID Bcb _____
Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.32 2004/12/30 18:30:05 ion Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -556,34 +556,31 @@ /* * @unimplemented */ -BOOLEAN +VOID STDCALL CcFastCopyRead ( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN ULONG PageCount, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus + IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN ULONG PageCount, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus ) { UNIMPLEMENTED; - return FALSE; } /* * @unimplemented */ -BOOLEAN +VOID STDCALL -CcFastCopyWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN PVOID Buffer - ) +CcFastCopyWrite( + IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN PVOID Buffer) { UNIMPLEMENTED; - return FALSE; }
/* _____
Deleted: trunk/reactos/ntoskrnl/cc/misc.c --- trunk/reactos/ntoskrnl/cc/misc.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/misc.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,11 +0,0 @@
-/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#define ROUND_DOWN(N, S) (((N) % (S)) ? ROUND_UP(N, S) - S : N) - _____
Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@
-/* $Id: pin.c,v 1.18 2004/10/22 20:11:11 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -117,7 +117,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb ) { @@ -134,14 +134,14 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ) { - if (CcMapData(FileObject, FileOffset, Length, Wait, Bcb, Buffer)) + if (CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) { - if (CcPinMappedData(FileObject, FileOffset, Length, Wait, Bcb)) + if (CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) return TRUE; else CcUnpinData(Bcb); @@ -159,7 +159,7 @@ IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN BOOLEAN Zero, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ) @@ -172,7 +172,7 @@ * For now calling CcPinRead is better than returning error or * just having UNIMPLEMENTED here. */ - return CcPinRead(FileObject, FileOffset, Length, Wait, Bcb, Buffer); + return CcPinRead(FileObject, FileOffset, Length, Flags, Bcb, Buffer); }
/*