[PATCH] wineps: Use void* instead of typeof

Huw Davies huw at codeweavers.com
Mon Oct 18 02:41:30 CDT 2021


On Sun, Oct 17, 2021 at 11:35:39PM -0600, Alex Henrie wrote:
> MSVC does not support typeof, and void* is cleaner anyway.
> 
> Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
> ---
>  dlls/wineps.drv/download.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c
> index dc77cf11703..8374610c644 100644
> --- a/dlls/wineps.drv/download.c
> +++ b/dlls/wineps.drv/download.c
> @@ -78,7 +78,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str
>              GetFontData(dev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size);
>              count = GET_BE_WORD(name + 2);
>              strings = name + GET_BE_WORD(name + 4);
> -            name_record = (typeof(name_record))(name + 6);
> +            name_record = (void*)(name + 6);
>              for(i = 0; i < count; i++, name_record++)
>              {
>                  name_record->platform_id = GET_BE_WORD(&name_record->platform_id);
> @@ -703,7 +703,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name)
>      size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size);
>      if(size < sizeof(*post_header) || size == GDI_ERROR)
>          goto cleanup;
> -    post_header = (typeof(post_header))(post);
> +    post_header = (void*)post;
>      /* note: only interested in the format for obtaining glyph names */
>      post_header->format = GET_BE_DWORD(&post_header->format);

Thanks.  I've sent in a patch achieving this in a rather different fashion.

Huw.



More information about the wine-devel mailing list