Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17006: Merge 16557 (hbirr) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16557 (hbirr) from trunk: Fixed the allocation of the buffer for the environment variable in ProcessInput. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c --- branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c 2005-08-03 16:10:03 UTC (rev 17005) +++ branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.c 2005-08-03 16:11:00 UTC (rev 17006) @@ -1061,18 +1061,19 @@ } else { - evar = malloc ( size * sizeof(TCHAR)); + evar = malloc ( 512 * sizeof(TCHAR)); if (evar==NULL) return 1; - size = GetEnvironmentVariable (ip, evar, size); - if (size!=0) + size = GetEnvironmentVariable (ip, evar, 512); + if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar!=NULL) + if (evar==NULL) { - size = GetEnvironmentVariable (ip, evar, size); + return 1; } + size = GetEnvironmentVariable (ip, evar, size); } if (size)

1 0

[navaraf] 17005: Merge 16553 / 16555 (weiden) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16553 / 16555 (weiden) from trunk: handle memory allocation errors in GetEnvironmentVariable() and ensure the string is always null-terminated Modified: branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c --- branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c 2005-08-03 15:05:54 UTC (rev 17004) +++ branches/ros-branch-0_2_7/reactos/lib/kernel32/misc/env.c 2005-08-03 16:10:03 UTC (rev 17005) @@ -48,17 +48,33 @@ /* initialize unicode variable value string and allocate buffer */ VarValueU.Length = 0; - VarValueU.MaximumLength = nSize * sizeof(WCHAR); - VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - VarValueU.MaximumLength); + if (nSize != 0) + { + VarValueU.MaximumLength = (nSize - 1) * sizeof(WCHAR); + VarValueU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + nSize * sizeof(WCHAR)); + if (VarValueU.Buffer != NULL) + { + /* NULL-terminate the buffer in any case! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length! */ + VarValueU.Buffer[nSize - 1] = L'\0'; + } + } + else + { + VarValueU.MaximumLength = 0; + VarValueU.Buffer = NULL; + } - /* get unicode environment variable */ - Status = RtlQueryEnvironmentVariable_U (NULL, - &VarNameU, - &VarValueU); - if (!NT_SUCCESS(Status)) - { + if (VarValueU.Buffer != NULL || nSize == 0) + { + /* get unicode environment variable */ + Status = RtlQueryEnvironmentVariable_U (NULL, + &VarNameU, + &VarValueU); + if (!NT_SUCCESS(Status)) + { /* free unicode buffer */ RtlFreeHeap (RtlGetProcessHeap (), 0, @@ -70,28 +86,37 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return VarValueU.Length / sizeof(WCHAR) + 1; + return (VarValueU.Length / sizeof(WCHAR)) + 1; } else { return 0; } - } + } - /* convert unicode value string to ansi */ - RtlUnicodeStringToAnsiString (&VarValue, - &VarValueU, - FALSE); + /* convert unicode value string to ansi */ + RtlUnicodeStringToAnsiString (&VarValue, + &VarValueU, + FALSE); - /* free unicode buffer */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - VarValueU.Buffer); + if (VarValueU.Buffer != NULL) + { + /* free unicode buffer */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + VarValueU.Buffer); + } - /* free unicode variable name string */ - RtlFreeUnicodeString (&VarNameU); + /* free unicode variable name string */ + RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR)); + return (VarValueU.Length / sizeof(WCHAR)); + } + else + { + SetLastError (ERROR_NOT_ENOUGH_MEMORY); + return 0; + } } @@ -114,7 +139,7 @@ lpName); VarValue.Length = 0; - VarValue.MaximumLength = nSize * sizeof(WCHAR); + VarValue.MaximumLength = (nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); VarValue.Buffer = lpBuffer; Status = RtlQueryEnvironmentVariable_U (NULL, @@ -125,13 +150,20 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return (VarValue.Length / sizeof(WCHAR)) + 1; + return (VarValue.Length / sizeof(WCHAR)) + 1; } else { return 0; } } + + if (nSize != 0) + { + /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U + only terminates it if MaximumLength < Length */ + VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + } return (VarValue.Length / sizeof(WCHAR)); }

1 0

[ea] 17004: Document <module type="nativecui" ...>
by ea＠svn.reactos.com 03 Aug '05

03 Aug '05

Document <module type="nativecui" ...> Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk _____ Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk --- trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-03 14:48:38 UTC (rev 17003) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk 2005-08-03 15:05:54 UTC (rev 17004) @@ -1171,6 +1171,21 @@ </row> <row> + <entry>nativecui</entry> + + <entry>.exe</entry> + + <entry>_NtProcessStartup</entry> + + <entry>-</entry> + + <entry>-</entry> + + <entry>Build a native NT/ROS program (no enviroment + subsystem required to run).</entry> + </row> + + <row> <entry>nativedll</entry> <entry><filename>.dll</filename></entry>

1 0

[hpoussin] 17003: Fix mouse.inf file (missing %)
by hpoussin＠svn.reactos.com 03 Aug '05

03 Aug '05

Fix mouse.inf file (missing %) Modified: trunk/reactos/media/inf/mouse.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-08-03 14:46:17 UTC (rev 17002) +++ trunk/reactos/media/inf/mouse.inf 2005-08-03 14:48:38 UTC (rev 17003) @@ -25,7 +25,7 @@ [Manufacturer] %StdMfg% = StdMfg -%LogMfg = LogMsf +%LogMfg% = LogMsf %MSMfg% = MSMfg [StdMfg] @@ -39,7 +39,7 @@ [MSMfg] %*PNP0F01.DeviceDesc% = Serial_Inst,*PNP0F01,SERENUM\PNP0F01 %*PNP0F03.DeviceDesc% = PS2_Inst,*PNP0F03 -%*PNP0F13.DeviceDesc" = PS2_Inst,*PNP0F13 +%*PNP0F13.DeviceDesc% = PS2_Inst,*PNP0F13 ;---------------------------- MOUCLASS DRIVER ---------------------------

1 0

[hpoussin] 17002: Don't display available resolutions even if DBG is set. Rely only on NDEBUG
by hpoussin＠svn.reactos.com 03 Aug '05

03 Aug '05

Don't display available resolutions even if DBG is set. Rely only on NDEBUG Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-08-03 14:46:12 UTC (rev 17001) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-08-03 14:46:17 UTC (rev 17002) @@ -372,10 +372,10 @@ VBESortModes(VBEDeviceExtension); /* - * Print the supported video modes when DBG is set. + * Print the supported video modes when NDEBUG is not set. */ -#if defined(DBG) && ! defined(NDEBUG) +#ifndef NDEBUG for (CurrentMode = 0; CurrentMode < SuitableModeCount; CurrentMode++)

1 0

[hpoussin] 17001: Implement VideoPortVerifyAccessRanges
by hpoussin＠svn.reactos.com 03 Aug '05

03 Aug '05

Implement VideoPortVerifyAccessRanges Modified: trunk/reactos/drivers/video/videoprt/resource.c _____ Modified: trunk/reactos/drivers/video/videoprt/resource.c --- trunk/reactos/drivers/video/videoprt/resource.c 2005-08-03 14:45:50 UTC (rev 17000) +++ trunk/reactos/drivers/video/videoprt/resource.c 2005-08-03 14:46:12 UTC (rev 17001) @@ -576,7 +576,7 @@ } /* - * @unimplemented + * @implemented */ VP_STATUS STDCALL @@ -585,8 +585,74 @@ IN ULONG NumAccessRanges, IN PVIDEO_ACCESS_RANGE AccessRanges) { - DPRINT1("VideoPortVerifyAccessRanges not implemented\n"); - return NO_ERROR; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + BOOLEAN ConflictDetected; + ULONG i; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCM_RESOURCE_LIST ResourceList; + ULONG ResourceListSize; + NTSTATUS Status; + + DPRINT("VideoPortVerifyAccessRanges\n"); + + DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + + /* Create the resource list */ + ResourceListSize = sizeof(CM_RESOURCE_LIST) + + (NumAccessRanges - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = ExAllocatePool(PagedPool, ResourceListSize); + if (!ResourceList) + { + DPRINT("ExAllocatePool() failed\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Fill resource list */ + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = DeviceExtension->AdapterInterfaceType; + ResourceList->List[0].BusNumber = DeviceExtension->SystemIoBusNumber; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = NumAccessRanges; + for (i = 0; i < NumAccessRanges; i++, AccessRanges++) + { + PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + if (AccessRanges->RangeInIoSpace) + { + PartialDescriptor->Type = CmResourceTypePort; + PartialDescriptor->u.Port.Start = AccessRanges->RangeStart; + PartialDescriptor->u.Port.Length = AccessRanges->RangeLength; + } + else + { + PartialDescriptor->Type = CmResourceTypeMemory; + PartialDescriptor->u.Memory.Start = AccessRanges->RangeStart; + PartialDescriptor->u.Memory.Length = AccessRanges->RangeLength; + } + if (AccessRanges->RangeShareable) + PartialDescriptor->ShareDisposition = CmResourceShareShared; + else + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->Flags = 0; + if (AccessRanges->RangePassive & VIDEO_RANGE_PASSIVE_DECODE) + PartialDescriptor->Flags |= CM_RESOURCE_PORT_PASSIVE_DECODE; + if (AccessRanges->RangePassive & VIDEO_RANGE_10_BIT_DECODE) + PartialDescriptor->Flags |= CM_RESOURCE_PORT_10_BIT_DECODE; + } + + /* Try to acquire all resource ranges */ + Status = IoReportResourceForDetection( + DeviceExtension->DriverObject, + NULL, 0, /* Driver List */ + DeviceExtension->PhysicalDeviceObject, + ResourceList, ResourceListSize, + &ConflictDetected); + ExFreePool(ResourceList); + + if (!NT_SUCCESS(Status) || ConflictDetected) + return ERROR_INVALID_PARAMETER; + else + return NO_ERROR; } /*

1 0

[chorns] 17000: Fix building kernel32 test
by chorns＠svn.reactos.com 03 Aug '05

03 Aug '05

Fix building kernel32 test Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml Modified: trunk/reactos/lib/kernel32/tests/setup.c _____ Modified: trunk/reactos/lib/kernel32/tests/kernel32.xml --- trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-03 14:45:39 UTC (rev 16999) +++ trunk/reactos/lib/kernel32/tests/kernel32.xml 2005-08-03 14:45:50 UTC (rev 17000) @@ -1,5 +1,6 @@ <module name="kernel32_test" type="test"> <include base="rtshared">.</include> + <include base="kernel32">.</include> <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="__USE_W32API" /> @@ -10,6 +11,7 @@ <library>regtests</library> <library>kernel32_base</library> <library>pseh</library> + <library>intrlck</library> <library>ntdll</library> <library>msvcrt</library> <linkerflag>-lgcc</linkerflag> _____ Modified: trunk/reactos/lib/kernel32/tests/setup.c --- trunk/reactos/lib/kernel32/tests/setup.c 2005-08-03 14:45:39 UTC (rev 16999) +++ trunk/reactos/lib/kernel32/tests/setup.c 2005-08-03 14:45:50 UTC (rev 17000) @@ -1,4 +1,5 @@ #include <k32.h> +#include <regtests.h> int mainCRTStartup(int argc, char *argv[])

1 0

[navaraf] 16999: Fix name length handing in RtlQueryAtomInAtomTable.
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Fix name length handing in RtlQueryAtomInAtomTable. Modified: trunk/reactos/lib/rtl/atom.c _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-08-03 14:26:56 UTC (rev 16998) +++ trunk/reactos/lib/rtl/atom.c 2005-08-03 14:45:39 UTC (rev 16999) @@ -602,19 +602,10 @@ if (*NameLength < Length + sizeof(WCHAR)) { - /* prevent underflow! */ - if (*NameLength >= sizeof(WCHAR)) - { - Length = *NameLength - sizeof(WCHAR); - } - else - { - Length = 0; - Status = STATUS_BUFFER_TOO_SMALL; - } + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; } - - if (Length) + else { RtlCopyMemory(AtomName, NameString, @@ -652,19 +643,10 @@ if (*NameLength < Length + sizeof(WCHAR)) { - /* prevent underflow! */ - if (*NameLength >= sizeof(WCHAR)) - { - Length = *NameLength - sizeof(WCHAR); - } - else - { - Length = 0; - Status = STATUS_BUFFER_TOO_SMALL; - } + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; } - - if (Length) + else { RtlCopyMemory(AtomName, Entry->Name,

1 0

[navaraf] 16998: - Implement !DeletePinned case in RtlEmptyAtomTable.
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

- Implement !DeletePinned case in RtlEmptyAtomTable. - Fix error checking in RtlAddAtomToAtomTable / RtlpCheckIntegerAtom. Modified: trunk/reactos/lib/rtl/atom.c _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-08-03 14:03:31 UTC (rev 16997) +++ trunk/reactos/lib/rtl/atom.c 2005-08-03 14:26:56 UTC (rev 16998) @@ -98,9 +98,6 @@ { LoValue = (USHORT)((ULONG)AtomName & 0xFFFF); - if (LoValue >= 0xC000) - return FALSE; - if (LoValue == 0) LoValue = 0xC000; @@ -244,7 +241,7 @@ BOOLEAN DeletePinned) { PRTL_ATOM_TABLE_ENTRY *CurrentBucket, *LastBucket; - PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry; + PRTL_ATOM_TABLE_ENTRY CurrentEntry, NextEntry, *PtrEntry; DPRINT("RtlEmptyAtomTable (AtomTable %p DeletePinned %x)\n", AtomTable, DeletePinned); @@ -261,17 +258,26 @@ CurrentBucket++) { NextEntry = *CurrentBucket; - *CurrentBucket = NULL; + PtrEntry = CurrentBucket; while (NextEntry != NULL) { CurrentEntry = NextEntry; NextEntry = NextEntry->HashLink; - RtlpFreeAtomHandle(AtomTable, - CurrentEntry); + if (DeletePinned || !(CurrentEntry->Flags & RTL_ATOM_IS_PINNED)) + { + *PtrEntry = NextEntry; - RtlpFreeAtomTableEntry(CurrentEntry); + RtlpFreeAtomHandle(AtomTable, + CurrentEntry); + + RtlpFreeAtomTableEntry(CurrentEntry); + } + else + { + PtrEntry = &CurrentEntry->HashLink; + } } } @@ -385,7 +391,7 @@ else { /* The caller supplied an empty atom name! */ - Status = STATUS_INVALID_PARAMETER; + Status = STATUS_OBJECT_NAME_INVALID; } }

1 0

[hpoussin] 16997: Set right compatible IDs for USB devices with multiple interfaces
by hpoussin＠svn.reactos.com 03 Aug '05

03 Aug '05

Set right compatible IDs for USB devices with multiple interfaces Better implementation of IOCTL_USB_GET_NODE_CONNECTION_INFORMATION Modified: trunk/reactos/drivers/usb/cromwell/hub/fdo.c Modified: trunk/reactos/drivers/usb/cromwell/hub/pdo.c Modified: trunk/reactos/drivers/usb/cromwell/hub/usbhub.c Modified: trunk/reactos/drivers/usb/cromwell/hub/usbhub.h _____ Modified: trunk/reactos/drivers/usb/cromwell/hub/fdo.c --- trunk/reactos/drivers/usb/cromwell/hub/fdo.c 2005-08-03 13:45:18 UTC (rev 16996) +++ trunk/reactos/drivers/usb/cromwell/hub/fdo.c 2005-08-03 14:03:31 UTC (rev 16997) @@ -103,10 +103,6 @@ PdoExtension->IsFDO = FALSE; PdoExtension->dev = dev->children[i]; - RtlInitUnicodeString( - &PdoExtension->DeviceDescription, - L"USB device"); /* FIXME */ - sprintf(Buffer[0], "%lu", i + 1); Status = UsbhubInitMultiSzString( &PdoExtension->InstanceId, @@ -114,7 +110,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; - /* FIXME: what if it is a multiple-interface usb device? */ + sprintf(Buffer[0], "USB\\Vid_%04x&Pid_%04x&Rev_%04x", PdoExtension->dev->descriptor.idVendor, PdoExtension->dev->descriptor.idProduct, @@ -134,19 +130,39 @@ if (!NT_SUCCESS(Status)) goto ByeBye; - /* FIXME: what if it is a multiple-interface usb device? */ - sprintf(Buffer[0], "USB\\Class_%02x&SubClass_%02x&Prot_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass, - PdoExtension->dev->descriptor.bDeviceProtocol); - sprintf(Buffer[1], "USB\\Class_%02x&SubClass_%02x", - PdoExtension->dev->descriptor.bDeviceClass, - PdoExtension->dev->descriptor.bDeviceSubClass); - sprintf(Buffer[2], "USB\\Class_%02x", - PdoExtension->dev->descriptor.bDeviceClass); - Status = UsbhubInitMultiSzString( - &PdoExtension->CompatibleIds, - Buffer[0], Buffer[1], Buffer[2], NULL); + if (PdoExtension->dev->actconfig->desc.bNumInterfaces == 1) + { + /* Single-interface USB device */ + sprintf(Buffer[0], "USB\\Class_%02x&SubClass_%02x&Prot_%02x", + PdoExtension->dev->descriptor.bDeviceClass, + PdoExtension->dev->descriptor.bDeviceSubClass, + PdoExtension->dev->descriptor.bDeviceProtocol); + sprintf(Buffer[1], "USB\\Class_%02x&SubClass_%02x", + PdoExtension->dev->descriptor.bDeviceClass, + PdoExtension->dev->descriptor.bDeviceSubClass); + sprintf(Buffer[2], "USB\\Class_%02x", + PdoExtension->dev->descriptor.bDeviceClass); + Status = UsbhubInitMultiSzString( + &PdoExtension->CompatibleIds, + Buffer[0], Buffer[1], Buffer[2], NULL); + } + else + { + /* Multiple-interface USB device */ + sprintf(Buffer[0], "USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", + PdoExtension->dev->descriptor.bDeviceClass, + PdoExtension->dev->descriptor.bDeviceSubClass, + PdoExtension->dev->descriptor.bDeviceProtocol); + sprintf(Buffer[1], "USB\\DevClass_%02x&SubClass_%02x", + PdoExtension->dev->descriptor.bDeviceClass, + PdoExtension->dev->descriptor.bDeviceSubClass); + sprintf(Buffer[2], "USB\\DevClass_%02x", + PdoExtension->dev->descriptor.bDeviceClass); + Status = UsbhubInitMultiSzString( + &PdoExtension->CompatibleIds, + Buffer[0], Buffer[1], Buffer[2], "USB\\COMPOSITE", NULL); + } + if (!NT_SUCCESS(Status)) goto ByeBye; @@ -178,7 +194,6 @@ return STATUS_SUCCESS; ByeBye: - RtlFreeUnicodeString(&PdoExtension->DeviceDescription); RtlFreeUnicodeString(&PdoExtension->DeviceId); RtlFreeUnicodeString(&PdoExtension->InstanceId); RtlFreeUnicodeString(&PdoExtension->HardwareIds); @@ -286,7 +301,7 @@ &NodeInformation->u.HubInformation.HubDescriptor, ((struct usb_hub *)usb_get_intfdata(to_usb_interface(&dev->actconfig->interface[0].dev))) ->descriptor, sizeof(USB_HUB_DESCRIPTOR)); - NodeInformation->u.HubInformation.HubIsBusPowered = TRUE; /* FIXME */ + NodeInformation->u.HubInformation.HubIsBusPowered = dev->actconfig->desc.bmAttributes & 0x80; Information = sizeof(USB_NODE_INFORMATION); Status = STATUS_SUCCESS; } @@ -341,7 +356,10 @@ case IOCTL_USB_GET_NODE_CONNECTION_INFORMATION: { PUSB_NODE_CONNECTION_INFORMATION ConnectionInformation; + ULONG i, j, k; struct usb_device* dev; + ULONG NumberOfOpenPipes = 0; + ULONG SizeOfOpenPipesArray; ConnectionInformation = (PUSB_NODE_CONNECTION_INFORMATION)BufferOut; DPRINT("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_INFORMATION\n"); @@ -354,7 +372,6 @@ Status = STATUS_INVALID_PARAMETER; else { - DPRINT1("Usbhub: IOCTL_USB_GET_NODE_CONNECTION_INFORMATION partially implemented\n"); dev = ((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->dev; dev = dev->children[ConnectionInformation->ConnectionIndex - 1]; if (dev == NULL) @@ -368,27 +385,40 @@ Status = STATUS_SUCCESS; break; } + SizeOfOpenPipesArray = (LengthOut - FIELD_OFFSET(USB_NODE_CONNECTION_INFORMATION, PipeList)) / sizeof(USB_PIPE_INFO); RtlCopyMemory( &ConnectionInformation->DeviceDescriptor, &dev->descriptor, sizeof(USB_DEVICE_DESCRIPTOR)); - ConnectionInformation->CurrentConfigurationValue = 0; /* FIXME */ + ConnectionInformation->CurrentConfigurationValue = dev->actconfig->desc.bConfigurationValue; ConnectionInformation->LowSpeed = dev->speed == USB_SPEED_LOW || dev->speed == USB_SPEED_FULL; ConnectionInformation->DeviceIsHub = dev->descriptor.bDeviceClass == USB_CLASS_HUB; ConnectionInformation->DeviceAddress = dev->devnum; - RtlZeroMemory(&ConnectionInformation->NumberOfOpenPipes, sizeof(ConnectionInformation->NumberOfOpenPipes)); /* FIXME */ ConnectionInformation->ConnectionStatus = DeviceConnected; - RtlZeroMemory(&ConnectionInformation->PipeList, sizeof(ConnectionInformation->PipeList)); /* FIXME */ - /*for (i = 0; i < 32; i++) - { - RtlCopyMemory( - &ConnectionInformation->PipeList[i].EndpointDescriptor, - xxx, // FIXME - sizeof(USB_ENDPOINT_DESCRIPTOR)); - ConnectionInformation->PipeList[i].ScheduleOffset = 0; // FIXME - }*/ + + for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) + for (j = 0; j < dev->actconfig->interface[i].num_altsetting; j++) + for (k = 0; k < dev->actconfig->interface[i].altsetting[j].desc.bNumEndpoints; k++) + { + if (NumberOfOpenPipes < SizeOfOpenPipesArray) + { + PUSB_PIPE_INFO Pipe = &ConnectionInformation->PipeList[NumberOfOpenPipes]; + struct usb_host_endpoint* endpoint = &dev->actconfig->interface[i].altsetting[j].endpoint[k]; + RtlCopyMemory( + &Pipe->EndpointDescriptor, + &endpoint->desc, + endpoint->desc.bLength); + Pipe->ScheduleOffset = 0; /* FIXME */ + } + NumberOfOpenPipes++; + } + ConnectionInformation->NumberOfOpenPipes = NumberOfOpenPipes; + Information = sizeof(USB_NODE_CONNECTION_INFORMATION); - Status = STATUS_SUCCESS; + if (NumberOfOpenPipes <= SizeOfOpenPipesArray) + Status = STATUS_SUCCESS; + else + Status = STATUS_BUFFER_OVERFLOW; } break; } @@ -428,7 +458,6 @@ &StringSize); if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) { - DPRINT("Usbhub: IOCTL_GET_HCD_DRIVERKEY_NAME returns '%S'\n", StringDescriptor->DriverKeyName); StringDescriptor->ActualLength = StringSize + FIELD_OFFSET(USB_NODE_CONNECTION_DRIVERKEY_NAME, DriverKeyName); Information = LengthOut; Status = STATUS_SUCCESS; _____ Modified: trunk/reactos/drivers/usb/cromwell/hub/pdo.c --- trunk/reactos/drivers/usb/cromwell/hub/pdo.c 2005-08-03 13:45:18 UTC (rev 16996) +++ trunk/reactos/drivers/usb/cromwell/hub/pdo.c 2005-08-03 14:03:31 UTC (rev 16997) @@ -54,8 +54,7 @@ DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DbgBreakPoint(); - /* Register device interface */ - /* FIXME: when should we activate this interface? */ + /* Register and activate device interface */ Status = IoRegisterDeviceInterface( DeviceObject, DeviceExtension->dev->descriptor.bDeviceClass == USB_CLASS_HUB ? @@ -110,9 +109,11 @@ break; } case BusQueryCompatibleIDs: + { DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &DeviceExtension->CompatibleIds; break; + } case BusQueryInstanceID: { DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); _____ Modified: trunk/reactos/drivers/usb/cromwell/hub/usbhub.c --- trunk/reactos/drivers/usb/cromwell/hub/usbhub.c 2005-08-03 13:45:18 UTC (rev 16996) +++ trunk/reactos/drivers/usb/cromwell/hub/usbhub.c 2005-08-03 14:03:31 UTC (rev 16997) @@ -125,7 +125,7 @@ if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) { DPRINT1("Usbhub: FDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); #ifndef NDEBUG DbgBreakPoint(); #endif _____ Modified: trunk/reactos/drivers/usb/cromwell/hub/usbhub.h --- trunk/reactos/drivers/usb/cromwell/hub/usbhub.h 2005-08-03 13:45:18 UTC (rev 16996) +++ trunk/reactos/drivers/usb/cromwell/hub/usbhub.h 2005-08-03 14:03:31 UTC (rev 16997) @@ -23,7 +23,6 @@ PDEVICE_OBJECT Children[USB_MAXCHILDREN]; /* Fields valid only when IsFDO == FALSE */ - UNICODE_STRING DeviceDescription; // REG_SZ UNICODE_STRING DeviceId; // REG_SZ UNICODE_STRING InstanceId; // REG_SZ UNICODE_STRING HardwareIds; // REG_MULTI_SZ

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