Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 22906: remove a miss use assert in ProtocolReceive, I have talk with arty about it.
by greatlrd＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: greatlrd Date: Sat Jul 8 01:43:49 2006 New Revision: 22906 URL: http://svn.reactos.org/svn/reactos?rev=22906&view=rev Log: remove a miss use assert in ProtocolReceive, I have talk with arty about it. Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c Sat Jul 8 01:43:49 2006 @@ -486,9 +486,7 @@ else { if (NdisStatus == NDIS_STATUS_SUCCESS) - { - ASSERT(PacketSize <= Adapter->MTU); - + { NdisTransferData(&NdisStatus, Adapter->NdisHandle, MacReceiveContext, 0, PacketSize, NdisPacket, &BytesTransferred);

1 0

[ion] 22905: - Add some more proper handling of ref/dereferencing in IopParseDevice.
by ion＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: ion Date: Fri Jul 7 21:53:34 2006 New Revision: 22905 URL: http://svn.reactos.org/svn/reactos?rev=22905&view=rev Log: - Add some more proper handling of ref/dereferencing in IopParseDevice. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 7 21:53:34 2006 @@ -40,6 +40,7 @@ IO_STATUS_BLOCK IoStatusBlock; BOOLEAN DirectOpen = FALSE; OBJECT_ATTRIBUTES ObjectAttributes; + BOOLEAN OpenCancelled; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -63,7 +64,8 @@ } /* Reference the DO FIXME: Don't allow failure */ - Status = IopReferenceDeviceObject(OriginalDeviceObject); + //Status = IopReferenceDeviceObject(OriginalDeviceObject); + OriginalDeviceObject->ReferenceCount++; /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess, @@ -192,7 +194,6 @@ SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (!Irp) return STATUS_UNSUCCESSFUL; @@ -275,12 +276,16 @@ /* Reference the file object and call the driver */ ObReferenceObject(FileObject); + + /* Initialize the File Object event and set the FO */ + KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); OpenPacket->FileObject = FileObject; - Status = IoCallDriver(FileObject->DeviceObject, Irp ); + + /* Queue the IRP and call the driver */ + //IopQueueIrpToThread(Irp); + Status = IoCallDriver(DeviceObject, Irp); /* Copy the status block */ - OpenPacket->Information = IoStatusBlock.Information; - OpenPacket->FinalStatus = IoStatusBlock.Status; if (Status == STATUS_PENDING) { KeWaitForSingleObject(&FileObject->Event, @@ -309,6 +314,9 @@ } #endif + /* Copy the I/O Status */ + OpenPacket->Information = IoStatusBlock.Information; + /* The driver failed to create the file */ if (!NT_SUCCESS(Status)) { @@ -323,11 +331,17 @@ /* Clear its device object */ FileObject->DeviceObject = NULL; + /* Save this now because the FO might go away */ + OpenCancelled = FileObject->Flags & FO_FILE_OPEN_CANCELLED; + /* Clear the file object in the open packet */ OpenPacket->FileObject = NULL; /* Dereference the file object */ ObDereferenceObject(FileObject); + + /* Unless the driver canelled the open, dereference the VPB */ + if (!(OpenCancelled) && (Vpb)) IopDereferenceVpb(Vpb); /* Set the status and return */ OpenPacket->FinalStatus = Status;

1 0

[ion] 22904: - Make an I/O Tagged copy of the file name and properly handle failure.
by ion＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: ion Date: Fri Jul 7 21:29:12 2006 New Revision: 22904 URL: http://svn.reactos.org/svn/reactos?rev=22904&view=rev Log: - Make an I/O Tagged copy of the file name and properly handle failure. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jul 7 21:29:12 2006 @@ -612,6 +612,12 @@ VOID NTAPI +IopDereferenceVpb( + IN PVPB Vpb +); + +VOID +NTAPI IoInitFileSystemImplementation( VOID ); Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Fri Jul 7 21:29:12 2006 @@ -53,6 +53,7 @@ #define TAG_IO TAG('I', 'o', ' ', ' ') #define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') #define TAG_EA TAG('I', 'o', 'E', 'a') +#define TAG_IO_NAME TAG('I', 'o', 'N', 'm') /* formerly located in io/work.c */ #define TAG_IOWI TAG('I', 'O', 'W', 'I') Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 7 21:29:12 2006 @@ -33,7 +33,7 @@ PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject; NTSTATUS Status; PFILE_OBJECT FileObject; - PVPB Vpb; + PVPB Vpb = NULL; PIRP Irp; PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; @@ -141,9 +141,6 @@ (PVOID*)&FileObject); RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); - /* Create the name for the file object */ - RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); - /* Set the device object and reference it */ Status = IopReferenceDeviceObject(DeviceObject); FileObject->DeviceObject = DeviceObject; @@ -248,6 +245,33 @@ StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; StackLoc->Parameters.Create.SecurityContext = &SecurityContext; + + /* Check if the file object has a name */ + if (RemainingName->Length) + { + /* Setup the unicode string */ + FileObject->FileName.MaximumLength = RemainingName->Length; + FileObject->FileName.Buffer = ExAllocatePoolWithTag(PagedPool, + RemainingName-> + Length, + TAG_IO_NAME); + if (!FileObject->FileName.Buffer) + { + /* Failed to allocate the name, free the IRP */ + IoFreeIrp(Irp); + + /* Dereference the device object and VPB */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + + /* Clear the FO */ + FileObject->DeviceObject = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* Copy the name */ + RtlCopyUnicodeString(&FileObject->FileName, RemainingName); /* Reference the file object and call the driver */ ObReferenceObject(FileObject);

1 0

[ion] 22903: - Implement IopCheckVpbMounted and use it in IopParseDevice as documented in NT File System Internals. - Add some missing ref/deref calls for DOs and VPBs.
by ion＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: ion Date: Fri Jul 7 21:18:52 2006 New Revision: 22903 URL: http://svn.reactos.org/svn/reactos?rev=22903&view=rev Log: - Implement IopCheckVpbMounted and use it in IopParseDevice as documented in NT File System Internals. - Add some missing ref/deref calls for DOs and VPBs. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jul 7 21:18:52 2006 @@ -574,6 +574,15 @@ IN PDEVICE_NODE DeviceNode ); +PVPB +NTAPI +IopCheckVpbMounted( + IN POPEN_PACKET OpenPacket, + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING RemainingName, + OUT PNTSTATUS Status +); + NTSTATUS NTAPI IopMountVolume( @@ -617,6 +626,13 @@ NTAPI IopReferenceDeviceObject( IN PDEVICE_OBJECT DeviceObject +); + +VOID +NTAPI +IopDereferenceDeviceObject( + IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN ForceUnload ); // Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 7 21:18:52 2006 @@ -92,6 +92,9 @@ { /* Yes, remember it */ Vpb = OpenPacket->RelatedFileObject->Vpb; + + /* Reference it */ + InterlockedIncrement(&Vpb->ReferenceCount); } } else @@ -102,25 +105,15 @@ /* Check if it has a VPB */ if ((DeviceObject->Vpb) && !(DirectOpen)) { - /* Check if it's not already mounted */ - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - /* Mount the volume */ - Status = IopMountVolume(DeviceObject, - FALSE, - FALSE, - FALSE, - &Vpb); - if (!NT_SUCCESS(Status)) - { - /* Couldn't mount, fail the lookup */ - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; - } - } + /* Check if the VPB is mounted, and mount it */ + Vpb = IopCheckVpbMounted(OpenPacket, + DeviceObject, + RemainingName, + &Status); + if (!Vpb) return Status; /* Get the VPB's device object */ - DeviceObject = DeviceObject->Vpb->DeviceObject; + DeviceObject = Vpb->DeviceObject; } /* Check if there's an attached device */ Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c Fri Jul 7 21:18:52 2006 @@ -52,6 +52,76 @@ ExInitializeResourceLite(&FileSystemListLock); InitializeListHead(&FsChangeNotifyListHead); KeInitializeGuardedMutex(&FsChangeNotifyListLock); +} + +PVPB +NTAPI +IopCheckVpbMounted(IN POPEN_PACKET OpenPacket, + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING RemainingName, + OUT PNTSTATUS Status) +{ + BOOLEAN Alertable, Raw; + KIRQL OldIrql; + PVPB Vpb = NULL; + + /* Lock the VPBs */ + IoAcquireVpbSpinLock(&OldIrql); + + /* Set VPB mount settings */ + Raw = !RemainingName->Length && !OpenPacket->RelatedFileObject; + Alertable = (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT); + + /* Start looping until the VPB is mounted */ + while (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) + { + /* Release the lock */ + IoReleaseVpbSpinLock(OldIrql); + + /* Mount the volume */ + *Status = IopMountVolume(DeviceObject, + Raw, + FALSE, + Alertable, + &Vpb); + + /* Check if we failed or if we were alerted */ + if (!(NT_SUCCESS(*Status)) || + (*Status == STATUS_USER_APC) || + (*Status == STATUS_ALERTED)) + { + /* Dereference the device, since IopParseDevice referenced it */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + + /* Check if it was a total failure */ + if (!NT_SUCCESS(Status)) return NULL; + + /* Otherwise we were alerted */ + *Status = STATUS_WRONG_VOLUME; + return NULL; + } + + /* Re-acquire the lock */ + IoAcquireVpbSpinLock(&OldIrql); + } + + /* Make sure the VPB isn't locked */ + Vpb = DeviceObject->Vpb; + if (Vpb->Flags & VPB_LOCKED) + { + /* We're locked, so fail */ + *Status = STATUS_ACCESS_DENIED; + Vpb = NULL; + } + else + { + /* Success! Reference the VPB */ + Vpb->ReferenceCount++; + } + + /* Release the lock and return the VPB */ + IoReleaseVpbSpinLock(OldIrql); + return Vpb; } NTSTATUS

1 0

[ion] 22902: - Use a simpler and more robust way to detect direct device opens and save it in a variable that's read when needed, instead of having multiple large code paths.
by ion＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: ion Date: Fri Jul 7 20:26:05 2006 New Revision: 22902 URL: http://svn.reactos.org/svn/reactos?rev=22902&view=rev Log: - Use a simpler and more robust way to detect direct device opens and save it in a variable that's read when needed, instead of having multiple large code paths. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 7 20:26:05 2006 @@ -30,7 +30,7 @@ OUT PVOID *Object) { POPEN_PACKET OpenPacket = (POPEN_PACKET)Context; - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject; NTSTATUS Status; PFILE_OBJECT FileObject; PVPB Vpb; @@ -38,6 +38,8 @@ PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN DirectOpen = FALSE; + OBJECT_ATTRIBUTES ObjectAttributes; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -53,6 +55,17 @@ /* Validate the open packet */ if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; + /* Check if we have a related file object */ + if (OpenPacket->RelatedFileObject) + { + /* Use the related file object's device object */ + OriginalDeviceObject = OpenPacket->RelatedFileObject->DeviceObject; + } + + /* Reference the DO FIXME: Don't allow failure */ + Status = IopReferenceDeviceObject(OriginalDeviceObject); + + /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); RtlMapGenericMask(&AccessState->OriginalDesiredAccess, @@ -60,10 +73,73 @@ SeSetAccessStateGenericMapping(AccessState, &IoFileObjectType->TypeInfo.GenericMapping); + /* Check if this is a direct open */ + if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject)) + { + /* Remember this for later */ + DirectOpen = TRUE; + } + + /* Check if we have a related FO that wasn't a direct open */ + if ((OpenPacket->RelatedFileObject) && + !(OpenPacket->RelatedFileObject->Flags & FO_DIRECT_DEVICE_OPEN)) + { + /* The device object is the one we were given */ + DeviceObject = OriginalDeviceObject; + + /* Check if the related FO had a VPB */ + if (OpenPacket->RelatedFileObject->Vpb) + { + /* Yes, remember it */ + Vpb = OpenPacket->RelatedFileObject->Vpb; + } + } + else + { + /* The device object is the one we were given */ + DeviceObject = OriginalDeviceObject; + + /* Check if it has a VPB */ + if ((DeviceObject->Vpb) && !(DirectOpen)) + { + /* Check if it's not already mounted */ + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) + { + /* Mount the volume */ + Status = IopMountVolume(DeviceObject, + FALSE, + FALSE, + FALSE, + &Vpb); + if (!NT_SUCCESS(Status)) + { + /* Couldn't mount, fail the lookup */ + ObDereferenceObject(FileObject); + return STATUS_UNSUCCESSFUL; + } + } + + /* Get the VPB's device object */ + DeviceObject = DeviceObject->Vpb->DeviceObject; + } + + /* Check if there's an attached device */ + if (DeviceObject->AttachedDevice) + { + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + } + } + /* Create the actual file object */ - Status = ObCreateObject(AccessMode, + InitializeObjectAttributes(&ObjectAttributes, + NULL, + Attributes, + NULL, + NULL); + Status = ObCreateObject(KernelMode, IoFileObjectType, - NULL, + &ObjectAttributes, AccessMode, NULL, sizeof(FILE_OBJECT), @@ -72,54 +148,8 @@ (PVOID*)&FileObject); RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); - /* Parent is a device object */ - DeviceObject = IoGetAttachedDevice(ParseObject); - - /* Check if we don't have a remaining name */ - if (!*RemainingName->Buffer) - { - /* Then this is a device */ - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - } - else - { - /* Check if we don't have a related file object */ - if (!OpenPacket->RelatedFileObject) - { - /* Check if it has a VPB */ - if (DeviceObject->Vpb) - { - /* Check if it's not already mounted */ - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - /* Mount the volume */ - Status = IopMountVolume(DeviceObject, - FALSE, - FALSE, - FALSE, - &Vpb); - if (!NT_SUCCESS(Status)) - { - /* Couldn't mount, fail the lookup */ - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; - } - } - - /* Get the VPB's device object */ - DeviceObject = DeviceObject->Vpb->DeviceObject; - } - } - else - { - /* Otherwise, this is an open */ - FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; - DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; - } - - /* Create the name for the file object */ - RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); - } + /* Create the name for the file object */ + RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); /* Set the device object and reference it */ Status = IopReferenceDeviceObject(DeviceObject); @@ -127,6 +157,7 @@ FileObject->Type = IO_TYPE_FILE; FileObject->Size = sizeof(FILE_OBJECT); + FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; if (OpenPacket->CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) @@ -153,6 +184,11 @@ if (OpenPacket->CreateOptions & FILE_RANDOM_ACCESS) { FileObject->Flags |= FO_RANDOM_ACCESS; + } + + if (DirectOpen) + { + FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; } if (!(Attributes & OBJ_CASE_INSENSITIVE)) @@ -168,7 +204,7 @@ KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); - Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (!Irp) return STATUS_UNSUCCESSFUL; /* Now set the IRP data */

1 0

[amunger] 22901: Add a \n so the output under linux looks correct. Every other printf had a \n, no idea why this one didn't.
by amunger＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: amunger Date: Fri Jul 7 20:23:44 2006 New Revision: 22901 URL: http://svn.reactos.org/svn/reactos?rev=22901&view=rev Log: Add a \n so the output under linux looks correct. Every other printf had a \n, no idea why this one didn't. Modified: trunk/reactos/tools/raddr2line.c Modified: trunk/reactos/tools/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.c?rev=229… ============================================================================== --- trunk/reactos/tools/raddr2line.c (original) +++ trunk/reactos/tools/raddr2line.c Fri Jul 7 20:23:44 2006 @@ -85,7 +85,7 @@ else { PROSSYM_ENTRY e = &Entries[i]; - printf ( "%s:%lu (%s)", + printf ( "%s:%lu (%s)\n", &Strings[e->FileOffset], e->SourceLine, &Strings[e->FunctionOffset] );

1 0

[greatlrd] 22900: Change in the auto screen saver startup code in win32k 1. Fixing allot better sync for the timeout counter 2. Change the hard code value to 30 sec instead for 15 sec 3. The start of screen saver are 30.0 sec to 30.9 sec for we can not start on exactly on the x.0 sec but betwin
by greatlrd＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: greatlrd Date: Fri Jul 7 20:22:46 2006 New Revision: 22900 URL: http://svn.reactos.org/svn/reactos?rev=22900&view=rev Log: Change in the auto screen saver startup code in win32k 1. Fixing allot better sync for the timeout counter 2. Change the hard code value to 30 sec instead for 15 sec 3. The start of screen saver are 30.0 sec to 30.9 sec for we can not start on exactly on the x.0 sec but betwin Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Fri Jul 7 20:22:46 2006 @@ -41,6 +41,8 @@ static HANDLE ScreenSaverThreadHandle; static CLIENT_ID ScreenSaverThreadId; +static LARGE_INTEGER MouseInputCurrentTime; +static LARGE_INTEGER KeyboardInputCurrentTime; static HANDLE MouseDeviceHandle; static HANDLE MouseThreadHandle; @@ -50,7 +52,6 @@ static HANDLE KeyboardDeviceHandle; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; -static BOOLEAN ScreenSaverRunning = FALSE; PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue = 0; /* FUNCTIONS *****************************************************************/ @@ -157,10 +158,24 @@ { KEVENT Event; LARGE_INTEGER Timeout; + LARGE_INTEGER DelayTimer; + LARGE_INTEGER CurrentTime; + LARGE_INTEGER DiffTimeMouse; + LARGE_INTEGER DiffTimeKeyboard; + LARGE_INTEGER OldTimeMouse; + LARGE_INTEGER OldTimeKeyboard; NTSTATUS Status; - + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); + + KeQuerySystemTime(&MouseInputCurrentTime); + KeQuerySystemTime(&KeyboardInputCurrentTime); + + OldTimeMouse.QuadPart = MouseInputCurrentTime.QuadPart; + OldTimeKeyboard.QuadPart = MouseInputCurrentTime.QuadPart; + + DelayTimer.QuadPart = -10000000LL; /* 1 second timeout */ for(;;) { @@ -172,17 +187,17 @@ NULL); DPRINT("Screen Saver auto start Thread Starting...\n"); while(InputThreadsRunning) - { - NTSTATUS OldStatus; + { /* FIXME 1. read timeout value from reg 2. read timeout value from spi msg */ - OldStatus = STATUS_SUCCESS; - - Timeout.QuadPart = -150000000LL; /* 15 second timeout */ + + /* 30 second timeout This value should be read from register */ + Timeout.QuadPart = 300000000LL; + KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &Timeout); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DelayTimer); if(Status == STATUS_ALERTED && !InputThreadsRunning) { @@ -193,18 +208,31 @@ DPRINT1("Win32K: Failed to read from Screen Saver auto thread.\n"); return; //(Status); } - - - if ((Status == STATUS_TIMEOUT) && (ScreenSaverRunning == FALSE)) - { - DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver...\n"); - CSR_API_MESSAGE Request; - ScreenSaverRunning = TRUE; - CsrInit(); - Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); - Request.Data.StartScreenSaver.Start = TRUE; - co_CsrNotifyScreenSaver(&Request ); - } + + KeQuerySystemTime(&CurrentTime); + DiffTimeMouse.QuadPart = CurrentTime.QuadPart - MouseInputCurrentTime.QuadPart; + DiffTimeKeyboard.QuadPart = CurrentTime.QuadPart - KeyboardInputCurrentTime.QuadPart; + + if ( DiffTimeMouse.QuadPart >= Timeout.QuadPart && + DiffTimeKeyboard.QuadPart >= Timeout.QuadPart && + OldTimeMouse.QuadPart != MouseInputCurrentTime.QuadPart && + OldTimeKeyboard.QuadPart != MouseInputCurrentTime.QuadPart) + { + DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); + DPRINT1("Keyboard Timeout counter was %I64d\n",DiffTimeKeyboard.QuadPart); + DPRINT1("Mouse Timeout counter was %I64d\n",DiffTimeMouse.QuadPart); + + CSR_API_MESSAGE Request; + + OldTimeMouse.QuadPart = MouseInputCurrentTime.QuadPart; + OldTimeKeyboard.QuadPart = MouseInputCurrentTime.QuadPart; + + CsrInit(); + Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); + Request.Data.StartScreenSaver.Start = TRUE; + co_CsrNotifyScreenSaver(&Request ); + } + } DPRINT("Screen Saver auto start Thread Stopped...\n"); } @@ -286,8 +314,8 @@ } DPRINT("MouseEvent\n"); - ScreenSaverRunning = FALSE; - + KeQuerySystemTime(&MouseInputCurrentTime); + UserEnterExclusive(); ProcessMouseInputData(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); @@ -596,7 +624,7 @@ return; //(Status); } - ScreenSaverRunning = FALSE; + KeQuerySystemTime(&KeyboardInputCurrentTime); /* Update modifier state */ fsModifiers = IntKeyboardGetModifiers(&KeyInput); @@ -845,7 +873,7 @@ InitInputImpl(VOID) { NTSTATUS Status; - + KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); Status = PsCreateSystemThread(&KeyboardThreadHandle,

1 0

[amunger] 22899: Merge 22898 to branch.
by amunger＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: amunger Date: Fri Jul 7 17:28:34 2006 New Revision: 22899 URL: http://svn.reactos.org/svn/reactos?rev=22899&view=rev Log: Merge 22898 to branch. Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Fri Jul 7 17:28:34 2006 @@ -489,7 +489,7 @@ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); - Packet->Icmp.SeqNum = (USHORT)CurrentSeqNum; + Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; /* Timestamp is part of data area */

1 0

[amunger] 22898: Convert sequence number to network byte order before sending it on the wire.
by amunger＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: amunger Date: Fri Jul 7 17:23:10 2006 New Revision: 22898 URL: http://svn.reactos.org/svn/reactos?rev=22898&view=rev Log: Convert sequence number to network byte order before sending it on the wire. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Fri Jul 7 17:23:10 2006 @@ -489,7 +489,7 @@ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); - Packet->Icmp.SeqNum = (USHORT)CurrentSeqNum; + Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; /* Timestamp is part of data area */

1 0

[hpoussin] 22897: Fix typo (UNICODE -> _UNICODE)
by hpoussin＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: hpoussin Date: Fri Jul 7 01:58:48 2006 New Revision: 22897 URL: http://svn.reactos.org/svn/reactos?rev=22897&view=rev Log: Fix typo (UNICODE -> _UNICODE) Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Fri Jul 7 01:58:48 2006 @@ -182,7 +182,7 @@ 1, &dwWritten, NULL); -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif } @@ -230,7 +230,7 @@ NULL); -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif } @@ -330,7 +330,7 @@ } -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif return 0;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006