Re: [PATCH] devenum: Remove an unused impl_from_ helper

[Michael Stefaniuc]

Also wrong commit message, will resend.

bye
      michael

On 2018-08-04 22:36, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc
>
> dlls/devenum/createdevenum.c | 17 ++++++++---------
>  dlls/devenum/mediacatenum.c  |  4 ++--
>  2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/dlls/devenum/createdevenum.c 
> b/dlls/devenum/createdevenum.c
> index 4b2feca650..8fbf323971 100644
> --- a/dlls/devenum/createdevenum.c
> +++ b/dlls/devenum/createdevenum.c
> @@ -155,7 +155,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey,
> REGFILTERPINS2 *rgPin)
>      {
>          HKEY hkeyMajorType = NULL;
>          WCHAR wszMajorTypeName[64];
> -
>    DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR);
> -
>    DWORD cName = ARRAY_SIZE(wszMajorTypeName);
>    DWORD dwMinorTypes, i1;
>
>    if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName,
>
> NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
> @@ -175,7 +175,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey,
> REGFILTERPINS2 *rgPin)
>              CLSID *clsMajorType = NULL, *clsMinorType = NULL;
>              HRESULT hr;
> -
>        cName = sizeof(wszMinorTypeName) / sizeof(WCHAR);
> -
>        cName = ARRAY_SIZE(wszMinorTypeName);
>        if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName,
>
> &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;
>          clsMinorType = CoTaskMemAlloc(sizeof(CLSID));
>
> @@ -261,7 +261,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass,
> REGFILTER2 *rgf2)
>      {
>          HKEY hkeyPinKey = NULL;
>          WCHAR wszPinName[MAX_PATH];
> -
>    DWORD cName = sizeof(wszPinName) / sizeof(WCHAR);
> -
>    DWORD cName = ARRAY_SIZE(wszPinName);
>    REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2];
>    DWORD value, size, Type;
>    LONG lRet;
>
> @@ -408,7 +408,7 @@ static void register_legacy_filters(void)
>          for (i = 0; i < dwFilterSubkeys; i++)
>          {
>              WCHAR wszFilterSubkeyName[64];
> -
>        DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR);
> -
>        DWORD cName = ARRAY_SIZE(wszFilterSubkeyName);
>        IPropertyBag *prop_bag = NULL;
>        WCHAR wszRegKey[MAX_PATH];
>        HKEY classkey = NULL;
>
> @@ -944,7 +944,7 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const
> CLSID * clsidCategory)
>  strcpyW(wszRegKey, wszActiveMovieKey);
>
> - if (!StringFromGUID2(clsidCategory, wszRegKey +
>
> strlenW(wszRegKey), sizeof(wszRegKey)/sizeof(wszRegKey[0]) -
> strlenW(wszRegKey)))
> - if (!StringFromGUID2(clsidCategory, wszRegKey +
>
> strlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - strlenW(wszRegKey)))
>          res = E_INVALIDARG;
>  if (SUCCEEDED(res))
>
> @@ -1016,13 +1016,12 @@ static HRESULT register_codecs(void)
>              {
>                  WCHAR szDeviceName[32], szDeviceVersion[32], 
> szDevicePath[10];
> -
>            if (capGetDriverDescriptionW ((WORD) i,
> -
>                                          szDeviceName,
>
> sizeof(szDeviceName)/sizeof(WCHAR),
> -
>                                          szDeviceVersion,
>
> sizeof(szDeviceVersion)/sizeof(WCHAR)))
> -
>            if (capGetDriverDescriptionW (i, szDeviceName,
>
> ARRAY_SIZE(szDeviceName),
> -
>                                          szDeviceVersion,
>
> ARRAY_SIZE(szDeviceVersion)))
>                  {
>                      IMoniker * pMoniker = NULL;
>                      WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 
> };
> -
>                snprintfW(szDevicePath,
>
> sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i);
> -
>                snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath),
>
> dprintf, i);
>                      /* The above code prevents 1 device with a
> different ID overwriting another */
>                  rfp2.nMediaTypes = 1;
>
> diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
> index 660e81c145..5fa2f008dc 100644
> --- a/dlls/devenum/mediacatenum.c
> +++ b/dlls/devenum/mediacatenum.c
> @@ -889,7 +889,7 @@ static HRESULT WINAPI
> DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt,
>              StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1,
> CHARS_IN_GUID);
>          }
>          /* try DirectShow filters */
> -
>    else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index,
>
> buffer, sizeof(buffer)/sizeof(WCHAR))))
> -
>    else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index,
>
> buffer, ARRAY_SIZE(buffer))))
>          {
>              This->sw_index++;
>              if ((res = RegOpenKeyExW(This->sw_key, buffer, 0,
> KEY_QUERY_VALUE, &hkey)))
> @@ -908,7 +908,7 @@ static HRESULT WINAPI
> DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt,
>              strcpyW(pMoniker->name, buffer);
>          }
>          /* then try codecs */
> -
>    else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index,
>
> buffer, sizeof(buffer)/sizeof(WCHAR))))
> -
>    else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index,
>
> buffer, ARRAY_SIZE(buffer))))
>          {
>              This->cm_index++;