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

Alexandre Julliard julliard at winehq.org
Fri Nov 2 08:10:17 CDT 2007


Module: wine
Branch: master
Commit: aac8194c74f31883d77ef995a527e01eaf3165bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aac8194c74f31883d77ef995a527e01eaf3165bf

Author: Gerald Pfeifer <gerald at pfeifer.com>
Date:   Thu Nov  1 15:52:21 2007 +0100

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

---

 dlls/comctl32/tests/rebar.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 3d8bd70..79da16e 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -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,
-    UINT cxMinChild, UINT cyMinChild, UINT cx, HBITMAP hbmBack, UINT wID,
-    UINT cyChild, UINT cyMaxChild, UINT cyIntegral, UINT cxIdeal, LPARAM lParam,
-    UINT cxHeader)
+    INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID,
+    INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam,
+    INT cxHeader)
 {
     CHAR buf[MAX_PATH] = "abc";
     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");
     expect_eq(rb.fStyle, fStyle, int, "%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(rb.iImage, iImage, int, "%x");
     expect_eq(rb.hwndChild, hwndChild, HWND, "%p");




More information about the wine-cvs mailing list