Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix my previous NtDelayExecution patch. Fix Cc function prototypes which were incorrect, and remove useless file.

Browse source 
svn path=/trunk/; revision=12675
This commit is contained in:
Alex Ionescu 2005-01-01 01:51:05 +00:00
parent b11715e1ab
commit 7510a729c6
9 changed files with 33 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/include/ddk/ccfuncs.h
View file

@ -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 @@ CcDeferWrite (
IN BOOLEAN Retrying
);
BOOLEAN
VOID
STDCALL
CcFastCopyRead (
IN PFILE_OBJECT FileObject,
@ -73,11 +73,11 @@ CcFastCopyRead (
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 @@ CcPinMappedData (
IN PFILE_OBJECT FileObject,
IN PLARGE_INTEGER FileOffset,
IN ULONG Length,
IN BOOLEAN Wait,
IN ULONG Flags,
OUT PVOID * Bcb
);
@ -201,7 +201,7 @@ CcPinRead (
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 @@ CcPreparePinWrite (
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 @@ CcRepinBcb (
IN PVOID Bcb
);
VOID
PVOID
STDCALL
CcRemapBcb (
IN PVOID Bcb

1
reactos/include/defines.h
View file

@ -2243,7 +2243,6 @@ extern "C" {
#define WAIT_IO_COMPLETION (0xc0L)
#define WAIT_ABANDONED (0x80L)
#define WAIT_FAILED (0xffffffffL)
#define MAXIMUM_WAIT_OBJECTS (0x40)
#define MAXIMUM_SUSPEND_COUNT (0x7f)
/* MultiByteToWideChar */

2
reactos/include/ntos/ntdef.h
View file

@ -11,7 +11,7 @@
#ifndef __INCLUDE_NTDEF_H
#define __INCLUDE_NTDEF_H
#ifndef _USE_W32API
#ifndef __USE_W32API
#define MAXIMUM_WAIT_OBJECTS (64)
#endif

4
reactos/lib/kernel32/process/proc.c
View file

@ -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 @@ DWORD STDCALL
SleepEx(DWORD dwMilliseconds,
BOOL bAlertable)
{
TIME Interval;
LARGE_INTEGER Interval;
NTSTATUS errCode;
if (dwMilliseconds != INFINITE)

1
reactos/ntoskrnl/Makefile
View file

@ -356,7 +356,6 @@ OBJECTS_CC = \
cc/fs.o \
cc/pin.o \
cc/mdl.o \
cc/misc.o \
cc/view.o
# Kernel Debugger Support (Kd)

2
reactos/ntoskrnl/cc/cacheman.c
View file

@ -60,7 +60,7 @@ CcGetFlushedValidData (
/*
* @unimplemented
*/
VOID
PVOID
STDCALL
CcRemapBcb (
IN PVOID Bcb

31
reactos/ntoskrnl/cc/copy.c
View file

@ -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 @@ CcDeferWrite (
/*
* @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;
}
/*

11
reactos/ntoskrnl/cc/misc.c
View file

@ -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)

14
reactos/ntoskrnl/cc/pin.c
View file

@ -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 @@ CcPinMappedData (
IN PFILE_OBJECT FileObject,
IN PLARGE_INTEGER FileOffset,
IN ULONG Length,
IN BOOLEAN Wait,
IN ULONG Flags,
OUT PVOID * Bcb
)
{
@ -134,14 +134,14 @@ CcPinRead (
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 @@ CcPreparePinWrite (
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 @@ CcPreparePinWrite (
* 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);
}
/*