Author: hpoussin Date: Fri May 16 14:00:47 2008 New Revision: 33542
URL: http://svn.reactos.org/svn/reactos?rev=33542&view=rev Log: Remove IRP_MJ_QUERY_INFORMATION / FileNetworkOpenInformation Fix misc bugs
Modified: trunk/reactos/drivers/serial/serial/info.c trunk/reactos/drivers/serial/serial/pnp.c trunk/reactos/drivers/serial/serial/rw.c
Modified: trunk/reactos/drivers/serial/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info.... ============================================================================== --- trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -68,26 +68,6 @@ } break; } - case FileNetworkOpenInformation: - { - PFILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo = (PFILE_NETWORK_OPEN_INFORMATION)SystemBuffer; - - ASSERT(NetworkOpenInfo); - - TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FileNetworkInformation\n"); - DbgBreakPoint(); - if (BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) - Status = STATUS_BUFFER_OVERFLOW; - else if (!NetworkOpenInfo) - Status = STATUS_INVALID_PARAMETER; - else - { - RtlZeroMemory(NetworkOpenInfo, sizeof(FILE_NETWORK_OPEN_INFORMATION)); - Information = sizeof(FILE_NETWORK_OPEN_INFORMATION); - Status = STATUS_SUCCESS; - } - break; - } default: { TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass);
Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.c... ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -90,6 +90,11 @@ Fdo->Flags |= DO_BUFFERED_IO; if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) Fdo->Flags |= DO_DIRECT_IO; + + /* Choose default strategy */ + if ((Fdo->Flags & (DO_BUFFERED_IO | DO_DIRECT_IO)) == 0) + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (pFdo) {
Modified: trunk/reactos/drivers/serial/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c?... ============================================================================== --- trunk/reactos/drivers/serial/serial/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/rw.c [iso-8859-1] Fri May 16 14:00:47 2008 @@ -16,7 +16,10 @@ { ASSERT(Irp);
- return Irp->AssociatedIrp.SystemBuffer; + if (Irp->MdlAddress) + return Irp->MdlAddress; + else + return Irp->AssociatedIrp.SystemBuffer; }
static VOID