Zebediah Figura : hid/tests: Use DIGCF_PRESENT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4526c5923cc55a7de0a6d803631898d63da325c7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4526c5923cc55a7de0a6d8036...

Author: Zebediah Figura 
Date:   Thu Aug 16 18:37:40 2018 -0500

hid/tests: Use DIGCF_PRESENT.

Signed-off-by: Zebediah Figura 
Signed-off-by: Aric Stewart 
Signed-off-by: Alexandre Julliard

---

dlls/hid/tests/device.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c
index ce9b3a5..f20677f 100644
--- a/dlls/hid/tests/device.c
+++ b/dlls/hid/tests/device.c
@@ -66,7 +66,7 @@ static void run_for_each_device(device_test *test)
     data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + detail_size);
     data->cbSize = sizeof(*data);

-    info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE);
+    info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
     while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data))
     {
         index ++;
@@ -74,11 +74,13 @@ static void run_for_each_device(device_test *test)
         if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL))
         {
             HANDLE file = CreateFileW(data->DevicePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
-            if (file == INVALID_HANDLE_VALUE)
+            if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED)
             {
-                trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath));
+                trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath));
                 continue;
             }
+            ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n",
+                wine_dbgstr_w(data->DevicePath), GetLastError());

test(file);

@@ -108,7 +110,7 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a
     data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size);
     data->cbSize = sizeof(*data);

-    info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE);
+    info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
     while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data))
     {
         index ++;
@@ -118,11 +120,13 @@ static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD a
             PHIDP_PREPARSED_DATA ppd;
             HIDP_CAPS Caps;
             HANDLE file = CreateFileW(data->DevicePath, access, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
-            if (file == INVALID_HANDLE_VALUE)
+            if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_ACCESS_DENIED)
             {
-                trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath));
+                trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath));
                 continue;
             }
+            ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError());
+
             rc = HidD_GetPreparsedData(file, &ppd);
             ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError());
             status = HidP_GetCaps(ppd, &Caps);