[PATCH v2] comctl32/datetime: Change DATETIME_ReturnFieldWidth() to return width.

[Zhiyi Zhang]

Supersede 143620

This avoids a clang warning of uninitialized value usage.
Also removes redundant argument check and not useful trace.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
  dlls/comctl32/datetime.c | 22 ++++++----------------
  1 file changed, 6 insertions(+), 16 deletions(-)

[Huw Davies]

On Sat, Mar 24, 2018 at 12:17:50PM +0800, Zhiyi Zhang wrote:
> @@ -752,7 +744,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc)
>          for (i = 0; i < infoPtr->nrFields; i++) {
>              DATETIME_ReturnTxt (infoPtr, i, txt, ARRAY_SIZE(txt));
>              GetTextExtentPoint32W (hdc, txt, strlenW(txt), &size);
> -            DATETIME_ReturnFieldWidth (infoPtr, hdc, i, &fieldWidth);
> +            fieldWidth = DATETIME_ReturnFieldWidth (infoPtr, hdc, i);
>              field = &infoPtr->fieldRect[i];
>              field->left   = prevright;
>              field->right  = prevright + fieldWidth;

You could eliminate 'fieldWidth' entirely rather like you do below
with 'width'.

While you're at it, you could rename DATETIME_ReturnFieldWidth() to
DATETIME_GetFieldWidth().
> @@ -1458,7 +1450,6 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
>  {
>      SIZE field_size;
>      RECT rect;
> -    SHORT width;
>      WCHAR txt[80];
>      HDC hdc;
>      HFONT oldFont;
> @@ -1477,8 +1468,7 @@ static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size)
>      /* Get text font width */
>      for (i = 0; i < infoPtr->nrFields; i++)
>      {
> -        DATETIME_ReturnFieldWidth(infoPtr, hdc, i, &width);
> -        size->cx += width;
> +        size->cx += DATETIME_ReturnFieldWidth(infoPtr, hdc, i);
>      }
>
> SelectObject(hdc, oldFont);