PNP_GetDeviceList and PNP_GetDeviceListSize:
- Do not return CR_CALL_NOT_IMPLEMENTED by default.
- pulLength is counted in characters, not in bytes!
- Use the correct Relations value for PowerRelations.
[NDK]
Add the PowerRelations value to a comment.
[DEVMGR]
CM_Get_Device_ID_List_Size_ExW and CM_Get_Device_ID_List_ExW count the buffer length in characters, not in bytes!
svn path=/trunk/; revision=73796
DWORD ulFlags)
{
PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData;
DWORD ulFlags)
{
PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData;
- CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED;
+ CONFIGRET ret = CR_SUCCESS;
NTSTATUS Status;
DPRINT("PNP_GetDeviceList() called\n");
NTSTATUS Status;
DPRINT("PNP_GetDeviceList() called\n");
return CR_INVALID_POINTER;
// if (Buffer == NULL)
return CR_INVALID_POINTER;
// if (Buffer == NULL)
-// return
-
- *pulLength = 0;
+// return CR_INVALID_POINTER;
if (ulFlags &
(CM_GETIDLIST_FILTER_BUSRELATIONS |
if (ulFlags &
(CM_GETIDLIST_FILTER_BUSRELATIONS |
}
else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS)
{
- /* FIXME */
- PlugPlayData.Relations = 0;
+ PlugPlayData.Relations = 2;
}
else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS)
{
PlugPlayData.Relations = 0;
}
PlugPlayData.Relations = 0;
}
- PlugPlayData.BufferSize = *pulLength;
+ PlugPlayData.BufferSize = *pulLength * sizeof(WCHAR);
PlugPlayData.Buffer = Buffer;
Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations,
PlugPlayData.Buffer = Buffer;
Status = NtPlugPlayControl(PlugPlayControlQueryDeviceRelations,
sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA));
if (NT_SUCCESS(Status))
{
sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA));
if (NT_SUCCESS(Status))
{
- *pulLength = PlugPlayData.BufferSize;
+ *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR);
}
else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE)
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
}
else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR)
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
}
else /* CM_GETIDLIST_FILTER_NONE */
{
}
else /* CM_GETIDLIST_FILTER_NONE */
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
DWORD ulFlags)
{
PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData;
DWORD ulFlags)
{
PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA PlugPlayData;
- CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED;
+ CONFIGRET ret = CR_SUCCESS;
NTSTATUS Status;
DPRINT("PNP_GetDeviceListSize() called\n");
NTSTATUS Status;
DPRINT("PNP_GetDeviceListSize() called\n");
}
else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_POWERRELATIONS)
{
- /* FIXME */
- PlugPlayData.Relations = 0;
+ PlugPlayData.Relations = 2;
}
else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_REMOVALRELATIONS)
{
sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA));
if (NT_SUCCESS(Status))
{
sizeof(PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA));
if (NT_SUCCESS(Status))
{
- *pulLength = PlugPlayData.BufferSize;
+ *pulLength = PlugPlayData.BufferSize / sizeof(WCHAR);
}
else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_SERVICE)
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
}
else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR)
{
}
else if (ulFlags & CM_GETIDLIST_FILTER_ENUMERATOR)
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
}
else /* CM_GETIDLIST_FILTER_NONE */
{
}
else /* CM_GETIDLIST_FILTER_NONE */
{
+ ret = CR_CALL_NOT_IMPLEMENTED;
*pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0;
if (hKey != NULL)
*pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0;
if (hKey != NULL)
ULONG ulLength = 0;
LPWSTR pszBuffer = NULL, pszStr;
INT index = 0, len;
ULONG ulLength = 0;
LPWSTR pszBuffer = NULL, pszStr;
INT index = 0, len;
CONFIGRET ret;
ret = CM_Get_Device_ID_List_Size_ExW(&ulLength,
CONFIGRET ret;
ret = CM_Get_Device_ID_List_Size_ExW(&ulLength,
pszBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
pszBuffer = (LPWSTR)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
+ ulLength * sizeof(WCHAR));
if (pszBuffer == NULL)
return;
if (pszBuffer == NULL)
return;
typedef struct _PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA
{
UNICODE_STRING DeviceInstance;
typedef struct _PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA
{
UNICODE_STRING DeviceInstance;
- ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 3:BusRelations
+ ULONG Relations; // 0:EjectRelations, 1:RemovalRelations, 2:PowerRelations, 3:BusRelations
ULONG BufferSize;
PWCHAR Buffer;
} PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA;
ULONG BufferSize;
PWCHAR Buffer;
} PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA;