Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 51672: [USBHUB_NEW] - Save PortNumber in child device extensions as its needed when PNP request device capabilities. - Handle IOCTL_INTERNAL_USB_SUBMIT_URB request by creating a new Irp ...
by mjmartin＠svn.reactos.org 11 May '11

11 May '11

Author: mjmartin Date: Wed May 11 02:25:11 2011 New Revision: 51672 URL: http://svn.reactos.org/svn/reactos?rev=51672&view=rev Log: [USBHUB_NEW] - Save PortNumber in child device extensions as its needed when PNP request device capabilities. - Handle IOCTL_INTERNAL_USB_SUBMIT_URB request by creating a new Irp and passing the Urb down to the miniport. - Now working with our ehci driver, we at least see a usb driver and can browse directory in Windows, though doing so results in assert as ehci doesnt support transfers over 5 Pages yet. Fix coming soon. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/misc.c branches/usb-bringup/drivers/usb/usbhub_new/pdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Wed May 11 02:25:11 2011 @@ -9,8 +9,6 @@ */ #define INITGUID - -#define NDEBUG #include "usbhub.h" NTSTATUS @@ -73,11 +71,18 @@ // Status = IoCallDriver(RootHubDeviceObject, Irp); - if (Status == STATUS_PENDING) + // + // Its ok to block here as this function is called in an nonarbitrary thread + // + if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } + + // + // The IO Manager will free the IRP + // return Status; } @@ -353,9 +358,21 @@ DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + // + // Check that reset was cleared + // if(PortStatus.Change & USB_PORT_STATUS_RESET) { DPRINT1("Port did not clear reset! Possible Hardware problem!\n"); + } + + // + // Check if the device is still connected + // + if (!(PortStatus.Status & USB_PORT_STATUS_CONNECT)) + { + DPRINT1("Device has been disconnected\n"); + continue; } // @@ -838,8 +855,8 @@ DevDesc->bDeviceClass) + 1; } BufferPtr[Index] = UNICODE_NULL; + UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); - UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; // // Initialize the DeviceId String @@ -860,8 +877,8 @@ // Construct DeviceId // swprintf(BufferPtr, L"USB\\Vid_%04x&Pid_%04x\0", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); - DPRINT1("usDeviceId) %wZ\n", &UsbChildExtension->usDeviceId); UsbChildExtension->usDeviceId.Buffer = BufferPtr; + DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId); // // Initialize the HardwareId String @@ -889,8 +906,8 @@ L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; BufferPtr[Index] = UNICODE_NULL; + UsbChildExtension->usHardwareIds.Buffer = BufferPtr; DPRINT1("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); - UsbChildExtension->usHardwareIds.Buffer = BufferPtr; // // FIXME: Handle Lang ids @@ -1049,6 +1066,7 @@ UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)NewChildDeviceObject->DeviceExtension; RtlZeroMemory(UsbChildExtension, sizeof(HUB_CHILDDEVICE_EXTENSION)); UsbChildExtension->ParentDeviceObject = UsbHubDeviceObject; + UsbChildExtension->PortNumber = PortId; // // Create the UsbDeviceObject @@ -1567,6 +1585,10 @@ Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, DeviceObject, (PRH_INIT_CALLBACK)RootHubInitCallbackFunction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set callback\n"); + } } else { @@ -1574,11 +1596,6 @@ // Send the first SCE Request // QueryStatusChangeEndpoint(DeviceObject); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to set callback\n"); } ExFreePool(Urb); Modified: branches/usb-bringup/drivers/usb/usbhub_new/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] Wed May 11 02:25:11 2011 @@ -7,7 +7,6 @@ * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define NDEBUG #include "usbhub.h" #include <stdarg.h> Modified: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Wed May 11 02:25:11 2011 @@ -9,24 +9,141 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ -#define NDEBUG #include "usbhub.h" #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) - + +NTSTATUS +UrbCompletion( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + PIRP OriginalIrp; + DPRINT("Entered Urb Completion\n"); + + // + // Get the original Irp + // + OriginalIrp = (PIRP)Context; + + // + // Update it to match what was returned for the IRP that was passed to RootHub + // + OriginalIrp->IoStatus.Status = Irp->IoStatus.Status; + OriginalIrp->IoStatus.Information = Irp->IoStatus.Information; + DPRINT("Status %x, Information %x\n", Irp->IoStatus.Status, Irp->IoStatus.Information); + + // + // Complete the original Irp + // + IoCompleteRequest(OriginalIrp, IO_NO_INCREMENT); + + // + // Return this status so the IO Manager doesnt mess with the Irp + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +FowardUrbToRootHub( + PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG IoControlCode, + PIRP Irp, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2) +{ + NTSTATUS Status; + PIRP ForwardIrp; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION ForwardStack, CurrentStack; + PURB Urb; + + // + // Get the current stack location for the Irp + // + CurrentStack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(CurrentStack); + + // + // Pull the Urb from that stack, it will be reused in the Irp sent to RootHub + // + Urb = (PURB)CurrentStack->Parameters.Others.Argument1; + ASSERT(Urb); + + // + // Create the Irp to forward to RootHub + // + ForwardIrp = IoBuildAsynchronousFsdRequest(IRP_MJ_SHUTDOWN, + RootHubDeviceObject, + NULL, + 0, + 0, + &IoStatus); + if (!ForwardIrp) + { + DPRINT1("Failed to allocate IRP\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Get the new Irps next stack + // + ForwardStack = IoGetNextIrpStackLocation(ForwardIrp); + + // + // Copy the stack for the current irp into the next stack of new irp + // + RtlCopyMemory(ForwardStack, CurrentStack, sizeof(IO_STACK_LOCATION)); + + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + // + // Mark the Irp from upper driver as pending + // + IoMarkIrpPending(Irp); + + // + // Now set the completion routine for the new Irp. + // + IoSetCompletionRoutine(ForwardIrp, + (PIO_COMPLETION_ROUTINE)UrbCompletion, + Irp, + TRUE, + TRUE, + TRUE); + + Status = IoCallDriver(RootHubDeviceObject, ForwardIrp); + + // + // Always return pending as the completion routine will take care of it + // + return STATUS_PENDING; +} + NTSTATUS USBHUB_PdoHandleInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; - NTSTATUS Status; - - DPRINT1("UsbhubInternalDeviceControlPdo(%x) called\n", DeviceObject); + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + PDEVICE_OBJECT RootHubDeviceObject; + PURB Urb; + + //DPRINT1("UsbhubInternalDeviceControlPdo(%x) called\n", DeviceObject); Stack = IoGetCurrentIrpStackLocation(Irp); Status = Irp->IoStatus.Status; + + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; switch (Stack->Parameters.DeviceIoControl.IoControlCode) { @@ -53,6 +170,102 @@ } break; } + case IOCTL_INTERNAL_USB_SUBMIT_URB: + { + //DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB\n"); + // + // get current stack location + // + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + + // + // Get the Urb + // + Urb = (PURB)Stack->Parameters.Others.Argument1; + ASSERT(Urb); + + // + // Set the real device handle + // + DPRINT("UsbdDeviceHandle %x, ChildDeviceHandle %x\n", Urb->UrbHeader.UsbdDeviceHandle, ChildDeviceExtension->UsbDeviceHandle); + + Urb->UrbHeader.UsbdDeviceHandle = ChildDeviceExtension->UsbDeviceHandle; + + // + // Submit to RootHub + // + switch (Urb->UrbHeader.Function) + { + // + // Debugging only + // + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); + break; + case URB_FUNCTION_CLASS_DEVICE: + DPRINT1("URB_FUNCTION_CLASS_DEVICE\n"); + break; + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); + break; + case URB_FUNCTION_SELECT_CONFIGURATION: + DPRINT1("URB_FUNCTION_SELECT_CONFIGURATION\n"); + break; + case URB_FUNCTION_SELECT_INTERFACE: + DPRINT1("URB_FUNCTION_SELECT_INTERFACE\n"); + break; + case URB_FUNCTION_CLASS_OTHER: + DPRINT1("URB_FUNCTION_CLASS_OTHER\n"); + break; + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + /* + DPRINT1("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER\n"); + DPRINT1("PipeHandle %x\n", Urb->UrbBulkOrInterruptTransfer.PipeHandle); + DPRINT1("TransferFlags %x\n", Urb->UrbBulkOrInterruptTransfer.TransferFlags); + DPRINT1("Buffer %x\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer); + DPRINT1("BufferMDL %x\n", Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT1("Length %x\n", Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + DPRINT1("UrbLink %x\n", Urb->UrbBulkOrInterruptTransfer.UrbLink); + DPRINT1("hca %x\n", Urb->UrbBulkOrInterruptTransfer.hca); + */ + break; + } + case URB_FUNCTION_CLASS_INTERFACE: + DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + break; + default: + DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); + break; + } + Urb->UrbHeader.UsbdDeviceHandle = ChildDeviceExtension->UsbDeviceHandle; + //DPRINT1("Stack->CompletionRoutine %x\n", Stack->CompletionRoutine); + // + // Send the request to RootHub + // + Status = FowardUrbToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Irp, Urb, NULL); + return Status; + break; + } + // + // FIXME: Can these be sent to RootHub? + // + case IOCTL_INTERNAL_USB_RESET_PORT: + DPRINT1("IOCTL_INTERNAL_USB_RESET_PORT\n"); + break; + case IOCTL_INTERNAL_USB_GET_PORT_STATUS: + DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); + break; + case IOCTL_INTERNAL_USB_ENABLE_PORT: + DPRINT1("IOCTL_INTERNAL_USB_ENABLE_PORT\n"); + break; + case IOCTL_INTERNAL_USB_CYCLE_PORT: + DPRINT1("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); + break; + case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: + DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); + break; default: { DPRINT1("Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); @@ -61,9 +274,12 @@ } } - Irp->IoStatus.Information = Information; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } return Status; } @@ -202,11 +418,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; ULONG MinorFunction; PIO_STACK_LOCATION Stack; ULONG_PTR Information = 0; - NTSTATUS Status; - + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; + + UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; @@ -226,16 +444,18 @@ DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; // FIXME: capabilities can change with connected device - DeviceCapabilities->LockSupported = TRUE; - DeviceCapabilities->EjectSupported = TRUE; + DeviceCapabilities->LockSupported = FALSE; + DeviceCapabilities->EjectSupported = FALSE; DeviceCapabilities->Removable = TRUE; DeviceCapabilities->DockDevice = FALSE; - DeviceCapabilities->UniqueID = TRUE; - DeviceCapabilities->SilentInstall = TRUE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = FALSE; DeviceCapabilities->RawDeviceOK = FALSE; - DeviceCapabilities->SurpriseRemovalOK = TRUE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; DeviceCapabilities->HardwareDisabled = FALSE; //DeviceCapabilities->NoDisplayInUI = FALSE; + DeviceCapabilities->Address = UsbChildExtension->PortNumber; + DeviceCapabilities->UINumber = 0; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; for (i = 0; i < PowerSystemMaximum; i++) DeviceCapabilities->DeviceState[i] = PowerDeviceD3; @@ -318,6 +538,7 @@ // FIXME // Status = STATUS_SUCCESS; + break; } default: { Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Wed May 11 02:25:11 2011 @@ -56,6 +56,7 @@ COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT ParentDeviceObject; PUSB_DEVICE_HANDLE UsbDeviceHandle; + ULONG PortNumber; UNICODE_STRING usDeviceId; UNICODE_STRING usInstanceId; UNICODE_STRING usHardwareIds;

1 0

[janderwald] 51671: [USBSTOR] - Partly implement test unit command
by janderwald＠svn.reactos.org 10 May '11

10 May '11

Author: janderwald Date: Tue May 10 23:26:56 2011 New Revision: 51671 URL: http://svn.reactos.org/svn/reactos?rev=51671&view=rev Log: [USBSTOR] - Partly implement test unit command Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Tue May 10 23:26:56 2011 @@ -125,13 +125,36 @@ else { // - // failed to retrieve sense data + // failed to read // Irp->IoStatus.Information = 0; Request->SrbStatus = SRB_STATUS_ERROR; } } - + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) + { + DPRINT1("SCSIOP_TEST_UNIT_READY\n"); + + // + // send test unit command + // + Status = USBSTOR_SendTestUnitCmd(DeviceObject, Request); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // test unit command failed + // + Request->SrbStatus = SRB_STATUS_ERROR; + } + } else { UNIMPLEMENTED; @@ -421,7 +444,7 @@ DeviceDescriptor->Size = TotalLength; DeviceDescriptor->DeviceType = InquiryData->DeviceType; DeviceDescriptor->DeviceTypeModifier = (InquiryData->RMB & 0x7F); - DeviceDescriptor->RemovableMedia = FALSE; //FIXME check if floppy + DeviceDescriptor->RemovableMedia = TRUE; DeviceDescriptor->CommandQueueing = FALSE; DeviceDescriptor->BusType = BusTypeUsb; DeviceDescriptor->VendorIdOffset = sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR); Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Tue May 10 23:26:56 2011 @@ -632,7 +632,7 @@ // MODE_PARAMETER_BLOCK // // - DbgBreakPoint(); + UNIMPLEMENTED // // send csw @@ -813,3 +813,77 @@ // return Status; } + +NTSTATUS +USBSTOR_SendTestUnitCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request) +{ + UFI_TEST_UNIT_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PVOID Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + PCDB pCDB; + ULONG BlockCount; + + // + // initialize test unit cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_TEST_UNIT_CMD)); + Cmd.Code = SCSIOP_TEST_UNIT_READY; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + + // + // no data should be transferred + // + ASSERT(Request->DataTransferLength == 0); + + // + // now send test unit cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendReadCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + ASSERT(CSW.DataResidue == 0); + + // + // free item + // + FreeItem(OutControl); + + // + // FIXME: read sense buffer + // + + // + // done + // + return Status; +} Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Tue May 10 23:26:56 2011 @@ -19,6 +19,22 @@ #define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16) + + +#define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) +#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) + +#define HTONL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + + +#define NTOHL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + NTSTATUS NTAPI IoAttachDeviceToDeviceStackSafe( IN PDEVICE_OBJECT SourceDevice, @@ -56,6 +72,8 @@ UCHAR LUN; // lun id PVOID InquiryData; // USB SCSI inquiry data UCHAR Claimed; // indicating if it has been claimed by upper driver + ULONG BlockLength; // length of block + ULONG LastLogicBlockAddress; // last block address }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; // @@ -127,6 +145,24 @@ //-------------------------------------------------------------------------------------------------------------------------------------------- // +// UFI read cmd +// +typedef struct +{ + UCHAR Code; // operation code + UCHAR LUN; // lun + ULONG LogicalBlockAddress; // logical block address + UCHAR Reserved; // reserved 0x00 + USHORT ContiguousLogicBlocks; // num of contiguous logical blocks + UCHAR Reserved1[3]; // reserved 0x00 +}UFI_READ_CMD; + +C_ASSERT(sizeof(UFI_READ_CMD) == 12); + +#define UFI_READ_CMD_LEN (0xA) + +//-------------------------------------------------------------------------------------------------------------------------------------------- +// // UFI read capacity cmd // typedef struct @@ -153,22 +189,6 @@ }UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; C_ASSERT(sizeof(UFI_CAPACITY_RESPONSE) == 8); - -#define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) -#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) - -#define HTONL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) - - -#define NTOHL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) - - //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -214,6 +234,22 @@ }UFI_TIMER_PROTECT_PAGE, *PUFI_TIMER_PROTECT_PAGE; C_ASSERT(sizeof(UFI_TIMER_PROTECT_PAGE) == 8); +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI test unit command +// + +typedef struct +{ + UCHAR Code; // operation code 0x00 + UCHAR LUN; // lun + UCHAR Reserved[10]; // reserved 0x00 +}UFI_TEST_UNIT_CMD, *PUFI_TEST_UNIT_CMD; + +C_ASSERT(sizeof(UFI_TEST_UNIT_CMD) == 12); + +#define UFI_TEST_UNIT_CMD_LEN (6) + //--------------------------------------------------------------------- // // fdo.c routines @@ -318,6 +354,18 @@ IN OUT PSCSI_REQUEST_BLOCK Request, OUT PULONG TransferBufferLength); +NTSTATUS +USBSTOR_SendReadCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength); + +NTSTATUS +USBSTOR_SendTestUnitCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request); + + //--------------------------------------------------------------------- // // disk.c routines

1 0

[ekohl] 51670: [EVENTLOG] Log product info upon startup.
by ekohl＠svn.reactos.org 10 May '11

10 May '11

Author: ekohl Date: Tue May 10 20:19:14 2011 New Revision: 51670 URL: http://svn.reactos.org/svn/reactos?rev=51670&view=rev Log: [EVENTLOG] Log product info upon startup. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Tue May 10 20:19:14 2011 @@ -135,6 +135,71 @@ } +static VOID +ReportProductInfoEvent(VOID) +{ + OSVERSIONINFOW versionInfo; + WCHAR szBuffer[512]; + DWORD dwLength; + HKEY hKey; + DWORD dwValueLength; + DWORD dwType; + LONG lResult = ERROR_SUCCESS; + + ZeroMemory(&versionInfo, sizeof(OSVERSIONINFO)); + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + + /* Get version information */ + if (!GetVersionExW(&versionInfo)) + return; + + ZeroMemory(szBuffer, 512 * sizeof(WCHAR)); + + /* Write version into the buffer */ + dwLength = swprintf(szBuffer, + L"%lu.%lu", + versionInfo.dwMajorVersion, + versionInfo.dwMinorVersion) + 1; + + /* Write build number into the buffer */ + dwLength += swprintf(&szBuffer[dwLength], + L"%lu", + versionInfo.dwBuildNumber) + 1; + + /* Write service pack info into the buffer */ + wcscpy(&szBuffer[dwLength], versionInfo.szCSDVersion); + dwLength += wcslen(versionInfo.szCSDVersion) + 1; + + /* Read 'CurrentType' from the registry and write it into the buffer */ + lResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lResult == ERROR_SUCCESS) + { + dwValueLength = 512 - dwLength; + lResult = RegQueryValueEx(hKey, + L"CurrentType", + NULL, + &dwType, + (LPBYTE)&szBuffer[dwLength], + &dwValueLength); + + RegCloseKey(hKey); + } + + /* Log the product information */ + LogfReportEvent(EVENTLOG_INFORMATION_TYPE, + 0, + EVENT_EventLogProductInfo, + 4, + szBuffer, + 0, + NULL); +} + + static VOID CALLBACK ServiceMain(DWORD argc, LPWSTR *argv) @@ -169,9 +234,15 @@ DPRINT("Service started\n"); UpdateServiceStatus(SERVICE_RUNNING); + ReportProductInfoEvent(); + LogfReportEvent(EVENTLOG_INFORMATION_TYPE, 0, - EVENT_EventlogStarted); + EVENT_EventlogStarted, + 0, + NULL, + 0, + NULL); } DPRINT("ServiceMain() done\n"); Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Tue May 10 20:19:14 2011 @@ -12,6 +12,7 @@ #define NDEBUG #define WIN32_NO_STATUS +#include <stdio.h> #include <windows.h> #include <netevent.h> #include <lpctypes.h> @@ -181,7 +182,11 @@ VOID LogfReportEvent(WORD wType, WORD wCategory, - DWORD dwEventId); + DWORD dwEventId, + WORD wNumStrings, + WCHAR *lpStrings, + DWORD dwDataSize, + LPVOID lpRawData); /* eventlog.c */ extern HANDLE MyHeap; Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Tue May 10 20:19:14 2011 @@ -1054,7 +1054,11 @@ VOID LogfReportEvent(WORD wType, WORD wCategory, - DWORD dwEventId) + DWORD dwEventId, + WORD wNumStrings, + WCHAR *lpStrings, + DWORD dwDataSize, + LPVOID lpRawData) { WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwComputerNameLength = MAX_COMPUTERNAME_LENGTH + 1; @@ -1086,10 +1090,10 @@ (LPCWSTR)szComputerName, 0, NULL, - 0, //wNumStrings, - NULL, //lpStrings, - 0, //dwDataSize, - NULL); //lpRawData); + wNumStrings, + lpStrings, + dwDataSize, + lpRawData); dwError = LogfWriteData(pEventSource->LogFile, recSize, logBuffer); if (!dwError)

1 0

[ilardig] 51669: [KERNEL32_WINETEST] Sam Arun Raj Seeniraj: Update kernel32 winetests for dos device. See bug 993 for details.
by ilardig＠svn.reactos.org 10 May '11

10 May '11

Author: ilardig Date: Tue May 10 16:11:30 2011 New Revision: 51669 URL: http://svn.reactos.org/svn/reactos?rev=51669&view=rev Log: [KERNEL32_WINETEST] Sam Arun Raj Seeniraj: Update kernel32 winetests for dos device. See bug 993 for details. Modified: trunk/rostests/winetests/kernel32/dosdev.c Modified: trunk/rostests/winetests/kernel32/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/dosdev… ============================================================================== --- trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/dosdev.c [iso-8859-1] Tue May 10 16:11:30 2011 @@ -25,204 +25,362 @@ #include "winbase.h" #include "winerror.h" -static void test_DefineDosDeviceA1(void) +#define SUBST_DRIVE_LETTER 'M' +#define SUBST_DRIVE "M:" +#define SUBST_DRIVE_NON_EXIST_DIR "M:\\deadbeef" +#define SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR "M:\\" +#define SUBST_DRIVE_SEARCH "M:\\*" +#define SUBST_DRIVE_LOWERCASE "m:" +#define SUBST_DRIVE_LOWERCASE_SEARCH "m:\\*" +#define SUBST_DRIVE2_LETTER 'R' +#define SUBST_DRIVE2 "R:" +#define SUBST_DRIVE2_WITH_TRAILING_PATH_SEPERATOR "R:\\" +#define SUBST_DRIVE2_SEARCH "R:\\*" + +static void test_DefineDosDeviceA(void) { - /* Test using lowercase drive letters */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "m:"; + CHAR Buffer[MAX_PATH], Target[MAX_PATH]; BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); + UINT CharCount; + HANDLE hnd; + WIN32_FIND_DATAA Data; + UINT SystemDriveType, DriveType1, DriveType2; + DWORD dwMaskPrev, dwMaskCur; + CHAR c; + + /* Choose the symbolic link target */ + CharCount = GetSystemWindowsDirectoryA(Target, MAX_PATH); + ok(CharCount > 0, "Failed to get windows directory\n"); + c = Target[3]; + Target[3] = '\0'; + SystemDriveType = GetDriveTypeA(Target); + Target[3] = c; + + /* Test with a subst drive pointing to another substed drive */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + Result = DefineDosDeviceA(0, SUBST_DRIVE2, SUBST_DRIVE); + ok(Result, "Failed to subst drive\n"); + DriveType2 = GetDriveTypeA(SUBST_DRIVE2_WITH_TRAILING_PATH_SEPERATOR); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE2_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE2_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + ok(DriveType1 == DriveType2, "subst drive types don't match\n"); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + ok(DriveType2 == SystemDriveType, "subst drive types don't match\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Target); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + hnd = FindFirstFileA(SUBST_DRIVE2_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail, we removed the target\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE2, SUBST_DRIVE); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + Result = QueryDosDeviceA(SUBST_DRIVE2, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using lowercase drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE_LOWERCASE, Target); ok(Result, "Failed to subst drive using lowercase drive letter\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE_LOWERCASE, Target); ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); + Result = QueryDosDeviceA(SUBST_DRIVE_LOWERCASE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test remove without using DDD_EXACT_MATCH_ON_REMOVE */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, SUBST_DRIVE, NULL); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes in add order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes in reverse order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test multiple adds and multiple removes out of order */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp4"); + ok(Result, "Failed to subst drive\n"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, "C:\\temp5"); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp2"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp5"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp1"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp3"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "Failed to query subst drive\n"); + if (Result) ok((_stricmp(Buffer, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, "C:\\temp4"); + ok(Result, "Failed to remove subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test with trailing '\' appended to TargetPath */ + dwMaskPrev = GetLogicalDrives(); + strcpy_s(Buffer, MAX_PATH, Target); + strcat_s(Buffer, MAX_PATH, "\\\\\\"); + Result = DefineDosDeviceA(0, SUBST_DRIVE, Buffer); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 == SystemDriveType, "subst drive types don't match\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd != INVALID_HANDLE_VALUE, "Failed to open subst drive\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Buffer); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test with trailing '\' appended to TargetPath and DDD_RAW_TARGET_PATH flag */ + dwMaskPrev = GetLogicalDrives(); + strcpy_s(Buffer, MAX_PATH, "\\??\\"); + strcat_s(Buffer, MAX_PATH, Target); + strcat_s(Buffer, MAX_PATH, "\\\\\\"); + Result = DefineDosDeviceA(DDD_RAW_TARGET_PATH, SUBST_DRIVE, Buffer); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when they shouldn't\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "GetLastError() reports unexpected error code\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, SUBST_DRIVE, NULL); + ok(Result, "Failed to remove subst drive using NULL Target name\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using trailing \ against drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Target); + ok(!Result, "Subst drive using trailing path seperator, this should not happen\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + ok(!(dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is set when it shouldn't\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Target); + ok(!Result, "Removing Subst drive using trailing path seperator passed when it should fail\n"); + Result = QueryDosDeviceA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present when it should not be created in the first place\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test using arbitary string, not necessarily a DOS drive letter */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, "!QHello:", Target); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, "!QHello:", Target); + ok(Result, "Failed to subst drive using non-DOS drive name\n"); + Result = QueryDosDeviceA("!QHello:", Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test by subst a drive to itself */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, SUBST_DRIVE); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, SUBST_DRIVE); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); + + /* Test by subst a drive to an non-existent folder under itself */ + dwMaskPrev = GetLogicalDrives(); + Result = DefineDosDeviceA(0, SUBST_DRIVE, SUBST_DRIVE_NON_EXIST_DIR); + ok(Result, "Failed to subst drive\n"); + DriveType1 = GetDriveTypeA(SUBST_DRIVE_WITH_TRAILING_PATH_SEPERATOR); + ok(DriveType1 != SystemDriveType, "subst drive types match when it shouldn't\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() reports unexpected error code\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur != dwMaskPrev, "Drive masks match when it shouldn't\n"); + ok((dwMaskCur & (1 << (SUBST_DRIVE_LETTER - 'A'))), "Drive bit is not set\n"); + hnd = FindFirstFileA(SUBST_DRIVE_SEARCH, &Data); + ok(hnd == INVALID_HANDLE_VALUE, "Opened subst drive when it should fail\n"); + if (hnd) FindClose(hnd); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, SUBST_DRIVE_NON_EXIST_DIR); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(!Result, "Subst drive is present even after remove attempt\n"); + dwMaskCur = GetLogicalDrives(); + ok(dwMaskCur == dwMaskPrev, "Drive masks don't match\n"); } -static void test_DefineDosDeviceA2(void) +static void test_QueryDosDeviceA(void) { - /* Test using trailing \ against drive letter */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "Q:\\"; + CHAR Buffer[MAX_PATH], Target[MAX_PATH]; BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(!Result, "Subst drive using trailing path seperator\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present when it should not be created in the first place\n"); -} - -static void test_DefineDosDeviceA3(void) -{ - /* Test using arbitary string, not necessarily a DOS drive letter */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "!QHello:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive using non-DOS drive name\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA4(void) -{ - /* Test remove without using DDD_EXACT_MATCH_ON_REMOVE */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION, Drive, NULL); - ok(Result, "Failed to remove subst drive using NULL Target name\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA5(void) -{ - /* Test multiple adds and multiple removes in add order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp3") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA6(void) -{ - /* Test multiple adds and multiple removes in reverse order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp2") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp1") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); -} - -static void test_DefineDosDeviceA7(void) -{ - /* Test multiple adds and multiple removes out of order */ - CHAR Target[MAX_PATH]; - CHAR Drive[] = "M:"; - BOOL Result; - - Result = DefineDosDeviceA(0, Drive, "C:\\temp1"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp2"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp3"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp4"); - ok(Result, "Failed to subst drive\n"); - Result = DefineDosDeviceA(0, Drive, "C:\\temp5"); - ok(Result, "Failed to subst drive\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp2"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp5") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp5"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp1"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target\n"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp3"); - ok(Result, "Failed to remove subst drive\n"); - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(Result, "Failed to query subst drive\n"); - if (Result) - ok((_stricmp(Target, "\\??\\C:\\temp4") == 0), "Subst drive is not pointing to correct target"); - - Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, Drive, "C:\\temp4"); - ok(Result, "Failed to remove subst drive\n"); - - Result = QueryDosDeviceA(Drive, Target, MAX_PATH); - ok(!Result, "Subst drive is present even after remove attempt\n"); + UINT CharCount; + + /* Choose the symbolic link target */ + CharCount = GetSystemWindowsDirectoryA(Target, MAX_PATH); + ok(CharCount > 0, "Failed to get windows directory\n"); + + Result = DefineDosDeviceA(0, SUBST_DRIVE, Target); + ok(Result, "Failed to subst drive\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, 0); + ok(!Result, "Should fail as the buffer passed is supposed to be small\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() reports unexpected error code\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + ok(Result, "failed to get target path\n"); + ok(_strnicmp(Buffer, "\\??\\", 4) == 0, "The target returned does have correct prefix set\n"); + ok(stricmp(&Buffer[4], Target) == 0, "The target returned does not match the one set\n"); + Result = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE, SUBST_DRIVE, Target); + ok(Result, "Failed to remove subst drive using lowercase drive letter\n"); + Result = QueryDosDeviceA(SUBST_DRIVE, Buffer, MAX_PATH); + + /* This will try to retrieve all existing MS-DOS device names */ + Result = QueryDosDeviceA(NULL, Buffer, 0); + ok(!Result, "Should fail as the buffer passed is supposed to be small\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() reports unexpected error code\n"); } START_TEST(dosdev) { - test_DefineDosDeviceA1(); - test_DefineDosDeviceA2(); - test_DefineDosDeviceA3(); - test_DefineDosDeviceA4(); - test_DefineDosDeviceA5(); - test_DefineDosDeviceA6(); - test_DefineDosDeviceA7(); + test_DefineDosDeviceA(); + test_QueryDosDeviceA(); }

1 0

[fireball] 51668: [NTDLL] - Result of LdrQueryImageFileExecutionOptions() shouldn't be used as a return status. Always reset it to STATUS_SUCCESS whatever the function returns. See bug #6231 for mo...
by fireball＠svn.reactos.org 10 May '11

10 May '11

Author: fireball Date: Tue May 10 16:05:59 2011 New Revision: 51668 URL: http://svn.reactos.org/svn/reactos?rev=51668&view=rev Log: [NTDLL] - Result of LdrQueryImageFileExecutionOptions() shouldn't be used as a return status. Always reset it to STATUS_SUCCESS whatever the function returns. See bug #6231 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Tue May 10 16:05:59 2011 @@ -591,6 +591,9 @@ sizeof(ULONG), NULL); if (!NT_SUCCESS(Status)) BreakOnDllLoad = 0; + + /* Reset status back to STATUS_SUCCESS */ + Status = STATUS_SUCCESS; } /* Break if aksed */

1 0

[fireball] 51667: Sam Arun Raj Seeniraj: [WIN32CSR.DLL] - Removed previous hack in CsrDefineDosDevice() that was stripping off extra trailing path separators. [SUBST.EXE] - The help message was not...
by fireball＠svn.reactos.org 10 May '11

10 May '11

Author: fireball Date: Tue May 10 15:48:54 2011 New Revision: 51667 URL: http://svn.reactos.org/svn/reactos?rev=51667&view=rev Log: Sam Arun Raj Seeniraj: [WIN32CSR.DLL] - Removed previous hack in CsrDefineDosDevice() that was stripping off extra trailing path separators. [SUBST.EXE] - The help message was not show aligned properly, fixing that. See issue #993 for more details. Modified: trunk/reactos/base/system/subst/lang/en-US.rc trunk/reactos/base/system/subst/lang/es-ES.rc trunk/reactos/base/system/subst/lang/it-IT.rc trunk/reactos/subsystems/win32/csrss/win32csr/file.c Modified: trunk/reactos/base/system/subst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/en-… ============================================================================== --- trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Invalid parameter - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Drive already SUBSTed\n" IDS_FAILED_WITH_ERROCODE "Failed with error code 0x%x: %s\n" - IDS_USAGE "Associates a path with a drive letter.\n\nSUBST [drive1: [drive2:]path]\nSUBST drive1: /D\n\n drive1: \ - Specifies a virtual drive to which you want to assign a path.\n \ - [drive2:]path Specifies a physical drive and path you want to assign to\n \ - a virtual drive.\n /D \ - Deletes a substituted (virtual) drive.\n\nType SUBST with no parameters to display a list of current virtual drives.\n" + IDS_USAGE "Associates a path with a drive letter.\n\n\ +SUBST [drive1: [drive2:]path]\n\ +SUBST drive1: /D\n\n\ + drive1: Specifies a virtual drive to which you want to assign a path.\n\ + [drive2:]path Specifies a physical drive and path you want to assign to\n a virtual drive.\n\ + /D Deletes a substituted (virtual) drive.\n\n\ +Type SUBST with no parameters to display a list of current virtual drives.\n" END Modified: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… ============================================================================== --- trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Parámetro incorrecto - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Unidad ya sustituida\n" IDS_FAILED_WITH_ERROCODE "Falla con código de error 0x%x: %s\n" - IDS_USAGE "Asocia una ruta con una letra de unidad.\n\nSUBST [unidad1: [unidad2:]ruta]\nSUBST unidad1: /D\n\n unidad1: \ - Especifica una unidad virtual a la cual se quiere asignar una ruta.\n \ - [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n \ - una unidad virtual.\n /D \ - Elimina una unidad (virtual) substituida.\n\nEscribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" + IDS_USAGE "Asocia una ruta con una letra de unidad.\n\n\ +SUBST [unidad1: [unidad2:]ruta]\n\ +SUBST unidad1: /D\n\n\ + unidad1: Especifica una unidad virtual a la cual se quiere asignar una ruta.\n\ + [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n una unidad virtual.\n\ + /D Elimina una unidad (virtual) substituida.\n\n\ +Escribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" END Modified: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Tue May 10 15:48:54 2011 @@ -8,9 +8,11 @@ IDS_INVALID_PARAMETER2 "Parametro errato - %s\n" IDS_DRIVE_ALREAD_SUBSTED "Unità già sostituita\n" IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" - IDS_USAGE "Associa un percorso ad una lettera di unità.\n\nSUBST [unità1: [unità2:]percorso]\nSUBST unità1: /D\n\n unità1: \ - Specifica un'unità virtuale alla quale assegnare un percorso.\n \ - [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n \ - unità virtuale.\n /D \ - Elimina un'unità (virtuale) sostituita.\n\nDigitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" + IDS_USAGE "Associa un percorso ad una lettera di unità.\n\n\ +SUBST [unità1: [unità2:]percorso]\n\ +SUBST unità1: /D\n\n\ + unità1: Specifica un'unità virtuale alla quale assegnare un percorso.\n\ + [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n unità virtuale.\n\ + /D Elimina un'unità (virtuale) sostituita.\n\n\ +Digitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] Tue May 10 15:48:54 2011 @@ -98,17 +98,6 @@ RequestLinkTarget = &Request->Data.DefineDosDeviceRequest.TargetName; - /* - * Strip off any trailing '\', if we leave a trailing slash the drive remains non-accessible. - * So working around it for now. - * FIXME: Need to fix this in the object manager ObpLookupObjectName()??, and remove this when the its fixed. - */ - while (RequestLinkTarget->Length >= sizeof(WCHAR) && - RequestLinkTarget->Buffer[(RequestLinkTarget->Length/sizeof(WCHAR)) - 1] == L'\\') - { - RequestLinkTarget->Length -= sizeof(WCHAR); - } - lpBuffer = (PWSTR) RtlAllocateHeap(Win32CsrApiHeap, HEAP_ZERO_MEMORY, RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR));

1 0

[fireball] 51666: [NTOSKRNL] - Sam Arun Raj Seeniraj: ObpLookupObjectName() used to reparse endlessly when a symlink points to itself, preventing this by limiting number of reparse attemtps. See is...
by fireball＠svn.reactos.org 10 May '11

10 May '11

Author: fireball Date: Tue May 10 15:43:55 2011 New Revision: 51666 URL: http://svn.reactos.org/svn/reactos?rev=51666&view=rev Log: [NTOSKRNL] - Sam Arun Raj Seeniraj: ObpLookupObjectName() used to reparse endlessly when a symlink points to itself, preventing this by limiting number of reparse attemtps. See issue #993 for more details. Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Tue May 10 15:43:55 2011 @@ -544,7 +544,7 @@ } /* Reparse */ - while (Reparse) + while (Reparse && MaxReparse) { /* Get the name */ RemainingName = *ObjectName; @@ -795,6 +795,7 @@ { /* Reparse again */ Reparse = TRUE; + --MaxReparse; /* Start over from root if we got sent back there */ if ((Status == STATUS_REPARSE_OBJECT) ||

1 0

[fireball] 51665: [NTOSKRNL] - Make ObpParseSymbolicLink properly handle the case when target path has a trailing path separator. Based on findings by Samarunraj. See issue #993 for more details.
by fireball＠svn.reactos.org 10 May '11

10 May '11

Author: fireball Date: Tue May 10 15:09:36 2011 New Revision: 51665 URL: http://svn.reactos.org/svn/reactos?rev=51665&view=rev Log: [NTOSKRNL] - Make ObpParseSymbolicLink properly handle the case when target path has a trailing path separator. Based on findings by Samarunraj. See issue #993 for more details. Modified: trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Tue May 10 15:09:36 2011 @@ -374,7 +374,7 @@ POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)ParsedObject; PUNICODE_STRING TargetPath; PWSTR NewTargetPath; - ULONG LengthUsed, MaximumLength; + ULONG LengthUsed, MaximumLength, TempLength; NTSTATUS Status; PAGED_CODE(); @@ -411,9 +411,39 @@ return STATUS_OBJECT_TYPE_MISMATCH; } + /* Check if this symlink is bound to a specific object */ + if (SymlinkObject->LinkTargetObject) + { + UNIMPLEMENTED; + } + /* Set the target path and length */ TargetPath = &SymlinkObject->LinkTarget; - LengthUsed = TargetPath->Length + RemainingName->Length; + TempLength = TargetPath->Length; + + /* + * Strip off the extra trailing '\', if we don't do this we will end up + * adding a extra '\' between TargetPath and RemainingName + * causing caller's like ObpLookupObjectName() to fail. + */ + if (TempLength && RemainingName->Length) + { + /* The target and remaining names aren't empty, so check for slashes */ + if ((TargetPath->Buffer[TempLength / sizeof(WCHAR) - 1] == + OBJ_NAME_PATH_SEPARATOR) && + (RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR)) + { + /* Reduce the length by one to cut off the extra '\' */ + TempLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + } + + /* Calculate the new length */ + LengthUsed = TempLength + RemainingName->Length; + + /* Check if it's not too much */ + if (LengthUsed > 0xFFF0) + return STATUS_NAME_TOO_LONG; /* Optimization: check if the new name is shorter */ if (FullPath->MaximumLength <= LengthUsed) @@ -436,13 +466,13 @@ if (RemainingName->Length) { /* Copy the new path */ - RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), + RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TempLength), RemainingName->Buffer, RemainingName->Length); } /* Copy the target path and null-terminate it */ - RtlCopyMemory(NewTargetPath, TargetPath->Buffer, TargetPath->Length); + RtlCopyMemory(NewTargetPath, TargetPath->Buffer, TempLength); NewTargetPath[LengthUsed / sizeof(WCHAR)] = UNICODE_NULL; /* If the optimization didn't work, free the old buffer */

1 0

[spetreolle] 51664: [CMAKE] Dereference non existing targets : buildno_header, kernel_zw, kernel_napi, subsystem_napi Spotted by msbuild.
by spetreolle＠svn.reactos.org 10 May '11

10 May '11

Author: spetreolle Date: Tue May 10 13:15:51 2011 New Revision: 51664 URL: http://svn.reactos.org/svn/reactos?rev=51664&view=rev Log: [CMAKE] Dereference non existing targets : buildno_header, kernel_zw, kernel_napi, subsystem_napi Spotted by msbuild. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=516… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue May 10 13:15:51 2011 @@ -170,7 +170,7 @@ macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} psdk buildno_header) + add_dependencies(${MODULE} psdk) if(${IS_CPP}) target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) endif() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=516… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue May 10 13:15:51 2011 @@ -66,7 +66,7 @@ endmacro() macro(set_module_type MODULE TYPE) - add_dependencies(${MODULE} psdk buildno_header) + add_dependencies(${MODULE} psdk) if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue May 10 13:15:51 2011 @@ -446,7 +446,7 @@ add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) -add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi asm) +add_dependencies(ntoskrnl psdk bugcodes asm) add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Tue May 10 13:15:51 2011 @@ -195,7 +195,7 @@ add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) -add_dependencies(win32k gendib_generated subsystem_napi) +add_dependencies(win32k gendib_generated) add_cab_target(win32k 1) add_importlib_target(win32k.spec)

1 0

[ekohl] 51663: [NTOSKRNL] Fix two typos, one spotted by Gabriel Ilardi and the other one spotted by me.
by ekohl＠svn.reactos.org 10 May '11

10 May '11

Author: ekohl Date: Tue May 10 12:31:11 2011 New Revision: 51663 URL: http://svn.reactos.org/svn/reactos?rev=51663&view=rev Log: [NTOSKRNL] Fix two typos, one spotted by Gabriel Ilardi and the other one spotted by me. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue May 10 12:31:11 2011 @@ -1957,7 +1957,7 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, - 0, + NULL, NULL); Status = NtCreateKey(&KeyHandle, @@ -1969,7 +1969,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create key &wZ (Status: %08lx)\n", &KeyName, Status); + DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); return; }

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