=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version.

Alexandre Julliard julliard at winehq.org
Mon Jul 29 14:01:19 CDT 2013


Module: wine
Branch: master
Commit: ca7ba7053f9a9f79de5a19387073a40d01371e78
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ca7ba7053f9a9f79de5a19387073a40d01371e78

Author: André Hentschel <nerv at dawncrow.de>
Date:   Sun Jul 28 19:41:51 2013 +0200

usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version.

---

 dlls/usbd.sys/usbd.c        |    9 +++++++++
 dlls/usbd.sys/usbd.sys.spec |    2 +-
 include/ddk/usbdlib.h       |    1 +
 3 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c
index ff0362c..fbec22e 100644
--- a/dlls/usbd.sys/usbd.c
+++ b/dlls/usbd.sys/usbd.c
@@ -198,6 +198,15 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(
     return NULL;
 }
 
+PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor(
+        PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, UCHAR InterfaceNumber,
+        UCHAR AlternateSetting )
+{
+    TRACE( "(%p, %u, %u)\n", ConfigurationDescriptor, InterfaceNumber, AlternateSetting );
+    return USBD_ParseConfigurationDescriptorEx( ConfigurationDescriptor, ConfigurationDescriptor,
+                                                InterfaceNumber, AlternateSetting, -1, -1, -1 );
+}
+
 PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(
         PVOID DescriptorBuffer,
         ULONG TotalLength,
diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec
index 15cf352..75ce083 100644
--- a/dlls/usbd.sys/usbd.sys.spec
+++ b/dlls/usbd.sys/usbd.sys.spec
@@ -21,7 +21,7 @@
 @ stdcall USBD_GetUSBDIVersion(ptr)
 @ stub USBD_InitializeDevice
 @ stub USBD_MakePdoName
-@ stub USBD_ParseConfigurationDescriptor
+@ stdcall USBD_ParseConfigurationDescriptor(ptr long long)
 @ stdcall _USBD_ParseConfigurationDescriptorEx at 28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx
 @ stdcall _USBD_ParseDescriptors at 16(ptr long ptr long) USBD_ParseDescriptors
 @ stub USBD_QueryBusTime
diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h
index 86080ce..188744f 100644
--- a/include/ddk/usbdlib.h
+++ b/include/ddk/usbdlib.h
@@ -30,6 +30,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx(PUSB_CONFIGURATION_DESCRIPTOR,PUSB
 ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR);
 VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION);
 PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG);
+PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,UCHAR,UCHAR);
 PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG);
 USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,ULONG,USHORT,PUCHAR*,ULONG);
 




More information about the wine-cvs mailing list