[PATCH 1/2] windows.devices.enumeration: Implement DeviceInformationStatics::FindAllAsync using DevGetObjects.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/windows.devices.enumeration/Makefile.in |  2 +-
 dlls/windows.devices.enumeration/main.c      | 27 ++++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dlls/windows.devices.enumeration/Makefile.in b/dlls/windows.devices.enumeration/Makefile.in
index 5e3f6fbb6fa..853c1303efa 100644
--- a/dlls/windows.devices.enumeration/Makefile.in
+++ b/dlls/windows.devices.enumeration/Makefile.in
@@ -1,5 +1,5 @@
 MODULE = windows.devices.enumeration.dll
-IMPORTS = advapi32 combase setupapi uuid
+IMPORTS = advapi32 cfgmgr32 combase setupapi uuid

SOURCES = \
    access.c \
diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c
index c927ccff18d..2cd727a4149 100644
--- a/dlls/windows.devices.enumeration/main.c
+++ b/dlls/windows.devices.enumeration/main.c
@@ -21,6 +21,8 @@
 #include "initguid.h"
 #include "private.h"
 #include "setupapi.h"
+#include "devfiltertypes.h"
+#include "devquery.h"

#include "wine/debug.h"

@@ -519,12 +521,6 @@ static HRESULT WINAPI device_statics_CreateFromIdAsyncAdditionalProperties( IDev
     return E_NOTIMPL;
 }

-static HRESULT append_device_information( IDeviceInformation *info, void *context )
-{
-    IVector_IInspectable *vector = context;
-    return IVector_IInspectable_Append( vector, (IInspectable *)info );
-}
-
 static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *result )
 {
     static const struct vector_iids iids =
@@ -536,13 +532,28 @@ static HRESULT find_all_async( IUnknown *invoker, IUnknown *param, PROPVARIANT *
     };
     IVectorView_DeviceInformation *view;
     IVector_IInspectable *vector;
+    const DEV_OBJECT *objects;
+    ULONG len, i;
     HRESULT hr;

TRACE( "invoker %p, param %p, result %p\n", invoker, param, result );

if (FAILED(hr = vector_create( &iids, (void *)&vector ))) return hr;
-    hr = enum_device_information( append_device_information, vector );
-
+    if (FAILED(hr = DevGetObjects( DevObjectTypeDeviceInterfaceDisplay, DevQueryFlagNone, 0, NULL, 0, NULL, &len, &objects )))
+    {
+        IVector_IInspectable_Release( vector );
+        return hr;
+    }
+    for (i = 0; i < len && SUCCEEDED(hr); i++)
+    {
+        IDeviceInformation *info;
+        if (SUCCEEDED(hr = device_information_create( objects[i].pszObjectId, &info )))
+        {
+            hr = IVector_IInspectable_Append( vector, (IInspectable *)info );
+            IDeviceInformation_Release( info );
+        }
+    }
+    DevFreeObjects( len, objects );
     if (SUCCEEDED(hr)) hr = IVector_IInspectable_GetView( vector, (void *)&view );
     IVector_IInspectable_Release( vector );
     if (FAILED(hr)) return hr;