system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

user32: Fix some printf format warnings.

Browse source
This commit is contained in:
Alexandre Julliard 2012-01-17 14:59:19 +01:00
parent 51bba9ee07
commit 03820a527b
4 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/user32/menu.c
View file

@ -2111,7 +2111,7 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
(INT_PTR)menu->items[pos - 1].hbmpItem <= (INT_PTR)HBMMENU_MBAR_CLOSE_D)
pos--;
TRACE("inserting at %u by pos %u\n", pos, flags & MF_BYPOSITION);
TRACE("inserting at %u flags %x\n", pos, flags);
/* Create new items array */

8
dlls/user32/tests/edit.c
View file

@ -1736,7 +1736,7 @@ static void test_espassword(void)
hwEdit = create_editcontrol(ES_PASSWORD, 0);
r = get_edit_style(hwEdit);
ok(r == ES_PASSWORD, "Wrong style expected 0x%x got: 0x%x\n", ES_PASSWORD, r);
ok(r == ES_PASSWORD, "Wrong style expected ES_PASSWORD got: 0x%x\n", r);
/* set text */
r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) password);
ok(r == TRUE, "Expected: %d, got: %d\n", TRUE, r);
@ -1840,7 +1840,7 @@ static void test_enter(void)
/* multiline */
hwEdit = create_editcontrol(ES_MULTILINE, 0);
r = get_edit_style(hwEdit);
ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r);
ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r);
/* set text */
r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) "");
@ -1880,7 +1880,7 @@ static void test_enter(void)
/* single line with ES_WANTRETURN */
hwEdit = create_editcontrol(ES_WANTRETURN, 0);
r = get_edit_style(hwEdit);
ok(ES_WANTRETURN == r, "Wrong style expected 0x%x got: 0x%x\n", ES_WANTRETURN, r);
ok(ES_WANTRETURN == r, "Wrong style expected ES_WANTRETURN got: 0x%x\n", r);
/* set text */
r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) "");
@ -1907,7 +1907,7 @@ static void test_tab(void)
/* multiline */
hwEdit = create_editcontrol(ES_MULTILINE, 0);
r = get_edit_style(hwEdit);
ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r);
ok(ES_MULTILINE == r, "Wrong style expected ES_MULTILINE got: 0x%x\n", r);
/* set text */
r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) "");

18
dlls/user32/tests/scroll.c
View file

@ -302,13 +302,10 @@ todo_wine
if (bThemeActive || style != WS_HSCROLL)
todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL),
"unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL);
"unexpected style change %08x/%08x\n", winstyle, style);
else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style ||
broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */
"unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style,
"unexpected style change %08x/%08x\n", winstyle, style);
}
/* do the test again with H and V reversed.
* Start with a clean window */
@ -341,13 +338,10 @@ todo_wine
if (bThemeActive || style != WS_VSCROLL)
todo_wine
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL),
"unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL);
"unexpected style change %08x/%08x\n", winstyle, style);
else
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style ||
broken((winstyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL)), /* Win 9x/ME */
"unexpected style change %08x expected %08x\n",
(winstyle & (WS_HSCROLL|WS_VSCROLL)), style);
ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style,
"unexpected style change %08x/%08x\n", winstyle, style);
}
/* Slightly change the test to use SetScrollInfo
* Start with a clean window */

8
dlls/user32/win.c
View file

@ -1066,7 +1066,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
/* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */
#define DUMPED_STYLES \
(WS_POPUP | \
((DWORD)(WS_POPUP | \
WS_CHILD | \
WS_MINIMIZE | \
WS_VISIBLE | \
@ -1083,7 +1083,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
WS_GROUP | \
WS_TABSTOP | \
WS_MINIMIZEBOX | \
WS_MAXIMIZEBOX)
WS_MAXIMIZEBOX))
if(style & ~DUMPED_STYLES) TRACE(" %08x", style & ~DUMPED_STYLES);
TRACE("\n");
@ -1111,7 +1111,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
if(exstyle & WS_EX_LAYOUTRTL) TRACE(" WS_EX_LAYOUTRTL");
#define DUMPED_EX_STYLES \
(WS_EX_DLGMODALFRAME | \
((DWORD)(WS_EX_DLGMODALFRAME | \
WS_EX_DRAGDETECT | \
WS_EX_NOPARENTNOTIFY | \
WS_EX_TOPMOST | \
@ -1129,7 +1129,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle )
WS_EX_STATICEDGE | \
WS_EX_APPWINDOW | \
WS_EX_LAYERED | \
WS_EX_LAYOUTRTL)
WS_EX_LAYOUTRTL))
if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES);
TRACE("\n");