Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[ros-arm-bringup] 34608: - Write out all the IOCTLs the RAM Disk emulation core needs to handle. - Looks like the React CDFS driver behaves very differently from the NT CDFS driver.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 11:13:19 2008 New Revision: 34608 URL: http://svn.reactos.org/svn/reactos?rev=34608&view=rev Log: - Write out all the IOCTLs the RAM Disk emulation core needs to handle. - Looks like the React CDFS driver behaves very differently from the NT CDFS driver. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 20 11:13:19 2008 @@ -14,6 +14,7 @@ #include <ntddcdrm.h> #include <scsi.h> #include <ntddscsi.h> +#include <ntddvol.h> #include <mountdev.h> #include <mountmgr.h> #include <helper.h> @@ -856,7 +857,7 @@ NTSTATUS Status; PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); PRAMDISK_BUS_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - ULONG Information = 0; + ULONG Information; // // Grab the remove lock @@ -874,6 +875,12 @@ } // + // Setup some defaults + // + Status = STATUS_INVALID_DEVICE_REQUEST; + Information = 0; + + // // Check if this is an bus device or the drive // if (DeviceExtension->Type == RamdiskBus) @@ -911,12 +918,18 @@ // switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_DISK_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY2: case IOCTL_CDROM_CHECK_VERIFY: UNIMPLEMENTED; while (TRUE); break; - + + case IOCTL_STORAGE_GET_MEDIA_TYPES: + case IOCTL_DISK_GET_MEDIA_TYPES: + case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: UNIMPLEMENTED; @@ -924,6 +937,84 @@ break; case IOCTL_CDROM_READ_TOC: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_SET_PARTITION_INFO: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_GET_PARTITION_INFO: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_GET_DRIVE_LAYOUT: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_GET_LENGTH_INFO: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_DISK_IS_WRITABLE: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_SCSI_MINIPORT: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_STORAGE_QUERY_PROPERTY: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_MOUNTDEV_QUERY_STABLE_GUID: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_VOLUME_SET_GPT_ATTRIBUTES: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_VOLUME_GET_GPT_ATTRIBUTES: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_VOLUME_OFFLINE: UNIMPLEMENTED; while (TRUE); @@ -932,19 +1023,16 @@ default: // - // Drive code not yet done + // Drive code not emulated // DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); - UNIMPLEMENTED; - while (TRUE); break; } // - // Cleanup/complete - // - UNIMPLEMENTED; - while (TRUE); + // If requests drop down here, we just return them complete them + // + goto CompleteRequest; } //

1 0

[mkupfer] 34607: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details.
by mkupfer＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: mkupfer Date: Sun Jul 20 09:58:35 2008 New Revision: 34607 URL: http://svn.reactos.org/svn/reactos?rev=34607&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details. Modified: trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/usb.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3460… ============================================================================== Binary files - no diff available.

1 0

[mkupfer] 34606: - again, one more fix of damaged inf files - please take care when committing this utf-16 files
by mkupfer＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: mkupfer Date: Sun Jul 20 09:52:15 2008 New Revision: 34606 URL: http://svn.reactos.org/svn/reactos?rev=34606&view=rev Log: - again, one more fix of damaged inf files - please take care when committing this utf-16 files Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=34… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3460… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3460… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3460… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=346… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3460… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

Re: [ros-diffs] [ros-arm-bringup] 34603: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exis
by Steven Edwards 20 Jul '08

20 Jul '08

On Sun, Jul 20, 2008 at 12:40 AM, <ros-arm-bringup(a)svn.reactos.org> wrote: > - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. Ninjas! I don't know if this is related but would it be possible to switch to doing development on NoCC in case you guys run in to more problems like these? I don't know if it would help but I assume your going to run in to more problems with the current Cc and you might be able to save a lot of trouble later on. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

[ros-arm-bringup] 34605: - Unlike NT, it seems React has a bug and does not automatically load the boot FS driver regardless of start type.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 01:36:27 2008 New Revision: 34605 URL: http://svn.reactos.org/svn/reactos?rev=34605&view=rev Log: - Unlike NT, it seems React has a bug and does not automatically load the boot FS driver regardless of start type. Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sun Jul 20 01:36:27 2008 @@ -766,7 +766,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 ; RAM Disk class driver

1 0

[ros-arm-bringup] 34604: - Fix the parameters we were sending to IoCreateDevice for our drive FDO. - Now the kernel attempts to mount us through CDFS! - Start stubbing the work we'll need to do in RamdiskDeviceControl -- this is where the emulation magic will happen.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 01:32:23 2008 New Revision: 34604 URL: http://svn.reactos.org/svn/reactos?rev=34604&view=rev Log: - Fix the parameters we were sending to IoCreateDevice for our drive FDO. - Now the kernel attempts to mount us through CDFS! - Start stubbing the work we'll need to do in RamdiskDeviceControl -- this is where the emulation magic will happen. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 20 01:32:23 2008 @@ -11,6 +11,7 @@ #include <initguid.h> #include <ntddk.h> #include <ntdddisk.h> +#include <ntddcdrm.h> #include <scsi.h> #include <ntddscsi.h> #include <mountdev.h> @@ -371,8 +372,8 @@ Status = IoCreateDevice(DeviceExtension->DeviceObject->DriverObject, sizeof(RAMDISK_DRIVE_EXTENSION), &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, // FIXME: DISK - FILE_READ_ONLY_DEVICE, // FIXME: Not always + FILE_DEVICE_CD_ROM, + 0, 0, &DeviceObject); if (!NT_SUCCESS(Status)) goto FailCreate; @@ -906,9 +907,44 @@ else { // - // Drive code not yet done - // - ASSERT(FALSE); + // Check what the request is + // + switch (IoStackLocation->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_CDROM_CHECK_VERIFY: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_CDROM_GET_DRIVE_GEOMETRY: + + UNIMPLEMENTED; + while (TRUE); + break; + + case IOCTL_CDROM_READ_TOC: + + UNIMPLEMENTED; + while (TRUE); + break; + + default: + + // + // Drive code not yet done + // + DPRINT1("IOCTL: %lx\n", IoStackLocation->Parameters.DeviceIoControl.IoControlCode); + UNIMPLEMENTED; + while (TRUE); + break; + } + + // + // Cleanup/complete + // + UNIMPLEMENTED; + while (TRUE); } //

1 0

[ros-arm-bringup] 34603: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. - We need to verify if this is truly the case -- in either case, add an ASSERT, since all assumptions should be ASSERTed!
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:40:27 2008 New Revision: 34603 URL: http://svn.reactos.org/svn/reactos?rev=34603&view=rev Log: - Ramdisk doesn't seem to work yet, we're not getting properly initialized yet. - We end up crashing in CcRosTryToInitialzeFileCache because there is no SectionObjectPointer, and it is assumed this always exists. - We need to verify if this is truly the case -- in either case, add an ASSERT, since all assumptions should be ASSERTed! Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=346… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Jul 19 23:40:27 2008 @@ -1213,6 +1213,7 @@ KeAcquireGuardedMutex(&ViewLock); + ASSERT(FileObject->SectionObjectPointer); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; if (Bcb == NULL) {

1 0

[ros-arm-bringup] 34602: - Finish implementing RamdiskCreateDiskDevice -- we should now have a working ramdisk drive that should receive read/write requests.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:39:01 2008 New Revision: 34602 URL: http://svn.reactos.org/svn/reactos?rev=34602&view=rev Log: - Finish implementing RamdiskCreateDiskDevice -- we should now have a working ramdisk drive that should receive read/write requests. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 19 23:39:01 2008 @@ -81,6 +81,9 @@ LONGLONG DiskLength; LONG DiskOffset; WCHAR DriveLetter; + ULONG BytesPerSector; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; } RAMDISK_DRIVE_EXTENSION, *PRAMDISK_DRIVE_EXTENSION; ULONG MaximumViewLength; @@ -491,7 +494,43 @@ DeviceName.Buffer = NULL; SymbolicLinkName.Buffer = NULL; GuidString.Buffer = NULL; - } + + // + // Only support ISO stuff for now + // + ASSERT(Input->Options.ExportAsCd == TRUE); + ASSERT(Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM); + + // + // Setup partition parameters + // + DriveExtension->BytesPerSector = 2048; // 512 for Disk + DriveExtension->SectorsPerTrack = 32; // 128 for disk + DriveExtension->NumberOfHeads = 64; // 16 for disk + + // + // Acquire the disk lock + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + + // + // Insert us + // + InsertTailList(&DeviceExtension->DiskList, &DriveExtension->DiskList); + + // + // Release the lock + // + ExReleaseFastMutex(&DeviceExtension->DiskListLock); + KeLeaveCriticalRegion(); + + // + // Clear init flag + // + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + return STATUS_SUCCESS; + } FailCreate: UNIMPLEMENTED;

1 0

[ros-arm-bringup] 34601: - Looks like this FIXME was fixed.
by ros-arm-bringup＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: ros-arm-bringup Date: Sat Jul 19 23:38:26 2008 New Revision: 34601 URL: http://svn.reactos.org/svn/reactos?rev=34601&view=rev Log: - Looks like this FIXME was fixed. Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Jul 19 23:38:26 2008 @@ -278,7 +278,7 @@ KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 2, 0, 0); } - /* FIXME: Check if the image is valid */ + /* Check if the image is valid */ Status = MmCheckSystemImage(FileHandle, TRUE); if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) {

1 0

[arty] 34600: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Fixes some issues with releasing locks - Verify that we have an MDL before trying to unlock it
by arty＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: arty Date: Sat Jul 19 23:33:53 2008 New Revision: 34600 URL: http://svn.reactos.org/svn/reactos?rev=34600&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Fixes some issues with releasing locks - Verify that we have an MDL before trying to unlock it Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -140,7 +140,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !(ConnectReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, - 0, NULL, TRUE ); + 0, NULL, FALSE ); AFD_DbgPrint(MID_TRACE,("Connect request:\n")); #if 0 Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -20,7 +20,7 @@ PAFD_FCB FCB = FileObject->FsContext; UINT ContextSize = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( FCB->ContextSize < ContextSize ) ContextSize = FCB->ContextSize; @@ -43,7 +43,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -26,7 +26,7 @@ _SEH_TRY { if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp, TRUE ); + Status = LostSocket( Irp, FALSE ); _SEH_YIELD(return Status); } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -157,7 +157,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !(ListenReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, @@ -209,7 +209,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); if( !IsListEmpty( &FCB->PendingConnections ) ) { PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; @@ -246,7 +246,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); FCB->EventsFired &= ~AFD_EVENT_ACCEPT; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -154,7 +154,7 @@ FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; - UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); FCB->Overread = TRUE; //FCB->PollState |= AFD_EVENT_DISCONNECT; @@ -198,7 +198,7 @@ NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = TotalBytesCopied; if( NextIrp == Irp ) RetStatus = Status; - UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } } Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Sat Jul 19 23:33:53 2008 @@ -274,13 +274,17 @@ (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp ); PAFD_FCB FCB = FileObject->FsContext; + if ( !EventSelectInfo ) { + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, + 0, NULL, FALSE ); + } AFD_DbgPrint(MID_TRACE,("Called (Event %x Triggers %x)\n", EventSelectInfo->EventObject, EventSelectInfo->Events)); if( !SocketAcquireStateLock( FCB ) ) { UnlockRequest( Irp, IrpSp ); - return LostSocket( Irp, FALSE ); + return LostSocket( Irp, TRUE ); } FCB->EventSelectTriggers = FCB->EventsFired = 0; @@ -319,9 +323,14 @@ AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); + if ( !EnumReq ) { + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, + 0, NULL, FALSE ); + } + if( !SocketAcquireStateLock( FCB ) ) { UnlockRequest( Irp, IrpSp ); - return LostSocket( Irp, FALSE ); + return LostSocket( Irp, TRUE ); } EnumReq->PollEvents = FCB->PollState;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
77
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 2008