Module: wine Branch: master Commit: 83cb24f9b43fd0ccc08da8c7227e5eb4c5b0f92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cb24f9b43fd0ccc08da8c722...
Author: Alexandre Julliard julliard@winehq.org Date: Thu May 28 15:24:31 2009 +0200
user32/tests: Fix some pointer conversion warnings on 64-bit.
---
dlls/user32/tests/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 75059ea..0948f69 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -571,7 +571,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) : 0) + arrowwidth + MOD_avec + (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cx + 2 : GetSystemMetrics( SM_CXMENUSIZE) + 2) : 0) + (text && hastab ? /* TAB space */ MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + @@ -588,7 +588,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), (hbmp ? - ((int)hbmp<0||(int)hbmp>12 ? + ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ? bmpsize.cy + 2 : GetSystemMetrics( SM_CYMENUSIZE) + 2) : 0)));