Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[sginsberg] 35424: - Don't export PoSetDeviceBusy, it should be a macro in a DDK header - Clean up Po* stubs

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 18 04:49:28 2008 New Revision: 35424 URL: http://svn.reactos.org/svn/reactos?rev=35424&view=rev Log: - Don't export PoSetDeviceBusy, it should be a macro in a DDK header - Clean up Po* stubs Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Aug 18 04:49:28 2008 @@ -10948,6 +10948,9 @@ PoSetDeviceBusy( PULONG IdlePointer); +#define PoSetDeviceBusy(IdlePointer) \ + ((void)(*(IdlePointer) = 0)) + NTKERNELAPI POWER_STATE NTAPI Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Mon Aug 18 04:49:28 2008 @@ -909,7 +909,6 @@ @ stdcall PoRequestPowerIrp(ptr long long ptr ptr ptr) ;PoRequestShutdownEvent ;PoSetHiberRange -@ stdcall PoSetDeviceBusy(ptr) @ stdcall PoSetPowerState(ptr long long) @ stdcall PoSetSystemState(long) ;PoShutdownBugCheck Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Mon Aug 18 04:49:28 2008 @@ -1,44 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/po/events.c * PURPOSE: Power Manager - * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ + +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -PKWIN32_POWEREVENT_CALLOUT PopEventCallout; -extern PCALLBACK_OBJECT SetSystemTimeCallback; - -static VOID -NTAPI -PopGetSysButton( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context); - -VOID -NTAPI -PoNotifySystemTimeSet(VOID) -{ - KIRQL OldIrql; - - /* Check if Win32k registered a notification callback */ - if (PopEventCallout) - { - /* Raise to dispatch */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - /* Notify the callback */ - ExNotifyCallback(SetSystemTimeCallback, NULL, NULL); - - /* Lower IRQL back */ - KeLowerIrql(OldIrql); - } -} +/* GLOBALS *******************************************************************/ typedef struct _SYS_BUTTON_CONTEXT { @@ -48,6 +22,37 @@ IO_STATUS_BLOCK IoStatusBlock; ULONG SysButton; } SYS_BUTTON_CONTEXT, *PSYS_BUTTON_CONTEXT; + +static VOID +NTAPI +PopGetSysButton( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context); + +PKWIN32_POWEREVENT_CALLOUT PopEventCallout; +extern PCALLBACK_OBJECT SetSystemTimeCallback; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +PoNotifySystemTimeSet(VOID) +{ + KIRQL OldIrql; + + /* Check if Win32k registered a notification callback */ + if (PopEventCallout) + { + /* Raise to dispatch */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Notify the callback */ + ExNotifyCallback(SetSystemTimeCallback, NULL, NULL); + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); + } +} static NTSTATUS NTAPI @@ -137,9 +142,8 @@ NTSTATUS NTAPI -PopAddRemoveSysCapsCallback( - IN PVOID NotificationStructure, - IN PVOID Context) +PopAddRemoveSysCapsCallback(IN PVOID NotificationStructure, + IN PVOID Context) { PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification; PSYS_BUTTON_CONTEXT SysButtonContext; Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Mon Aug 18 04:49:28 2008 @@ -1,16 +1,19 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/po/power.c * PURPOSE: Power Manager - * * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Hervé Poussineau (hpoussin(a)reactos.com) */ + +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +/* GLOBALS *******************************************************************/ extern ULONG ExpInitialiationPhase; @@ -24,50 +27,11 @@ PDEVICE_NODE PopSystemPowerDeviceNode = NULL; BOOLEAN PopAcpiPresent = FALSE; -/* - * @implemented - */ -NTSTATUS -STDCALL -PoCallDriver(IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp) -{ - NTSTATUS Status; - - Status = IoCallDriver(DeviceObject, Irp); - - return Status; -} - -/* - * @unimplemented - */ -PULONG -STDCALL -PoRegisterDeviceForIdleDetection(IN PDEVICE_OBJECT DeviceObject, - IN ULONG ConservationIdleTime, - IN ULONG PerformanceIdleTime, - IN DEVICE_POWER_STATE State) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ -PVOID -STDCALL -PoRegisterSystemState(IN PVOID StateHandle, - IN EXECUTION_STATE Flags) -{ - UNIMPLEMENTED; - return NULL; -} +/* PRIVATE FUNCTIONS *********************************************************/ static NTSTATUS -STDCALL +NTAPI PopRequestPowerIrpCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) @@ -90,148 +54,11 @@ return STATUS_SUCCESS; } -/* - * @implemented - */ -NTSTATUS -STDCALL -PoRequestPowerIrp(IN PDEVICE_OBJECT DeviceObject, - IN UCHAR MinorFunction, - IN POWER_STATE PowerState, - IN PREQUEST_POWER_COMPLETE CompletionFunction, - IN PVOID Context, - OUT PIRP *pIrp OPTIONAL) -{ - PDEVICE_OBJECT TopDeviceObject; - PIO_STACK_LOCATION Stack; - PIRP Irp; - PIO_STATUS_BLOCK IoStatusBlock; - PREQUEST_POWER_ITEM RequestPowerItem; - NTSTATUS Status; - - if (MinorFunction != IRP_MN_QUERY_POWER - && MinorFunction != IRP_MN_SET_POWER - && MinorFunction != IRP_MN_WAIT_WAKE) - return STATUS_INVALID_PARAMETER_2; - - RequestPowerItem = ExAllocatePool(NonPagedPool, sizeof(REQUEST_POWER_ITEM)); - if (!RequestPowerItem) - return STATUS_INSUFFICIENT_RESOURCES; - IoStatusBlock = ExAllocatePool(NonPagedPool, sizeof(IO_STATUS_BLOCK)); - if (!IoStatusBlock) - { - ExFreePool(RequestPowerItem); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Always call the top of the device stack */ - TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject); - - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, - TopDeviceObject, - NULL, - 0, - NULL, - NULL, - IoStatusBlock); - if (!Irp) - { - ExFreePool(RequestPowerItem); - ExFreePool(IoStatusBlock); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* POWER IRPs are always initialized with a status code of - STATUS_NOT_IMPLEMENTED */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - - Stack = IoGetNextIrpStackLocation(Irp); - Stack->MinorFunction = MinorFunction; - if (MinorFunction == IRP_MN_WAIT_WAKE) - Stack->Parameters.WaitWake.PowerState = PowerState.SystemState; - else - Stack->Parameters.WaitWake.PowerState = PowerState.DeviceState; - - RequestPowerItem->CompletionRoutine = CompletionFunction; - RequestPowerItem->PowerState = PowerState; - RequestPowerItem->Context = Context; - - if (pIrp != NULL) - *pIrp = Irp; - - IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE, TRUE, TRUE); - Status = IoCallDriver(TopDeviceObject, Irp); - - /* Always return STATUS_PENDING. The completion routine - * will call CompletionFunction and complete the Irp. - */ - return STATUS_PENDING; -} - -#undef PoSetDeviceBusy -VOID -NTAPI -PoSetDeviceBusy(IN PULONG IdlePointer) -{ - UNIMPLEMENTED; - *IdlePointer = 0; -} - VOID NTAPI PopCleanupPowerState(IN PPOWER_STATE PowerState) { //UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -POWER_STATE -STDCALL -PoSetPowerState(IN PDEVICE_OBJECT DeviceObject, - IN POWER_STATE_TYPE Type, - IN POWER_STATE State) -{ - POWER_STATE ps; - - ASSERT_IRQL(DISPATCH_LEVEL); - - ps.SystemState = PowerSystemWorking; // Fully on - ps.DeviceState = PowerDeviceD0; // Fully on - - return ps; -} - -/* - * @unimplemented - */ -VOID -STDCALL -PoSetSystemState(IN EXECUTION_STATE Flags) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -STDCALL -PoStartNextPowerIrp(IN PIRP Irp) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -STDCALL -PoUnregisterSystemState(IN PVOID StateHandle) -{ - UNIMPLEMENTED; } NTSTATUS @@ -387,11 +214,197 @@ KeInitializeTimerEx(&Prcb->PowerState.PerfTimer, SynchronizationTimer); } -/* - * @unimplemented - */ -NTSTATUS -STDCALL +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +PoCallDriver(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + NTSTATUS Status; + + /* Forward to Io -- FIXME! */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Return status */ + return Status; +} + +/* + * @unimplemented + */ +PULONG +NTAPI +PoRegisterDeviceForIdleDetection(IN PDEVICE_OBJECT DeviceObject, + IN ULONG ConservationIdleTime, + IN ULONG PerformanceIdleTime, + IN DEVICE_POWER_STATE State) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +PVOID +NTAPI +PoRegisterSystemState(IN PVOID StateHandle, + IN EXECUTION_STATE Flags) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PoRequestPowerIrp(IN PDEVICE_OBJECT DeviceObject, + IN UCHAR MinorFunction, + IN POWER_STATE PowerState, + IN PREQUEST_POWER_COMPLETE CompletionFunction, + IN PVOID Context, + OUT PIRP *pIrp OPTIONAL) +{ + PDEVICE_OBJECT TopDeviceObject; + PIO_STACK_LOCATION Stack; + PIRP Irp; + PIO_STATUS_BLOCK IoStatusBlock; + PREQUEST_POWER_ITEM RequestPowerItem; + NTSTATUS Status; + + if (MinorFunction != IRP_MN_QUERY_POWER + && MinorFunction != IRP_MN_SET_POWER + && MinorFunction != IRP_MN_WAIT_WAKE) + return STATUS_INVALID_PARAMETER_2; + + RequestPowerItem = ExAllocatePool(NonPagedPool, sizeof(REQUEST_POWER_ITEM)); + if (!RequestPowerItem) + return STATUS_INSUFFICIENT_RESOURCES; + IoStatusBlock = ExAllocatePool(NonPagedPool, sizeof(IO_STATUS_BLOCK)); + if (!IoStatusBlock) + { + ExFreePool(RequestPowerItem); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Always call the top of the device stack */ + TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + TopDeviceObject, + NULL, + 0, + NULL, + NULL, + IoStatusBlock); + if (!Irp) + { + ExFreePool(RequestPowerItem); + ExFreePool(IoStatusBlock); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* POWER IRPs are always initialized with a status code of + STATUS_NOT_IMPLEMENTED */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + Stack = IoGetNextIrpStackLocation(Irp); + Stack->MinorFunction = MinorFunction; + if (MinorFunction == IRP_MN_WAIT_WAKE) + Stack->Parameters.WaitWake.PowerState = PowerState.SystemState; + else + Stack->Parameters.WaitWake.PowerState = PowerState.DeviceState; + + RequestPowerItem->CompletionRoutine = CompletionFunction; + RequestPowerItem->PowerState = PowerState; + RequestPowerItem->Context = Context; + + if (pIrp != NULL) + *pIrp = Irp; + + IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE, TRUE, TRUE); + Status = IoCallDriver(TopDeviceObject, Irp); + + /* Always return STATUS_PENDING. The completion routine + * will call CompletionFunction and complete the Irp. + */ + return STATUS_PENDING; +} + +/* + * @unimplemented + */ +POWER_STATE +NTAPI +PoSetPowerState(IN PDEVICE_OBJECT DeviceObject, + IN POWER_STATE_TYPE Type, + IN POWER_STATE State) +{ + POWER_STATE ps; + + ASSERT_IRQL(DISPATCH_LEVEL); + + ps.SystemState = PowerSystemWorking; // Fully on + ps.DeviceState = PowerDeviceD0; // Fully on + + return ps; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoSetSystemState(IN EXECUTION_STATE Flags) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoStartNextPowerIrp(IN PIRP Irp) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +VOID +NTAPI +PoUnregisterSystemState(IN PVOID StateHandle) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +PoQueueShutdownWorkItem(IN PWORK_QUEUE_ITEM WorkItem) +{ + PAGED_CODE(); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI NtInitiatePowerAction (IN POWER_ACTION SystemAction, IN SYSTEM_POWER_STATE MinSystemState, IN ULONG Flags, @@ -405,7 +418,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI NtPowerInformation(IN POWER_INFORMATION_LEVEL PowerInformationLevel, IN PVOID InputBuffer OPTIONAL, IN ULONG InputBufferLength, @@ -467,18 +480,6 @@ return Status; } - -NTSTATUS -STDCALL -PoQueueShutdownWorkItem(IN PWORK_QUEUE_ITEM WorkItem) -{ - PAGED_CODE(); - - DPRINT1("PoQueueShutdownWorkItem(%p)\n", WorkItem); - - return STATUS_NOT_IMPLEMENTED; -} - NTSTATUS NTAPI NtGetDevicePowerState(IN HANDLE Device, @@ -512,5 +513,3 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -/* EOF */

16 years, 2 months

[sginsberg] 35423: - Add KdInitSystem to kd64.h

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 18 02:47:44 2008 New Revision: 35423 URL: http://svn.reactos.org/svn/reactos?rev=35423&view=rev Log: - Add KdInitSystem to kd64.h Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Mon Aug 18 02:47:44 2008 @@ -48,6 +48,16 @@ IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT Context, IN BOOLEAN SecondChance +); + +// +// Initialization Routines +// +BOOLEAN +NTAPI +KdInitSystem( + ULONG Reserved, + PLOADER_PARAMETER_BLOCK LoaderBlock ); //

16 years, 2 months

[sginsberg] 35422: - Remove 3 deprecated macros - Use X86_EFLAGS_ID instead of cpu.c specific EFLAGS_ID

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 18 02:42:12 2008 New Revision: 35422 URL: http://svn.reactos.org/svn/reactos?rev=35422&view=rev Log: - Remove 3 deprecated macros - Use X86_EFLAGS_ID instead of cpu.c specific EFLAGS_ID Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Aug 18 02:42:12 2008 @@ -11,12 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* FIXME: Local EFLAGS defines not used anywhere else */ -#define EFLAGS_IOPL 0x3000 -#define EFLAGS_NF 0x4000 -#define EFLAGS_RF 0x10000 -#define EFLAGS_ID 0x200000 /* GLOBALS *******************************************************************/ @@ -133,7 +127,7 @@ Ke386SaveFlags(EFlags); /* XOR out the ID bit and update EFlags */ - NewEFlags = EFlags ^ EFLAGS_ID; + NewEFlags = EFlags ^ X86_EFLAGS_ID; Ke386RestoreFlags(NewEFlags); /* Get them back and see if they were modified */ @@ -141,7 +135,7 @@ if (NewEFlags != EFlags) { /* The modification worked, so CPUID exists. Set the ID Bit again. */ - EFlags |= EFLAGS_ID; + EFlags |= X86_EFLAGS_ID; Ke386RestoreFlags(EFlags); /* Peform CPUID 0 to see if CPUID 1 is supported */

16 years, 2 months

[sginsberg] 35421: - Remove empty header

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 18 02:37:25 2008 New Revision: 35421 URL: http://svn.reactos.org/svn/reactos?rev=35421&view=rev Log: - Remove empty header Removed: trunk/reactos/ntoskrnl/include/internal/i386/fpu.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Removed: trunk/reactos/ntoskrnl/include/internal/i386/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/fpu.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/fpu.h (removed) @@ -1,5 +1,0 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H -#define __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H - -#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_FPU_H */ - Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Mon Aug 18 02:37:25 2008 @@ -42,7 +42,6 @@ #include "ke.h" #include "i386/mm.h" -#include "i386/fpu.h" #include "i386/v86m.h" #include "ob.h" #include "mm.h"

16 years, 2 months

[cgutman] 35420: - Handle STATUS_FILE_CLOSED

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 17 19:05:05 2008 New Revision: 35420 URL: http://svn.reactos.org/svn/reactos?rev=35420&view=rev Log: - Handle STATUS_FILE_CLOSED Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 17 19:05:05 2008 @@ -291,6 +291,7 @@ case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); *Errno = WSA_NOT_ENOUGH_MEMORY; break; case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); *Errno = WSAEAFNOSUPPORT; break; case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); *Errno = WSAECONNRESET; break; + case STATUS_FILE_CLOSED: DbgPrint("MSAFD: STATUS_FILE_CLOSED\n"); *Errno = WSAENOTSOCK; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break;

16 years, 2 months

[cgutman] 35419: - Change STATUS_UNSUCCESSFUL to STATUS_FILE_CLOSED - Move the Irp->Cancel check after SocketAcquireStateLock to fix a possible crash - Change STATUS_INVALID_PARAMETER to STATUS_FILE_CLOSED - Move SocketAcquireStateLock in front of the check for a NULL return from LockRequest to prevent another possible crash

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 17 17:12:31 2008 New Revision: 35419 URL: http://svn.reactos.org/svn/reactos?rev=35419&view=rev Log: - Change STATUS_UNSUCCESSFUL to STATUS_FILE_CLOSED - Move the Irp->Cancel check after SocketAcquireStateLock to fix a possible crash - Change STATUS_INVALID_PARAMETER to STATUS_FILE_CLOSED - Move SocketAcquireStateLock in front of the check for a NULL return from LockRequest to prevent another possible crash Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/lock.c branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -83,19 +83,18 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status = STATUS_FILE_CLOSED; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; - if ( Irp->Cancel ) { - /* FIXME: is this anything else we need to do? */ - FCB->ListenIrp.InFlightRequest = NULL; + if( !SocketAcquireStateLock( FCB ) ) return Status; + + FCB->ListenIrp.InFlightRequest = NULL; + + if( Irp->Cancel ) { + SocketStateUnlock( FCB ); return STATUS_SUCCESS; } - - if( !SocketAcquireStateLock( FCB ) ) return Status; - - FCB->ListenIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -262,7 +262,7 @@ NTSTATUS LostSocket( PIRP Irp ) { - NTSTATUS Status = STATUS_INVALID_PARAMETER; + NTSTATUS Status = STATUS_FILE_CLOSED; AFD_DbgPrint(MIN_TRACE,("Called.\n")); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -449,7 +449,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ReceiveIrp.InFlightRequest = NULL; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Sun Aug 17 17:12:31 2008 @@ -277,6 +277,10 @@ (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp ); PAFD_FCB FCB = FileObject->FsContext; + if( !SocketAcquireStateLock( FCB ) ) { + return LostSocket( Irp ); + } + if ( !EventSelectInfo ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); @@ -284,10 +288,6 @@ AFD_DbgPrint(MID_TRACE,("Called (Event %x Triggers %x)\n", EventSelectInfo->EventObject, EventSelectInfo->Events)); - - if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp ); - } FCB->EventSelectTriggers = FCB->EventsFired = 0; if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); @@ -325,13 +325,13 @@ AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); + if( !SocketAcquireStateLock( FCB ) ) { + return LostSocket( Irp ); + } + if ( !EnumReq ) { return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - } - - if( !SocketAcquireStateLock( FCB ) ) { - return LostSocket( Irp ); } EnumReq->PollEvents = FCB->PollState;

16 years, 2 months

[cgutman] 35418: - Call SocketStateUnlock before returning - Don't complete the IRP again in the completion routine

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 17 16:48:09 2008 New Revision: 35418 URL: http://svn.reactos.org/svn/reactos?rev=35418&view=rev Log: - Call SocketStateUnlock before returning - Don't complete the IRP again in the completion routine Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Aug 17 16:48:09 2008 @@ -77,7 +77,7 @@ /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; AFD_DbgPrint(MID_TRACE,("Irp->IoStatus.Status = %x\n", Irp->IoStatus.Status)); @@ -108,7 +108,10 @@ if( NT_SUCCESS(Status) ) { Status = MakeSocketIntoConnection( FCB ); - if( !NT_SUCCESS(Status) ) return Status; + if( !NT_SUCCESS(Status) ) { + SocketStateUnlock( FCB ); + return Status; + } if( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]);

16 years, 2 months

[arty] 35417: Tolerate NULL SectionObjectPointer.

by arty＠svn.reactos.org

Author: arty Date: Sun Aug 17 16:14:51 2008 New Revision: 35417 URL: http://svn.reactos.org/svn/reactos?rev=35417&view=rev Log: Tolerate NULL SectionObjectPointer. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun Aug 17 16:14:51 2008 @@ -220,9 +220,10 @@ PNOCC_BCB Bcb; DPRINT("AllocateCacheSections: FileObject %x\n", FileObject); - DPRINT - ("AllocateCacheSections: FileObject->SectionObjectPointer: %x\n", - FileObject->SectionObjectPointer); + + if (!FileObject->SectionObjectPointer) + return INVALID_CACHE; + Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; if (!Map)

16 years, 2 months

[arty] 35416: More WIP for newcc. Not completely working.

by arty＠svn.reactos.org

Author: arty Date: Sun Aug 17 16:10:35 2008 New Revision: 35416 URL: http://svn.reactos.org/svn/reactos?rev=35416&view=rev Log: More WIP for newcc. Not completely working. Added: branches/arty-newcc/ntoskrnl/ntoskrnl.spec - copied unchanged from r35355, trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/lazyrite.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/cc.h branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -10,7 +10,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -20,6 +20,10 @@ PDEVICE_OBJECT NTAPI MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); + +BOOLEAN +NTAPI +MmIsCOWAddress(PEPROCESS Process, PVOID Address); NTSTATUS NTAPI @@ -29,60 +33,85 @@ PVOID Buffer, PIO_STATUS_BLOCK ReadStatus) { - NTSTATUS Status; - PIRP Irp = NULL; - KEVENT ReadWait; - PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); - PIO_STACK_LOCATION IrpSp; - + ULONG Length = PAGE_SIZE; + NTSTATUS Status; + PIRP Irp = NULL; + KEVENT ReadWait; + PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); + PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + if (MmIsDirtyPage(PsInitialSystemProcess, Buffer) && + !MmIsCOWAddress(PsInitialSystemProcess, Buffer)) + { + DPRINT1 + ("PAGING WRITE (FLUSH) File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + + MmSetCleanPage(PsInitialSystemProcess, Buffer); + + KeLowerIrql(OldIrql); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest - (IRP_MJ_WRITE, - DeviceObject, - Buffer, - PAGE_SIZE, - FileOffset, - ReadStatus); + (IRP_MJ_WRITE, + DeviceObject, + Buffer, + Length, + FileOffset, + ReadStatus); if (!Irp) { - return STATUS_NO_MEMORY; + return STATUS_NO_MEMORY; } Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE; - + ObReferenceObject(FileObject); - + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->FileObject = FileObject; - + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!NT_SUCCESS - (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, - NULL))) - { - DPRINT1("Warning: Failed to wait for synchronous IRP\n"); - ASSERT(FALSE); - ObDereferenceObject(FileObject); - return Status; - } - } - + if (!NT_SUCCESS + (KeWaitForSingleObject + (&ReadWait, + Suspended, + KernelMode, + FALSE, + NULL))) + { + DPRINT1("Warning: Failed to wait for synchronous IRP\n"); + ASSERT(FALSE); + ObDereferenceObject(FileObject); + return Status; + } + } + ObDereferenceObject(FileObject); + MmDeleteHyperspaceMapping(Buffer); DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - - return ReadStatus->Status; + } + else + { + ReadStatus->Status = STATUS_SUCCESS; + ReadStatus->Information = PAGE_SIZE; + KeLowerIrql(OldIrql); + } + + return ReadStatus->Status; } VOID @@ -156,6 +185,8 @@ LARGE_INTEGER ToWrite = *FileOffset; IO_STATUS_BLOCK IOSB; + DPRINT("CcFlushCache\n"); + BOOLEAN Result = CcpMapData ((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap, FileOffset, @@ -170,11 +201,18 @@ ToWrite.LowPart = PAGE_ROUND_DOWN(FileOffset->LowPart); for (BufPage = BufStart; - BufPage < BufStart + PAGE_ROUND_UP(Length); - BufPage += PAGE_SIZE) - { - CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); - ToWrite.QuadPart += PAGE_SIZE; + BufPage < BufStart + PAGE_ROUND_UP(Length); + BufPage += PAGE_SIZE) + { + DPRINT + ("CcpSimpleWrite: [%wZ] %x:%d\n", + &Bcb->FileObject->FileName, + Bcb->FileOffset.LowPart, + Bcb->Length); + CcpSimpleWrite(Bcb->FileObject, &ToWrite, BufPage, &IOSB); + DPRINT + ("Page Write: %08x\n", IOSB.Status); + ToWrite.QuadPart += PAGE_SIZE; } CcUnpinData(Bcb); @@ -189,15 +227,15 @@ IoStatus->Status = IOSB.Status; IoStatus->Information = 0; } -} - + DPRINT("CcFlushCache -> %08x\n", IOSB.Status); +} + +// Always succeeds for us PVOID NTAPI CcRemapBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + return Bcb; } @@ -205,8 +243,14 @@ NTAPI CcRepinBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); + PVOID TheBcb; + PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; + CcPinMappedData + (RealBcb->FileObject, + &RealBcb->FileOffset, + RealBcb->Length, + PIN_WAIT, + &TheBcb); } VOID @@ -215,8 +259,18 @@ IN BOOLEAN WriteThrough, OUT PIO_STATUS_BLOCK IoStatus) { - UNIMPLEMENTED; - while (TRUE); + PNOCC_BCB RealBcb = (PNOCC_BCB)RealBcb; + + CcUnpinData(Bcb); + + if (WriteThrough) + { + CcFlushCache + (RealBcb->FileObject->SectionObjectPointer, + &RealBcb->FileOffset, + RealBcb->Length, + IoStatus); + } } /* EOF */ Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -25,45 +25,6 @@ #define TAG_COPY_WRITE TAG('R', 'i', 't', 'e') /* FUNCTIONS ******************************************************************/ - -NTSTATUS -NTAPI -DoDeviceRead(PFILE_OBJECT FileObject, - LARGE_INTEGER SectorBase, - PCHAR SystemBuffer, - ULONG AlignSize, - ULONG *LengthRead) -{ - IO_STATUS_BLOCK IoStatusBlock = {{0}}; - NTSTATUS Status; - KEVENT Event; - PMDL Mdl; - - /* Create an MDL for the transfer */ - Mdl = IoAllocateMdl(SystemBuffer, AlignSize, TRUE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl), - Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); - - /* Setup the event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* Read the page */ - Status = IoPageRead(FileObject, Mdl, &SectorBase, &Event, &IoStatusBlock); - if (Status == STATUS_PENDING) - { - /* Do the wait */ - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - /* Free the MDL */ - IoFreeMdl(Mdl); - - /* Save how much we read, if needed */ - if (LengthRead) *LengthRead = IoStatusBlock.Information; - - return Status; -} BOOLEAN NTAPI Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -17,9 +17,11 @@ PFSN_PREFETCHER_GLOBALS CcPfGlobals; extern LONG CcOutstandingDeletes; +extern KEVENT CcpLazyWriteEvent; extern VOID STDCALL CcpUnmapThread(PVOID Unused); -HANDLE CcUnmapThreadHandle; -CLIENT_ID CcUnmapThreadId; +extern VOID STDCALL CcpLazyWriteThread(PVOID Unused); +HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; +CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; /* FUNCTIONS ******************************************************************/ @@ -38,6 +40,7 @@ } KeInitializeEvent(&CcDeleteEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&CcpLazyWriteEvent, SynchronizationEvent, FALSE); CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); @@ -56,6 +59,20 @@ KEBUGCHECK(0); } + Status = PsCreateSystemThread + (&CcLazyWriteThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &CcLazyWriteThreadId, + (PKSTART_ROUTINE) CcpLazyWriteThread, + NULL); + + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + return TRUE; } @@ -173,18 +190,15 @@ NTAPI CcGetFileObjectFromSectionPtrs(IN PSECTION_OBJECT_POINTERS SectionObjectPointer) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + return ((PNOCC_CACHE_MAP)SectionObjectPointer->SharedCacheMap)->FileObject; } PFILE_OBJECT NTAPI CcGetFileObjectFromBcb(IN PVOID Bcb) { - UNIMPLEMENTED; - while (TRUE); - return NULL; + PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; + return RealBcb->FileObject; } /* EOF */ Modified: branches/arty-newcc/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/lazyr… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/lazyrite.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -9,19 +9,63 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ +KEVENT CcpLazyWriteEvent; + /* FUNCTIONS ******************************************************************/ + +VOID STDCALL +CcpLazyWriteThread(PVOID Unused) +{ + ULONG i; + BOOLEAN GotLock; + PNOCC_BCB RealBcb; + LARGE_INTEGER Interval; + IO_STATUS_BLOCK IoStatus; + + while (TRUE) + { + for (i = 0; i < CACHE_NUM_SECTIONS; i++) + { + RealBcb = &CcCacheSections[i]; + CcpLock(&CcMutex); + GotLock = RealBcb->RefCount == 1; + if (GotLock) RealBcb->RefCount++; + CcpUnlock(&CcMutex); + // Pinned (temporarily) + if (GotLock) + { + DPRINT("CcpLazyWrite: Flush #%x\n", i); + CcFlushCache + (RealBcb->FileObject->SectionObjectPointer, + &RealBcb->FileOffset, + RealBcb->Length, + &IoStatus); + + DPRINT + ("CcpLazyWriteThread UnmapIoStatus.Status %08x IoStatus.Information %08x\n", + IoStatus.Status, + IoStatus.Information); + + CcUnpinData(RealBcb); + DPRINT("CcpLazyWrite: done #%x\n", i); + } + } + KeSetEvent(&CcpLazyWriteEvent, IO_DISK_INCREMENT, TRUE); + Interval.QuadPart = -1000000L; + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + } +} NTSTATUS NTAPI CcWaitForCurrentLazyWriterActivity(VOID) { - UNIMPLEMENTED; - while (TRUE); + KeWaitForSingleObject(&CcpLazyWriteEvent, Executive, KernelMode, FALSE, NULL); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -10,7 +10,7 @@ /* INCLUDES *******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -29,9 +29,11 @@ typedef struct _NOCC_UNMAP_CHAIN { - PVOID Buffer; - PVOID SectionObject; - PVOID FileObject; + PVOID Buffer; + PSECTION_OBJECT SectionObject; + PFILE_OBJECT FileObject; + LARGE_INTEGER FileOffset; + ULONG Length; } NOCC_UNMAP_CHAIN, *PNOCC_UNMAP_CHAIN; NOCC_UNMAP_CHAIN CcUnmapChain[CACHE_NUM_SECTIONS]; @@ -60,6 +62,7 @@ VOID CcpPerformUnmapWork() { NOCC_UNMAP_CHAIN WorkingOn; + IO_STATUS_BLOCK IoStatus; ULONG NumElements; KeAcquireGuardedMutex(&CcMutex); @@ -70,6 +73,12 @@ WorkingOn = CcUnmapChain[0]; RtlMoveMemory(&CcUnmapChain[0], &CcUnmapChain[1], NumElements * sizeof(NOCC_UNMAP_CHAIN)); KeReleaseGuardedMutex(&CcMutex); + CcFlushCache + (WorkingOn.FileObject->SectionObjectPointer, + &WorkingOn.FileOffset, + WorkingOn.Length, + &IoStatus); + DPRINT1("Status result from flush: %08x\n", IoStatus.Status); MmUnmapViewInSystemSpace(WorkingOn.Buffer); ObDereferenceObject(WorkingOn.SectionObject); DPRINT1("Done unmapping\n"); @@ -110,7 +119,8 @@ UnmapWork->Buffer = Bcb->BaseAddress; UnmapWork->SectionObject = Bcb->SectionObject; UnmapWork->FileObject = Bcb->FileObject; - + UnmapWork->FileOffset = Bcb->FileOffset; + UnmapWork->Length = Bcb->Length; Bcb->BaseAddress = NULL; Bcb->Length = 0; Bcb->FileOffset.QuadPart = 0; @@ -206,9 +216,18 @@ PLARGE_INTEGER FileOffset) { ULONG i = INVALID_CACHE; - PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + PNOCC_CACHE_MAP Map; PNOCC_BCB Bcb; + DPRINT("AllocateCacheSections: FileObject %x\n", FileObject); + DPRINT + ("AllocateCacheSections: FileObject->SectionObjectPointer: %x\n", + FileObject->SectionObjectPointer); + Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + + if (!Map) + return INVALID_CACHE; + DPRINT("Allocating Cache Section (File already has %d sections)\n", Map->NumberOfMaps); i = RtlFindClearBitsAndSet @@ -217,6 +236,8 @@ if (i != INVALID_CACHE) { + DPRINT("Setting up Bcb #%x\n", i); + Bcb = &CcCacheSections[i]; ASSERT(Bcb->RefCount < 2); @@ -229,7 +250,7 @@ ASSERT(!Bcb->RefCount); Bcb->RefCount = 1; - //DPRINT("Bcb #%x RefCount %d\n", Bcb - CcCacheSections, Bcb->RefCount); + DPRINT("Bcb #%x RefCount %d\n", Bcb - CcCacheSections, Bcb->RefCount); ObReferenceObject(SectionObject); Bcb->FileObject = FileObject; @@ -239,7 +260,11 @@ Map->NumberOfMaps++; InsertTailList(&Map->AssociatedBcb, &Bcb->ThisFileList); - + + if (!RtlTestBit(CcCacheBitmap, i)) + { + DPRINT("Somebody stoeled BCB #%x\n", i); + } ASSERT(RtlTestBit(CcCacheBitmap, i)); DPRINT("Allocated #%x\n", i); Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -239,9 +239,19 @@ extern KEVENT CcDeleteEvent; extern ULONG CcCacheClockHand; extern LIST_ENTRY CcPendingUnmap; +extern KEVENT CcpLazyWriteEvent; extern VOID CcpLock(); extern VOID CcpUnlock(); extern VOID CcpDereferenceCache(ULONG Sector); +BOOLEAN +NTAPI +CcpMapData +(IN PNOCC_CACHE_MAP Map, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID *BcbResult, + OUT PVOID *Buffer); #endif Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 17 16:10:35 2008 @@ -161,6 +161,12 @@ PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); PIO_STACK_LOCATION IrpSp; + DPRINT1 + ("PAGING READ File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest @@ -226,6 +232,12 @@ PDEVICE_OBJECT DeviceObject = MmGetDeviceObjectForFile(FileObject); PIO_STACK_LOCATION IrpSp; + DPRINT1 + ("PAGING WRITE File %wZ Offset %x Length %d\n", + &FileObject->FileName, + FileOffset->u.LowPart, + Length); + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest @@ -333,6 +345,21 @@ */ RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +MmIsCOWAddress(IN PEPROCESS Process, IN PVOID Address) +{ + BOOLEAN IsCow = TRUE; /* Don't write unless we're sure */ + PMEMORY_AREA MemoryArea; + + MmLockAddressSpace(&Process->VadRoot); + MemoryArea = MmLocateMemoryAreaByAddress(&Process->VadRoot, Address); + ASSERT(MemoryArea); + IsCow = MemoryArea->Data.SectionData.WriteCopyView; + MmUnlockAddressSpace(&Process->VadRoot); + return IsCow; } /* Note: Mmsp prefix denotes "Memory Manager Section Private". */ @@ -3788,7 +3815,7 @@ return(Status); } -VOID static +VOID MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) {

16 years, 2 months

[arty] 35415: Merged files (partial) from trunk.

by arty＠svn.reactos.org

Author: arty Date: Sun Aug 17 16:10:15 2008 New Revision: 35415 URL: http://svn.reactos.org/svn/reactos?rev=35415&view=rev Log: Merged files (partial) from trunk. Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/config/cmsy… ============================================================================== --- branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -120,7 +120,7 @@ IN KPROCESSOR_MODE PreviousMode) { DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); + ASSERT(FALSE); return STATUS_SUCCESS; } Modified: branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/kdbg/kdb_cl… ============================================================================== --- branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -1266,7 +1266,7 @@ if (Argc >= 2 && _stricmp(Argv[1], "list") == 0) { Entry = PsActiveProcessHead.Flink; - if (Entry == &PsActiveProcessHead) + if (!Entry || Entry == &PsActiveProcessHead) { KdbpPrint("No processes in the system!\n"); return TRUE; Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge… ============================================================================== --- branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -2,7 +2,12 @@ <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="ntoskrnl_$(ARCH).def" /> + <ifnot property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl.spec.def" /> + </ifnot> + <if property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl_arm.def" /> + </if> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> @@ -112,28 +117,16 @@ <file>timerobj.c</file> <file>wait.c</file> </directory> - <if property="CC" value="1"> - <directory name="cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - </if> - <if property="CC" value="0"> - <directory name="cache"> - <file>cachesub.c</file> - <file>copysup.c</file> - <file>fssup.c</file> - <file>lazyrite.c</file> - <file>logsup.c</file> - <file>mdlsup.c</file> - <file>pinsup.c</file> - <file>vacbsup.c</file> - </directory> - </if> + <directory name="cache"> + <file>cachesub.c</file> + <file>copysup.c</file> + <file>fssup.c</file> + <file>lazyrite.c</file> + <file>logsup.c</file> + <file>mdlsup.c</file> + <file>pinsup.c</file> + <file>vacbsup.c</file> + </directory> <directory name="config"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -479,5 +472,6 @@ <file>wmi.c</file> </directory> <file>ntoskrnl.rc</file> + <file>ntoskrnl.spec</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </group>

16 years, 2 months

← Newer
1
...
40
41
42
43
44
45
46
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008