[UMPNPMGR] Simplify PNP_GetDeviceRegProp

This commit is contained in:
Eric Kohl 2018-08-20 00:55:03 +02:00
parent 91fab9e53b
commit 934104d73f

View file

@ -782,7 +782,7 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_PHYSICAL_DEVICE_OBJECT_NAME;
break; break;
case CM_DRP_CAPABILITIES: case CM_DRP_CAPABILITIES:
@ -790,7 +790,7 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_UI_NUMBER: case CM_DRP_UI_NUMBER:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_UI_NUMBER;
break; break;
case CM_DRP_UPPERFILTERS: case CM_DRP_UPPERFILTERS:
@ -802,19 +802,19 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_BUSTYPEGUID: case CM_DRP_BUSTYPEGUID:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_BUSTYPEGUID;
break; break;
case CM_DRP_LEGACYBUSTYPE: case CM_DRP_LEGACYBUSTYPE:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_LEGACYBUSTYPE;
break; break;
case CM_DRP_BUSNUMBER: case CM_DRP_BUSNUMBER:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_BUSNUMBER;
break; break;
case CM_DRP_ENUMERATOR_NAME: case CM_DRP_ENUMERATOR_NAME:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_ENUMERATOR_NAME;
break; break;
case CM_DRP_SECURITY: case CM_DRP_SECURITY:
@ -834,7 +834,7 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_ADDRESS: case CM_DRP_ADDRESS:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_ADDRESS;
break; break;
case CM_DRP_UI_NUMBER_DESC_FORMAT: case CM_DRP_UI_NUMBER_DESC_FORMAT:
@ -842,15 +842,15 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_DEVICE_POWER_DATA: case CM_DRP_DEVICE_POWER_DATA:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_POWER_DATA;
break; break;
case CM_DRP_REMOVAL_POLICY: case CM_DRP_REMOVAL_POLICY:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY;
break; break;
case CM_DRP_REMOVAL_POLICY_HW_DEFAULT: case CM_DRP_REMOVAL_POLICY_HW_DEFAULT:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT;
break; break;
case CM_DRP_REMOVAL_POLICY_OVERRIDE: case CM_DRP_REMOVAL_POLICY_OVERRIDE:
@ -858,18 +858,18 @@ PNP_GetDeviceRegProp(
break; break;
case CM_DRP_INSTALL_STATE: case CM_DRP_INSTALL_STATE:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_INSTALL_STATE;
break; break;
#if (WINVER >= _WIN32_WINNT_WS03) #if (WINVER >= _WIN32_WINNT_WS03)
case CM_DRP_LOCATION_PATHS: case CM_DRP_LOCATION_PATHS:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_LOCATION_PATHS;
break; break;
#endif #endif
#if (WINVER >= _WIN32_WINNT_WIN7) #if (WINVER >= _WIN32_WINNT_WIN7)
case CM_DRP_BASE_CONTAINERID: case CM_DRP_BASE_CONTAINERID:
lpValueName = NULL; PlugPlayData.Property = PNP_PROPERTY_CONTAINERID;
break; break;
#endif #endif
@ -923,68 +923,6 @@ PNP_GetDeviceRegProp(
PlugPlayData.Buffer = Buffer; PlugPlayData.Buffer = Buffer;
PlugPlayData.BufferSize = *pulLength; PlugPlayData.BufferSize = *pulLength;
switch (ulProperty)
{
case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME:
PlugPlayData.Property = PNP_PROPERTY_PHYSICAL_DEVICE_OBJECT_NAME;
break;
case CM_DRP_UI_NUMBER:
PlugPlayData.Property = PNP_PROPERTY_UI_NUMBER;
break;
case CM_DRP_BUSTYPEGUID:
PlugPlayData.Property = PNP_PROPERTY_BUSTYPEGUID;
break;
case CM_DRP_LEGACYBUSTYPE:
PlugPlayData.Property = PNP_PROPERTY_LEGACYBUSTYPE;
break;
case CM_DRP_BUSNUMBER:
PlugPlayData.Property = PNP_PROPERTY_BUSNUMBER;
break;
case CM_DRP_ENUMERATOR_NAME:
PlugPlayData.Property = PNP_PROPERTY_ENUMERATOR_NAME;
break;
case CM_DRP_ADDRESS:
PlugPlayData.Property = PNP_PROPERTY_ADDRESS;
break;
case CM_DRP_DEVICE_POWER_DATA:
PlugPlayData.Property = PNP_PROPERTY_POWER_DATA;
break;
case CM_DRP_REMOVAL_POLICY:
PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY;
break;
case CM_DRP_REMOVAL_POLICY_HW_DEFAULT:
PlugPlayData.Property = PNP_PROPERTY_REMOVAL_POLICY_HARDWARE_DEFAULT;
break;
case CM_DRP_INSTALL_STATE:
PlugPlayData.Property = PNP_PROPERTY_INSTALL_STATE;
break;
#if (WINVER >= _WIN32_WINNT_WS03)
case CM_DRP_LOCATION_PATHS:
PlugPlayData.Property = PNP_PROPERTY_LOCATION_PATHS;
break;
#endif
#if (WINVER >= _WIN32_WINNT_WIN7)
case CM_DRP_BASE_CONTAINERID:
PlugPlayData.Property = PNP_PROPERTY_CONTAINERID;
break;
#endif
default:
return CR_INVALID_PROPERTY;
}
Status = NtPlugPlayControl(PlugPlayControlProperty, Status = NtPlugPlayControl(PlugPlayControlProperty,
(PVOID)&PlugPlayData, (PVOID)&PlugPlayData,
sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)); sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA));
@ -999,7 +937,6 @@ PNP_GetDeviceRegProp(
} }
done: done:
if (pulTransferLen) if (pulTransferLen)
*pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0; *pulTransferLen = (ret == CR_SUCCESS) ? *pulLength : 0;