mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
87 lines
3.5 KiB
Diff
87 lines
3.5 KiB
Diff
From e9a6546ce13c09f63a180aceb7181d8145c120d3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
|
Date: Fri, 19 Aug 2016 00:47:08 +0200
|
|
Subject: setupapi: SetupDiGetDeviceInterfaceDetail should fill out
|
|
DeviceInfoData even if the buffer for DeviceInterfaceData is too small.
|
|
|
|
---
|
|
dlls/setupapi/devinst.c | 14 ++++++++------
|
|
dlls/setupapi/tests/devinst.c | 6 +++++-
|
|
2 files changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
|
|
index 9f77669..f8c347b 100644
|
|
--- a/dlls/setupapi/devinst.c
|
|
+++ b/dlls/setupapi/devinst.c
|
|
@@ -2844,9 +2844,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
|
|
else
|
|
DeviceInterfaceDetailData->DevicePath[0] = '\0';
|
|
|
|
- if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA))
|
|
- copy_device_data(device_data, iface->device);
|
|
-
|
|
ret = TRUE;
|
|
}
|
|
else
|
|
@@ -2855,6 +2852,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
|
|
*RequiredSize = bytesNeeded;
|
|
SetLastError(ERROR_INSUFFICIENT_BUFFER);
|
|
}
|
|
+
|
|
+ if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA))
|
|
+ copy_device_data(device_data, iface->device);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
@@ -2914,9 +2915,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
|
|
else
|
|
DeviceInterfaceDetailData->DevicePath[0] = '\0';
|
|
|
|
- if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA))
|
|
- copy_device_data(device_data, iface->device);
|
|
-
|
|
ret = TRUE;
|
|
}
|
|
else
|
|
@@ -2925,6 +2923,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
|
|
*RequiredSize = bytesNeeded;
|
|
SetLastError(ERROR_INSUFFICIENT_BUFFER);
|
|
}
|
|
+
|
|
+ if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA))
|
|
+ copy_device_data(device_data, iface->device);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
|
|
index 9a8ecbc..187e022 100644
|
|
--- a/dlls/setupapi/tests/devinst.c
|
|
+++ b/dlls/setupapi/tests/devinst.c
|
|
@@ -674,6 +674,7 @@ static void testGetDeviceInterfaceDetail(void)
|
|
"\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}";
|
|
static const char path_w2k[] =
|
|
"\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\";
|
|
+ SP_DEVINFO_DATA devinfo;
|
|
LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size);
|
|
SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail =
|
|
(SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf;
|
|
@@ -701,9 +702,12 @@ static void testGetDeviceInterfaceDetail(void)
|
|
!lstrcmpiA(path_w2k, detail->DevicePath), "Unexpected path %s\n",
|
|
detail->DevicePath);
|
|
/* Check SetupDiGetDeviceInterfaceDetailW */
|
|
- ret = pSetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, NULL);
|
|
+ memset(&devinfo, 0, sizeof(devinfo));
|
|
+ devinfo.cbSize = sizeof(devinfo);
|
|
+ ret = pSetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, &devinfo);
|
|
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
|
|
"Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError());
|
|
+ ok(devinfo.DevInst, "Expected DevInst to be set\n");
|
|
ok(expectedsize == size ||
|
|
(expectedsize + sizeof(WCHAR)) == size /* W2K adds a backslash */,
|
|
"SetupDiGetDeviceInterfaceDetailW returned wrong reqsize, got %d\n",
|
|
--
|
|
2.7.4
|
|
|