[PATCH 4/7] gdi32: Support passing an array of chars to NtGdiGetCharWidthW.

Huw Davies huw at codeweavers.com
Thu Aug 26 07:47:07 CDT 2021


On Thu, Aug 26, 2021 at 12:09:38PM +0200, Jacek Caban wrote:
> 
> And use it for GetCharWidthA.
> 
> Signed-off-by: Jacek Caban <jacek at codeweavers.com>
> ---
>  dlls/gdi32/driver.c       |  3 ++-
>  dlls/gdi32/font.c         | 29 ++++++++++++++++-------------
>  dlls/gdi32/text.c         | 38 ++++++++++++--------------------------
>  dlls/wineps.drv/builtin.c | 24 +++++++++++++-----------
>  dlls/wineps.drv/psdrv.h   |  2 +-
>  include/wine/gdi_driver.h |  4 ++--
>  6 files changed, 46 insertions(+), 54 deletions(-)
> 
> 

> diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
> index f370d088585..5c09679b754 100644
> --- a/dlls/gdi32/driver.c
> +++ b/dlls/gdi32/driver.c
> @@ -380,7 +380,8 @@ static BOOL CDECL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count
>      return FALSE;
>  }
>  
> -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer )
> +static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last,
> +                                        const WCHAR *chars, INT *buffer )

Just for consistency, I've changed the third parameter's name to
"count" and sent in v2.

Huw.



More information about the wine-devel mailing list