Commit 1435b5ec authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

include: Make "long" numeric constants LP64/LLP64 proof (winuser.h).

parent 8f923e38
...@@ -302,12 +302,12 @@ todo_wine ...@@ -302,12 +302,12 @@ todo_wine
if (bThemeActive || style != WS_HSCROLL) if (bThemeActive || style != WS_HSCROLL)
todo_wine todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL),
"unexpected style change %8lx expected %8lx\n", "unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL);
else else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style ||
broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */
"unexpected style change %8lx expected %8x\n", "unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style); (winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
} }
/* do the test again with H and V reversed. /* do the test again with H and V reversed.
...@@ -341,12 +341,12 @@ todo_wine ...@@ -341,12 +341,12 @@ todo_wine
if (bThemeActive || style != WS_VSCROLL) if (bThemeActive || style != WS_VSCROLL)
todo_wine todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL),
"unexpected style change %8lx expected %8lx\n", "unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL);
else else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style || ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style ||
broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */ broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */
"unexpected style change %8lx expected %8x\n", "unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style); (winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
} }
/* Slightly change the test to use SetScrollInfo /* Slightly change the test to use SetScrollInfo
......
...@@ -3642,7 +3642,7 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM ...@@ -3642,7 +3642,7 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
ok(!(lpcs->dwExStyle & WS_EX_WINDOWEDGE), "Window shouldn't have WS_EX_WINDOWEDGE style\n"); ok(!(lpcs->dwExStyle & WS_EX_WINDOWEDGE), "Window shouldn't have WS_EX_WINDOWEDGE style\n");
ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE),
"Ex style (0x%08lx) should match what the caller passed to CreateWindowEx (0x%08lx)\n", "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n",
(lpss->styleOld & ~WS_EX_WINDOWEDGE), (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE)); (lpss->styleOld & ~WS_EX_WINDOWEDGE), (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE));
ok(lpss->styleNew == lpcs->style, ok(lpss->styleNew == lpcs->style,
......
...@@ -1085,7 +1085,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) ...@@ -1085,7 +1085,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
WS_MINIMIZEBOX | \ WS_MINIMIZEBOX | \
WS_MAXIMIZEBOX) WS_MAXIMIZEBOX)
if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); if(style & ~DUMPED_STYLES) TRACE(" %08x", style & ~DUMPED_STYLES);
TRACE("\n"); TRACE("\n");
#undef DUMPED_STYLES #undef DUMPED_STYLES
...@@ -1131,7 +1131,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) ...@@ -1131,7 +1131,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
WS_EX_LAYERED | \ WS_EX_LAYERED | \
WS_EX_LAYOUTRTL) WS_EX_LAYOUTRTL)
if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES);
TRACE("\n"); TRACE("\n");
#undef DUMPED_EX_STYLES #undef DUMPED_EX_STYLES
} }
......
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