Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 16:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix an incorrect assumption that endpoint descriptors must immediately follow an interface descriptor (there may be generic descriptors in between too, as it is for e.g. USB HID devices). Thanks to Michael Lotz from Haiku for his help with this issue.

Browse source 
- Fix incorrect handling of alternate interface settings, which resulted in reading uninitialized memory.

svn path=/trunk/; revision=39912
This commit is contained in:
Aleksey Bragin 2009-03-09 09:40:43 +00:00
parent eb94cff07d
commit 9b878bfeb9
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/drivers/usb/nt4compat/usbdriver/devmgr.c
View file

@ -1200,6 +1200,7 @@ dev_mgr_build_usb_if(PUSB_CONFIGURATION pcfg, PUSB_INTERFACE pif, PUSB_INTERFACE
{
LONG i;
PUSB_ENDPOINT_DESC pendp_desc;
PBYTE pbuf;
if (pcfg == NULL || pif == NULL || pif_desc == NULL)
return FALSE;
@ -1218,11 +1219,23 @@ dev_mgr_build_usb_if(PUSB_CONFIGURATION pcfg, PUSB_INTERFACE pif, PUSB_INTERFACE
InitializeListHead(&pif->altif_list);
pif->altif_count = 0;
pendp_desc = (PUSB_ENDPOINT_DESC) (&((PBYTE) pif_desc)[sizeof(USB_INTERFACE_DESC)]);
pbuf = &((PBYTE) pif_desc)[sizeof(USB_INTERFACE_DESC)];
for(i = 0; i < pif->endp_count; i++, pendp_desc++)
i = 0;
while (i < pif->endp_count)
{
dev_mgr_build_usb_endp(pif, &pif->endp[i], pendp_desc);
pendp_desc = (PUSB_ENDPOINT_DESC)pbuf;
// check if it's an endpoint descriptor
if (pendp_desc->bDescriptorType == USB_DT_ENDPOINT)
{
// add it
dev_mgr_build_usb_endp(pif, &pif->endp[i], pendp_desc);
i++;
}
// skip to the next one
pbuf += pendp_desc->bLength;
}
}
else
@ -1299,8 +1312,7 @@ dev_mgr_build_usb_config(PUSB_DEV pdev, PBYTE pbuf, ULONG config_val, LONG confi
}
else
{
i--;
pif = &pcfg->interf[i];
pif = &pcfg->interf[i-1];
dev_mgr_build_usb_if(pcfg, pif, pif_desc, TRUE);
}
}