[PATCH 0/1] MR1510: winebus.sys: Use the device path instead of the udev_device pointer to match devices.

[Zebediah Figura (＠zfigura)]

The latter is not guaranteed to be equal across events, and in practice may not be.

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

[PATCH 1/1] winebus.sys: Use the device path instead of the udev_device pointer to match devices.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

The latter is not guaranteed to be equal across events, and in practice may not be.
---
 dlls/winebus.sys/bus_udev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index 21a70d0829b..16bf30e553f 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -262,10 +262,14 @@ static struct base_device *find_device_from_fd(int fd)
 
 static struct base_device *find_device_from_udev(struct udev_device *dev)
 {
+    const char *devnode = udev_device_get_devnode(dev);
     struct base_device *impl;
 
     LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry)
-        if (impl->udev_device == dev) return impl;
+    {
+        if (!strcmp(impl->devnode, devnode))
+            return impl;
+    }
 
     return NULL;
 }
-- 
GitLab

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

[Rémi Bernon]

I think it'd be better with something like https://gitlab.winehq.org/logos128/wine/-/commit/7744a8e655a9a33c5da4514fd4f... if you don't mind updating this MR with it.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1510#note_17183