[PATCH v2 0/7] MR10173: cfgmgr32: Remove setupapi dependency from DevObject* implementation (1/2).

[Rémi Bernon (＠rbernon)]

--
  v2: cfrmgr32: Introduce a new dev_get_device_interface_property helper.
      cfgmgr32: Remove DEV_OBJECT parameter from internal callbacks.
      cfgmgr32: Keep properties in the order they were requested. (broken)
      cfgmgr32: Allocate the property array to its maximum size.
      cfgmgr32: Introduce helpers to collect object property keys.
      cfgmgr32: Move qsort out of dev_object_iface_get_props.
      cfgmgr32: Fix leak of device info set in DevGetObjectPropertiesEx.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 1/7] cfgmgr32: Fix leak of device info set in DevGetObjectPropertiesEx.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index c4934f6590a..9e33bcbd8f8 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -1186,6 +1186,7 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
         hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, !!(flags & DevQueryFlagAllProperties), FALSE );
         *buf = obj.pProperties;
         *buf_len = obj.cPropertyCount;
+        SetupDiDestroyDeviceInfoList( set );
         break;
     }
     default:
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 2/7] cfgmgr32: Move qsort out of dev_object_iface_get_props.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index 9e33bcbd8f8..975c413e7e9 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -352,7 +352,7 @@ static BOOL devprop_filters_validate( const DEVPROP_FILTER_EXPRESSION *filters,
 }
 
 static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data,
-                                           ULONG props_len, const DEVPROPCOMPKEY *props, BOOL all_props, BOOL sort )
+                                           ULONG props_len, const DEVPROPCOMPKEY *props, BOOL all_props )
 {
     DEVPROPKEY *all_keys = NULL;
     DWORD keys_len = 0, i = 0;
@@ -434,8 +434,6 @@ done:
         obj->cPropertyCount = 0;
         obj->pProperties = NULL;
     }
-    else if (sort) /* Sort properties by DEVPROPCOMPKEY for faster filter evaluation. */
-        qsort( (DEVPROPERTY *)obj->pProperties, obj->cPropertyCount, sizeof( *obj->pProperties ), devproperty_compare );
     return hr;
 }
 
@@ -550,11 +548,15 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, ULONG props_len, const DE
             /* If we're also filtering objects, get all properties for this object. Once the filters have been
              * evaluated, free properties that have not been requested, and set cPropertyCount to props_len.  */
             if (filters)
-                hr = dev_object_iface_get_props( &obj, set, &iface, 0, NULL, TRUE, TRUE );
+                hr = dev_object_iface_get_props( &obj, set, &iface, 0, NULL, TRUE );
             else
-                hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, all_props, FALSE );
+                hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, all_props );
+
             if (SUCCEEDED( hr ))
             {
+                /* Sort properties by DEVPROPCOMPKEY for faster filter evaluation. */
+                if (filters) qsort( (DEVPROPERTY *)obj.pProperties, obj.cPropertyCount, sizeof(*obj.pProperties), devproperty_compare );
+
                 /* By default, the evaluation is performed by AND-ing all individual filter expressions. */
                 hr = devprop_filter_matches_object( &obj, DEVPROP_OPERATOR_AND_OPEN, filters, filters_end );
                 /* Shrink pProperties to only the desired ones, unless DevQueryFlagAllProperties is set. */
@@ -1183,7 +1185,7 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
             return HRESULT_FROM_WIN32(err == ERROR_NO_SUCH_DEVICE_INTERFACE ? ERROR_FILE_NOT_FOUND : err);
         }
 
-        hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, !!(flags & DevQueryFlagAllProperties), FALSE );
+        hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, !!(flags & DevQueryFlagAllProperties) );
         *buf = obj.pProperties;
         *buf_len = obj.cPropertyCount;
         SetupDiDestroyDeviceInfoList( set );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 3/7] cfgmgr32: Introduce helpers to collect object property keys.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 92 +++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index 975c413e7e9..92a15950e6d 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -351,54 +351,52 @@ static BOOL devprop_filters_validate( const DEVPROP_FILTER_EXPRESSION *filters,
     return TRUE;
 }
 
+static HRESULT get_property_compare_keys( const DEVPROPKEY *keys, ULONG keys_len, const DEVPROPCOMPKEY **comp_keys, ULONG *comp_keys_len )
+{
+    if (!(*comp_keys_len = keys_len)) return S_OK;
+    if (!(*comp_keys = calloc( keys_len, sizeof(**comp_keys) ))) return E_OUTOFMEMORY;
+    for (UINT i = 0; i < keys_len; ++i) ((DEVPROPCOMPKEY *)*comp_keys)[i].Key = keys[i];
+    return S_OK;
+}
+
+static HRESULT dev_get_device_interface_property_keys( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data, const DEVPROPCOMPKEY **comp_keys, ULONG *comp_keys_len )
+{
+    DEVPROPKEY *keys;
+    HRESULT hr;
+
+    if (SetupDiGetDeviceInterfacePropertyKeys( set, iface_data, NULL, 0, comp_keys_len, 0 )) return S_OK;
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32( GetLastError() );
+    if (!*comp_keys_len) return S_OK;
+
+    if (!(keys = malloc( *comp_keys_len * sizeof(*keys) ))) return E_OUTOFMEMORY;
+    if (!SetupDiGetDeviceInterfacePropertyKeys( set, iface_data, keys, *comp_keys_len, comp_keys_len, 0 )) hr = HRESULT_FROM_WIN32( GetLastError() );
+    else hr = get_property_compare_keys( keys, *comp_keys_len, comp_keys, comp_keys_len );
+    free( keys );
+
+    return hr;
+}
+
 static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data,
-                                           ULONG props_len, const DEVPROPCOMPKEY *props, BOOL all_props )
+                                           const DEVPROPCOMPKEY *keys, ULONG keys_len )
 {
-    DEVPROPKEY *all_keys = NULL;
-    DWORD keys_len = 0, i = 0;
     HRESULT hr = S_OK;
+    DWORD i = 0;
 
     obj->cPropertyCount = 0;
     obj->pProperties = NULL;
-    if (!props && !all_props)
-        return S_OK;
-
-    if (all_props)
-    {
-        DWORD req = 0;
-        if (SetupDiGetDeviceInterfacePropertyKeys( set, iface_data, NULL, 0, &req, 0 )
-            || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-            return HRESULT_FROM_WIN32( GetLastError() );
-
-        keys_len = req;
-        if (!(all_keys = calloc( keys_len, sizeof( *all_keys ) )))
-            return E_OUTOFMEMORY;
-        if (!SetupDiGetDeviceInterfacePropertyKeys( set, iface_data, all_keys, keys_len, &req, 0 ))
-        {
-            free( all_keys );
-            return HRESULT_FROM_WIN32( GetLastError() );
-        }
-    }
-    else
-        keys_len = props_len;
 
     for (i = 0; i < keys_len; i++)
     {
-        const DEVPROPKEY *key = all_keys ? &all_keys[i] : &props[i].Key;
+        const DEVPROPKEY *key = &keys[i].Key;
         DWORD req = 0, size;
         DEVPROPTYPE type;
         BYTE *buf;
 
-        if (props && props[i].Store != DEVPROP_STORE_SYSTEM)
-        {
-            FIXME( "Unsupported Store value: %d\n", props[i].Store );
-            continue;
-        }
         if (SetupDiGetDeviceInterfacePropertyW( set, iface_data, key, &type, NULL, 0, &req, 0 )
             || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
         {
-            if (props && !dev_properties_append( (DEVPROPERTY **)&obj->pProperties, &obj->cPropertyCount, key,
-                                                 DEVPROP_TYPE_EMPTY, 0, NULL ))
+            if (!dev_properties_append( (DEVPROPERTY **)&obj->pProperties, &obj->cPropertyCount, key,
+                                        DEVPROP_TYPE_EMPTY, 0, NULL ))
             {
                 hr = E_OUTOFMEMORY;
                 goto done;
@@ -427,7 +425,6 @@ static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEV
     }
 
 done:
-    free( all_keys );
     if (FAILED( hr ))
     {
         DevFreeObjectProperties( obj->cPropertyCount, obj->pProperties );
@@ -474,7 +471,7 @@ static void dev_object_remove_unwanted_props( DEV_OBJECT *obj, ULONG keys_len, c
     }
 }
 
-static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, ULONG props_len, const DEVPROPCOMPKEY *props, BOOL all_props,
+static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, const DEVPROPCOMPKEY *props, ULONG props_len, BOOL all_props,
                                  const DEVPROP_FILTER_EXPRESSION *filters, const DEVPROP_FILTER_EXPRESSION *filters_end,
                                  enum_device_object_cb callback, void *data )
 {
@@ -538,6 +535,8 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, ULONG props_len, const DE
 
         for (j = 0; SUCCEEDED( hr ) && SetupDiEnumDeviceInterfaces( set, NULL, &iface_class, j, &iface ); j++)
         {
+            const DEVPROPCOMPKEY *keys = props;
+            ULONG keys_len = props_len;
             DEV_OBJECT obj = {0};
 
             detail->cbSize = sizeof( *detail );
@@ -545,12 +544,12 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, ULONG props_len, const DE
 
             obj.ObjectType = type;
             obj.pszObjectId = detail->DevicePath;
+
             /* If we're also filtering objects, get all properties for this object. Once the filters have been
              * evaluated, free properties that have not been requested, and set cPropertyCount to props_len.  */
-            if (filters)
-                hr = dev_object_iface_get_props( &obj, set, &iface, 0, NULL, TRUE );
-            else
-                hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, all_props );
+            if ((all_props || filters) && FAILED(hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len ))) break;
+
+            hr = dev_object_iface_get_props( &obj, set, &iface, keys, keys_len );
 
             if (SUCCEEDED( hr ))
             {
@@ -567,6 +566,8 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, ULONG props_len, const DE
                 else
                     DevFreeObjectProperties( obj.cPropertyCount, obj.pProperties );
             }
+
+            if (keys != props) free( (void *)keys );
         }
 
         if (set != INVALID_HANDLE_VALUE)
@@ -632,7 +633,7 @@ HRESULT WINAPI DevGetObjectsEx( DEV_OBJECT_TYPE type, ULONG flags, ULONG props_l
     *objs = NULL;
     *objs_len = 0;
 
-    hr = enum_dev_objects( type, props_len, props, !!(flags & DevQueryFlagAllProperties), filters, filters + filters_len,
+    hr = enum_dev_objects( type, props, props_len, !!(flags & DevQueryFlagAllProperties), filters, filters + filters_len,
                            dev_objects_append, &objects );
     if (SUCCEEDED( hr ))
     {
@@ -986,7 +987,7 @@ static void CALLBACK device_query_enum_objects_async( TP_CALLBACK_INSTANCE *inst
     HRESULT hr = S_OK;
 
     if (!ctx->filters)
-        hr = enum_dev_objects( ctx->type, ctx->prop_keys_len, ctx->prop_keys, !!(ctx->flags & DevQueryFlagAllProperties),
+        hr = enum_dev_objects( ctx->type, ctx->prop_keys, ctx->prop_keys_len, !!(ctx->flags & DevQueryFlagAllProperties),
                                0, NULL, device_query_context_add_object, ctx );
 
     EnterCriticalSection( &ctx->cs );
@@ -1153,8 +1154,9 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
                                          const DEVPROPCOMPKEY *props, ULONG params_len,
                                          const DEV_QUERY_PARAMETER *params, ULONG *buf_len, const DEVPROPERTY **buf )
 {
-    HRESULT hr;
+    HRESULT hr = S_OK;
     ULONG valid_flags = DevQueryFlagAllProperties | DevQueryFlagLocalize;
+    BOOL all_props = flags & DevQueryFlagAllProperties;
 
     TRACE( "(%d, %s, %#lx, %lu, %p, %lu, %p, %p, %p)\n", type, debugstr_w( id ), flags, props_len, props,
            params_len, params, buf_len, buf );
@@ -1173,6 +1175,8 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
     case DevObjectTypeDeviceInterfaceDisplay:
     {
         SP_DEVICE_INTERFACE_DATA iface = {.cbSize = sizeof( iface )};
+        const DEVPROPCOMPKEY *keys = props;
+        ULONG keys_len = props_len;
         DEV_OBJECT obj = {0};
         HDEVINFO set;
 
@@ -1185,9 +1189,13 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
             return HRESULT_FROM_WIN32(err == ERROR_NO_SUCH_DEVICE_INTERFACE ? ERROR_FILE_NOT_FOUND : err);
         }
 
-        hr = dev_object_iface_get_props( &obj, set, &iface, props_len, props, !!(flags & DevQueryFlagAllProperties) );
+        if (all_props) hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len );
+        if (SUCCEEDED(hr)) hr = dev_object_iface_get_props( &obj, set, &iface, keys, keys_len );
+
         *buf = obj.pProperties;
         *buf_len = obj.cPropertyCount;
+
+        if (keys != props) free( (void *)keys );
         SetupDiDestroyDeviceInfoList( set );
         break;
     }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 4/7] cfgmgr32: Allocate the property array to its maximum size.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 69 ++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index 92a15950e6d..acc87bd16d7 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -22,25 +22,15 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 
-static BOOL dev_properties_append( DEVPROPERTY **properties, ULONG *props_len, const DEVPROPKEY *key, DEVPROPTYPE type,
-                                   ULONG buf_size, void *buf )
+static void devproperty_init( DEVPROPERTY *property, const DEVPROPKEY *key, DEVPROPTYPE type,
+                              ULONG buf_size, void *buf )
 {
-    DEVPROPERTY *tmp;
-
-    if (!(tmp = realloc( *properties, (*props_len + 1) * sizeof( **properties ))))
-        return FALSE;
-    *properties = tmp;
-
-    tmp = &tmp[*props_len];
-    tmp->CompKey.Key = *key;
-    tmp->CompKey.Store = DEVPROP_STORE_SYSTEM;
-    tmp->CompKey.LocaleName = NULL;
-    tmp->Type = type;
-    tmp->BufferSize = buf_size;
-    tmp->Buffer = buf;
-
-    *props_len += 1;
-    return TRUE;
+    property->CompKey.Key = *key;
+    property->CompKey.Store = DEVPROP_STORE_SYSTEM;
+    property->CompKey.LocaleName = NULL;
+    property->Type = type;
+    property->BufferSize = buf_size;
+    property->Buffer = buf;
 }
 
 static const char *debugstr_DEV_OBJECT( const DEV_OBJECT *obj )
@@ -376,15 +366,12 @@ static HRESULT dev_get_device_interface_property_keys( HDEVINFO set, SP_DEVICE_I
     return hr;
 }
 
-static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data,
-                                           const DEVPROPCOMPKEY *keys, ULONG keys_len )
+static HRESULT dev_object_iface_get_props( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data, const DEVPROPCOMPKEY *keys, ULONG keys_len,
+                                           DEVPROPERTY *properties, ULONG *properties_len )
 {
     HRESULT hr = S_OK;
     DWORD i = 0;
 
-    obj->cPropertyCount = 0;
-    obj->pProperties = NULL;
-
     for (i = 0; i < keys_len; i++)
     {
         const DEVPROPKEY *key = &keys[i].Key;
@@ -395,12 +382,7 @@ static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEV
         if (SetupDiGetDeviceInterfacePropertyW( set, iface_data, key, &type, NULL, 0, &req, 0 )
             || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
         {
-            if (!dev_properties_append( (DEVPROPERTY **)&obj->pProperties, &obj->cPropertyCount, key,
-                                        DEVPROP_TYPE_EMPTY, 0, NULL ))
-            {
-                hr = E_OUTOFMEMORY;
-                goto done;
-            }
+            devproperty_init( properties + i, key, DEVPROP_TYPE_EMPTY, 0, NULL );
             continue;
         }
 
@@ -416,21 +398,11 @@ static HRESULT dev_object_iface_get_props( DEV_OBJECT *obj, HDEVINFO set, SP_DEV
             free( buf );
             goto done;
         }
-        if (!dev_properties_append( (DEVPROPERTY **)&obj->pProperties, &obj->cPropertyCount, key, type, size, buf ))
-        {
-            free( buf );
-            hr = E_OUTOFMEMORY;
-            goto done;
-        }
+        devproperty_init( properties + i, key, type, size, buf );
     }
 
 done:
-    if (FAILED( hr ))
-    {
-        DevFreeObjectProperties( obj->cPropertyCount, obj->pProperties );
-        obj->cPropertyCount = 0;
-        obj->pProperties = NULL;
-    }
+    *properties_len = i;
     return hr;
 }
 
@@ -536,6 +508,7 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, const DEVPROPCOMPKEY *pro
         for (j = 0; SUCCEEDED( hr ) && SetupDiEnumDeviceInterfaces( set, NULL, &iface_class, j, &iface ); j++)
         {
             const DEVPROPCOMPKEY *keys = props;
+            DEVPROPERTY *properties = NULL;
             ULONG keys_len = props_len;
             DEV_OBJECT obj = {0};
 
@@ -549,12 +522,14 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, const DEVPROPCOMPKEY *pro
              * evaluated, free properties that have not been requested, and set cPropertyCount to props_len.  */
             if ((all_props || filters) && FAILED(hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len ))) break;
 
-            hr = dev_object_iface_get_props( &obj, set, &iface, keys, keys_len );
+            if ((obj.cPropertyCount = keys_len) && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
+            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &obj.cPropertyCount );
+            obj.pProperties = properties;
 
             if (SUCCEEDED( hr ))
             {
                 /* Sort properties by DEVPROPCOMPKEY for faster filter evaluation. */
-                if (filters) qsort( (DEVPROPERTY *)obj.pProperties, obj.cPropertyCount, sizeof(*obj.pProperties), devproperty_compare );
+                if (filters) qsort( properties, obj.cPropertyCount, sizeof(*properties), devproperty_compare );
 
                 /* By default, the evaluation is performed by AND-ing all individual filter expressions. */
                 hr = devprop_filter_matches_object( &obj, DEVPROP_OPERATOR_AND_OPEN, filters, filters_end );
@@ -1190,7 +1165,13 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
         }
 
         if (all_props) hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len );
-        if (SUCCEEDED(hr)) hr = dev_object_iface_get_props( &obj, set, &iface, keys, keys_len );
+        if (SUCCEEDED(hr))
+        {
+            DEVPROPERTY *properties = NULL;
+            if ((obj.cPropertyCount = keys_len) && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
+            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &obj.cPropertyCount );
+            obj.pProperties = properties;
+        }
 
         *buf = obj.pProperties;
         *buf_len = obj.cPropertyCount;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 5/7] cfgmgr32: Keep properties in the order they were requested. (broken)

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 57 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index acc87bd16d7..eceaa2bedc8 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -408,38 +408,33 @@ done:
 
 typedef HRESULT (*enum_device_object_cb)( DEV_OBJECT object, void *context );
 
-static void dev_object_remove_unwanted_props( DEV_OBJECT *obj, ULONG keys_len, const DEVPROPCOMPKEY *keys_wanted )
+static UINT select_property( const DEVPROPCOMPKEY *key, DEVPROPERTY *props, DEVPROPERTY *select_end, DEVPROPERTY *props_end )
 {
-    DEVPROPERTY *props = (DEVPROPERTY *)obj->pProperties;
-    ULONG i = 0, j;
-
-    if (!keys_len)
+    for (DEVPROPERTY *prop = select_end; prop < props_end; prop++)
     {
-        DevFreeObjectProperties( obj->cPropertyCount, obj->pProperties );
-        obj->cPropertyCount = 0;
-        obj->pProperties = NULL;
+        if (IsEqualDevPropCompKey( prop->CompKey, *key ))
+        {
+            DEVPROPERTY tmp = *select_end;
+            *select_end = *prop;
+            *prop = tmp;
+            return 1;
+        }
     }
+    return 0;
+}
 
-    while (i < obj->cPropertyCount)
-    {
-        BOOL found = FALSE;
+static void select_properties( const DEVPROPCOMPKEY *keys, ULONG keys_len, DEVPROPERTY **props, ULONG *props_len )
+{
+    DEVPROPERTY *select_end = *props, *props_end = *props + *props_len;
 
-        for (j = 0; j < keys_len; j++)
-        {
-            if (IsEqualDevPropCompKey( props[i].CompKey, keys_wanted[j] ))
-            {
-                found = TRUE;
-                break;
-            }
-        }
-        if (!found)
-        {
-            free( obj->pProperties[i].Buffer );
-            props[i] = props[obj->cPropertyCount - 1];
-            obj->cPropertyCount--;
-        }
-        else
-            i++;
+    for (UINT i = 0; i < keys_len; i++) select_end += select_property( keys + i, *props, select_end, props_end );
+    *props_len = select_end - *props;
+
+    while (select_end < props_end) free( (select_end++)->Buffer );
+    if (!*props_len)
+    {
+        free( *props );
+        *props = NULL;
     }
 }
 
@@ -533,9 +528,11 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, const DEVPROPCOMPKEY *pro
 
                 /* By default, the evaluation is performed by AND-ing all individual filter expressions. */
                 hr = devprop_filter_matches_object( &obj, DEVPROP_OPERATOR_AND_OPEN, filters, filters_end );
-                /* Shrink pProperties to only the desired ones, unless DevQueryFlagAllProperties is set. */
-                if (!all_props)
-                    dev_object_remove_unwanted_props( &obj, props_len, props );
+
+                /* Shrink properties to only the desired ones, unless DevQueryFlagAllProperties is set. */
+                if (!all_props) select_properties( props, props_len, &properties, &obj.cPropertyCount );
+                obj.pProperties = properties;
+
                 if (hr == S_OK)
                     hr = callback( obj, data );
                 else
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 6/7] cfgmgr32: Remove DEV_OBJECT parameter from internal callbacks.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/devobject.c | 120 +++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 66 deletions(-)

diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index eceaa2bedc8..21332ccba52 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -33,13 +33,6 @@ static void devproperty_init( DEVPROPERTY *property, const DEVPROPKEY *key, DEVP
     property->Buffer = buf;
 }
 
-static const char *debugstr_DEV_OBJECT( const DEV_OBJECT *obj )
-{
-    if (!obj) return "(null)";
-    return wine_dbg_sprintf( "{%d, %s, %lu, %p}", obj->ObjectType, debugstr_w( obj->pszObjectId ), obj->cPropertyCount,
-                             obj->pProperties );
-}
-
 static int devproperty_compare( const void *p1, const void *p2 )
 {
     const DEVPROPCOMPKEY *key1 = &((DEVPROPERTY *)p1)->CompKey;
@@ -78,14 +71,14 @@ static const char *debugstr_DEVPROP_FILTER_EXPRESSION( const DEVPROP_FILTER_EXPR
 }
 
 /* Evaluate a filter expression containing comparison operator. */
-static HRESULT devprop_filter_eval_compare( const DEV_OBJECT *obj, const DEVPROP_FILTER_EXPRESSION *filter )
+static HRESULT devprop_filter_eval_compare( const DEVPROPERTY *props, UINT props_len, const DEVPROP_FILTER_EXPRESSION *filter )
 {
     const DEVPROPERTY *cmp_prop = &filter->Property;
     DEVPROP_OPERATOR op = filter->Operator;
     const DEVPROPERTY *prop = NULL;
     BOOL ret = FALSE;
 
-    TRACE( "(%s, %s)\n", debugstr_DEV_OBJECT( obj ), debugstr_DEVPROP_FILTER_EXPRESSION( filter ) );
+    TRACE( "(%p, %u, %s)\n", props, props_len, debugstr_DEVPROP_FILTER_EXPRESSION( filter ) );
 
     if ((op & DEVPROP_OPERATOR_MASK_MODIFIER) & ~(DEVPROP_OPERATOR_MODIFIER_NOT | DEVPROP_OPERATOR_MODIFIER_IGNORE_CASE))
         return E_INVALIDARG;
@@ -93,8 +86,7 @@ static HRESULT devprop_filter_eval_compare( const DEV_OBJECT *obj, const DEVPROP
     switch (filter->Operator & DEVPROP_OPERATOR_MASK_EVAL)
     {
     case DEVPROP_OPERATOR_EXISTS:
-        prop = bsearch( &filter->Property.CompKey, obj->pProperties, obj->cPropertyCount, sizeof( *obj->pProperties ),
-                        devproperty_compare );
+        prop = bsearch( &filter->Property.CompKey, props, props_len, sizeof(*props), devproperty_compare );
         ret = prop && prop->Type != DEVPROP_TYPE_EMPTY;
         break;
     case DEVPROP_OPERATOR_EQUALS:
@@ -105,8 +97,7 @@ static HRESULT devprop_filter_eval_compare( const DEV_OBJECT *obj, const DEVPROP
     {
         int cmp = 0;
 
-        prop = bsearch( &filter->Property.CompKey, obj->pProperties, obj->cPropertyCount, sizeof( *obj->pProperties ),
-                        devproperty_compare );
+        prop = bsearch( &filter->Property.CompKey, props, props_len, sizeof(*props), devproperty_compare );
         if (prop && cmp_prop->Type == prop->Type && cmp_prop->BufferSize == prop->BufferSize)
         {
             switch (prop->Type)
@@ -159,12 +150,12 @@ static const DEVPROP_FILTER_EXPRESSION *find_closing_filter( const DEVPROP_FILTE
 }
 
 /* Return S_OK if the specified filter expressions match the object, S_FALSE if it doesn't. */
-static HRESULT devprop_filter_matches_object( const DEV_OBJECT *obj, DEVPROP_OPERATOR op_outer_logical, const DEVPROP_FILTER_EXPRESSION *filters,
-                                              const DEVPROP_FILTER_EXPRESSION *end )
+static HRESULT devprop_filter_matches_properties( const DEVPROPERTY *props, UINT props_len, DEVPROP_OPERATOR op_outer_logical,
+                                                  const DEVPROP_FILTER_EXPRESSION *filters, const DEVPROP_FILTER_EXPRESSION *end )
 {
     HRESULT hr = S_OK;
 
-    TRACE( "(%s, %#x, %p, %p)\n", debugstr_DEV_OBJECT( obj ), op_outer_logical, filters, end );
+    TRACE( "(%p, %u, %#x, %p, %p)\n", props, props_len, op_outer_logical, filters, end );
 
     for (const DEVPROP_FILTER_EXPRESSION *filter = filters; filter < end; filter++)
     {
@@ -182,12 +173,12 @@ static HRESULT devprop_filter_matches_object( const DEV_OBJECT *obj, DEVPROP_OPE
         else if (op & DEVPROP_OPERATOR_MASK_LOGICAL)
         {
             const DEVPROP_FILTER_EXPRESSION *closing = find_closing_filter( filter, end );
-            hr = devprop_filter_matches_object( obj, op & DEVPROP_OPERATOR_MASK_LOGICAL, filter + 1, closing );
+            hr = devprop_filter_matches_properties( props, props_len, op & DEVPROP_OPERATOR_MASK_LOGICAL, filter + 1, closing );
             filter = closing;
         }
         else if (op & DEVPROP_OPERATOR_MASK_EVAL)
         {
-            hr = devprop_filter_eval_compare( obj, filter );
+            hr = devprop_filter_eval_compare( props, props_len, filter );
         }
         if (FAILED( hr )) break;
 
@@ -406,7 +397,7 @@ done:
     return hr;
 }
 
-typedef HRESULT (*enum_device_object_cb)( DEV_OBJECT object, void *context );
+typedef HRESULT (*enum_device_object_cb)( DEV_OBJECT_TYPE type, const WCHAR *id, ULONG *props_len, DEVPROPERTY **props, void *context );
 
 static UINT select_property( const DEVPROPCOMPKEY *key, DEVPROPERTY *props, DEVPROPERTY *select_end, DEVPROPERTY *props_end )
 {
@@ -502,43 +493,36 @@ static HRESULT enum_dev_objects( DEV_OBJECT_TYPE type, const DEVPROPCOMPKEY *pro
 
         for (j = 0; SUCCEEDED( hr ) && SetupDiEnumDeviceInterfaces( set, NULL, &iface_class, j, &iface ); j++)
         {
+            ULONG keys_len = props_len, properties_len = 0;
             const DEVPROPCOMPKEY *keys = props;
             DEVPROPERTY *properties = NULL;
-            ULONG keys_len = props_len;
-            DEV_OBJECT obj = {0};
 
             detail->cbSize = sizeof( *detail );
             if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof( buffer ), NULL, NULL )) continue;
 
-            obj.ObjectType = type;
-            obj.pszObjectId = detail->DevicePath;
-
             /* If we're also filtering objects, get all properties for this object. Once the filters have been
              * evaluated, free properties that have not been requested, and set cPropertyCount to props_len.  */
             if ((all_props || filters) && FAILED(hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len ))) break;
 
-            if ((obj.cPropertyCount = keys_len) && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
-            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &obj.cPropertyCount );
-            obj.pProperties = properties;
+            if (keys_len && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
+            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &properties_len );
 
             if (SUCCEEDED( hr ))
             {
                 /* Sort properties by DEVPROPCOMPKEY for faster filter evaluation. */
-                if (filters) qsort( properties, obj.cPropertyCount, sizeof(*properties), devproperty_compare );
+                if (filters) qsort( properties, properties_len, sizeof(*properties), devproperty_compare );
 
                 /* By default, the evaluation is performed by AND-ing all individual filter expressions. */
-                hr = devprop_filter_matches_object( &obj, DEVPROP_OPERATOR_AND_OPEN, filters, filters_end );
+                hr = devprop_filter_matches_properties( properties, properties_len, DEVPROP_OPERATOR_AND_OPEN, filters, filters_end );
 
                 /* Shrink properties to only the desired ones, unless DevQueryFlagAllProperties is set. */
-                if (!all_props) select_properties( props, props_len, &properties, &obj.cPropertyCount );
-                obj.pProperties = properties;
+                if (!all_props) select_properties( props, props_len, &properties, &properties_len );
 
-                if (hr == S_OK)
-                    hr = callback( obj, data );
-                else
-                    DevFreeObjectProperties( obj.cPropertyCount, obj.pProperties );
+                if (hr == S_OK) hr = callback( type, detail->DevicePath, &properties_len, &properties, data );
             }
 
+            DevFreeObjectProperties( properties_len, properties );
+
             if (keys != props) free( (void *)keys );
         }
 
@@ -555,24 +539,23 @@ struct objects_list
     ULONG len;
 };
 
-static HRESULT dev_objects_append( DEV_OBJECT obj, void *data )
+static HRESULT dev_objects_append( DEV_OBJECT_TYPE type, const WCHAR *id, ULONG *props_len, DEVPROPERTY **props, void *data )
 {
-    struct objects_list *objects = data;
-    WCHAR *id;
-    DEV_OBJECT *tmp;
+    struct objects_list *list = data;
+    DEV_OBJECT *tmp, *obj;
 
-    if (!(id = wcsdup( obj.pszObjectId )))
-        return E_OUTOFMEMORY;
-    if (!(tmp = realloc( objects->objects, (objects->len + 1) * sizeof( obj ) )))
-    {
-        free( id );
-        return E_OUTOFMEMORY;
-    }
+    if (!(tmp = realloc( list->objects, (list->len + 1) * sizeof(*list->objects) ))) return E_OUTOFMEMORY;
+    list->objects = tmp;
+
+    obj = list->objects + list->len;
+    if (!(obj->pszObjectId = wcsdup( id ))) return E_OUTOFMEMORY;
+    obj->ObjectType = type;
+    obj->cPropertyCount = *props_len;
+    obj->pProperties = *props;
+    *props_len = 0;
+    *props = NULL;
+    list->len++;
 
-    objects->objects = tmp;
-    tmp = &tmp[objects->len++];
-    *tmp = obj;
-    tmp->pszObjectId = id;
     return S_OK;
 }
 
@@ -664,25 +647,33 @@ struct device_query_context
     HCMNOTIFICATION notify;
 };
 
-static HRESULT device_query_context_add_object( DEV_OBJECT obj, void *data )
+static HRESULT device_query_context_add_object( DEV_OBJECT_TYPE type, const WCHAR *id, ULONG *props_len, DEVPROPERTY **props, void *data )
 {
-    DEV_QUERY_RESULT_ACTION_DATA action_data = {0};
+    DEV_QUERY_RESULT_ACTION_DATA action_data =
+    {
+        .Action = DevQueryResultAdd,
+        .Data.DeviceObject =
+        {
+            .ObjectType = type,
+            .pszObjectId = id,
+            .cPropertyCount = *props_len,
+            .pProperties = *props,
+        },
+    };
     struct device_query_context *ctx = data;
     struct device_iface_path *iface_entry = NULL;
     HRESULT hr = S_OK;
 
-    TRACE( "(%s, %p)\n", debugstr_w( obj.pszObjectId ), data );
+    TRACE( "(%s, %p)\n", debugstr_w( id ), data );
 
-    action_data.Action = DevQueryResultAdd;
-    action_data.Data.DeviceObject = obj;
     ctx->callback( (HDEVQUERY)ctx, ctx->user_data, &action_data );
 
     EnterCriticalSection( &ctx->cs );
     if (ctx->state == DevQueryStateClosed)
         hr = E_CHANGED_STATE;
-    else if (obj.ObjectType == DevObjectTypeDeviceInterface || obj.ObjectType == DevObjectTypeDeviceInterfaceDisplay)
+    else if (type == DevObjectTypeDeviceInterface || type == DevObjectTypeDeviceInterfaceDisplay)
     {
-        if (!(iface_entry = calloc( 1, sizeof( *iface_entry ) )) || !(iface_entry->path = wcsdup( obj.pszObjectId )))
+        if (!(iface_entry = calloc( 1, sizeof( *iface_entry ) )) || !(iface_entry->path = wcsdup( id )))
         {
             if (iface_entry) free( iface_entry->path );
             free( iface_entry );
@@ -696,7 +687,6 @@ static HRESULT device_query_context_add_object( DEV_OBJECT obj, void *data )
     }
     LeaveCriticalSection( &ctx->cs );
 
-    DevFreeObjectProperties( obj.cPropertyCount, obj.pProperties );
     return hr;
 }
 
@@ -1147,9 +1137,9 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
     case DevObjectTypeDeviceInterfaceDisplay:
     {
         SP_DEVICE_INTERFACE_DATA iface = {.cbSize = sizeof( iface )};
+        ULONG properties_len = 0, keys_len = props_len;
         const DEVPROPCOMPKEY *keys = props;
-        ULONG keys_len = props_len;
-        DEV_OBJECT obj = {0};
+        DEVPROPERTY *properties = NULL;
         HDEVINFO set;
 
         set = SetupDiCreateDeviceInfoListExW( NULL, NULL, NULL, NULL );
@@ -1164,14 +1154,12 @@ HRESULT WINAPI DevGetObjectPropertiesEx( DEV_OBJECT_TYPE type, const WCHAR *id,
         if (all_props) hr = dev_get_device_interface_property_keys( set, &iface, &keys, &keys_len );
         if (SUCCEEDED(hr))
         {
-            DEVPROPERTY *properties = NULL;
-            if ((obj.cPropertyCount = keys_len) && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
-            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &obj.cPropertyCount );
-            obj.pProperties = properties;
+            if ((properties_len = keys_len) && !(properties = calloc( keys_len, sizeof(*properties) ))) hr = E_OUTOFMEMORY;
+            else hr = dev_object_iface_get_props( set, &iface, keys, keys_len, properties, &properties_len );
         }
 
-        *buf = obj.pProperties;
-        *buf_len = obj.cPropertyCount;
+        *buf = properties;
+        *buf_len = properties_len;
 
         if (keys != props) free( (void *)keys );
         SetupDiDestroyDeviceInfoList( set );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[PATCH v2 7/7] cfrmgr32: Introduce a new dev_get_device_interface_property helper.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

---
 dlls/cfgmgr32/cfgmgr32.c         | 10 --------
 dlls/cfgmgr32/cfgmgr32_private.h | 10 ++++++++
 dlls/cfgmgr32/devobject.c        | 44 +++++++++++++++-----------------
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/dlls/cfgmgr32/cfgmgr32.c b/dlls/cfgmgr32/cfgmgr32.c
index af03d245559..651e873a81b 100644
--- a/dlls/cfgmgr32/cfgmgr32.c
+++ b/dlls/cfgmgr32/cfgmgr32.c
@@ -120,16 +120,6 @@ static LSTATUS open_device_classes_key( HKEY root, const WCHAR *key, REGSAM acce
     return open_key( root, path, access, open, hkey );
 }
 
-struct property
-{
-    BOOL ansi;
-    DEVPROPKEY key;
-    DEVPROPTYPE *type;
-    DWORD *reg_type;
-    void *buffer;
-    DWORD *size;
-};
-
 static LSTATUS init_property( struct property *prop, const DEVPROPKEY *key, DEVPROPTYPE *type, void *buffer, DWORD *size )
 {
     if (!key) return ERROR_INVALID_PARAMETER;
diff --git a/dlls/cfgmgr32/cfgmgr32_private.h b/dlls/cfgmgr32/cfgmgr32_private.h
index 0aad9a3f247..118be9c1d0d 100644
--- a/dlls/cfgmgr32/cfgmgr32_private.h
+++ b/dlls/cfgmgr32/cfgmgr32_private.h
@@ -49,3 +49,13 @@ static inline const char *debugstr_DEVPROPCOMPKEY( const DEVPROPCOMPKEY *key )
     return wine_dbg_sprintf( "{%s, %d, %s}", debugstr_DEVPROPKEY( &key->Key ), key->Store,
                              debugstr_w( key->LocaleName ) );
 }
+
+struct property
+{
+    BOOL ansi;
+    DEVPROPKEY key;
+    DEVPROPTYPE *type;
+    DWORD *reg_type;
+    void *buffer;
+    DWORD *size;
+};
diff --git a/dlls/cfgmgr32/devobject.c b/dlls/cfgmgr32/devobject.c
index 21332ccba52..804257c0d15 100644
--- a/dlls/cfgmgr32/devobject.c
+++ b/dlls/cfgmgr32/devobject.c
@@ -332,6 +332,17 @@ static BOOL devprop_filters_validate( const DEVPROP_FILTER_EXPRESSION *filters,
     return TRUE;
 }
 
+static HRESULT dev_get_device_interface_property( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface_data, struct property *prop )
+{
+    if (SetupDiGetDeviceInterfacePropertyW( set, iface_data, &prop->key, prop->type, NULL, 0, prop->size, 0 )) return S_OK;
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return S_OK;
+
+    if (!(prop->buffer = malloc( *prop->size ))) return E_OUTOFMEMORY;
+    if (SetupDiGetDeviceInterfacePropertyW( set, iface_data, &prop->key, prop->type, prop->buffer, *prop->size, prop->size, 0 )) return S_OK;
+    free( prop->buffer );
+    return HRESULT_FROM_WIN32( GetLastError() );
+}
+
 static HRESULT get_property_compare_keys( const DEVPROPKEY *keys, ULONG keys_len, const DEVPROPCOMPKEY **comp_keys, ULONG *comp_keys_len )
 {
     if (!(*comp_keys_len = keys_len)) return S_OK;
@@ -361,38 +372,23 @@ static HRESULT dev_object_iface_get_props( HDEVINFO set, SP_DEVICE_INTERFACE_DAT
                                            DEVPROPERTY *properties, ULONG *properties_len )
 {
     HRESULT hr = S_OK;
-    DWORD i = 0;
+    DWORD i;
 
     for (i = 0; i < keys_len; i++)
     {
-        const DEVPROPKEY *key = &keys[i].Key;
-        DWORD req = 0, size;
+        DWORD size = 0;
         DEVPROPTYPE type;
-        BYTE *buf;
-
-        if (SetupDiGetDeviceInterfacePropertyW( set, iface_data, key, &type, NULL, 0, &req, 0 )
-            || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+        struct property prop =
         {
-            devproperty_init( properties + i, key, DEVPROP_TYPE_EMPTY, 0, NULL );
-            continue;
-        }
+            .key = keys[i].Key,
+            .type = &type,
+            .size = &size,
+        };
 
-        size = req;
-        if (!(buf = calloc( 1, size )))
-        {
-            hr = E_OUTOFMEMORY;
-            goto done;
-        }
-        if (!SetupDiGetDeviceInterfacePropertyW( set, iface_data, key, &type, buf, size, &req, 0 ))
-        {
-            hr = HRESULT_FROM_WIN32( GetLastError() );
-            free( buf );
-            goto done;
-        }
-        devproperty_init( properties + i, key, type, size, buf );
+        if (FAILED(hr = dev_get_device_interface_property( set, iface_data, &prop ))) break;
+        devproperty_init( properties + i, &prop.key, *prop.type, *prop.size, prop.buffer );
     }
 
-done:
     *properties_len = i;
     return hr;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10173

[Rémi Bernon (＠rbernon)]

Anything wrong with this?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10173#note_130570

[Alexandre Julliard (＠julliard)]

One of the commits is marked "broken", is that still the case?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10173#note_130571

[Rémi Bernon (＠rbernon)]

Oh sorry, I don't think so but I'll check.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10173#note_130574