Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55082: [USBHUB_NEW] - Fix calling convention of completion routine
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 23:25:33 2012 New Revision: 55082 URL: http://svn.reactos.org/svn/reactos?rev=55082&view=rev Log: [USBHUB_NEW] - Fix calling convention of completion routine Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 22 23:25:33 2012 @@ -435,6 +435,7 @@ } NTSTATUS +NTAPI StatusChangeEndpointCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,

1 0

[gadamopoulos] 55081: [kernel32] - Fix IntReadConsoleOutputCharacter to copy the correct count of characters. Its 3rd parameter is a character count and not buffer size. - Should fix infinite loop ...
by gadamopoulos＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: gadamopoulos Date: Sun Jan 22 22:27:08 2012 New Revision: 55081 URL: http://svn.reactos.org/svn/reactos?rev=55081&view=rev Log: [kernel32] - Fix IntReadConsoleOutputCharacter to copy the correct count of characters. Its 3rd parameter is a character count and not buffer size. - Should fix infinite loop when kernel32:console test runs Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c Modified: trunk/reactos/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/console.c [iso-8859-1] Sun Jan 22 22:27:08 2012 @@ -2634,18 +2634,17 @@ PCSR_API_MESSAGE Request; ULONG CsrRequest; NTSTATUS Status; - ULONG nChars, SizeBytes, CharSize; + ULONG SizeBytes, CharSize; DWORD CharsRead = 0; CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - nChars = min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR) / CharSize; - SizeBytes = nChars * CharSize; + nLength = min(nLength, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR / CharSize); + SizeBytes = nLength * CharSize; Request = RtlAllocateHeap(RtlGetProcessHeap(), 0, max(sizeof(CSR_API_MESSAGE), - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) - + min (nChars, CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR / CharSize) * CharSize)); + CSR_API_MESSAGE_HEADER_SIZE(CSRSS_READ_CONSOLE_OUTPUT_CHAR) + SizeBytes)); if (Request == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -2661,7 +2660,7 @@ Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle = hConsoleOutput; Request->Data.ReadConsoleOutputCharRequest.Unicode = bUnicode; - Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead = min(nLength, nChars); + Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead = nLength; SizeBytes = Request->Data.ReadConsoleOutputCharRequest.NumCharsToRead * CharSize; Status = CsrClientCallServer(Request,

1 0

[cgutman] 55080: [USB-BRINGUP-TRUNK] - Implement device disconnect indication for usbehci and usbohci - Implement device removal for FDOs and PDOs in usbstor and usbhub
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 21:58:06 2012 New Revision: 55080 URL: http://svn.reactos.org/svn/reactos?rev=55080&view=rev Log: [USB-BRINGUP-TRUNK] - Implement device disconnect indication for usbehci and usbohci - Implement device removal for FDOs and PDOs in usbstor and usbhub Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -1131,21 +1131,28 @@ This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_HIGH_SPEED; This->m_PortStatus[i].PortStatus |= USB_PORT_STATUS_CONNECT; This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; - - // - // is there a status change callback - // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } } else { DPRINT1("Device disconnected on port %d\n", i); + + // + // update port status flags + // + This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_HIGH_SPEED; + This->m_PortStatus[i].PortStatus &= ~USB_PORT_STATUS_CONNECT; + This->m_PortStatus[i].PortChange |= USB_PORT_STATUS_CONNECT; + } + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -20,6 +20,11 @@ IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId, OUT PDEVICE_OBJECT *UsbChildDeviceObject); + +NTSTATUS +DestroyUsbChildDeviceObject( + IN PDEVICE_OBJECT UsbHubDeviceObject, + IN LONG PortId); NTSTATUS SubmitRequestToRootHub( @@ -304,9 +309,11 @@ { DPRINT1("Device disconnected from port %d\n", PortId); - // - // FIXME: Remove the device, and deallocate memory - // + Status = DestroyUsbChildDeviceObject(DeviceObject, PortId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to delete child device object after disconnect\n"); + } } else { @@ -997,6 +1004,51 @@ ExFreePool(UsbChildExtension->usInstanceId.Buffer); return Status; +} + +NTSTATUS +DestroyUsbChildDeviceObject( + IN PDEVICE_OBJECT UsbHubDeviceObject, + IN LONG PortId) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbHubDeviceObject->DeviceExtension; + PHUB_CHILDDEVICE_EXTENSION UsbChildExtension = NULL; + PDEVICE_OBJECT ChildDeviceObject = NULL; + ULONG Index = 0; + + DPRINT1("Removing device on port %d (Child index: %d)\n", PortId, Index); + + for (Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index]) + { + UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)HubDeviceExtension->ChildDeviceObject[Index]->DeviceExtension; + + /* Check if it matches the port ID */ + if (UsbChildExtension->PortNumber == PortId) + { + /* We found it */ + ChildDeviceObject = HubDeviceExtension->ChildDeviceObject[Index]; + break; + } + } + } + + /* Fail the request if the device doesn't exist */ + if (!ChildDeviceObject) + { + DPRINT1("Removal request for non-existant device!\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Remove the device from the table */ + HubDeviceExtension->ChildDeviceObject[Index] = NULL; + + /* Invalidate device relations for the root hub */ + IoInvalidateDeviceRelations(HubDeviceExtension->RootHubPhysicalDeviceObject, BusRelations); + + /* The rest of the removal process takes place in IRP_MN_REMOVE_DEVICE handling for the PDO */ + return STATUS_SUCCESS; } NTSTATUS Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -582,11 +582,21 @@ } case IRP_MN_REMOVE_DEVICE: { - // - // FIXME - // - Status = STATUS_SUCCESS; - break; + PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension; + PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface; + + DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + + /* Remove the device */ + HubInterface->RemoveUsbDevice(HubDeviceExtension->UsbDInterface.BusContext, UsbChildExtension->UsbDeviceHandle, 0); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; } default: { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -1447,17 +1447,6 @@ // This->m_PortStatus[Index].PortStatus |= USB_PORT_STATUS_LOW_SPEED; } - - // - // is there a status change callback - // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } } else { @@ -1465,6 +1454,24 @@ // device disconnected // DPRINT1("Device disconnected at Port %x\n", Index); + + // + // update port status flags + // + This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_LOW_SPEED; + This->m_PortStatus[Index].PortStatus &= ~USB_PORT_STATUS_CONNECT; + This->m_PortStatus[Index].PortChange |= USB_PORT_STATUS_CONNECT; + } + + // + // is there a status change callback + // + if (This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } } } Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -119,6 +119,31 @@ } NTSTATUS +USBSTOR_FdoHandleRemoveDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension, + IN OUT PIRP Irp) +{ + NTSTATUS Status; + + DPRINT1("Handling FDO removal\n"); + + /* We don't need to request removal of our children here */ + + /* Send the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + + /* Detach from the device stack */ + /* IoDetachDevice(DeviceExtension->LowerDeviceObject); */ //This crashes for some reason during unload + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + + return Status; +} + +NTSTATUS USBSTOR_FdoHandleStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension, @@ -302,9 +327,11 @@ Status = STATUS_NOT_SUPPORTED; break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("USBSTOR_FdoHandlePnp: IRP_MN_REMOVE_DEVICE unimplemented\n"); - Status = STATUS_NOT_SUPPORTED; - break; + { + DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + + return USBSTOR_FdoHandleRemoveDevice(DeviceObject, DeviceExtension, Irp); + } case IRP_MN_QUERY_CAPABILITIES: { // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Jan 22 21:58:06 2012 @@ -842,9 +842,18 @@ break; } case IRP_MN_REMOVE_DEVICE: - DPRINT1("USBSTOR_PdoHandlePnp: IRP_MN_REMOVE_DEVICE unimplemented\n"); - Status = STATUS_SUCCESS; - break; + { + 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: { //

1 0

[cgutman] 55079: [USB-BRINGUP-TRUNK] - Send removal IRPs to children and removal relations before sending to the device itself
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 21:50:29 2012 New Revision: 55079 URL: http://svn.reactos.org/svn/reactos?rev=55079&view=rev Log: [USB-BRINGUP-TRUNK] - Send removal IRPs to children and removal relations before sending to the device itself Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Jan 22 21:50:29 2012 @@ -48,7 +48,7 @@ IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); NTSTATUS -IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject); +IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject, BOOLEAN Force); PDEVICE_NODE FASTCALL @@ -588,9 +588,9 @@ NewList = ExAllocatePool(PagedPool, NewSize); if (!NewList) { - /* Fail */ - ExFreePool(PnpBusTypeGuidList); - goto Quickie; + /* Fail */ + ExFreePool(PnpBusTypeGuidList); + goto Quickie; } /* Now copy them, decrease the size too */ @@ -620,7 +620,7 @@ /* * DESCRIPTION - * Creates a device node + * Creates a device node * * ARGUMENTS * ParentNode = Pointer to parent device node @@ -630,7 +630,7 @@ * DeviceNode = Pointer to storage for created device node * * RETURN VALUE - * Status + * Status */ NTSTATUS IopCreateDeviceNode(PDEVICE_NODE ParentNode, @@ -1369,11 +1369,11 @@ RtlInitUnicodeString(&ValueName, L"HardwareID"); Status = ZwSetValueKey(InstanceKey, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)IoStatusBlock.Information, - (TotalLength + 1) * sizeof(WCHAR)); + &ValueName, + 0, + REG_MULTI_SZ, + (PVOID)IoStatusBlock.Information, + (TotalLength + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); @@ -1826,12 +1826,20 @@ if (!Found) { + /* Send removal IRPs to all of its children */ + IopPrepareDeviceForRemoval(Child->PhysicalDeviceObject, TRUE); + + /* Set the flag */ + Child->Flags |= DNF_WILL_BE_REMOVED; + + /* Send the surprise removal IRP */ IopSendSurpriseRemoval(Child->PhysicalDeviceObject); /* Tell the user-mode PnP manager that a device was removed */ IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, &Child->InstancePath); + /* Send the remove device IRP */ IopSendRemoveDevice(Child->PhysicalDeviceObject); } @@ -3899,7 +3907,7 @@ static NTSTATUS -IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode) +IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode, BOOLEAN Force) { PDEVICE_NODE ChildDeviceNode, NextDeviceNode, FailedRemoveDevice; NTSTATUS Status; @@ -3912,7 +3920,7 @@ NextDeviceNode = ChildDeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject); + Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject, Force); if (!NT_SUCCESS(Status)) { FailedRemoveDevice = ChildDeviceNode; @@ -3998,7 +4006,7 @@ static NTSTATUS -IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations) +IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations, BOOLEAN Force) { /* This function DOES NOT dereference the device objects on SUCCESS * but it DOES dereference device objects on FAILURE */ @@ -4008,7 +4016,7 @@ for (i = 0; i < DeviceRelations->Count; i++) { - Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i]); + Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i], Force); if (!NT_SUCCESS(Status)) { j = i; @@ -4104,7 +4112,7 @@ } NTSTATUS -IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject) +IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject, BOOLEAN Force) { PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); IO_STACK_LOCATION Stack; @@ -4112,13 +4120,13 @@ PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; - if (DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) + if ((DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) && !Force) { DPRINT1("Removal not allowed for %wZ\n", &DeviceNode->InstancePath); return STATUS_UNSUCCESSFUL; } - if (IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) + if (!Force && IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) { DPRINT1("Removal vetoed by failing the query remove request\n"); @@ -4145,19 +4153,19 @@ if (DeviceRelations) { - Status = IopQueryRemoveDeviceRelations(DeviceRelations); + Status = IopQueryRemoveDeviceRelations(DeviceRelations, Force); if (!NT_SUCCESS(Status)) return Status; } - - Status = IopQueryRemoveChildDevices(DeviceNode); + + Status = IopQueryRemoveChildDevices(DeviceNode, Force); if (!NT_SUCCESS(Status)) { if (DeviceRelations) IopCancelRemoveDeviceRelations(DeviceRelations); return Status; } - + if (DeviceRelations) IopSendRemoveDeviceRelations(DeviceRelations); IopSendRemoveChildDevices(DeviceNode); @@ -4172,7 +4180,7 @@ DPRINT("Removing device: %wZ\n", &DeviceNode->InstancePath); - Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject); + Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject, FALSE); if (NT_SUCCESS(Status)) { IopSendRemoveDevice(DeviceNode->PhysicalDeviceObject); @@ -4225,12 +4233,12 @@ if (DeviceRelations) { - Status = IopQueryRemoveDeviceRelations(DeviceRelations); + Status = IopQueryRemoveDeviceRelations(DeviceRelations, FALSE); if (!NT_SUCCESS(Status)) goto cleanup; } - Status = IopQueryRemoveChildDevices(DeviceNode); + Status = IopQueryRemoveChildDevices(DeviceNode, FALSE); if (!NT_SUCCESS(Status)) { if (DeviceRelations) @@ -4238,7 +4246,7 @@ goto cleanup; } - if (IopPrepareDeviceForRemoval(PhysicalDeviceObject) != STATUS_SUCCESS) + if (IopPrepareDeviceForRemoval(PhysicalDeviceObject, FALSE) != STATUS_SUCCESS) { if (DeviceRelations) IopCancelRemoveDeviceRelations(DeviceRelations);

1 0

[tkreuzer] 55078: [PSDK} Add missing BYTE GAMMA_TABLES declaration
by tkreuzer＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: tkreuzer Date: Sun Jan 22 21:49:13 2012 New Revision: 55078 URL: http://svn.reactos.org/svn/reactos?rev=55078&view=rev Log: [PSDK} Add missing BYTE GAMMA_TABLES declaration Modified: trunk/reactos/include/psdk/winddi.h Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Sun Jan 22 21:49:13 2012 @@ -846,6 +846,8 @@ ULONG cCurves; } PATHOBJ; +typedef BYTE GAMMA_TABLES[2][256]; + typedef struct _GLYPHBITS { POINTL ptlOrigin; SIZEL sizlBitmap;

1 0

[fireball] 55077: - Misc trunk headers compatibility fixes.
by fireball＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: fireball Date: Sun Jan 22 21:31:01 2012 New Revision: 55077 URL: http://svn.reactos.org/svn/reactos?rev=55077&view=rev Log: - Misc trunk headers compatibility fixes. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sun Jan 22 21:31:01 2012 @@ -331,12 +331,12 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.gdiinfo), - &PrimarySurface.gdiinfo, + (PULONG)&PrimarySurface.gdiinfo, sizeof(PrimarySurface.devinfo), &PrimarySurface.devinfo, NULL, L"", - (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); + PrimarySurface.VideoFileObject->DeviceObject); /* If no handle, then fallback to default */ if (!PrimarySurface.hPDev) @@ -361,12 +361,12 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.gdiinfo), - &PrimarySurface.gdiinfo, + (PULONG)&PrimarySurface.gdiinfo, sizeof(PrimarySurface.devinfo), &PrimarySurface.devinfo, NULL, L"", - (HANDLE) (PrimarySurface.VideoFileObject->DeviceObject)); + PrimarySurface.VideoFileObject->DeviceObject); if (!PrimarySurface.hPDev) {

1 0

[cgutman] 55076: [USB-BRINGUP-TRUNK] - Load the disk class for USB drives in 1st stage - They don't show up on the partition page due to some usetup stuff that needs to be changed
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 16:55:16 2012 New Revision: 55076 URL: http://svn.reactos.org/svn/reactos?rev=55076&view=rev Log: [USB-BRINGUP-TRUNK] - Load the disk class for USB drives in 1st stage - They don't show up on the partition page due to some usetup stuff that needs to be changed Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Jan 22 16:55:16 2012 @@ -78,6 +78,7 @@ PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid +GenDisk = disk [BootBusExtenders.Load] acpi = acpi.sys @@ -100,6 +101,7 @@ [SCSI.Load] uniata = uniata.sys buslogic = buslogic.sys +disk = disk.sys [Cabinets] Cabinet=reactos.cab

1 0

[janderwald] 55075: [USBSTOR] - Implement legacy IOCTL IOCTL_SCSI_GET_CAPABILITIES, IOCTL_SCSI_GET_INQUIRY_DATA, IOCTL_SCSI_GET_ADDRESS - Patch by Cameron Gutman and minor modifications
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 16:39:53 2012 New Revision: 55075 URL: http://svn.reactos.org/svn/reactos?rev=55075&view=rev Log: [USBSTOR] - Implement legacy IOCTL IOCTL_SCSI_GET_CAPABILITIES, IOCTL_SCSI_GET_INQUIRY_DATA, IOCTL_SCSI_GET_ADDRESS - Patch by Cameron Gutman and minor modifications Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Sun Jan 22 16:39:53 2012 @@ -526,6 +526,11 @@ { PIO_STACK_LOCATION IoStack; NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PSCSI_ADAPTER_BUS_INFO BusInfo; + PSCSI_INQUIRY_DATA InquiryData; + PINQUIRYDATA ScsiInquiryData; + PUFI_INQUIRY_RESPONSE UFIInquiryResponse; // // get current stack location @@ -538,14 +543,6 @@ // query property // Status = USBSTOR_HandleQueryProperty(DeviceObject, Irp); - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) - { - // - // query get scsi address - // - DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_GET_ADDRESS NOT implemented\n"); - Status = STATUS_NOT_SUPPORTED; } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH) { @@ -571,6 +568,105 @@ DPRINT1("USBSTOR_HandleDeviceControl IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER NOT implemented\n"); Status = STATUS_NOT_SUPPORTED; } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_CAPABILITIES) + { + PIO_SCSI_CAPABILITIES Capabilities; + + /* Legacy port capability query */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(PVOID)) + { + Capabilities = *((PVOID *)Irp->AssociatedIrp.SystemBuffer) = ExAllocatePool(NonPagedPool, sizeof(IO_SCSI_CAPABILITIES)); + Irp->IoStatus.Information = sizeof(PVOID); + } + else + { + Capabilities = Irp->AssociatedIrp.SystemBuffer; + Irp->IoStatus.Information = sizeof(IO_SCSI_CAPABILITIES); + } + + if (Capabilities) + { + Capabilities->MaximumTransferLength = MAXULONG; + Capabilities->MaximumPhysicalPages = 25; + Capabilities->SupportedAsynchronousEvents = 0; + Capabilities->AlignmentMask = 0; + Capabilities->TaggedQueuing = FALSE; + Capabilities->AdapterScansDown = FALSE; + Capabilities->AdapterUsesPio = FALSE; + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_INQUIRY_DATA) + { + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension); + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get parameters + // + BusInfo = Irp->AssociatedIrp.SystemBuffer; + InquiryData = (PSCSI_INQUIRY_DATA)(BusInfo + 1); + ScsiInquiryData = (PINQUIRYDATA)InquiryData->InquiryData; + + + // + // get inquiry data + // + UFIInquiryResponse = (PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData; + ASSERT(UFIInquiryResponse); + + + BusInfo->NumberOfBuses = 1; + BusInfo->BusData[0].NumberOfLogicalUnits = 1; //FIXME + BusInfo->BusData[0].InitiatorBusId = 0; + BusInfo->BusData[0].InquiryDataOffset = sizeof(SCSI_ADAPTER_BUS_INFO); + + InquiryData->PathId = 0; + InquiryData->TargetId = 0; + InquiryData->Lun = PDODeviceExtension->LUN & MAX_LUN; + InquiryData->DeviceClaimed = PDODeviceExtension->Claimed; + InquiryData->InquiryDataLength = sizeof(INQUIRYDATA); + InquiryData->NextInquiryDataOffset = 0; + + RtlZeroMemory(ScsiInquiryData, sizeof(INQUIRYDATA)); + ScsiInquiryData->DeviceType = UFIInquiryResponse->DeviceType; + ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F); + ScsiInquiryData->RemovableMedia = FALSE; //HACK for IoReadPartitionTable + ScsiInquiryData->Versions = 0x04; + ScsiInquiryData->ResponseDataFormat = 0x02; + ScsiInquiryData->AdditionalLength = 31; + ScsiInquiryData->SoftReset = 0; + ScsiInquiryData->CommandQueue = 0; + ScsiInquiryData->LinkedCommands = 0; + ScsiInquiryData->RelativeAddressing = 0; + + RtlCopyMemory(&ScsiInquiryData->VendorId, UFIInquiryResponse->Vendor, USBSTOR_GetFieldLength(UFIInquiryResponse->Vendor, 8)); + RtlCopyMemory(&ScsiInquiryData->ProductId, UFIInquiryResponse->Product, USBSTOR_GetFieldLength(UFIInquiryResponse->Product, 16)); + + Irp->IoStatus.Information = sizeof(SCSI_ADAPTER_BUS_INFO) + sizeof(SCSI_INQUIRY_DATA) + sizeof(INQUIRYDATA) - 1; + Status = STATUS_SUCCESS; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) + { + PSCSI_ADDRESS Address = Irp->AssociatedIrp.SystemBuffer; + + Address->Length = sizeof(SCSI_ADDRESS); + Address->PortNumber = 0; + Address->PathId = 0; + Address->TargetId = 0; + Address->Lun = (((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LUN & MAX_LUN); + Irp->IoStatus.Information = sizeof(SCSI_ADDRESS); + + Status = STATUS_SUCCESS; + } else { // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Jan 22 16:39:53 2012 @@ -2,7 +2,7 @@ #pragma once #include <ntddk.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #include <usbdi.h> #include <hubbusif.h>

1 0

[cgutman] 55074: [USB-BRINGUP-TRUNK] - Remove the legacy usbdrv
by cgutman＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: cgutman Date: Sun Jan 22 16:07:58 2012 New Revision: 55074 URL: http://svn.reactos.org/svn/reactos?rev=55074&view=rev Log: [USB-BRINGUP-TRUNK] - Remove the legacy usbdrv Removed: branches/usb-bringup-trunk/drivers/usb/nt4compat/ Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/directory.rbuild Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1398,20 +1398,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1730,20 +1730,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1,4 +1,3 @@ -add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) add_subdirectory(usbhub_new) Modified: branches/usb-bringup-trunk/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/d… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] Sun Jan 22 16:07:58 2012 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> - <xi:include href="nt4compat/directory.rbuild" /> - </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[janderwald] 55073: [INF] - Add keyboard installation inf
by janderwald＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: janderwald Date: Sun Jan 22 15:25:43 2012 New Revision: 55073 URL: http://svn.reactos.org/svn/reactos?rev=55073&view=rev Log: [INF] - Add keyboard installation inf Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/key… ============================================================================== Binary files - no diff available.

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