Juan Lang : setupapi: Return the interface' s device from SetupDiGetDeviceInterfaceDetailA/W.

Alexandre Julliard julliard at winehq.org
Mon Sep 24 08:08:04 CDT 2007


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Sep 21 17:06:46 2007 -0700

setupapi: Return the interface's device from SetupDiGetDeviceInterfaceDetailA/W.

---

 dlls/setupapi/devinst.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 57c142b..9593b1c 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2401,6 +2401,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
                     NULL, NULL);
         else
             DeviceInterfaceDetailData->DevicePath[0] = '\0';
+        if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA))
+            memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA));
         ret = TRUE;
     }
     else
@@ -2467,6 +2469,8 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
             lstrcpyW(DeviceInterfaceDetailData->DevicePath, info->symbolicLink);
         else
             DeviceInterfaceDetailData->DevicePath[0] = '\0';
+        if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA))
+            memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA));
         ret = TRUE;
     }
     else




More information about the wine-cvs mailing list