Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55222: [USBSTOR] - USBD_SHORT_TRANSFER_OK is only a valid flag if USBD_TRANSFER_DIRECTION_IN is also set
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 19:30:46 2012 New Revision: 55222 URL: http://svn.reactos.org/svn/reactos?rev=55222&view=rev Log: [USBSTOR] - USBD_SHORT_TRANSFER_OK is only a valid flag if USBD_TRANSFER_DIRECTION_IN is also set Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] Thu Jan 26 19:30:46 2012 @@ -447,7 +447,7 @@ NULL, Context->TransferBufferMDL, Context->TransferDataLength, - ((Code == SCSIOP_WRITE) ? USBD_TRANSFER_DIRECTION_OUT : USBD_TRANSFER_DIRECTION_IN) | USBD_SHORT_TRANSFER_OK, + ((Code == SCSIOP_WRITE) ? USBD_TRANSFER_DIRECTION_OUT : (USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK)), NULL); // @@ -551,7 +551,7 @@ Context->cbw, NULL, sizeof(CBW), - USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK, + USBD_TRANSFER_DIRECTION_OUT, NULL); //

1 0

[akhaldi] 55221: [DDK] * portcls.h: Don't check for non existing NTDDI_WIN2003.
by akhaldi＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: akhaldi Date: Thu Jan 26 19:18:19 2012 New Revision: 55221 URL: http://svn.reactos.org/svn/reactos?rev=55221&view=rev Log: [DDK] * portcls.h: Don't check for non existing NTDDI_WIN2003. Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Jan 26 19:18:19 2012 @@ -614,7 +614,7 @@ typedef IServiceGroup *PSERVICEGROUP; -#if (NTDDI_VERSION >= NTDDI_WIN2003) +#if (NTDDI_VERSION >= NTDDI_WS03) /* =============================================================== IUnregisterSubdevice Interface */

1 0

[ion] 55220: [SDK]: Some fixes/additions to this header.
by ion＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: ion Date: Thu Jan 26 19:15:07 2012 New Revision: 55220 URL: http://svn.reactos.org/svn/reactos?rev=55220&view=rev Log: [SDK]: Some fixes/additions to this header. Modified: trunk/reactos/include/psdk/ntdddisk.h Modified: trunk/reactos/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdddisk.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] Thu Jan 26 19:15:07 2012 @@ -150,6 +150,19 @@ #define IOCTL_DISK_SET_CACHE_INFORMATION \ CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +// +// NTDDI_WIN2003 was an older define used in the early beta builds, which +// Microsoft forgot to fix in a few headers. +// NTDDI_WS03 is the correct term. +// +#if (NTDDI_VERSION < NTDDI_WS03) +#define IOCTL_DISK_GET_WRITE_CACHE_STATE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) +#else +#define OBSOLETE_DISK_GET_WRITE_CACHE_STATE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) +#endif #define IOCTL_DISK_SET_DRIVE_LAYOUT \ CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -460,10 +473,35 @@ } DUMMYUNIONNAME; } SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX; +typedef struct _CREATE_DISK_GPT { + GUID DiskId; + ULONG MaxPartitionCount; +} CREATE_DISK_GPT, *PCREATE_DISK_GPT; + +typedef struct _CREATE_DISK_MBR { + ULONG Signature; +} CREATE_DISK_MBR, *PCREATE_DISK_MBR; + +typedef struct _CREATE_DISK { + PARTITION_STYLE PartitionStyle; + _ANONYMOUS_UNION union { + CREATE_DISK_MBR Mbr; + CREATE_DISK_GPT Gpt; + } DUMMYUNIONNAME; +} CREATE_DISK, *PCREATE_DISK; + typedef struct _VERIFY_INFORMATION { LARGE_INTEGER StartingOffset; ULONG Length; } VERIFY_INFORMATION, *PVERIFY_INFORMATION; + +#if (OSVER(NTDDI_VERSION) == NTDDI_WINXP) +typedef enum _DISK_WRITE_CACHE_STATE { + DiskWriteCacheNormal, + DiskWriteCacheForceDisable, + DiskWriteCacheDisableNotSupported +} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE; +#endif typedef enum { EqualPriority,

1 0

[janderwald] 55219: [USBCCGP] - Implement querying device relations for FDO - Implement creating device objects for each discovered function - Invalidate device relations after the child pdo have b...
by janderwald＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: janderwald Date: Thu Jan 26 19:11:44 2012 New Revision: 55219 URL: http://svn.reactos.org/svn/reactos?rev=55219&view=rev Log: [USBCCGP] - Implement querying device relations for FDO - Implement creating device objects for each discovered function - Invalidate device relations after the child pdo have been created - Implement PDO device relations, most of query id, query device capabilities, start device - USBCCGP should now initialize and create the child pdos - Next is device control handling - WIP, untested Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Thu Jan 26 19:11:44 2012 @@ -127,9 +127,181 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG DeviceCount = 0; + ULONG Index; + PDEVICE_RELATIONS DeviceRelations; + PIO_STACK_LOCATION IoStack; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // check if relation type is BusRelations + // + if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) + { + // + // FDO always only handles bus relations + // + return USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + } + + // + // go through array and count device objects + // + for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) + { + if (FDODeviceExtension->ChildPDO[Index]) + { + // + // child pdo + // + DeviceCount++; + } + } + + // + // allocate device relations + // + DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0)); + if (!DeviceRelations) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // add device objects + // + for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) + { + if (FDODeviceExtension->ChildPDO[Index]) + { + // + // store child pdo + // + DeviceRelations->Objects[DeviceRelations->Count] = FDODeviceExtension->ChildPDO[Index]; + + // + // add reference + // + ObReferenceObject(FDODeviceExtension->ChildPDO[Index]); + + // + // increment count + // + DeviceRelations->Count++; + } + } + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + // + // request completed successfully + // + return STATUS_SUCCESS; +} + +NTSTATUS +FDO_CreateChildPdo( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT PDODeviceObject; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + ULONG Index; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // lets create array for the child PDO + // + FDODeviceExtension->ChildPDO = AllocateItem(NonPagedPool, sizeof(PDEVICE_OBJECT) * FDODeviceExtension->FunctionDescriptorCount); + if (!FDODeviceExtension->ChildPDO) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // create pdo for each function + // + for(Index = 0; Index < FDODeviceExtension->FunctionDescriptorCount; Index++) + { + // + // create the PDO + // + Status = IoCreateDevice(FDODeviceExtension->DriverObject, sizeof(PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_USB, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create device object + // + DPRINT1("IoCreateDevice failed with %x\n", Status); + return Status; + } + + // + // store in array + // + FDODeviceExtension->ChildPDO[Index] = PDODeviceObject; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + RtlZeroMemory(PDODeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); + + // + // init device extension + // + PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; + PDODeviceExtension->NextDeviceObject = DeviceObject; + PDODeviceExtension->FunctionIndex = Index; + RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + // + // patch the stack size + // + PDODeviceObject->StackSize = DeviceObject->StackSize + 1; + + // + // set device flags + // + PDODeviceObject->Flags |= DO_DIRECT_IO | DO_MAP_IO_BUFFER; + + // + // device is initialized + // + PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + } + + // + // done + // + return STATUS_SUCCESS; } NTSTATUS @@ -206,12 +378,29 @@ ASSERT(FDODeviceExtension->FunctionDescriptor); // - // FIXME:create PDO for each function - // - ASSERT(FALSE); + // now create the pdo + // + Status = FDO_CreateChildPdo(DeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("FDO_CreateChildPdo failed with %x\n", Status); + return Status; + } + + // + // inform pnp manager of new device objects + // + IoInvalidateDeviceRelations(FDODeviceExtension->PhysicalDeviceObject, BusRelations); + + // + // done + // + DPRINT1("[USBCCGP] FDO initialized successfully\n"); return Status; } - NTSTATUS FDO_HandlePnp( @@ -234,11 +423,17 @@ { case IRP_MN_START_DEVICE: { + // + // start the device + // Status = FDO_StartDevice(DeviceObject, Irp); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { + // + // handle device relations + // Status = FDO_DeviceRelations(DeviceObject, Irp); break; } @@ -301,6 +496,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } -} - - + +} + + Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Thu Jan 26 19:11:44 2012 @@ -11,6 +11,306 @@ #include "usbccgp.h" +NTSTATUS +USBCCGP_PdoHandleQueryDeviceText( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + LPWSTR Buffer; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // is there a device description + // + if (PDODeviceExtension->FunctionDescriptor->FunctionDescription.Length) + { + // + // allocate buffer + // + Buffer = AllocateItem(NonPagedPool, PDODeviceExtension->FunctionDescriptor->FunctionDescription.Length + sizeof(WCHAR)); + if (!Buffer) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + RtlCopyMemory(Buffer, PDODeviceExtension->FunctionDescriptor->FunctionDescription.Buffer, PDODeviceExtension->FunctionDescriptor->FunctionDescription.Length); + return STATUS_SUCCESS; + } + + // + // FIXME use GenericCompositeUSBDeviceString + // + UNIMPLEMENTED + return Irp->IoStatus.Status; +} + +NTSTATUS +USBCCGP_PdoHandleDeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + PDEVICE_RELATIONS DeviceRelations; + PIO_STACK_LOCATION IoStack; + + DPRINT1("USBCCGP_PdoHandleDeviceRelations\n"); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // check if relation type is BusRelations + // + if (IoStack->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + { + // + // PDO handles only target device relation + // + return Irp->IoStatus.Status; + } + + // + // allocate device relations + // + DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelations) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize device relations + // + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = DeviceObject; + ObReferenceObject(DeviceObject); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + // + // completed successfully + // + return STATUS_SUCCESS; +} + +NTSTATUS +USBCCGP_PdoHandleQueryId( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PUNICODE_STRING DeviceString = NULL; + UNICODE_STRING TempString; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + NTSTATUS Status; + LPWSTR Buffer; + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + + if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) + { + // + // handle query device id + // + Status = USBCCGP_SyncForwardIrp(PDODeviceExtension->NextDeviceObject, Irp); + + // + // FIXME append interface id + // + ASSERT(FALSE); + return Status; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + // + // handle instance id + // + DeviceString = &PDODeviceExtension->FunctionDescriptor->HardwareId; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + // + // handle instance id + // + RtlInitUnicodeString(&TempString, L"0000"); + DeviceString = &TempString; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + // + // handle instance id + // + DeviceString = &PDODeviceExtension->FunctionDescriptor->CompatibleId; + } + + // + // sanity check + // + ASSERT(DeviceString != NULL); + + // + // allocate buffer + // + Buffer = AllocateItem(NonPagedPool, DeviceString->Length + sizeof(WCHAR)); + if (!Buffer) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + RtlCopyMemory(Buffer, DeviceString->Buffer, DeviceString->Length); + return STATUS_SUCCESS; +} + +NTSTATUS +PDO_HandlePnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + NTSTATUS Status; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + switch(IoStack->MinorFunction) + { + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + // + // handle device relations + // + Status = USBCCGP_PdoHandleDeviceRelations(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_DEVICE_TEXT: + { + // + // handle query device text + // + Status = USBCCGP_PdoHandleQueryDeviceText(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_ID: + { + // + // handle request + // + Status = USBCCGP_PdoHandleQueryId(DeviceObject, Irp); + break; + } + case IRP_MN_REMOVE_DEVICE: + { + DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + + return STATUS_SUCCESS; + } + case IRP_MN_QUERY_CAPABILITIES: + { + // + // copy device capabilities + // + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + case IRP_MN_START_DEVICE: + { + // + // no-op for PDO + // + DPRINT1("[USBCCGP] PDO IRP_MN_START\n"); + Status = STATUS_SUCCESS; + break; + } + default: + { + // + // do nothing + // + Status = Irp->IoStatus.Status; + } + } + + // + // complete request + // + if (Status != STATUS_PENDING) + { + // + // store result + // + Irp->IoStatus.Status = Status; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // done processing + // + return Status; + +} NTSTATUS @@ -18,7 +318,22 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->MajorFunction) + { + case IRP_MJ_PNP: + return PDO_HandlePnp(DeviceObject, Irp); + default: + DPRINT1("PDO_Dispatch Function %x not implemented\n", IoStack->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + +} Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Thu Jan 26 19:11:44 2012 @@ -38,6 +38,7 @@ USBC_DEVICE_CONFIGURATION_INTERFACE_V1 BusInterface; // bus custom enumeration interface PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor; // usb function descriptor ULONG FunctionDescriptorCount; // number of function descriptor + PDEVICE_OBJECT * ChildPDO; // child pdos }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; #define USBCCPG_TAG 'cbsu' @@ -45,7 +46,10 @@ typedef struct { COMMON_DEVICE_EXTENSION Common; // shared with FDO - + PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor; // function descriptor + PDEVICE_OBJECT NextDeviceObject; // next device object + DEVICE_CAPABILITIES Capabilities; // device capabilities + ULONG FunctionIndex; // function index }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; /* descriptor.c */

1 0

[akhaldi] 55218: [CMAKE] * Define _inline to __inline when cross compiling. Dedicated to Alex.
by akhaldi＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: akhaldi Date: Thu Jan 26 19:09:02 2012 New Revision: 55218 URL: http://svn.reactos.org/svn/reactos?rev=55218&view=rev Log: [CMAKE] * Define _inline to __inline when cross compiling. Dedicated to Alex. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55218&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Jan 26 19:09:02 2012 @@ -73,6 +73,8 @@ add_definitions(-U_UNICODE -UUNICODE) add_definitions(-D__MSVCRT__) # DUBIOUS endif() + +add_definitions(-D_inline=__inline) # alternative arch name if(ARCH MATCHES amd64)

1 0

[cgutman] 55217: [USETUP] - Merge r55212 and 55215 - Add a temporary hack to allow testing installation on a device not bootable by the BIOS (like USB drives in VirtualBox) - USB devices now show u...
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 18:49:50 2012 New Revision: 55217 URL: http://svn.reactos.org/svn/reactos?rev=55217&view=rev Log: [USETUP] - Merge r55212 and 55215 - Add a temporary hack to allow testing installation on a device not bootable by the BIOS (like USB drives in VirtualBox) - USB devices now show up as installation targets during setup but attempting to install onto them results in setup hanging due to bugs in the USB code Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] Thu Jan 26 18:49:50 2012 @@ -88,12 +88,12 @@ PARTENTRY, ListEntry); - for (i=0; i<3; i++) + for (i=0; i<4; i++) PartEntry->DriveLetter[i] = 0; if (PartEntry->Unpartitioned == FALSE) { - for (i=0; i<3; i++) + for (i=0; i<4; i++) { if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType)) continue; @@ -374,7 +374,8 @@ PartEntry->PartInfo[j].StartingOffset.QuadPart - (LastStartingOffset + LastPartitionLength); - if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) + if (PartEntry->PartInfo[j].StartingOffset.QuadPart > (LastStartingOffset + LastPartitionLength) && + LastUnusedPartitionLength >= DiskEntry->CylinderSize) { DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength); @@ -718,7 +719,8 @@ return; } - if (DiskGeometry.MediaType != FixedMedia) + if (DiskGeometry.MediaType != FixedMedia && + DiskGeometry.MediaType != RemovableMedia) { return; } @@ -836,8 +838,12 @@ if (!DiskEntry->BiosFound) { +#if 0 RtlFreeHeap(ProcessHeap, 0, DiskEntry); return; +#else + DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber); +#endif } InitializeListHead (&DiskEntry->PartListHead);

1 0

[akhaldi] 55216: [SYSSETUP] * Register atl before anything else on rbuild builds too.
by akhaldi＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: akhaldi Date: Thu Jan 26 18:42:55 2012 New Revision: 55216 URL: http://svn.reactos.org/svn/reactos?rev=55216&view=rev Log: [SYSSETUP] * Register atl before anything else on rbuild builds too. Modified: trunk/reactos/media/inf/inf.rbuild Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=5… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Thu Jan 26 18:42:55 2012 @@ -27,7 +27,7 @@ <installfile installbase="inf">nettcpip.inf</installfile> <installfile installbase="inf">ports.inf</installfile> <installfile installbase="inf">scsi.inf</installfile> - <installfile installbase="inf" root="output">syssetup.inf</installfile> + <installfile installbase="inf">syssetup.inf</installfile> <installfile installbase="inf">unknown.inf</installfile> <installfile installbase="inf">usb.inf</installfile> <installfile installbase="inf">usbport.inf</installfile>

1 0

[cgutman] 55215: [USETUP] - Allow removable media to be selected as an installation target - Fix broken unpartitioned space calculation if the first partition starts below the disk's track size (su...
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 18:27:21 2012 New Revision: 55215 URL: http://svn.reactos.org/svn/reactos?rev=55215&view=rev Log: [USETUP] - Allow removable media to be selected as an installation target - Fix broken unpartitioned space calculation if the first partition starts below the disk's track size (such as a 1MB aligned partition) Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Thu Jan 26 18:27:21 2012 @@ -374,7 +374,8 @@ PartEntry->PartInfo[j].StartingOffset.QuadPart - (LastStartingOffset + LastPartitionLength); - if (LastUnusedPartitionLength >= DiskEntry->CylinderSize) + if (PartEntry->PartInfo[j].StartingOffset.QuadPart > (LastStartingOffset + LastPartitionLength) && + LastUnusedPartitionLength >= DiskEntry->CylinderSize) { DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength); @@ -718,7 +719,8 @@ return; } - if (DiskGeometry.MediaType != FixedMedia) + if (DiskGeometry.MediaType != FixedMedia && + DiskGeometry.MediaType != RemovableMedia) { return; }

1 0

[janderwald] 55214: [DISK_NEW] - Revert NTAPI changes
by janderwald＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: janderwald Date: Thu Jan 26 17:26:49 2012 New Revision: 55214 URL: http://svn.reactos.org/svn/reactos?rev=55214&view=rev Log: [DISK_NEW] - Revert NTAPI changes Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] Thu Jan 26 17:26:49 2012 @@ -173,7 +173,6 @@ NTSTATUS -NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -344,7 +343,6 @@ VOID -NTAPI DiskUnload( IN PDRIVER_OBJECT DriverObject ) @@ -359,7 +357,6 @@ NTSTATUS -NTAPI DiskCreateFdo( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject, @@ -632,7 +629,6 @@ NTSTATUS -NTAPI DiskReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1013,7 +1009,6 @@ NTSTATUS -NTAPI DiskDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -3271,7 +3266,6 @@ NTSTATUS -NTAPI DiskShutdownFlush ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -3791,7 +3785,6 @@ VOID -NTAPI DiskFdoProcessError( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -4261,7 +4254,6 @@ NTSTATUS -NTAPI DiskQueryPnpCapabilities( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_CAPABILITIES Capabilities Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.h [iso-8859-1] Thu Jan 26 17:26:49 2012 @@ -393,79 +393,67 @@ NTSTATUS -NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); VOID -NTAPI DiskUnload( IN PDRIVER_OBJECT DriverObject ); NTSTATUS -NTAPI DiskAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo ); NTSTATUS -NTAPI DiskInitFdo( IN PDEVICE_OBJECT Fdo ); NTSTATUS -NTAPI DiskInitPdo( IN PDEVICE_OBJECT Pdo ); NTSTATUS -NTAPI DiskStartFdo( IN PDEVICE_OBJECT Fdo ); NTSTATUS -NTAPI DiskStartPdo( IN PDEVICE_OBJECT Pdo ); NTSTATUS -NTAPI DiskStopDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS -NTAPI DiskRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS -NTAPI DiskReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS -NTAPI DiskDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID -NTAPI DiskFdoProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -474,42 +462,36 @@ ); NTSTATUS -NTAPI DiskShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS -NTAPI DiskGetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo ); NTSTATUS -NTAPI DiskSetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo ); VOID -NTAPI DisableWriteCache( IN PDEVICE_OBJECT DeviceObject, IN PIO_WORKITEM WorkItem ); VOID -NTAPI DiskIoctlVerify( IN PDEVICE_OBJECT DeviceObject, IN PDISK_VERIFY_WORKITEM_CONTEXT Context ); NTSTATUS -NTAPI DiskModeSelect( IN PDEVICE_OBJECT DeviceObject, IN PCHAR ModeSelectBuffer, @@ -533,7 +515,6 @@ NTSTATUS -NTAPI DiskPerformSmartCommand( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG SrbControlCode, @@ -546,28 +527,24 @@ ); NTSTATUS -NTAPI DiskGetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PMODE_INFO_EXCEPTIONS ReturnPageData ); NTSTATUS -NTAPI DiskSetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMODE_INFO_EXCEPTIONS PageData ); NTSTATUS -NTAPI DiskDetectFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PFAILURE_PREDICTION_METHOD FailurePredictCapability ); BOOLEAN -NTAPI EnumerateBusKey( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension, HANDLE BusKey, @@ -575,7 +552,6 @@ ); NTSTATUS -NTAPI DiskCreateFdo( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT LowerDeviceObject, @@ -584,39 +560,33 @@ ); VOID -NTAPI UpdateDeviceObjects( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID -NTAPI DiskSetSpecialHacks( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG_PTR Data ); VOID -NTAPI DiskScanRegistryForSpecial( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID -NTAPI ResetBus( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS -NTAPI DiskEnumerateDevice( IN PDEVICE_OBJECT Fdo ); NTSTATUS -NTAPI DiskQueryId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -624,14 +594,12 @@ ); NTSTATUS -NTAPI DiskQueryPnpCapabilities( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_CAPABILITIES Capabilities ); NTSTATUS -NTAPI DiskGenerateDeviceName( IN BOOLEAN IsFdo, IN ULONG DeviceNumber, @@ -642,27 +610,23 @@ ); VOID -NTAPI DiskCreateSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ); VOID -NTAPI DiskUpdatePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList ); VOID -NTAPI DiskUpdateRemovablePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList ); NTSTATUS -NTAPI DiskCreatePdo( IN PDEVICE_OBJECT Fdo, IN ULONG PartitionOrdinal, @@ -672,13 +636,11 @@ ); VOID -NTAPI DiskDeleteSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS -NTAPI DiskPdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -686,7 +648,6 @@ ); NTSTATUS -NTAPI DiskPdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -696,7 +657,6 @@ ); NTSTATUS -NTAPI DiskPdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -706,7 +666,6 @@ ); NTSTATUS -NTAPI DiskPdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -717,7 +676,6 @@ ); NTSTATUS -NTAPI DiskPdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -729,7 +687,6 @@ ); NTSTATUS -NTAPI DiskFdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -737,7 +694,6 @@ ); NTSTATUS -NTAPI DiskFdoQueryWmiRegInfoEx( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -746,7 +702,6 @@ ); NTSTATUS -NTAPI DiskFdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -756,7 +711,6 @@ ); NTSTATUS -NTAPI DiskFdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -766,7 +720,6 @@ ); NTSTATUS -NTAPI DiskFdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -777,7 +730,6 @@ ); NTSTATUS -NTAPI DiskFdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -789,7 +741,6 @@ ); NTSTATUS -NTAPI DiskWmiFunctionControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -799,28 +750,24 @@ ); NTSTATUS -NTAPI DiskReadFailurePredictStatus( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_STATUS DiskSmartStatus ); NTSTATUS -NTAPI DiskReadFailurePredictData( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_DATA DiskSmartData ); NTSTATUS -NTAPI DiskEnableDisableFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable ); NTSTATUS -NTAPI DiskEnableDisableFailurePredictPolling( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable, @@ -828,18 +775,16 @@ ); VOID -NTAPI DiskAcquirePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID -NTAPI DiskReleasePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); -NTSTATUS NTAPI DiskInitializeReregistration( +NTSTATUS DiskInitializeReregistration( void ); @@ -848,7 +793,6 @@ #if defined(_X86_) NTSTATUS -NTAPI DiskReadDriveCapacity( IN PDEVICE_OBJECT Fdo ); @@ -868,19 +812,16 @@ #endif NTSTATUS -NTAPI DiskSaveDetectInfo( PDRIVER_OBJECT DriverObject ); VOID -NTAPI DiskCleanupDetectInfo( IN PDRIVER_OBJECT DriverObject ); VOID -NTAPI DiskDriverReinitialization ( IN PDRIVER_OBJECT DriverObject, IN PVOID Nothing, @@ -890,26 +831,22 @@ #endif VOID -NTAPI DiskConvertPartitionToExtended( IN PPARTITION_INFORMATION Partition, OUT PPARTITION_INFORMATION_EX PartitionEx ); PDRIVE_LAYOUT_INFORMATION_EX -NTAPI DiskConvertLayoutToExtended( IN CONST PDRIVE_LAYOUT_INFORMATION Layout ); PDRIVE_LAYOUT_INFORMATION -NTAPI DiskConvertExtendedToLayout( IN CONST PDRIVE_LAYOUT_INFORMATION_EX LayoutEx ); NTSTATUS -NTAPI DiskReadPartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN BypassCache, @@ -917,14 +854,12 @@ ); NTSTATUS -NTAPI DiskWritePartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout ); NTSTATUS -NTAPI DiskSetPartitionInformationEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG PartitionNumber, @@ -932,7 +867,6 @@ ); NTSTATUS -NTAPI DiskSetPartitionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG SectorSize, @@ -941,14 +875,12 @@ ); NTSTATUS -NTAPI DiskVerifyPartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN FixErrors ); BOOLEAN -NTAPI DiskInvalidatePartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN PartitionLockHeld @@ -956,14 +888,12 @@ #if defined (_X86_) NTSTATUS -NTAPI DiskGetDetectInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PDISK_DETECTION_INFO DetectInfo ); NTSTATUS -NTAPI DiskReadSignature( IN PDEVICE_OBJECT Fdo ); Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1] Thu Jan 26 17:26:49 2012 @@ -219,7 +219,6 @@ NTSTATUS -NTAPI DiskEnumerateDevice( IN PDEVICE_OBJECT Fdo ) Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] Thu Jan 26 17:26:49 2012 @@ -188,7 +188,6 @@ NTSTATUS -NTAPI DiskInitFdo( IN PDEVICE_OBJECT Fdo ) @@ -657,7 +656,6 @@ NTSTATUS -NTAPI DiskQueryId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -1161,7 +1159,6 @@ NTSTATUS -NTAPI DiskStartFdo( IN PDEVICE_OBJECT Fdo )

1 0

[janderwald] 55213: - Use WIN32_WINNT >=0x600
by janderwald＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: janderwald Date: Thu Jan 26 17:24:52 2012 New Revision: 55213 URL: http://svn.reactos.org/svn/reactos?rev=55213&view=rev Log: - Use WIN32_WINNT >=0x600 Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Thu Jan 26 17:24:52 2012 @@ -1,3 +1,5 @@ +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) include_directories(..)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs