[PATCH 04/31] include/commctrl.h: fix definition of CLR_* macros

Nikolay Sivov nsivov at codeweavers.com
Thu Feb 24 04:31:10 CST 2022



On 2/24/22 13:26, Eric Pouech wrote:
> Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
>
> ---
>   dlls/comctl32/tests/rebar.c  |    8 ++++----
>   dlls/comctl32/tests/status.c |    2 +-
>   include/commctrl.h           |    4 ++--
>   3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
> index e868198b4d8..8f51a1f9175 100644
> --- a/dlls/comctl32/tests/rebar.c
> +++ b/dlls/comctl32/tests/rebar.c
> @@ -1029,9 +1029,9 @@ static void test_colors(void)
>   
>       /* test default colors */
>       clr = SendMessageA(hRebar, RB_GETTEXTCOLOR, 0, 0);
> -    compare(clr, CLR_NONE, "%x");
> +    compare(clr, (COLORREF)CLR_NONE, "%x");
>       clr = SendMessageA(hRebar, RB_GETBKCOLOR, 0, 0);
> -    compare(clr, CLR_NONE, "%x");
> +    compare(clr, (COLORREF)CLR_NONE, "%x");
>   
>       scheme.dwSize = sizeof(scheme);
>       scheme.clrBtnHighlight = 0;
> @@ -1039,8 +1039,8 @@ static void test_colors(void)
>       ret = SendMessageA(hRebar, RB_GETCOLORSCHEME, 0, (LPARAM)&scheme);
>       if (ret)
>       {
> -        compare(scheme.clrBtnHighlight, CLR_DEFAULT, "%x");
> -        compare(scheme.clrBtnShadow, CLR_DEFAULT, "%x");
> +        compare(scheme.clrBtnHighlight, (COLORREF)CLR_DEFAULT, "%x");
> +        compare(scheme.clrBtnShadow, (COLORREF)CLR_DEFAULT, "%x");
>       }
Let's get rid of macros instead, and use explicit ok() with equality check.




More information about the wine-devel mailing list