Juan Lang : setupapi: Add a device ID member to DeviceInfo.
Alexandre Julliard
julliard at winehq.org
Fri Oct 12 05:23:03 CDT 2007
Module: wine
Branch: master
Commit: 732b968b227b6bb490547d5e4424020ed3710ff5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=732b968b227b6bb490547d5e4424020ed3710ff5
Author: Juan Lang <juan.lang at gmail.com>
Date: Thu Oct 11 13:25:29 2007 -0700
setupapi: Add a device ID member to DeviceInfo.
---
dlls/setupapi/devinst.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index a25bc29..5d6d6ef 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -127,6 +127,7 @@ struct DeviceInfo
struct DeviceInfoSet *set;
HKEY key;
BOOL phantom;
+ DWORD devId;
LPWSTR instanceId;
struct list interfaces;
};
@@ -424,7 +425,7 @@ static HKEY SETUPDI_CreateDevKey(struct DeviceInfo *devInfo)
}
static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set,
- LPCWSTR instanceId, BOOL phantom)
+ DWORD devId, LPCWSTR instanceId, BOOL phantom)
{
struct DeviceInfo *devInfo = HeapAlloc(GetProcessHeap(), 0,
sizeof(struct DeviceInfo));
@@ -432,6 +433,7 @@ static struct DeviceInfo *SETUPDI_AllocateDeviceInfo(struct DeviceInfoSet *set,
if (devInfo)
{
devInfo->set = set;
+ devInfo->devId = devId;
devInfo->instanceId = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(instanceId) + 1) * sizeof(WCHAR));
if (devInfo->instanceId)
@@ -501,8 +503,8 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set,
SP_DEVINFO_DATA **dev)
{
BOOL ret = FALSE;
- struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, instanceId,
- phantom);
+ struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices,
+ instanceId, phantom);
TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst,
debugstr_w(instanceId), phantom);
More information about the wine-cvs
mailing list