- Wine-GitLab - list.winehq.org

[PATCH v10 0/5] MR8438: cfgmgr32: Device Query API part 1: Add a basic implementation for DevGetObjects.
by Vibhav Pant (＠vibhavp) June 30, 2025

June 30, 2025

(Follow up from !6788) The goal is to use the device object API as the backend for Windows.Devices.Enumeration, as most concepts from the latter have a one-to-one mapping to the former: * The device object API is centred around the [`DEV_OBJECT`](https://learn.microsoft.com/en-us/windows/win32/api/devquerydef/ns-devquerydef-dev_object) type, which provides a unified representation for devnodes, device interfaces/containers, device interface classes, and association endpoints (networking protocols and service instances, like UPnP and Bluetooth), together with the properties associated with it. The [`DevObjectType`](https://learn.microsoft.com/en-us/windows/win32/api/devquerydef/ne-devquerydef-dev_object_type) enum maps to [`Windows.Devices.Enumeration.DeviceInformationKind`](https://learn.microsoft.com/en-us/uwp/api/windows.devices.enumeration.deviceinformationkind?view=winrt-26100). This would be used to implement the [`DeviceInformation`](https://learn.microsoft.com/en-us/uwp/api/windows.devices.enumeration.deviceinformation?view=winrt-26100) class. * [`DEVPROP_FILTER_EXPRESSION`](https://learn.microsoft.com/en-us/windows/win32/api/devfiltertypes/ns-devfiltertypes-devprop_filter_expression) allows filtering device queries by their properties. AQS filter strings would be parsed into an array of filters, which are then passed to the query object methods. * `DevCreateObjectQuery` would be the backend for `DeviceWatcher`, as it provides asynchronous callbacks for initial device enumeration, device addition, removal and updates. * [`DevGetObjects`](https://learn.microsoft.com/en-us/windows/win32/api/devquery/nf-devquery-devgetobjects) would be used to implement the `FindAllAsync*` methods. This MR adds a basic implementation and tests for `DevGetObjects`. -- v10: cfgmgr32: Add a basic implementation for DevGetObjects(Ex) for device interface objects. cfgmgr32/test: Add tests for DevGetObjects. https://gitlab.winehq.org/wine/wine/-/merge_requests/8438

2 6

Re: [PATCH v5 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
by Vibhav Pant (＠vibhavp) June 30, 2025

June 30, 2025

Vibhav Pant (@vibhavp) commented about dlls/ntdll/unix/system.c: > + > + bat->full_charge_capacity = get_sys_int(path, "energy_full"); > + bat->capacity_now = get_sys_int(path, "energy_now"); > + bat->rate_now = get_sys_int(path, "power_now"); > + bat->power_unit = BATTERY_UNIT_ENERGY; > + > + if (!bat->full_charge_capacity || !bat->capacity_now) > + { > + bat->full_charge_capacity = get_sys_int(path, "charge_full"); > + bat->capacity_now = get_sys_int(path, "charge_now"); > + bat->voltage_now = get_sys_int(path, "voltage_now"); > + bat->rate_now = get_sys_int(path, "current_now"); > + bat->power_unit = BATTERY_UNIT_CHARGE; > + if (!bat->full_charge_capacity || !bat->capacity_now || !bat->voltage_now) > + bat->power_unit = BATTERY_UNIT_UNKNOWN; > + } It would improve readability if `full_charge_capacity`, `capacity_now` and `rate_now` in `linux_battery` were instead replaced with an inline `union` type, something like ```c union { struct { int charge_full_uah; int charge_now_uah; int current_now_ua; } charge; struct { int energy_full_uwh; int energy_now_uwh; int power_now_uw; } energy; } capacity_now; ``` With `power_unit` as the tag. The `fill_battery_state` code would also be much clearer as a result. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108372

1 0

Re: [PATCH v8 0/5] MR8438: cfgmgr32: Device Query API part 1: Add a basic implementation for DevGetObjects. - approved
by Rémi Bernon June 30, 2025

June 30, 2025

This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8438

1 0

Re: [PATCH v7 0/5] MR8438: cfgmgr32: Device Query API part 1: Add a basic implementation for DevGetObjects.
by Vibhav Pant (＠vibhavp) June 30, 2025

June 30, 2025

On Mon Jun 30 13:17:18 2025 +0000, Rémi Bernon wrote: > 77622615b657feedfb379f51346b4d05a2cbd0c4 still fails with: > ``` > cfgmgr32.c:561: Test succeeded inside todo block: got len 0 > cfgmgr32.c:562: Test succeeded inside todo block: got objects 0000000000000000 > cfgmgr32.c:566: Test succeeded inside todo block: got len 0 > cfgmgr32.c:567: Test succeeded inside todo block: got objects 0000000000000000 > ``` Apologies, I forgot to run final tests on this commit. Should be fixed now, thanks. Since the returned code in these two cases is `S_OK`, I have set both `len` and `objects` to dummy values to test whether they are correct set to zero/NULL respectively. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8438#note_108361

1 0

[PATCH v2 0/6] MR8358: user32: Preparatory cleanup of class name version logic.
by Rémi Bernon June 30, 2025

June 30, 2025

Always copying client class name to temporary buffer, to which version string also points to, in order to convert integral class names to string and unify the logic for versioning later on. -- v2: user32: Always copy class names to a temporary buffer. comctl32: Fix class name case in manifest. user32: Move get_class_version out of get_class_info. user32: Load class module in get_class_version. user32: Move user32_module default out of get_class_info. user32: Init class name outside of get_versioned_name. https://gitlab.winehq.org/wine/wine/-/merge_requests/8358

3 10

Re: [PATCH v3 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
by Vibhav Pant (＠vibhavp) June 30, 2025

June 30, 2025

It might be better to make this an enum, and add some documentation for how different values affect how `MaxCapacity` and `RemainingCapacity` get calculated. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108347

1 0

Re: [PATCH v5 0/5] MR8438: cfgmgr32: Device Query API part 1: Add a basic implementation for DevGetObjects.
by Rémi Bernon June 30, 2025

June 30, 2025

77622615b657feedfb379f51346b4d05a2cbd0c4 still fails with: ``` cfgmgr32.c:561: Test succeeded inside todo block: got len 0 cfgmgr32.c:562: Test succeeded inside todo block: got objects 0000000000000000 cfgmgr32.c:566: Test succeeded inside todo block: got len 0 cfgmgr32.c:567: Test succeeded inside todo block: got objects 0000000000000000 ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8438#note_108344

1 0

Re: [PATCH v3 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
by Tomas-Mendes-ai (＠Tomas-Mendes-ai) June 30, 2025

June 30, 2025

On Mon Jun 30 15:44:52 2025 +0000, Vibhav Pant wrote: > Shouldn't this be `!bat->present`? Hi Vibhav, Fear it should, yes. Thank you for catching that. Anything else you'd like to add before I edit the commit and rerun the pipeline? Thank you. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108343

1 0

Re: [PATCH v3 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
by Tomas-Mendes-ai (＠Tomas-Mendes-ai) June 30, 2025

June 30, 2025

On Mon Jun 30 10:40:44 2025 +0000, Rémi Bernon wrote: > Are you an AI yourself? Has this been written with an AI? Hi Rémi. No on both accounts. Just an unfortunate automatic suggestion made by github when LLMs were not really a _thing_ yet. That being said, if somethings seems off about the code it's probably because I haven't dabbed in C since college. Any critiques or suggestions are much appreciated. Thanks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108342

1 0

Re: [PATCH v3 0/5] MR8460: ntdll: Add support for multi-battery systems and energy-reporting batteries on Linux
by Vibhav Pant (＠vibhavp) June 30, 2025

June 30, 2025

Shouldn't this be `!bat->present`? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8460#note_108339

1 0