[PATCH 1/3] setupapi: Implement SetupDiGetDeviceInstallParams().
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This begins a series of patches which I've been working on as a side project for a while, which seek to improve support for installing and running Plug and Play (PnP) drivers. After this series it is possible to run Microsoft's sample "toaster" WDM driver (taken from the Windows 7 DDK; the purely WDM driver has been removed from the most recent version, and WDF is much harder to compile.) Needless to say, this is a huge step forward for running native PnP drivers. On the other hand, most native PnP drivers are designed to actually access hardware, and need to do things like handle interrupts and write to I/O ports. It is not clear how many native PnP drivers can actually execute in user-mode, and so the utility of this may be somewhat questionable. On the other hand, that missing step could certainly be filled in by a simple proxy kernel module, perhaps even using preëxisting frameworks like UIO. Regardless of whether that would be maintained by the Wine project directly, I imagine it could be hugely beneficial to people who are currently forced to use Windows to interact with various domain-specific hardware. The series also fixes several problems with our current HID drivers, to make them more architecturally correct. Of course, that's less clearly an advantage. The work is already done, because I found it interesting enough to do, but there's still time to warn me not to do such obscure and useless work in the future by rejecting these patches ;-) dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2640005abf..46aeb5a7d6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; }; struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); - if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3542,27 +3544,57 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; } /*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, ¶msW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; } /*********************************************************************** -- 2.21.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 48 +++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 46aeb5a7d6..43b86c7dd0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3600,25 +3600,51 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, /*********************************************************************** * SetupDiSetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + SP_DEVINSTALL_PARAMS_W paramsW; - return TRUE; + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + paramsW.Flags = params->Flags; + paramsW.FlagsEx = params->FlagsEx; + paramsW.hwndParent = params->hwndParent; + paramsW.InstallMsgHandler = params->InstallMsgHandler; + paramsW.InstallMsgHandlerContext = params->InstallMsgHandlerContext; + paramsW.FileQueue = params->FileQueue; + paramsW.ClassInstallReserved = params->ClassInstallReserved; + paramsW.Reserved = params->Reserved; + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + + return SetupDiSetDeviceInstallParamsW(devinfo, device_data, ¶msW); } /*********************************************************************** * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + device->params = *params; return TRUE; } -- 2.21.0
Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/15/19 10:56 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 48 +++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 46aeb5a7d6..43b86c7dd0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3600,25 +3600,51 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, /*********************************************************************** * SetupDiSetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + SP_DEVINSTALL_PARAMS_W paramsW;
- return TRUE; + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + paramsW.Flags = params->Flags; + paramsW.FlagsEx = params->FlagsEx; + paramsW.hwndParent = params->hwndParent; + paramsW.InstallMsgHandler = params->InstallMsgHandler; + paramsW.InstallMsgHandlerContext = params->InstallMsgHandlerContext; + paramsW.FileQueue = params->FileQueue; + paramsW.ClassInstallReserved = params->ClassInstallReserved; + paramsW.Reserved = params->Reserved; + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + + return SetupDiSetDeviceInstallParamsW(devinfo, device_data, ¶msW); }
/*********************************************************************** * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + device->params = *params;
return TRUE; }
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 269a499091..46715512ee 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1889,6 +1889,77 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); } +static void test_device_install_params(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + SP_DEVINSTALL_PARAMS_A params; + HDEVINFO set; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + memset(¶ms, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(!params.Flags, "Got flags %#x.\n", params.Flags); + ok(!params.FlagsEx, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!params.DriverPath[0], "Got driver path %s.\n", params.DriverPath); + + params.Flags = DI_INF_IS_SORTED; + params.FlagsEx = DI_FLAGSEX_ALLOWEXCLUDEDDRVS; + strcpy(params.DriverPath, "C:\\windows"); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to set device install params, error %#x.\n", GetLastError()); + + memset(¶ms, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(params.Flags == DI_INF_IS_SORTED, "Got flags %#x.\n", params.Flags); + ok(params.FlagsEx == DI_FLAGSEX_ALLOWEXCLUDEDDRVS, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!strcasecmp(params.DriverPath, "C:\\windows"), "Got driver path %s.\n", params.DriverPath); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1917,4 +1988,5 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_device_install_params(); } -- 2.21.0
Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/15/19 10:56 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+)
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 269a499091..46715512ee 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1889,6 +1889,77 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); }
+static void test_device_install_params(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + SP_DEVINSTALL_PARAMS_A params; + HDEVINFO set; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + memset(¶ms, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(!params.Flags, "Got flags %#x.\n", params.Flags); + ok(!params.FlagsEx, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!params.DriverPath[0], "Got driver path %s.\n", params.DriverPath); + + params.Flags = DI_INF_IS_SORTED; + params.FlagsEx = DI_FLAGSEX_ALLOWEXCLUDEDDRVS; + strcpy(params.DriverPath, "C:\\windows"); + ret = SetupDiSetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to set device install params, error %#x.\n", GetLastError()); + + memset(¶ms, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, ¶ms); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(params.Flags == DI_INF_IS_SORTED, "Got flags %#x.\n", params.Flags); + ok(params.FlagsEx == DI_FLAGSEX_ALLOWEXCLUDEDDRVS, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!strcasecmp(params.DriverPath, "C:\\windows"), "Got driver path %s.\n", params.DriverPath); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1917,4 +1988,5 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_device_install_params(); }
On 5/15/19 10:56 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This begins a series of patches which I've been working on as a side project for a while, which seek to improve support for installing and running Plug and Play (PnP) drivers.
After this series it is possible to run Microsoft's sample "toaster" WDM driver (taken from the Windows 7 DDK; the purely WDM driver has been removed from the most recent version, and WDF is much harder to compile.)
Needless to say, this is a huge step forward for running native PnP drivers. On the other hand, most native PnP drivers are designed to actually access hardware, and need to do things like handle interrupts and write to I/O ports. It is not clear how many native PnP drivers can actually execute in user-mode, and so the utility of this may be somewhat questionable. On the other hand, that missing step could certainly be filled in by a simple proxy kernel module, perhaps even using preëxisting frameworks like UIO. Regardless of whether that would be maintained by the Wine project directly, I imagine it could be hugely beneficial to people who are currently forced to use Windows to interact with various domain-specific hardware.
The series also fixes several problems with our current HID drivers, to make them more architecturally correct. Of course, that's less clearly an advantage.
The work is already done, because I found it interesting enough to do, but there's still time to warn me not to do such obscure and useless work in the future by rejecting these patches ;-)
I just had another person contact me directly with an application relying on RegisterDeviceNotificationA to detect the insertion and removal of devices. I personally think that having the PNP architecture in place will be a vast improvement! -aric
dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 15 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2640005abf..46aeb5a7d6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; };
struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom);
- if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W);
if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3542,27 +3544,57 @@ BOOL WINAPI SetupDiCallClassInstaller( }
/*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; }
/*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, ¶msW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; }
/***********************************************************************
Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/15/19 10:56 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This begins a series of patches which I've been working on as a side project for a while, which seek to improve support for installing and running Plug and Play (PnP) drivers.
After this series it is possible to run Microsoft's sample "toaster" WDM driver (taken from the Windows 7 DDK; the purely WDM driver has been removed from the most recent version, and WDF is much harder to compile.)
Needless to say, this is a huge step forward for running native PnP drivers. On the other hand, most native PnP drivers are designed to actually access hardware, and need to do things like handle interrupts and write to I/O ports. It is not clear how many native PnP drivers can actually execute in user-mode, and so the utility of this may be somewhat questionable. On the other hand, that missing step could certainly be filled in by a simple proxy kernel module, perhaps even using preëxisting frameworks like UIO. Regardless of whether that would be maintained by the Wine project directly, I imagine it could be hugely beneficial to people who are currently forced to use Windows to interact with various domain-specific hardware.
The series also fixes several problems with our current HID drivers, to make them more architecturally correct. Of course, that's less clearly an advantage.
The work is already done, because I found it interesting enough to do, but there's still time to warn me not to do such obscure and useless work in the future by rejecting these patches ;-)
dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 15 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2640005abf..46aeb5a7d6 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; };
struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom);
- if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W);
if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3542,27 +3544,57 @@ BOOL WINAPI SetupDiCallClassInstaller( }
/*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; }
/*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, ¶msW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; }
/***********************************************************************
participants (2)
-
Aric Stewart -
Zebediah Figura