From db4dab577e2bc56c9ae001035aa7b9cbdd16396d Mon Sep 17 00:00:00 2001 From: winesync Date: Tue, 2 Jan 2024 18:34:56 +0100 Subject: [PATCH] *********** SYNC ALTERNATIVE FOR WINE SYNC [WINESYNC] setupapi: Implement SetupDiGetClassDevsW. wine commit id f841667cac1558d2131543c5dc9baba1c6418b01 by Juan Lang SYNC NOTE: The functions added there (and still existing in Wine's code up to now) have our own equivalent (see comments): SETUPDI_EnumerateDevices --> SETUP_CreateDevicesList SETUPDI_EnumerateInterfaces --> SETUP_CreateInterfaceList The other SETUPDI_* are internal helpers for the previous ones: SETUPDI_EnumerateMatchingDevices SETUPDI_EnumerateMatchingInterfaces TODO: Sync the name and functionality? --- dll/win32/setupapi/devclass.c | 1 + dll/win32/setupapi/interface.c | 1 + dll/win32/setupapi/setupapi_private.h | 2 ++ sdk/tools/winesync/setupapi.cfg | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 7f94eebdb94..e9188273a73 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -117,6 +117,7 @@ SetupDiDestroyClassImageList( return ret; } +// SETUPDI_EnumerateDevices LONG SETUP_CreateDevicesList( IN OUT struct DeviceInfoSet *list, diff --git a/dll/win32/setupapi/interface.c b/dll/win32/setupapi/interface.c index 09b84d519a4..b297ffb2a2d 100644 --- a/dll/win32/setupapi/interface.c +++ b/dll/win32/setupapi/interface.c @@ -64,6 +64,7 @@ DestroyDeviceInterface( return HeapFree(GetProcessHeap(), 0, deviceInterface); } +// SETUPDI_EnumerateInterfaces LONG SETUP_CreateInterfaceList( struct DeviceInfoSet *list, diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index fb758142645..22d67dce329 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -308,6 +308,7 @@ CreateDeviceInfo( IN LPCGUID pClassGuid, OUT struct DeviceInfo **pDeviceInfo); +// SETUPDI_EnumerateDevices LONG SETUP_CreateDevicesList( IN OUT struct DeviceInfoSet *list, @@ -343,6 +344,7 @@ BOOL DestroyDeviceInterface( struct DeviceInterface* deviceInterface); +// SETUPDI_EnumerateInterfaces LONG SETUP_CreateInterfaceList( struct DeviceInfoSet *list, diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index ee19a6a2bd8..e1671eca0f3 100644 --- a/sdk/tools/winesync/setupapi.cfg +++ b/sdk/tools/winesync/setupapi.cfg @@ -5,4 +5,4 @@ files: dlls/setupapi/misc.c: dll/win32/setupapi/misc.c dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c tags: - wine: f4b9bc2454b6c996ea601a2ae3d3ce80b8225273 + wine: f841667cac1558d2131543c5dc9baba1c6418b01