Re: [PATCH v4 3/3] mmdevapi: Warn if returned device name is too long.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, May 26, 2022 at 07:06:39PM +0300, Gabriel Ivăncescu wrote:
> Signed-off-by: Gabriel Ivăncescu
>
> dlls/mmdevapi/devenum.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
> index 1354bf3..053275c 100644
> --- a/dlls/mmdevapi/devenum.c
> +++ b/dlls/mmdevapi/devenum.c
> @@ -1378,6 +1378,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR
>  static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv)
>  {
>      MMDevPropStore *This = impl_from_IPropertyStore(iface);
> -
>
> HRESULT hres;
> TRACE("(%p)->("%s,%lu", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv);
>
> if (!key || !pv)
>
> @@ -1397,7 +1398,19 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY
>          return S_OK;
>      }
> - return MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv);
> - hres = MMDevice_GetPropValue(&This->parent->devguid, This->parent->flow, key, pv);
> - if (FAILED(hres))
> -
>    return hres;
> -
> - if (WARN_ON(mmdevapi))
> - {
> -
>    if ((IsEqualPropertyKey(*key, DEVPKEY_Device_FriendlyName) ||
> -
>         IsEqualPropertyKey(*key, DEVPKEY_DeviceInterface_FriendlyName) ||
> -
>         IsEqualPropertyKey(*key, DEVPKEY_Device_DeviceDesc)) &&
> -
>        pv->vt == VT_LPWSTR && wcslen(pv->pwszVal) > 62)
> -
>        WARN("Returned name exceeds length limit of some broken apps/libs, might crash: %s\n", debugstr_w(pv->pwszVal));
> - }
> - return hres;
>
> }
> static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv)
>
> 2.34.1