From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/cfgmgr32/Makefile.in | 2 +- dlls/cfgmgr32/{main.c => cfgmgr32.c} | 4 ++++ dlls/setupapi/Makefile.in | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) rename dlls/cfgmgr32/{main.c => cfgmgr32.c} (99%) diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index da946c2160e..75a8ed7e514 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -3,5 +3,5 @@ IMPORTLIB = cfgmgr32 IMPORTS = advapi32 rpcrt4 sechost setupapi SOURCES = \ - main.c \ + cfgmgr32.c \ notification.c diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/cfgmgr32.c similarity index 99% rename from dlls/cfgmgr32/main.c rename to dlls/cfgmgr32/cfgmgr32.c index 06ef5a09623..e27faf52420 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/cfgmgr32.c @@ -118,6 +118,8 @@ CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW( LPCWSTR device_interface, co } } +#ifndef _SETUPAPI_ + static BOOL dev_properties_append( DEVPROPERTY **properties, ULONG *props_len, const DEVPROPKEY *key, DEVPROPTYPE type, ULONG buf_size, void *buf ) { @@ -1336,3 +1338,5 @@ void WINAPI DevFreeObjectProperties( ULONG len, const DEVPROPERTY *props ) free( properties[i].Buffer ); free( properties ); } + +#endif /* _SETUPAPI_ */ \ No newline at end of file diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 4a2d1109707..8fbd4a9046c 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -3,8 +3,10 @@ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid advapi32 rpcrt4 kernelbase DELAYIMPORTS = cabinet shell32 wintrust ole32 comdlg32 user32 +PARENTSRC = ../cfgmgr32 SOURCES = \ + cfgmgr32.c \ devinst.c \ dialog.c \ dirid.c \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9930