comctl32: Make parameters of expect_band_content() match the corresponding types of REBARBANDINFO and fix one format string.

This commit is contained in:
Gerald Pfeifer 2007-11-01 15:52:21 +01:00 committed by Alexandre Julliard
parent ff307d96c1
commit aac8194c74
1 changed files with 5 additions and 5 deletions

View File

@ -693,11 +693,11 @@ static void resize_test(void)
} }
} }
static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore,
COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild,
UINT cxMinChild, UINT cyMinChild, UINT cx, HBITMAP hbmBack, UINT wID, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID,
UINT cyChild, UINT cyMaxChild, UINT cyIntegral, UINT cxIdeal, LPARAM lParam, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam,
UINT cxHeader) INT cxHeader)
{ {
CHAR buf[MAX_PATH] = "abc"; CHAR buf[MAX_PATH] = "abc";
REBARBANDINFO rb; REBARBANDINFO rb;
@ -712,7 +712,7 @@ static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore,
ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n");
expect_eq(rb.fStyle, fStyle, int, "%x"); expect_eq(rb.fStyle, fStyle, int, "%x");
todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x");
todo_wine expect_eq(rb.clrBack, clrBack, int, "%x"); todo_wine expect_eq(rb.clrBack, clrBack, unsigned, "%x");
expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d");
expect_eq(rb.iImage, iImage, int, "%x"); expect_eq(rb.iImage, iImage, int, "%x");
expect_eq(rb.hwndChild, hwndChild, HWND, "%p"); expect_eq(rb.hwndChild, hwndChild, HWND, "%p");