Chip Davis : setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
Alexandre Julliard
julliard at winehq.org
Tue Jan 28 15:35:26 CST 2020
Module: wine
Branch: master
Commit: 4588f10f8d3895624a8a2087f2e5c3c1b51e576f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4588f10f8d3895624a8a2087f2e5c3c1b51e576f
Author: Chip Davis <cdavis at codeweavers.com>
Date: Sun Jan 26 18:02:37 2020 -0600
setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
.../api-ms-win-devices-config-l1-1-0.spec | 2 +-
.../api-ms-win-devices-config-l1-1-1.spec | 2 +-
dlls/cfgmgr32/cfgmgr32.spec | 2 +
dlls/setupapi/devinst.c | 105 +++++++++++++++------
dlls/setupapi/setupapi.spec | 2 +
5 files changed, 83 insertions(+), 30 deletions(-)
diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec
index 6fe5ee3b21..59004c997f 100644
--- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec
+++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec
@@ -8,7 +8,7 @@
@ stub CM_Get_Class_Property_Keys
@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW
@ stub CM_Get_Depth
-@ stub CM_Get_DevNode_PropertyW
+@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW
@ stub CM_Get_DevNode_Property_Keys
@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW
@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status
diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec
index 33dad4eaac..e10352eda5 100644
--- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec
+++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec
@@ -8,7 +8,7 @@
@ stub CM_Get_Class_Property_Keys
@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW
@ stub CM_Get_Depth
-@ stub CM_Get_DevNode_PropertyW
+@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW
@ stub CM_Get_DevNode_Property_Keys
@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW
@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status
diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec
index 20ede7b13d..8360048421 100644
--- a/dlls/cfgmgr32/cfgmgr32.spec
+++ b/dlls/cfgmgr32/cfgmgr32.spec
@@ -57,6 +57,8 @@
@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW
@ stub CM_Get_Depth
@ stub CM_Get_Depth_Ex
+@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW
+@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW
@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA
@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW
@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 25d4040da0..f8a4e93efc 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name,
return (have_guid || have_name);
}
-/***********************************************************************
- * SetupDiGetDevicePropertyW (SETUPAPI.@)
- */
-BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data,
- const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff,
- DWORD prop_buff_size, DWORD *required_size, DWORD flags)
+static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type,
+ BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags)
{
- static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0};
- WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'};
+ WCHAR key_path[55] = L"Properties\\";
HKEY hkey;
DWORD value_type;
DWORD value_size = 0;
LSTATUS ls;
- struct device *device;
-
- TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size,
- required_size, flags);
-
- if (!(device = get_device(devinfo, device_data)))
- return FALSE;
if (!prop_key)
- {
- SetLastError(ERROR_INVALID_DATA);
- return FALSE;
- }
+ return ERROR_INVALID_DATA;
if (!prop_type || (!prop_buff && prop_buff_size))
- {
- SetLastError(ERROR_INVALID_USER_BUFFER);
- return FALSE;
- }
+ return ERROR_INVALID_USER_BUFFER;
if (flags)
- {
- SetLastError(ERROR_INVALID_FLAGS);
- return FALSE;
- }
+ return ERROR_INVALID_FLAGS;
SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11);
- swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid);
+ swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid);
ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey);
if (!ls)
@@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_
if (required_size)
*required_size = value_size;
+ return ls;
+}
+
+/***********************************************************************
+ * SetupDiGetDevicePropertyW (SETUPAPI.@)
+ */
+BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data,
+ const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff,
+ DWORD prop_buff_size, DWORD *required_size, DWORD flags)
+{
+ struct device *device;
+ LSTATUS ls;
+
+ TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size,
+ required_size, flags);
+
+ if (!(device = get_device(devinfo, device_data)))
+ return FALSE;
+
+ ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags);
+
SetLastError(ls);
return !ls;
}
+/***********************************************************************
+ * CM_Get_DevNode_Property_ExW (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type,
+ BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine)
+{
+ struct device *device = get_devnode_device(devnode);
+ LSTATUS ls;
+
+ TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size,
+ flags, machine);
+
+ if (machine)
+ return CR_MACHINE_UNAVAILABLE;
+
+ if (!device)
+ return CR_NO_SUCH_DEVINST;
+
+ if (!prop_buff_size)
+ return CR_INVALID_POINTER;
+
+ ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags);
+ switch (ls)
+ {
+ case NO_ERROR:
+ return CR_SUCCESS;
+ case ERROR_INVALID_DATA:
+ return CR_INVALID_DATA;
+ case ERROR_INVALID_USER_BUFFER:
+ return CR_INVALID_POINTER;
+ case ERROR_INVALID_FLAGS:
+ return CR_INVALID_FLAG;
+ case ERROR_INSUFFICIENT_BUFFER:
+ return CR_BUFFER_SMALL;
+ case ERROR_NOT_FOUND:
+ return CR_NO_SUCH_VALUE;
+ }
+ return CR_FAILURE;
+}
+
+/***********************************************************************
+ * CM_Get_DevNode_PropertyW (SETUPAPI.@)
+ */
+CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type,
+ PVOID buf, PULONG len, ULONG flags)
+{
+ return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL);
+}
+
/***********************************************************************
* SetupDiInstallDeviceInterfaces (SETUPAPI.@)
*/
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 8c4ebcc101..74c252c6fd 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -67,6 +67,8 @@
@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr)
@ stub CM_Get_Depth
@ stub CM_Get_Depth_Ex
+@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long)
+@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr)
@ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long)
@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long)
@ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr)
More information about the wine-cvs
mailing list