Signed-off-by: Eric Pouech eric.pouech@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"); } else skip("RB_GETCOLORSCHEME not supported\n"); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 5de96c19f03..64313218e31 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -370,7 +370,7 @@ static void test_status_control(void) crColor = SendMessageA(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); ok(crColor == CLR_DEFAULT || broken(crColor == RGB(0,0,0)), /* win95 */ - "Expected 0x%.8x, got 0x%.8x\n", CLR_DEFAULT, crColor); + "Expected 0x%.8lx, got 0x%.8x\n", CLR_DEFAULT, crColor); crColor = SendMessageA(hWndStatus, SB_SETBKCOLOR , 0, CLR_DEFAULT); ok(crColor == RGB(255,0,0) || broken(crColor == RGB(0,0,0)), /* win95 */ diff --git a/include/commctrl.h b/include/commctrl.h index 944a9158371..1b51203b00b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -476,8 +476,8 @@ typedef struct struct _IMAGELIST; typedef struct _IMAGELIST *HIMAGELIST;
-#define CLR_NONE 0xFFFFFFFF -#define CLR_DEFAULT 0xFF000000 +#define CLR_NONE 0xFFFFFFFFL +#define CLR_DEFAULT 0xFF000000L #define CLR_HILIGHT CLR_DEFAULT
#define ILC_MASK 0x00000001