0);
if (hKey != INVALID_HANDLE_VALUE)
{
- Size = DISPLAY_NAME_LEN;
Type = REG_SZ;
// Lookup the class description (win7+)
+ Size = sizeof(m_DisplayName);
Success = RegQueryValueExW(hKey,
L"ClassDesc",
NULL,
if (m_DisplayName[0] == L'@')
{
// The description is located in a module resource
- Success = ConvertResourceDescriptorToString(m_DisplayName, DISPLAY_NAME_LEN);
+ Success = ConvertResourceDescriptorToString(m_DisplayName, sizeof(m_DisplayName));
}
}
else if (Success == ERROR_FILE_NOT_FOUND)
{
// WinXP stores the description in the default value
+ Size = sizeof(m_DisplayName);
Success = RegQueryValueExW(hKey,
NULL,
NULL,
if (Success != ERROR_SUCCESS)
{
// Use the class name as the description
- RequiredSize = DISPLAY_NAME_LEN;
+ RequiredSize = _countof(m_DisplayName);
(VOID)SetupDiClassNameFromGuidW(&m_ClassGuid,
m_DisplayName,
RequiredSize,
&m_ClassImage);
// Get the description for the device
- ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR);
+ ulLength = sizeof(m_DisplayName);
cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst,
CM_DRP_FRIENDLYNAME,
NULL,
0);
if (cr != CR_SUCCESS)
{
- ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR);
+ ulLength = sizeof(m_DisplayName);
cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst,
CM_DRP_DEVICEDESC,
NULL,
m_DeviceId = Node.m_DeviceId;
m_ClassImage = Node.m_ClassImage;
- StringCbCopyW(m_DisplayName, DISPLAY_NAME_LEN, Node.m_DisplayName);
+ StringCbCopyW(m_DisplayName, sizeof(m_DisplayName), Node.m_DisplayName);
CopyMemory(&m_ClassGuid, &Node.m_ClassGuid, sizeof(GUID));
}
}
// The root name is the computer name
- DWORD Size = DISPLAY_NAME_LEN;
+ DWORD Size = _countof(m_DisplayName);
GetComputerNameW(m_DisplayName, &Size);
return true;