Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 14:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- read ClassGUID from the registry instead of sending GUID_NULL

Browse source 
- fixes part of SetupDiOpenDeviceInfo which now allows loading of icons in the devmgr.dll property sheets

svn path=/trunk/; revision=28855
This commit is contained in:
Ged Murphy 2007-09-04 20:18:39 +00:00
parent a1de0509ed
commit 8f7e520058
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/dll/win32/setupapi/devinst.c
View file

@ -2710,7 +2710,7 @@ SetupDiOpenDeviceInfoW(
{ {
struct DeviceInfoSet *list; struct DeviceInfoSet *list;
HKEY hEnumKey, hKey = NULL; HKEY hEnumKey, hKey = NULL;
DWORD rc; DWORD rc, dwSize;
BOOL ret = FALSE; BOOL ret = FALSE;
TRACE("%p %s %p %lx %p\n", TRACE("%p %s %p %lx %p\n",
@ -2738,7 +2738,7 @@ SetupDiOpenDeviceInfoW(
struct DeviceInfoElement *deviceInfo = NULL; struct DeviceInfoElement *deviceInfo = NULL;
/* Search if device already exists in DeviceInfoSet. /* Search if device already exists in DeviceInfoSet.
* If yes, return the existing element * If yes, return the existing element
* If no, create a new element using informations in registry * If no, create a new element using information in registry
*/ */
PLIST_ENTRY ItemList = list->ListHead.Flink; PLIST_ENTRY ItemList = list->ListHead.Flink;
while (ItemList != &list->ListHead) while (ItemList != &list->ListHead)
@ -2757,6 +2757,9 @@ SetupDiOpenDeviceInfoW(
} }
else else
{ {
GUID ClassGUID;
WCHAR szClassGuid[MAX_GUID_STRING_LEN];
/* Open supposed registry key */ /* Open supposed registry key */
rc = RegOpenKeyExW( rc = RegOpenKeyExW(
list->HKLM, list->HKLM,
@ -2784,11 +2787,24 @@ SetupDiOpenDeviceInfoW(
goto cleanup; goto cleanup;
} }
/* FIXME: try to get ClassGUID from registry, instead of dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR);
* sending GUID_NULL to CreateDeviceInfoElement if (RegQueryValueExW(hKey,
*/ REGSTR_VAL_CLASSGUID,
if (!CreateDeviceInfoElement(list, DeviceInstanceId, &GUID_NULL, &deviceInfo)) NULL,
NULL,
(LPBYTE)szClassGuid,
&dwSize) == ERROR_SUCCESS)
{
szClassGuid[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL;
/* Convert a string to a ClassGuid */
if (UuidFromStringW(&szClassGuid[1], &ClassGUID) != RPC_S_OK)
ClassGUID = GUID_NULL;
}
if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo))
goto cleanup; goto cleanup;
InsertTailList(&list->ListHead, &deviceInfo->ListEntry); InsertTailList(&list->ListHead, &deviceInfo->ListEntry);
ret = TRUE; ret = TRUE;