ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Reënumerate root PnP devices in SetupDiRemoveDevice(). 

Allow them to be unloaded.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-04-02 10:53:39 -05:00 committed by Alexandre Julliard
parent 304b094d16
commit f023028640
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/setupapi/devinst.c
View File

@ -19,6 +19,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -1692,15 +1693,38 @@ BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_
*/ */
BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data)
{ {
SC_HANDLE manager = NULL, service = NULL;
struct device *device; struct device *device;
WCHAR *service_name;
DWORD size;
TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); TRACE("devinfo %p, device_data %p.\n", devinfo, device_data);
if (!(device = get_device(devinfo, device_data))) if (!(device = get_device(devinfo, device_data)))
return FALSE; return FALSE;
if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT)))
return FALSE;
if (!RegGetValueW(device->key, NULL, L"Service", RRF_RT_REG_SZ, NULL, NULL, &size))
{
service_name = malloc(size);
if (!RegGetValueW(device->key, NULL, L"Service", RRF_RT_REG_SZ, NULL, service_name, &size))
service = OpenServiceW(manager, service_name, SERVICE_USER_DEFINED_CONTROL);
free(service_name);
}
remove_device(device); remove_device(device);
if (service)
{
SERVICE_STATUS status;
if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status))
ERR("Failed to control service %s, error %u.\n", debugstr_w(service_name), GetLastError());
CloseServiceHandle(service);
}
CloseServiceHandle(manager);
return TRUE; return TRUE;
} }