Re: comctl32/tests: Add casts to avoid comparison of different int types. [take 2]

[Alexandre Julliard]

Gerald Pfeifer <gerald(a)pfeifer.com> writes:
> This is the first hunk of a patch a few days ago; testbot.winehq.org
> thinks it's fine:  https://testbot.winehq.org/JobDetails.pl?Key=9291

You don't need casts. If the variable has the wrong type you can change
that.

-- 
Alexandre Julliard
julliard(a)winehq.org

comctl32/tests: Add casts to avoid comparison of different int types. [take 2]

[Gerald Pfeifer]

On Wed, 16 Feb 2011, Alexandre Julliard wrote:
> > This is the first hunk of a patch a few days ago; testbot.winehq.org
> > thinks it's fine:  https://testbot.winehq.org/JobDetails.pl?Key=9291
> > You don't need casts. If the variable has the wrong type you can change
> > that.

At first I didn't realize what you had in mind, but now I believe the
patch below does this. :-)

Gerald


ChangeLog:
comctl32/tests: Rewrite a test in test_TCS_OWNERDRAWFIXED to avoid a type mismatch or cast.

---
 dlls/comctl32/tests/tab.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 8b64764..7f5bbb7 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -1313,6 +1313,7 @@ static void test_TCM_SETITEMEXTRA(void)
 static void test_TCS_OWNERDRAWFIXED(void)
 {
     LPARAM lparam, lparam2;
+    ULONG_PTR itemdata;
     TCITEMA item;
     HWND hTab;
     BOOL ret;
@@ -1335,9 +1336,9 @@ static void test_TCS_OWNERDRAWFIXED(void)
     ShowWindow(hTab, SW_SHOW);
     RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW);
 
-    lparam = 0;
-    memset(&lparam, 0xde, 4);
-    ok(g_drawitem.itemData == lparam, "got %lx, expected %lx\n", g_drawitem.itemData, lparam);
+    itemdata = 0;
+    memset(&itemdata, 0xde, 4);
+    ok(g_drawitem.itemData == itemdata, "got %lx, expected %lx\n", g_drawitem.itemData, itemdata);
 
     DestroyWindow(hTab);
 
-- 
1.7.4.1