Skip to content

W
wine-cw
Commit 83cb24f9 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

user32/tests: Fix some pointer conversion warnings on 64-bit.

parent fb640601
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/user32/tests/menu.c
View file @ 83cb24f9
...@@ -571,7 +571,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, ...@@ -571,7 +571,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt,
4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0) 4 + (mnuopt != 1 ? GetSystemMetrics(SM_CXMENUCHECK) : 0)
: 0) + : 0) +
arrowwidth + MOD_avec + (hbmp ? 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) + : 0) +
(text && hastab ? /* TAB space */ (text && hastab ? /* TAB space */
MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) + MOD_avec + ( hastab==2 ? sc_size.cx : 0) : 0) +
...@@ -588,7 +588,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, ...@@ -588,7 +588,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt,
expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0), expect = max( ( !(text || hbmp) ? GetSystemMetrics( SM_CYMENUSIZE)/2 : 0),
max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0), max( (text ? max( 2 + size.cy, MOD_hic + 4) : 0),
(hbmp ? (hbmp ?
((int)hbmp<0||(int)hbmp>12 ? ((INT_PTR)hbmp<0||(INT_PTR)hbmp>12 ?
bmpsize.cy + 2 bmpsize.cy + 2
: GetSystemMetrics( SM_CYMENUSIZE) + 2) : GetSystemMetrics( SM_CYMENUSIZE) + 2)
: 0))); : 0)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment