wine: Switch to using 'long' for INT_PTR type for 64-bit
compatibility
Dmitry Timoshkov
dmitry at codeweavers.com
Thu May 24 09:41:17 CDT 2007
Hello,
as discussed with Alexandre this is the best way to achieve better
compatibility with compilation in 64-bit mode.
Changelog:
wine: Switch to using 'long' for INT_PTR type for 64-bit compatibility.
---
dlls/cabinet/fdi.c | 6 ++--
dlls/comctl32/animate.c | 6 ++--
dlls/comctl32/comboex.c | 8 ++--
dlls/comctl32/commctrl.c | 16 +++++-----
dlls/comctl32/datetime.c | 6 ++--
dlls/comctl32/flatsb.c | 6 ++--
dlls/comctl32/header.c | 4 +-
dlls/comctl32/hotkey.c | 4 +-
dlls/comctl32/ipaddress.c | 6 ++--
dlls/comctl32/listview.c | 8 ++--
dlls/comctl32/monthcal.c | 16 +++++-----
dlls/comctl32/nativefont.c | 4 +-
dlls/comctl32/pager.c | 2 +-
dlls/comctl32/progress.c | 4 +-
dlls/comctl32/propsheet.c | 2 +-
dlls/comctl32/rebar.c | 14 ++++----
dlls/comctl32/status.c | 4 +-
dlls/comctl32/syslink.c | 4 +-
dlls/comctl32/tab.c | 6 ++--
dlls/comctl32/tests/datetime.c | 2 +-
dlls/comctl32/tests/header.c | 4 +-
dlls/comctl32/tests/listview.c | 6 ++--
dlls/comctl32/tests/monthcal.c | 4 +-
dlls/comctl32/tests/mru.c | 10 +++---
dlls/comctl32/tests/msg.c | 4 +-
dlls/comctl32/tests/subclass.c | 2 +-
dlls/comctl32/tests/tab.c | 4 +-
dlls/comctl32/tests/updown.c | 6 ++--
dlls/comctl32/theming.c | 2 +-
dlls/comctl32/toolbar.c | 52 ++++++++++++++++----------------
dlls/comctl32/tooltips.c | 22 +++++++-------
dlls/comctl32/trackbar.c | 4 +-
dlls/comctl32/treeview.c | 20 ++++++------
dlls/comctl32/updown.c | 8 ++--
dlls/comdlg32/colordlg.c | 2 +-
dlls/comdlg32/colordlg16.c | 2 +-
dlls/comdlg32/filedlg.c | 12 ++++----
dlls/comdlg32/filedlgbrowser.c | 2 +-
dlls/comdlg32/printdlg.c | 4 +-
dlls/dinput/keyboard.c | 2 +-
dlls/dinput/mouse.c | 2 +-
dlls/gdi32/opengl.c | 2 +-
dlls/gdi32/palette.c | 2 +-
dlls/imm32/imm.c | 4 +-
dlls/kernel32/tests/environ.c | 4 +-
dlls/mciavi32/wnd.c | 2 +-
dlls/msacm32/format.c | 4 +-
dlls/mshtml/olewnd.c | 2 +-
dlls/mshtml/task.c | 2 +-
dlls/msi/dialog.c | 16 +++++-----
dlls/msvfw32/mciwnd.c | 6 ++--
dlls/mswsock/mswsock.c | 2 +-
dlls/ole32/compobj.c | 4 +-
dlls/ole32/ole2.c | 12 ++++----
dlls/oleacc/main.c | 2 +-
dlls/oledlg/pastespl.c | 2 +-
dlls/riched20/editor.c | 8 ++--
dlls/rpcrt4/cproxy.c | 2 +-
dlls/rpcrt4/tests/ndr_marshall.c | 8 ++--
dlls/schannel/tests/main.c | 4 +-
dlls/setupapi/queue.c | 12 ++++----
dlls/setupapi/virtcopy.c | 4 +-
dlls/shdocvw/shdocvw_main.c | 2 +-
dlls/shell32/brsfolder.c | 2 +-
dlls/shell32/shell.c | 4 +-
dlls/shell32/shelllink.c | 2 +-
dlls/shell32/shellord.c | 2 +-
dlls/shell32/shlexec.c | 6 ++--
dlls/shell32/shlmenu.c | 2 +-
dlls/shell32/shlview.c | 4 +-
dlls/shell32/shv_bg_cmenu.c | 4 +-
dlls/shell32/shv_item_cmenu.c | 4 +-
dlls/shlwapi/msgbox.c | 4 +-
dlls/shlwapi/ordinal.c | 2 +-
dlls/user32/combo.c | 4 +-
dlls/user32/dde_client.c | 4 +-
dlls/user32/dde_misc.c | 4 +-
dlls/user32/dde_server.c | 2 +-
dlls/user32/dialog.c | 4 +-
dlls/user32/edit.c | 4 +-
dlls/user32/hook.c | 8 ++--
dlls/user32/input.c | 2 +-
dlls/user32/listbox.c | 4 +-
dlls/user32/mdi.c | 10 +++---
dlls/user32/menu.c | 26 ++++++++--------
dlls/user32/message.c | 40 ++++++++++++------------
dlls/user32/nonclient.c | 4 +-
dlls/user32/scroll.c | 6 ++--
dlls/user32/spy.c | 16 +++++-----
dlls/user32/static.c | 2 +-
dlls/user32/tests/dde.c | 8 ++--
dlls/user32/tests/input.c | 4 +-
dlls/user32/tests/listbox.c | 4 +-
dlls/user32/tests/msg.c | 62 +++++++++++++++++++-------------------
dlls/user32/tests/win.c | 16 +++++-----
dlls/user32/winproc.c | 16 +++++-----
dlls/winedos/dosvm.c | 4 +-
dlls/winex11.drv/event.c | 2 +-
dlls/winex11.drv/winpos.c | 2 +-
dlls/winex11.drv/x11ddraw.c | 2 +-
dlls/winmm/joystick.c | 2 +-
dlls/winmm/tests/mci.c | 2 +-
dlls/winmm/winmm.c | 12 ++++----
dlls/winspool.drv/tests/info.c | 2 +-
dlls/wintab32/manager.c | 2 +-
dlls/ws2_32/async.c | 2 +-
dlls/ws2_32/socket.c | 62 +++++++++++++++++++-------------------
include/basetsd.h | 4 +-
programs/explorer/desktop.c | 2 +-
programs/regedit/framewnd.c | 2 +-
programs/wineconsole/user.c | 2 +-
111 files changed, 399 insertions(+), 399 deletions(-)
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index c4278de..01203b6 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -446,7 +446,7 @@ static char *FDI_read_string(HFDI hfdi, INT_PTR hf, long cabsize)
unsigned int i;
cab_UBYTE *buf = NULL;
- TRACE("(hfdi == ^%p, hf == %d)\n", hfdi, hf);
+ TRACE("(hfdi == ^%p, hf == %ld)\n", hfdi, hf);
do {
if (len > maxlen) len = maxlen;
@@ -501,7 +501,7 @@ static BOOL FDI_read_entries(
cab_UBYTE buf[64], block_resv;
char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL;
- TRACE("(hfdi == ^%p, hf == %d, pfdici == ^%p)\n", hfdi, hf, pfdici);
+ TRACE("(hfdi == ^%p, hf == %ld, pfdici == ^%p)\n", hfdi, hf, pfdici);
/*
* FIXME: I just noticed that I am memorizing the initial file pointer
@@ -757,7 +757,7 @@ BOOL __cdecl FDIIsCabinet(
{
BOOL rv;
- TRACE("(hfdi == ^%p, hf == ^%d, pfdici == ^%p)\n", hfdi, hf, pfdici);
+ TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici);
if (!REALLY_IS_FDI(hfdi)) {
ERR("REALLY_IS_FDI failed on ^%p\n", hfdi);
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 9f9151d..5e3ffb1 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -845,7 +845,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc)
static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss)
{
- TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -861,7 +861,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
{
ANIMATE_INFO *infoPtr = (ANIMATE_INFO *)GetWindowLongPtrW(hWnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -945,7 +945,7 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
return DefWindowProcW(hWnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 64e7b12..8370f00 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -1720,7 +1720,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
RECT rect;
LRESULT lret;
- TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+ TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
hwnd, uMsg, wParam, lParam, infoPtr);
if (!infoPtr) return 0;
@@ -1921,7 +1921,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
POINT pt;
WCHAR edit_text[260];
- TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+ TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx, info_ptr=%p\n",
hwnd, uMsg, wParam, lParam, infoPtr);
if (!infoPtr) return 0;
@@ -2159,7 +2159,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr) {
if (uMsg == WM_CREATE)
@@ -2307,7 +2307,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",uMsg,wParam,lParam);
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",uMsg,wParam,lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 97810b3..f7f7ecc 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -239,7 +239,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
switch (uMsg) {
case WM_MENUSELECT:
- TRACE("WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
+ TRACE("WM_MENUSELECT wParam=0x%lX lParam=0x%lX\n",
wParam, lParam);
if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
@@ -269,7 +269,7 @@ MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
break;
case WM_COMMAND :
- TRACE("WM_COMMAND wParam=0x%X lParam=0x%lX\n",
+ TRACE("WM_COMMAND wParam=0x%lX lParam=0x%lX\n",
wParam, lParam);
/* WM_COMMAND is not invalid since it is documented
* in the windows api reference. So don't output
@@ -320,7 +320,7 @@ ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo)
{
LPINT lpMenuId;
- TRACE("%p, %x, %p\n", hwnd, uFlags, lpInfo);
+ TRACE("%p, %lx, %p\n", hwnd, uFlags, lpInfo);
if (lpInfo == NULL)
return FALSE;
@@ -1008,7 +1008,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
LPSUBCLASS_INFO stack;
LPSUBCLASSPROCS proc;
- TRACE ("(%p, %p, %x, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
+ TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
/* Since the window procedure that we set here has two additional arguments,
* we can't simply set it as the new window procedure of the window. So we
@@ -1092,7 +1092,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
const SUBCLASS_INFO *stack;
const SUBCLASSPROCS *proc;
- TRACE ("(%p, %p, %x, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
+ TRACE ("(%p, %p, %lx, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
/* See if we have been called for this window */
stack = (LPSUBCLASS_INFO)GetPropW (hWnd, COMCTL32_wSubclass);
@@ -1135,7 +1135,7 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u
LPSUBCLASSPROCS proc;
BOOL ret = FALSE;
- TRACE ("(%p, %p, %x)\n", hWnd, pfnSubclass, uID);
+ TRACE ("(%p, %p, %lx)\n", hWnd, pfnSubclass, uID);
/* Find the Subclass to remove */
stack = (LPSUBCLASS_INFO)GetPropW (hWnd, COMCTL32_wSubclass);
@@ -1189,7 +1189,7 @@ LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
LPSUBCLASSPROCS proc;
LRESULT ret;
- TRACE ("(%p, 0x%08x, 0x%08x, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
+ TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
stack = (LPSUBCLASS_INFO)GetPropW (hWnd, COMCTL32_wSubclass);
if (!stack) {
@@ -1239,7 +1239,7 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
LPSUBCLASS_INFO stack;
LRESULT ret;
- TRACE ("(%p, 0x%08x, 0x%08x, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
+ TRACE ("(%p, 0x%08x, 0x%08lx, 0x%08lx)\n", hWnd, uMsg, wParam, lParam);
/* retrieve our little stack from the Properties */
stack = (LPSUBCLASS_INFO)GetPropW (hWnd, COMCTL32_wSubclass);
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 4cc124d..ad989ec 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -1146,7 +1146,7 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU
{
static const WCHAR buttonW[] = { 'b', 'u', 't', 't', 'o', 'n', 0 };
- TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -1245,7 +1245,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0));
LRESULT ret;
- TRACE ("%x, %x, %lx\n", uMsg, wParam, lParam);
+ TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW( hwnd, uMsg, wParam, lParam );
@@ -1346,7 +1346,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index d6b2b63..080aff9 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -229,7 +229,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
static LRESULT
FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
+ TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam);
return 0;
}
@@ -237,7 +237,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT
FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
+ TRACE("[%p] wParam=%04lx lParam=%08lx\n", hwnd, wParam, lParam);
return 0;
}
@@ -258,7 +258,7 @@ FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index b80ef74..64403fc 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1997,7 +1997,7 @@ static LRESULT HEADER_ThemeChanged(HWND hwnd)
static LRESULT WINAPI
HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, msg, wParam, lParam);
if (!HEADER_GetInfoPtr (hwnd) && (msg != WM_CREATE))
return DefWindowProcW (hwnd, msg, wParam, lParam);
switch (msg) {
@@ -2127,7 +2127,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default:
if ((msg >= WM_USER) && (msg < WM_APP))
- ERR("unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04lx lp=%08lx\n",
msg, wParam, lParam );
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index a24a678..8a56fd3 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -466,7 +466,7 @@ static LRESULT WINAPI
HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
HOTKEY_INFO *infoPtr = (HOTKEY_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -529,7 +529,7 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 36682ae..cdc3e94 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -452,7 +452,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
INT index, len = 0, startsel, endsel;
IPPART_INFO *part;
- TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
part = &infoPtr->Part[index];
@@ -531,7 +531,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
IPADDRESS_INFO *infoPtr = (IPADDRESS_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("(hwnd=%p msg=0x%x wparam=0x%lx lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -584,7 +584,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
return 0;
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 161a5c8..38f9c18 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -9261,7 +9261,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType,
UINT uNewView = lpss->styleNew & LVS_TYPEMASK;
UINT uOldView = lpss->styleOld & LVS_TYPEMASK;
- TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
@@ -9347,7 +9347,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0);
- TRACE("(uMsg=%x wParam=%x lParam=%lx)\n", uMsg, wParam, lParam);
+ TRACE("(uMsg=%x wParam=%lx lParam=%lx)\n", uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
@@ -9851,7 +9851,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
fwd_msg:
/* call default window procedure */
@@ -9991,7 +9991,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0);
BOOL cancel = FALSE;
- TRACE("(hwnd=%p, uMsg=%x, wParam=%x, lParam=%lx, isW=%d)\n",
+ TRACE("(hwnd=%p, uMsg=%x, wParam=%lx, lParam=%lx, isW=%d)\n",
hwnd, uMsg, wParam, lParam, isW);
switch (uMsg)
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 3341626..83da9ad 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -825,7 +825,7 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
int prev = -1;
- TRACE("%d: color %08lx\n", wParam, lParam);
+ TRACE("%ld: color %08lx\n", wParam, lParam);
switch((int)wParam) {
case MCSC_BACKGROUND:
@@ -876,7 +876,7 @@ MONTHCAL_SetMonthDelta(MONTHCAL_INFO *infoPtr, WPARAM wParam)
{
int prev = infoPtr->delta;
- TRACE("delta %d\n", wParam);
+ TRACE("delta %ld\n", wParam);
infoPtr->delta = (int)wParam;
return prev;
@@ -950,7 +950,7 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam;
FILETIME ft_min, ft_max;
- TRACE("%x %lx\n", wParam, lParam);
+ TRACE("%lx %lx\n", wParam, lParam);
if ((wParam & GDTR_MIN && !MONTHCAL_ValidateTime(lprgSysTimeArray[0])) ||
(wParam & GDTR_MAX && !MONTHCAL_ValidateTime(lprgSysTimeArray[1])))
@@ -1019,7 +1019,7 @@ MONTHCAL_SetDayState(const MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
int i, iMonths = (int)wParam;
MONTHDAYSTATE *dayStates = (LPMONTHDAYSTATE)lParam;
- TRACE("%x %lx\n", wParam, lParam);
+ TRACE("%lx %lx\n", wParam, lParam);
if(iMonths!=infoPtr->monthRange) return 0;
for(i=0; i<iMonths; i++)
@@ -1076,7 +1076,7 @@ MONTHCAL_GetMaxSelCount(const MONTHCAL_INFO *infoPtr)
static LRESULT
MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, WPARAM wParam)
{
- TRACE("%x\n", wParam);
+ TRACE("%lx\n", wParam);
if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) {
infoPtr->maxSelCount = wParam;
@@ -1585,7 +1585,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM wParam)
{
BOOL redraw = FALSE;
- TRACE("%d\n", wParam);
+ TRACE("%ld\n", wParam);
switch(wParam) {
case MC_NEXTMONTHTIMER:
@@ -1941,7 +1941,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
MONTHCAL_INFO *infoPtr;
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
infoPtr = MONTHCAL_GetInfoPtr(hwnd);
if (!infoPtr && (uMsg != WM_CREATE))
@@ -2059,7 +2059,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR( "unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 54c8ac8..a599a2a 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -76,7 +76,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
NATIVEFONT_INFO *infoPtr = NATIVEFONT_GetInfoPtr(hwnd);
- TRACE("hwnd=%p msg=%04x wparam=%08x lparam=%08lx\n",
+ TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n",
hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
@@ -102,7 +102,7 @@ NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index 5fccc49..f377324 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -1241,7 +1241,7 @@ PAGER_StyleChanged(PAGER_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lp
{
DWORD oldStyle = infoPtr->dwStyle;
- TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n",
+ TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n",
wStyleType, lpss->styleOld, lpss->styleNew);
if (wStyleType != GWL_STYLE) return 0;
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index 5f29fc8..d3b7ded 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -545,7 +545,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
static const WCHAR themeClass[] = {'P','r','o','g','r','e','s','s',0};
HTHEME theme;
- TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
infoPtr = (PROGRESS_INFO *)GetWindowLongPtrW(hwnd, 0);
@@ -723,7 +723,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
default:
if ((message >= WM_USER) && (message < WM_APP))
- ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam );
+ ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam );
return DefWindowProcW( hwnd, message, wParam, lParam );
}
}
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 201e554..8740f01 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3402,7 +3402,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam)
static INT_PTR CALLBACK
PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=0x%04x wparam=%x lparam=%lx\n",
+ TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n",
hwnd, uMsg, wParam, lParam);
switch (uMsg)
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 6d4e869..9f11146 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2345,7 +2345,7 @@ REBAR_MaximizeBand (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
extra = REBAR_ShrinkBandsLTR(infoPtr, next_band(infoPtr, uBand), iRowEnd, extra, TRUE);
lpBand->cxEffective += extraOrig - extra;
lpBand->cx = lpBand->cxEffective;
- TRACE("(%d, %ld): Wanted size %d, obtained %d (shrink %d, %d)\n", wParam, lParam, cxDesired, lpBand->cx, extraOrig, extra);
+ TRACE("(%ld, %ld): Wanted size %d, obtained %d (shrink %d, %d)\n", wParam, lParam, cxDesired, lpBand->cx, extraOrig, extra);
REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd);
if (infoPtr->dwStyle & CCS_VERT)
@@ -2386,11 +2386,11 @@ REBAR_MinimizeBand (const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
if (iPrev < 0 || infoPtr->bands[iPrev].iRow != lpBand->iRow) {
int iNext = next_band(infoPtr, uBand);
if (iNext < infoPtr->uNumBands && infoPtr->bands[iNext].iRow == lpBand->iRow) {
- TRACE("(%d): Minimizing the first band in row is by maximizing the second\n", wParam);
+ TRACE("(%ld): Minimizing the first band in row is by maximizing the second\n", wParam);
REBAR_MaximizeBand(infoPtr, iNext, FALSE);
}
else
- TRACE("(%d): Only one band in row - nothing to do\n", wParam);
+ TRACE("(%ld): Only one band in row - nothing to do\n", wParam);
return TRUE;
}
@@ -2802,7 +2802,7 @@ REBAR_PushChevron(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
NMREBARCHEVRON nmrbc;
REBAR_BAND *lpBand = &infoPtr->bands[wParam];
- TRACE("Pressed chevron on band %d\n", wParam);
+ TRACE("Pressed chevron on band %ld\n", wParam);
/* redraw chevron in pushed state */
lpBand->fDraw |= DRAW_CHEVRONPUSHED;
@@ -3317,7 +3317,7 @@ REBAR_SetRedraw (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("wParam=%x, lParam=%lx\n", wParam, lParam);
+ TRACE("wParam=%lx, lParam=%lx\n", wParam, lParam);
/* avoid auto resize infinite recursion */
if (infoPtr->fStatus & AUTO_RESIZE) {
@@ -3395,7 +3395,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -3611,7 +3611,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 5f09520..4748083 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -1251,7 +1251,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
INT nPart = ((INT) wParam) & 0x00ff;
LRESULT res;
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam);
if (!infoPtr && msg != WM_CREATE)
return DefWindowProcW (hwnd, msg, wParam, lParam);
@@ -1386,7 +1386,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
default:
if ((msg >= WM_USER) && (msg < WM_APP))
- ERR("unknown msg %04x wp=%04x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%04lx lp=%08lx\n",
msg, wParam, lParam);
return DefWindowProcW (hwnd, msg, wParam, lParam);
}
diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 1d90b5c..ac3e464 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -1545,7 +1545,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
{
SYSLINK_INFO *infoPtr;
- TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd=%p msg=%04x wparam=%lx lParam=%lx\n", hwnd, message, wParam, lParam);
infoPtr = (SYSLINK_INFO *)GetWindowLongPtrW(hwnd, 0);
@@ -1754,7 +1754,7 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
HandleDefaultMessage:
if ((message >= WM_USER) && (message < WM_APP))
{
- ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam );
+ ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam );
}
return DefWindowProcW(hwnd, message, wParam, lParam);
}
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index d3237c7..31b0163 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -863,7 +863,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr
DWORD lStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE);
LONG *iRightBottom, *iLeftTop;
- TRACE ("hwnd=%p fLarger=%d (%d,%d)-(%d,%d)\n", infoPtr->hwnd, fLarger, prc->left, prc->top, prc->right, prc->bottom);
+ TRACE ("hwnd=%p fLarger=%ld (%d,%d)-(%d,%d)\n", infoPtr->hwnd, fLarger, prc->left, prc->top, prc->right, prc->bottom);
if(lStyle & TCS_VERTICAL)
{
@@ -3124,7 +3124,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
- TRACE("hwnd=%p msg=%x wParam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wParam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -3294,7 +3294,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if (uMsg >= WM_USER && uMsg < WM_APP)
- WARN("unknown msg %04x wp=%08x lp=%08lx\n",
+ WARN("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
break;
}
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index cdeeed7..c94bfec 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -142,7 +142,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("datetime: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("datetime: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index bce1d9c..b8a46ed 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -407,7 +407,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("header: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
if (defwndproc_counter) msg.flags |= defwinproc;
@@ -438,7 +438,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 3a7186b..1c2b465 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -163,7 +163,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -217,7 +217,7 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("listview: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -300,7 +300,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("header: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c
index 48afb74..8928890 100644
--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -378,7 +378,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -446,7 +446,7 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
LRESULT ret;
struct message msg;
- trace("monthcal: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("monthcal: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c
index f2e78a0..2893a10 100644
--- a/dlls/comctl32/tests/mru.c
+++ b/dlls/comctl32/tests/mru.c
@@ -173,7 +173,7 @@ static void test_MRUListA(void)
/* Create (size too small) */
mruA.cbSize = sizeof(mruA) - 2;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(too small) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
@@ -181,21 +181,21 @@ static void test_MRUListA(void)
/* Create (size too big) */
mruA.cbSize = sizeof(mruA) + 2;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(too big) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
mruA.cbSize = sizeof(mruA);
/* Create (NULL hKey) */
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(NULL key) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
/* Create (NULL name) */
mruA.lpszSubKey = NULL;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(NULL name) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
@@ -206,7 +206,7 @@ static void test_MRUListA(void)
"Couldn't create test key \"%s\"\n", REG_TEST_KEYA);
if (!hKey)
return;
- hMRU = create_mruA(hKey, MRUF_STRING_LIST, cmp_mru_strA);
+ hMRU = create_mruA(hKey, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
ok(hMRU && !GetLastError(),
"CreateMRUListA(string) expected non-NULL,0 got %p,%d\n",
hMRU, GetLastError());
diff --git a/dlls/comctl32/tests/msg.c b/dlls/comctl32/tests/msg.c
index 6d84a76..2129f22 100644
--- a/dlls/comctl32/tests/msg.c
+++ b/dlls/comctl32/tests/msg.c
@@ -95,14 +95,14 @@ void ok_sequence_(struct msg_sequence **seq, int sequence_index,
{
failcount++;
ok_(file, line) (FALSE,
- "%s: in msg 0x%04x expecting wParam 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
context, expected->message, expected->wParam, actual->wParam);
}
}
else
{
ok_(file, line) (expected->wParam == actual->wParam,
- "%s: in msg 0x%04x expecting wParam 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
context, expected->message, expected->wParam, actual->wParam);
}
}
diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c
index fc451ee..9c879e3 100644
--- a/dlls/comctl32/tests/subclass.c
+++ b/dlls/comctl32/tests/subclass.c
@@ -156,7 +156,7 @@ static void ok_sequence(const struct message *expected, const char *context)
"%s: the procnum %d was expected, but got procnum %d instead\n",
context, expected->procnum, actual->procnum);
ok(expected->wParam == actual->wParam,
- "%s: in procnum %d expecting wParam 0x%x got 0x%x\n",
+ "%s: in procnum %d expecting wParam 0x%lx got 0x%lx\n",
context, expected->procnum, expected->wParam, actual->wParam);
expected++;
actual++;
diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 6f7259f..484ee89 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -289,7 +289,7 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -357,7 +357,7 @@ static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("tab: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("tab: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c
index fb1a522..535422e 100644
--- a/dlls/comctl32/tests/updown.c
+++ b/dlls/comctl32/tests/updown.c
@@ -205,7 +205,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -264,7 +264,7 @@ static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam,
LRESULT ret;
struct message msg;
- trace("edit: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("edit: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
@@ -312,7 +312,7 @@ static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
LRESULT ret;
struct message msg;
- trace("updown: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("updown: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
msg.message = message;
msg.flags = sent|wparam|lparam;
diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c
index a4be617..e462f52 100644
--- a/dlls/comctl32/theming.c
+++ b/dlls/comctl32/theming.c
@@ -79,7 +79,7 @@ static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \
ULONG_PTR refData; \
SetPropW (wnd, (LPCWSTR)MAKEINTATOM(atSubclassProp), (HANDLE)N); \
refData = (ULONG_PTR)GetPropW (wnd, (LPCWSTR)MAKEINTATOM(atRefDataProp)); \
- TRACE ("%d; (%p, %x, %x, %lx, %lx)\n", N, wnd, msg, wParam, lParam, \
+ TRACE ("%d; (%p, %x, %lx, %lx, %lx)\n", N, wnd, msg, wParam, lParam, \
refData); \
result = subclasses[N].subclassProc (wnd, msg, wParam, lParam, refData);\
TRACE ("result = %lx\n", result); \
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 9be48ea..adb37fa 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -278,7 +278,7 @@ static void
TOOLBAR_DumpButton(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *bP, INT btn_num, BOOL internal)
{
if (TRACE_ON(toolbar)){
- TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08x\n",
+ TRACE("button %d id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx\n",
btn_num, bP->idCommand, GETIBITMAP(infoPtr, bP->iBitmap),
bP->fsState, bP->fsStyle, bP->dwData, bP->iString);
TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP)));
@@ -2351,7 +2351,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (!TOOLBAR_GetButtonInfo(infoPtr, &nmtb))
break;
- TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%d) %s\n",
+ TRACE("WM_INITDIALOG style: %x iItem(%d) idCommand(%d) iString(%ld) %s\n",
nmtb.tbButton.fsStyle, i,
nmtb.tbButton.idCommand,
nmtb.tbButton.iString,
@@ -2739,7 +2739,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
INT iSumButtons, i;
HIMAGELIST himlDef;
- TRACE("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam);
if (!lpAddBmp)
return -1;
@@ -2850,7 +2850,7 @@ TOOLBAR_AddButtonsT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode)
INT nOldButtons, nNewButtons, nAddButtons, nCount;
BOOL fHasString = FALSE;
- TRACE("adding %d buttons (unicode=%d)!\n", wParam, fUnicode);
+ TRACE("adding %ld buttons (unicode=%d)!\n", wParam, fUnicode);
nAddButtons = (UINT)wParam;
nOldButtons = infoPtr->nNumButtons;
@@ -3095,7 +3095,7 @@ TOOLBAR_ChangeBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
TBUTTON_INFO *btnPtr;
INT nIndex;
- TRACE("button %d, iBitmap now %d\n", wParam, LOWORD(lParam));
+ TRACE("button %ld, iBitmap now %d\n", wParam, LOWORD(lParam));
nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
if (nIndex == -1)
@@ -3271,7 +3271,7 @@ TOOLBAR_EnableButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
- TRACE("hwnd=%p, btn index=%d, lParam=0x%08lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, btn index=%ld, lParam=0x%08lx\n", hwnd, wParam, lParam);
if (nIndex == -1)
return FALSE;
@@ -3470,7 +3470,7 @@ TOOLBAR_GetButtonTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT
TOOLBAR_GetDisabledImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, wParam=%ld, lParam=0x%lx\n", hwnd, wParam, lParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT)GETDISIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
}
@@ -3490,7 +3490,7 @@ TOOLBAR_GetExtendedStyle (HWND hwnd)
static LRESULT
TOOLBAR_GetHotImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, wParam=%ld, lParam=0x%lx\n", hwnd, wParam, lParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT)GETHOTIMAGELIST(TOOLBAR_GetInfoPtr (hwnd), wParam);
}
@@ -3514,7 +3514,7 @@ TOOLBAR_GetHotItem (HWND hwnd)
static LRESULT
TOOLBAR_GetDefImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p, wParam=%d, lParam=0x%lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, wParam=%ld, lParam=0x%lx\n", hwnd, wParam, lParam);
/* UNDOCUMENTED: wParam is actually the ID of the image list to return */
return (LRESULT) GETDEFIMAGELIST(TOOLBAR_GetInfoPtr(hwnd), wParam);
}
@@ -3922,7 +3922,7 @@ TOOLBAR_LoadImages (HWND hwnd, WPARAM wParam, LPARAM lParam)
tbab.hInst = (HINSTANCE)lParam;
tbab.nID = (UINT_PTR)wParam;
- TRACE("hwnd = %p, hInst = %p, nID = %u\n", hwnd, tbab.hInst, tbab.nID);
+ TRACE("hwnd = %p, hInst = %p, nID = %lu\n", hwnd, tbab.hInst, tbab.nID);
return TOOLBAR_AddBitmap(hwnd, 0, (LPARAM)&tbab);
}
@@ -3980,7 +3980,7 @@ TOOLBAR_MarkButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
DWORD oldState;
TBUTTON_INFO *btnPtr;
- TRACE("hwnd = %p, wParam = %d, lParam = 0x%08lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd = %p, wParam = %ld, lParam = 0x%08lx\n", hwnd, wParam, lParam);
nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
if (nIndex == -1)
@@ -4030,7 +4030,7 @@ TOOLBAR_MoveButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
INT nMoveIndex = (INT)lParam;
TBUTTON_INFO button;
- TRACE("hwnd=%p, wParam=%d, lParam=%ld\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", hwnd, wParam, lParam);
nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, TRUE);
if ((nIndex == -1) || (nMoveIndex < 0))
@@ -4110,7 +4110,7 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
int nOldBitmaps, nNewBitmaps = 0;
HIMAGELIST himlDef = 0;
- TRACE("hInstOld %p nIDOld %x hInstNew %p nIDNew %x nButtons %x\n",
+ TRACE("hInstOld %p nIDOld %lx hInstNew %p nIDNew %lx nButtons %x\n",
lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew,
lpReplace->nButtons);
@@ -4122,7 +4122,7 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
else if (lpReplace->hInstOld != 0)
FIXME("resources not in the current module not implemented\n");
- TRACE("To be replaced hInstOld %p nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ TRACE("To be replaced hInstOld %p nIDOld %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);
for (i = 0; i < infoPtr->nNumBitmapInfos; i++) {
TBITMAP_INFO *tbi = &infoPtr->bitmaps[i];
TRACE("tbimapinfo %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
@@ -4141,7 +4141,7 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (nOldButtons == 0)
{
- WARN("No hinst/bitmap found! hInst %p nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ WARN("No hinst/bitmap found! hInst %p nID %lx\n", lpReplace->hInstOld, lpReplace->nIDOld);
return FALSE;
}
@@ -4381,10 +4381,10 @@ TOOLBAR_SetBitmapSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
HIMAGELIST himlDef = GETDEFIMAGELIST(infoPtr, 0);
- TRACE("hwnd=%p, wParam=%d, lParam=%ld\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", hwnd, wParam, lParam);
if (wParam != 0)
- FIXME("wParam is %d. Perhaps image list index?\n", wParam);
+ FIXME("wParam is %ld. Perhaps image list index?\n", wParam);
if (LOWORD(lParam) == 0)
lParam = MAKELPARAM(1, HIWORD(lParam));
@@ -5145,7 +5145,7 @@ TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT TOOLBAR_Unkwn45D(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
SIZE * pSize = (SIZE*)lParam;
- FIXME("hwnd=%p, wParam=0x%08x, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy);
+ FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy);
return 0;
}
@@ -5183,7 +5183,7 @@ static LRESULT TOOLBAR_Unkwn460(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
- TRACE("hwnd=%p iListGap=%d\n", hwnd, wParam);
+ TRACE("hwnd=%p iListGap=%ld\n", hwnd, wParam);
if (lParam != 0)
FIXME("lParam = 0x%08lx. Please report\n", lParam);
@@ -5201,7 +5201,7 @@ static LRESULT TOOLBAR_Unkwn462(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd);
- TRACE("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p wParam %08lx lParam %08lx\n", hwnd, wParam, lParam);
return max(infoPtr->cimlDef, max(infoPtr->cimlHot, infoPtr->cimlDis));
}
@@ -5222,7 +5222,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam)
* lParam pointer to SIZE structure
*
*/
- TRACE("[0463] wParam %d, lParam 0x%08lx -> 0x%08x 0x%08x\n",
+ TRACE("[0463] wParam %ld, lParam 0x%08lx -> 0x%08x 0x%08x\n",
wParam, lParam, lpsize->cx, lpsize->cy);
switch(wParam) {
@@ -5250,7 +5250,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam)
lpsize->cy = infoPtr->rcBound.bottom - infoPtr->rcBound.top;
break;
default:
- ERR("Unknown wParam %d for Toolbar message [0463]. Please report\n",
+ ERR("Unknown wParam %ld for Toolbar message [0463]. Please report\n",
wParam);
return 0;
}
@@ -5261,7 +5261,7 @@ TOOLBAR_Unkwn463 (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME("hwnd=%p wParam %08x lParam %08lx\n", hwnd, wParam, lParam);
+ FIXME("hwnd=%p wParam %08lx lParam %08lx\n", hwnd, wParam, lParam);
InvalidateRect(hwnd, NULL, TRUE);
return 1;
@@ -6348,7 +6348,7 @@ TOOLBAR_NotifyFormat(const TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
LRESULT format;
- TRACE("wParam = 0x%x, lParam = 0x%08lx\n", wParam, lParam);
+ TRACE("wParam = 0x%lx, lParam = 0x%08lx\n", wParam, lParam);
if (lParam == NF_QUERY)
return NFR_UNICODE;
@@ -6564,7 +6564,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n",
hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
if (!infoPtr && (uMsg != WM_NCCREATE))
@@ -6968,7 +6968,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index e9fcbf2..032ef25 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -319,7 +319,7 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam;
- TRACE("hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
+ TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY,
(WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
@@ -368,7 +368,7 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO
ttnmdi.uFlags = toolPtr->uFlags;
ttnmdi.lParam = toolPtr->lParam;
- TRACE("hdr.idFrom = %x\n", ttnmdi.hdr.idFrom);
+ TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom);
SendMessageW(toolPtr->hwnd, WM_NOTIFY,
(WPARAM)toolPtr->uId, (LPARAM)&ttnmdi);
@@ -995,7 +995,7 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE;
- TRACE("add tool (%p) %p %d%s!\n",
+ TRACE("add tool (%p) %p %ld%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -1086,7 +1086,7 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE)
return FALSE;
- TRACE("add tool (%p) %p %d%s!\n",
+ TRACE("add tool (%p) %p %ld%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -1461,7 +1461,7 @@ TOOLTIPS_GetDelayTime (HWND hwnd, WPARAM wParam, LPARAM lParam)
return infoPtr->nInitialTime;
default:
- WARN("Invalid wParam %x\n", wParam);
+ WARN("Invalid wParam %lx\n", wParam);
break;
}
@@ -1866,7 +1866,7 @@ TOOLTIPS_SetDelayTime (HWND hwnd, WPARAM wParam, LPARAM lParam)
break;
default:
- WARN("Invalid wParam %x\n", wParam);
+ WARN("Invalid wParam %lx\n", wParam);
break;
}
@@ -2445,7 +2445,7 @@ TOOLTIPS_NCHitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT
TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
+ FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam);
return 0;
}
@@ -2538,7 +2538,7 @@ TOOLTIPS_Timer (HWND hwnd, WPARAM wParam, LPARAM lParam)
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
INT nOldTool;
- TRACE("timer %d (%p) expired!\n", wParam, hwnd);
+ TRACE("timer %ld (%p) expired!\n", wParam, hwnd);
switch (wParam) {
case ID_TIMERSHOW:
@@ -2575,7 +2575,7 @@ TOOLTIPS_Timer (HWND hwnd, WPARAM wParam, LPARAM lParam)
break;
default:
- ERR("Unknown timer id %d\n", wParam);
+ ERR("Unknown timer id %ld\n", wParam);
break;
}
return 0;
@@ -2623,7 +2623,7 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_
static LRESULT CALLBACK
TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lParam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!TOOLTIPS_GetInfoPtr(hwnd) && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
@@ -2804,7 +2804,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n",
uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 8282e7c..1ae1f73 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -1734,7 +1734,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongPtrW (hwnd, 0);
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
@@ -1908,7 +1908,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
}
}
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 40c053d..a71045c 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -503,7 +503,7 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code)
static LRESULT
TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("wParam=%d, lParam=%ld\n", wParam, lParam);
+ TRACE("wParam=%ld, lParam=%ld\n", wParam, lParam);
return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam);
}
@@ -1746,7 +1746,7 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew)
int oldHeight = infoPtr->normalImageHeight;
- TRACE("%x,%p\n", wParam, himlNew);
+ TRACE("%lx,%p\n", wParam, himlNew);
switch (wParam)
{
@@ -3575,7 +3575,7 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static LRESULT
TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("%x %ld\n", wParam, lParam);
+ TRACE("%lx %ld\n", wParam, lParam);
switch (HIWORD(wParam))
{
@@ -4659,7 +4659,7 @@ TREEVIEW_VScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int nScrollCode = LOWORD(wParam);
- TRACE("wp %x\n", wParam);
+ TRACE("wp %lx\n", wParam);
if (!(infoPtr->uInternalStatus & TV_VSCROLL))
return 0;
@@ -4729,7 +4729,7 @@ TREEVIEW_HScroll(TREEVIEW_INFO *infoPtr, WPARAM wParam)
int scrollX = infoPtr->scrollX;
int nScrollCode = LOWORD(wParam);
- TRACE("wp %x\n", wParam);
+ TRACE("wp %lx\n", wParam);
if (!(infoPtr->uInternalStatus & TV_HSCROLL))
return FALSE;
@@ -5072,7 +5072,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam)
TREEVIEW_ITEM *prevItem = infoPtr->selectedItem;
- TRACE("%x\n", wParam);
+ TRACE("%lx\n", wParam);
if (prevItem == NULL)
return FALSE;
@@ -5320,7 +5320,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
}
else
{
- FIXME("WM_SIZE flag %x %lx not handled\n", wParam, lParam);
+ FIXME("WM_SIZE flag %lx %lx not handled\n", wParam, lParam);
}
TREEVIEW_Invalidate(infoPtr, NULL);
@@ -5330,7 +5330,7 @@ TREEVIEW_Size(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
static LRESULT
TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- TRACE("(%x %lx)\n", wParam, lParam);
+ TRACE("(%lx %lx)\n", wParam, lParam);
if (wParam == GWL_STYLE)
{
@@ -5438,7 +5438,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(hwnd);
- TRACE("hwnd %p msg %04x wp=%08x lp=%08lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd %p msg %04x wp=%08lx lp=%08lx\n", hwnd, uMsg, wParam, lParam);
if (infoPtr) TREEVIEW_VerifyTree(infoPtr);
else
@@ -5705,7 +5705,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
default:
/* This mostly catches MFC and Delphi messages. :( */
if ((uMsg >= WM_USER) && (uMsg < WM_APP))
- TRACE("Unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+ TRACE("Unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);
def:
return DefWindowProcW(hwnd, uMsg, wParam, lParam);
}
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 63df9dc..b60ab7b 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -478,7 +478,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
WNDPROC superClassWndProc = (WNDPROC)GetPropW(hwnd, BUDDY_SUPERCLASS_WNDPROC);
- TRACE("hwnd=%p, wndProc=%p, uMsg=%04x, wParam=%08x, lParam=%08lx\n",
+ TRACE("hwnd=%p, wndProc=%p, uMsg=%04x, wParam=%08lx, lParam=%08lx\n",
hwnd, superClassWndProc, uMsg, wParam, lParam);
if (uMsg == WM_KEYDOWN) {
@@ -794,7 +794,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
static const WCHAR themeClass[] = {'S','p','i','n',0};
HTHEME theme;
- TRACE("hwnd=%p msg=%04x wparam=%08x lparam=%08lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd=%p msg=%04x wparam=%08lx lparam=%08lx\n", hwnd, message, wParam, lParam);
if (!infoPtr && (message != WM_CREATE))
return DefWindowProcW (hwnd, message, wParam, lParam);
@@ -970,7 +970,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
return infoPtr->Base;
case UDM_SETBASE:
- TRACE("UpDown Ctrl new base(%d), hwnd=%p\n", wParam, hwnd);
+ TRACE("UpDown Ctrl new base(%ld), hwnd=%p\n", wParam, hwnd);
if (wParam==10 || wParam==16) {
temp = infoPtr->Base;
infoPtr->Base = wParam;
@@ -1052,7 +1052,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
default:
if ((message >= WM_USER) && (message < WM_APP))
- ERR("unknown msg %04x wp=%04x lp=%08lx\n", message, wParam, lParam);
+ ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam);
return DefWindowProcW (hwnd, message, wParam, lParam);
}
diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index c411fd3..a1cd5f6 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -947,7 +947,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode,
HDC hdc;
COLORREF *cr;
LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
- TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam);
+ TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
switch (LOWORD(wParam))
{
case 0x2c2: /* edit notify RGB */
diff --git a/dlls/comdlg32/colordlg16.c b/dlls/comdlg32/colordlg16.c
index 8ee44bf..7680239 100644
--- a/dlls/comdlg32/colordlg16.c
+++ b/dlls/comdlg32/colordlg16.c
@@ -197,7 +197,7 @@ static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD not
HDC hdc;
COLORREF *cr;
LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER);
- TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam);
+ TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
switch (wParam)
{
case 0x2c2: /* edit notify RGB */
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 68b6b60..f63e64f 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2976,7 +2976,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet
int i = 0;
int iCount = CBGetCount(hwnd);
- TRACE("0x%08x 0x%x\n",searchArg, iSearchMethod);
+ TRACE("0x%08lx 0x%x\n",searchArg, iSearchMethod);
if (iCount != CB_ERR)
{
@@ -3593,18 +3593,18 @@ static BOOL CALLBACK FD32_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM
if (priv->ofnA)
{
- TRACE("Call hookA %p (%p, %04x, %08x, %08lx)\n",
+ TRACE("Call hookA %p (%p, %04x, %08lx, %08lx)\n",
priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
ret = priv->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
- TRACE("ret hookA %p (%p, %04x, %08x, %08lx)\n",
+ TRACE("ret hookA %p (%p, %04x, %08lx, %08lx)\n",
priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
return ret;
}
- TRACE("Call hookW %p (%p, %04x, %08x, %08lx)\n",
+ TRACE("Call hookW %p (%p, %04x, %08lx, %08lx)\n",
lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
ret = lfs->ofnW->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
- TRACE("Ret hookW %p (%p, %04x, %08x, %08lx)\n",
+ TRACE("Ret hookW %p (%p, %04x, %08lx, %08lx)\n",
lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
return ret;
}
@@ -3705,7 +3705,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg,
{
PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
- TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
+ TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam);
if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
{
INT_PTR lRet;
diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
index f379425..11608f0 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -609,7 +609,7 @@ static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
LRESULT lres;
- TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
+ TRACE("(%p)->(0x%08x 0x%08x 0x%08lx 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
switch (id)
{
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 4dc4de0..a1ad355 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -2743,7 +2743,7 @@ PRINTDLG_PS_WMCommandA(
WORD id = LOWORD(wParam);
char buf[200];
- TRACE("loword (lparam) %d, wparam 0x%x, lparam %08lx\n",
+ TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
LOWORD(lParam),wParam,lParam);
switch (id) {
case IDOK:
@@ -2881,7 +2881,7 @@ static BOOL
PRINTDLG_PS_WMCommandW(
HWND hDlg, WPARAM wParam, LPARAM lParam, PageSetupDataW *pda
) {
- TRACE("loword (lparam) %d, wparam 0x%x, lparam %08lx\n",
+ TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
LOWORD(lParam),wParam,lParam);
switch (LOWORD(wParam)) {
case IDOK:
diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index a634156..a4ba984 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -68,7 +68,7 @@ static LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam
KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
BYTE new_diks;
- TRACE("(%d,%d,%ld)\n", code, wparam, lparam);
+ TRACE("(%d,%ld,%ld)\n", code, wparam, lparam);
/* returns now if not HC_ACTION */
if (code != HC_ACTION) return CallNextHookEx(0, code, wparam, lparam);
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index b398f2f..fcb98bb 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -369,7 +369,7 @@ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lpara
{
int i;
- TRACE("msg %x @ (%d %d): (X: %d Y: %d Z: %d", wparam, hook->pt.x, hook->pt.y,
+ TRACE("msg %lx @ (%d %d): (X: %d Y: %d Z: %d", wparam, hook->pt.x, hook->pt.y,
This->m_state.lX, This->m_state.lY, This->m_state.lZ);
for (i = 0; i < 5; i++) TRACE(" B%d: %02x", i, This->m_state.rgbButtons[i]);
TRACE(")\n");
diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c
index f450f65..fddbeef 100644
--- a/dlls/gdi32/opengl.c
+++ b/dlls/gdi32/opengl.c
@@ -306,7 +306,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR func)
* of a wrapper function which will handle the HDC->PhysDev conversion.
*/
if(ret && strcmp(func, "wglMakeContextCurrentARB") == 0)
- return wglMakeContextCurrentARB;
+ return (PROC)wglMakeContextCurrentARB;
else if(ret && strcmp(func, "wglGetPbufferDCARB") == 0)
return (PROC)wglGetPbufferDCARB;
diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index b491847..a3a6167 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -850,7 +850,7 @@ BOOL WINAPI UpdateColors(
*/
if (hWnd && size)
{
- RedrawWindow_funcptr pRedrawWindow = GetProcAddress( mod, "RedrawWindow" );
+ RedrawWindow_funcptr pRedrawWindow = (void *)GetProcAddress( mod, "RedrawWindow" );
if (pRedrawWindow) pRedrawWindow( hWnd, NULL, 0, RDW_INVALIDATE );
}
}
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index bc3f7a9..c3763fe 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1021,7 +1021,7 @@ BOOL WINAPI ImmIsUIMessageA(
{
BOOL rc = FALSE;
- TRACE("(%p, %x, %d, %ld)\n", hWndIME, msg, wParam, lParam);
+ TRACE("(%p, %x, %ld, %ld)\n", hWndIME, msg, wParam, lParam);
if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
(msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) ||
(msg == WM_MSIME_SERVICE) ||
@@ -1051,7 +1051,7 @@ BOOL WINAPI ImmIsUIMessageW(
HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam)
{
BOOL rc = FALSE;
- TRACE("(%p, %d, %d, %ld): stub\n", hWndIME, msg, wParam, lParam);
+ TRACE("(%p, %d, %ld, %ld): stub\n", hWndIME, msg, wParam, lParam);
if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) ||
(msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) ||
(msg == WM_MSIME_SERVICE) ||
diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c
index b53a4b4..bb9f745 100644
--- a/dlls/kernel32/tests/environ.c
+++ b/dlls/kernel32/tests/environ.c
@@ -282,7 +282,7 @@ static void test_GetComputerName(void)
HeapFree(GetProcessHeap(), 0, nameW);
}
- pGetComputerNameExA = GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA");
+ pGetComputerNameExA = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA");
if (!pGetComputerNameExA)
{
skip("GetComputerNameExA function not implemented, so not testing\n");
@@ -333,7 +333,7 @@ static void test_GetComputerName(void)
trace("NetBIOS name is \"%s\"\n", name);
HeapFree(GetProcessHeap(), 0, name);
- pGetComputerNameExW = GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExW");
+ pGetComputerNameExW = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExW");
if (!pGetComputerNameExW)
{
skip("GetComputerNameExW function not implemented, so not testing\n");
diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c
index 84ea5a5..c2fbb38 100644
--- a/dlls/mciavi32/wnd.c
+++ b/dlls/mciavi32/wnd.c
@@ -29,7 +29,7 @@ static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};
static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam);
switch (uMsg) {
case WM_CREATE:
diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
index 22629d6..a6fd57a 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -198,7 +198,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p msg=%i 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
+ TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam );
switch (msg) {
case WM_INITDIALOG:
@@ -258,7 +258,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
break;
#endif
default:
- TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08x 0x%08lx\n",
+ TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08lx 0x%08lx\n",
hWnd, msg, wParam, lParam );
break;
}
diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c
index 7a207be..45e505a 100644
--- a/dlls/mshtml/olewnd.c
+++ b/dlls/mshtml/olewnd.c
@@ -234,7 +234,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje
UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult)
{
HTMLDocument *This = OLEINPLACEWND_THIS(iface);
- FIXME("(%p)->(%u %u %lu %p)\n", This, msg, wParam, lParam, lpResult);
+ FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult);
return E_NOTIMPL;
}
diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c
index a9becef..d01c17d 100644
--- a/dlls/mshtml/task.c
+++ b/dlls/mshtml/task.c
@@ -260,7 +260,7 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
if(msg > WM_USER)
- FIXME("(%p %d %x %lx)\n", hwnd, msg, wParam, lParam);
+ FIXME("(%p %d %lx %lx)\n", hwnd, msg, wParam, lParam);
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 614b4aa..73aec69 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -706,7 +706,7 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_text_info *info;
LRESULT r = 0;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
info = GetPropW(hWnd, szButtonData);
@@ -891,7 +891,7 @@ MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_scrolltext_info *info;
HRESULT r;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
info = GetPropW( hWnd, szButtonData );
@@ -1283,7 +1283,7 @@ MSIMaskedEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
struct msi_maskedit_info *info;
HRESULT r;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
info = GetPropW(hWnd, szButtonData);
@@ -1605,7 +1605,7 @@ static LRESULT WINAPI MSIPathEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP
struct msi_pathedit_info *info = GetPropW(hWnd, szButtonData);
LRESULT r = 0;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
if ( msg == WM_KILLFOCUS )
{
@@ -1863,7 +1863,7 @@ MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
TVHITTESTINFO tvhti;
HRESULT r;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
info = GetPropW(hWnd, szButtonData);
@@ -2102,7 +2102,7 @@ static LRESULT WINAPI MSIListBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
LRESULT r;
DWORD j;
- TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam);
info = GetPropW( hWnd, szButtonData );
if (!info)
@@ -3163,7 +3163,7 @@ static LRESULT msi_dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd
{
msi_control *control = NULL;
- TRACE("%p %p %08x\n", dialog, hwnd, param);
+ TRACE("%p %p %08lx\n", dialog, hwnd, param);
switch (param)
{
@@ -3267,7 +3267,7 @@ static LRESULT WINAPI MSIRadioGroup_WndProc(HWND hWnd, UINT msg, WPARAM wParam,
WNDPROC oldproc = (WNDPROC) GetPropW(hWnd, szButtonData);
LRESULT r;
- TRACE("hWnd %p msg %04x wParam 0x%08x lParam 0x%08lx\n", hWnd, msg, wParam, lParam);
+ TRACE("hWnd %p msg %04x wParam 0x%08lx lParam 0x%08lx\n", hWnd, msg, wParam, lParam);
if (msg == WM_COMMAND) /* Forward notifications to dialog */
SendMessageW(GetParent(hWnd), msg, wParam, lParam);
diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index c7551f8..1e9a4f3 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -447,7 +447,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
{
MCIWndInfo *mwi;
- TRACE("%p %04x %08x %08lx\n", hWnd, wMsg, wParam, lParam);
+ TRACE("%p %04x %08lx %08lx\n", hWnd, wMsg, wParam, lParam);
mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0);
if (!mwi && wMsg != WM_CREATE)
@@ -1056,7 +1056,7 @@ end_of_mci_open:
return mwi->inactive_timer;
case MCIWNDM_CHANGESTYLES:
- TRACE("MCIWNDM_CHANGESTYLES mask %08x, set %08lx\n", wParam, lParam);
+ TRACE("MCIWNDM_CHANGESTYLES mask %08lx, set %08lx\n", wParam, lParam);
/* FIXME: update the visual window state as well:
* add/remove trackbar, autosize, etc.
*/
@@ -1120,7 +1120,7 @@ end_of_mci_open:
{
MCI_STATUS_PARMS mci_status;
- TRACE("MCIWNDM_GETTIMEFORMAT %08x %08lx\n", wParam, lParam);
+ TRACE("MCIWNDM_GETTIMEFORMAT %08lx %08lx\n", wParam, lParam);
/* get format string if requested */
if (wParam && lParam)
diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c
index fbd4a8c..d283405 100644
--- a/dlls/mswsock/mswsock.c
+++ b/dlls/mswsock/mswsock.c
@@ -61,7 +61,7 @@ BOOL WINAPI AcceptEx(
overlapped (asynchronous) I/O
operation */
{
- FIXME("(listen=%d, accept=%d, %p, %d, %d, %d, %p, %p), not implemented\n",
+ FIXME("(listen=%ld, accept=%ld, %p, %d, %d, %d, %p, %p), not implemented\n",
sListenSocket,sAcceptSocket,lpOutputBuffer,dwReceiveDataLength,
dwLocalAddressLength,dwRemoteAddressLength,lpdwBytesReceived,lpOverlapped
);
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index d9404a1..832770e 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -849,9 +849,9 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret)
return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */
}
- DllCanUnloadNow = GetProcAddress(hLibrary, "DllCanUnloadNow");
+ DllCanUnloadNow = (void *)GetProcAddress(hLibrary, "DllCanUnloadNow");
/* Note: failing to find DllCanUnloadNow is not a failure */
- DllGetClassObject = GetProcAddress(hLibrary, "DllGetClassObject");
+ DllGetClassObject = (void *)GetProcAddress(hLibrary, "DllGetClassObject");
if (!DllGetClassObject)
{
/* failure: the dll did not export DllGetClassObject */
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 4fe31b0..3ae9f55 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -1387,7 +1387,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar
OleMenuHookItem *pHookItem = NULL;
WORD fuFlags;
- TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
+ TRACE("%i, %04lx, %08lx\n", code, wParam, lParam );
/* Check if we're being asked to process the message */
if ( HC_ACTION != code )
@@ -1492,7 +1492,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara
OleMenuHookItem *pHookItem = NULL;
WORD wCode;
- TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
+ TRACE("%i, %04lx, %08lx\n", code, wParam, lParam );
/* Check if we're being asked to process a messages */
if ( HC_ACTION != code )
@@ -1727,7 +1727,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
}
TRACE_(accel)("hAccel=%p, cAccelEntries=%d,"
- "msg->hwnd=%p, msg->message=%04x, wParam=%08x, lParam=%08lx\n",
+ "msg->hwnd=%p, msg->message=%04x, wParam=%08lx, lParam=%08lx\n",
hAccel, cAccelEntries,
lpMsg->hwnd, lpMsg->message, lpMsg->wParam, lpMsg->lParam);
for(i = 0; i < cAccelEntries; i++)
@@ -1739,7 +1739,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
{
if(!(lpAccelTbl[i].fVirt & FALT) && !(lpAccelTbl[i].fVirt & FVIRTKEY))
{
- TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", lpMsg->wParam & 0xff);
+ TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", LOWORD(lpMsg->wParam) & 0xff);
goto found;
}
}
@@ -1748,7 +1748,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
if(lpAccelTbl[i].fVirt & FVIRTKEY)
{
INT mask = 0;
- TRACE_(accel)("found accel for virt_key %04x (scan %04x)\n",
+ TRACE_(accel)("found accel for virt_key %04lx (scan %04x)\n",
lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff);
if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
@@ -1762,7 +1762,7 @@ BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* l
{
if((lpAccelTbl[i].fVirt & FALT) && (lpMsg->lParam & 0x20000000))
{ /* ^^ ALT pressed */
- TRACE_(accel)("found accel for Alt-%c\n", lpMsg->wParam & 0xff);
+ TRACE_(accel)("found accel for Alt-%c\n", LOWORD(lpMsg->wParam) & 0xff);
goto found;
}
}
diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c
index eb57396..8717da9 100644
--- a/dlls/oleacc/main.c
+++ b/dlls/oleacc/main.c
@@ -38,7 +38,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject,
HRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )
{
- FIXME("%s %d %p\n", debugstr_guid(riid), wParam, pAcc );
+ FIXME("%s %ld %p\n", debugstr_guid(riid), wParam, pAcc );
return E_NOTIMPL;
}
diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c
index 64507e7..0835fa3 100644
--- a/dlls/oledlg/pastespl.c
+++ b/dlls/oledlg/pastespl.c
@@ -516,7 +516,7 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp)
static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0};
ps_struct_t *ps_struct;
- TRACE("(%p, %04x, %08x, %08lx)\n", hdlg, msg, wp, lp);
+ TRACE("(%p, %04x, %08lx, %08lx)\n", hdlg, msg, wp, lp);
ps_struct = GetPropW(hdlg, prop_name);
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index b5a26eb..24febcf 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -1416,7 +1416,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
{
ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0);
- TRACE("hwnd %p msg %04x (%s) %x %lx, unicode %d\n",
+ TRACE("hwnd %p msg %04x (%s) %lx %lx, unicode %d\n",
hWnd, msg, get_msg_name(msg), wParam, lParam, unicode);
if (!editor && msg != WM_NCCREATE && msg != WM_NCDESTROY) {
@@ -2188,7 +2188,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs
- (editor->bEmulateVersion10?2:1);
nChars = nNextLineOfs - nThisLineOfs;
- TRACE("EM_LINELENGTH(%d)==%d\n",wParam, nChars);
+ TRACE("EM_LINELENGTH(%ld)==%d\n",wParam, nChars);
return nChars;
}
case EM_EXLIMITTEXT:
@@ -2794,14 +2794,14 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance)
LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
/* FIXME: Not implemented */
- TRACE("hWnd %p msg %04x (%s) %08x %08lx\n",
+ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n",
hWnd, msg, get_msg_name(msg), wParam, lParam);
return DefWindowProcW(hWnd, msg, wParam, lParam);
}
LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
/* FIXME: Not implemented */
- TRACE("hWnd %p msg %04x (%s) %08x %08lx\n",
+ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n",
hWnd, msg, get_msg_name(msg), wParam, lParam);
return DefWindowProcW(hWnd, msg, wParam, lParam);
}
diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index f0996d0..6580bcf 100644
--- a/dlls/rpcrt4/cproxy.c
+++ b/dlls/rpcrt4/cproxy.c
@@ -434,7 +434,7 @@ CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid,
{
typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT);
HMODULE hUser32 = LoadLibraryA("user32");
- MessageBoxA pMessageBoxA = GetProcAddress(hUser32, "MessageBoxA");
+ MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA");
FIXME("%p %p %s %p %p\n", pTypeInfo, pUnkOuter, debugstr_guid(riid), ppProxy, ppv);
if (pMessageBoxA)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 4100822..3a9f791 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -929,13 +929,13 @@ static void test_client_init(void)
TEST_POINTER_UNSET(pCSInfo);
TEST_POINTER_UNSET(ConformanceMark);
TEST_POINTER_UNSET(VarianceMark);
- ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%x\n", stubMsg.Unused);
+ ok(stubMsg.Unused == 0xcccccccc, "Unused should have be unset instead of 0x%lx\n", stubMsg.Unused);
TEST_POINTER_UNSET(pContext);
TEST_POINTER_UNSET(ContextHandleHash);
TEST_POINTER_UNSET(pUserMarshalList);
- TEST_ULONG_UNSET(Reserved51_3);
- TEST_ULONG_UNSET(Reserved51_4);
- TEST_ULONG_UNSET(Reserved51_5);
+ TEST_ULONG_PTR_UNSET(Reserved51_3);
+ TEST_ULONG_PTR_UNSET(Reserved51_4);
+ TEST_ULONG_PTR_UNSET(Reserved51_5);
#undef TEST_ULONG_UNSET
#undef TEST_POINTER_UNSET
#undef TEST_ZERO
diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c
index 737495e..d09a17c 100644
--- a/dlls/schannel/tests/main.c
+++ b/dlls/schannel/tests/main.c
@@ -166,8 +166,8 @@ START_TEST(main)
return;
}
- pSpLsaModeInitialize = GetProcAddress(hMod, "SpLsaModeInitialize");
- pSpUserModeInitialize = GetProcAddress(hMod, "SpUserModeInitialize");
+ pSpLsaModeInitialize = (void *)GetProcAddress(hMod, "SpLsaModeInitialize");
+ pSpUserModeInitialize = (void *)GetProcAddress(hMod, "SpUserModeInitialize");
if (pSpLsaModeInitialize && pSpUserModeInitialize)
{
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index f9647ef..fa212fb 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -1400,10 +1400,10 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
TRACE( "end queue\n" );
return 0;
case SPFILENOTIFY_STARTSUBQUEUE:
- TRACE( "start subqueue %d count %d\n", param1, param2 );
+ TRACE( "start subqueue %ld count %ld\n", param1, param2 );
return TRUE;
case SPFILENOTIFY_ENDSUBQUEUE:
- TRACE( "end subqueue %d\n", param1 );
+ TRACE( "end subqueue %ld\n", param1 );
return 0;
case SPFILENOTIFY_STARTDELETE:
TRACE( "start delete %s\n", debugstr_a(paths->Target) );
@@ -1439,7 +1439,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification,
TRACE( "need media\n" );
return FILEOP_SKIP;
default:
- FIXME( "notification %d params %x,%x\n", notification, param1, param2 );
+ FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
break;
}
return 0;
@@ -1464,10 +1464,10 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
TRACE( "end queue\n" );
return 0;
case SPFILENOTIFY_STARTSUBQUEUE:
- TRACE( "start subqueue %d count %d\n", param1, param2 );
+ TRACE( "start subqueue %ld count %ld\n", param1, param2 );
return TRUE;
case SPFILENOTIFY_ENDSUBQUEUE:
- TRACE( "end subqueue %d\n", param1 );
+ TRACE( "end subqueue %ld\n", param1 );
return 0;
case SPFILENOTIFY_STARTDELETE:
TRACE( "start delete %s\n", debugstr_w(paths->Target) );
@@ -1504,7 +1504,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification,
TRACE( "need media\n" );
return FILEOP_SKIP;
default:
- FIXME( "notification %d params %x,%x\n", notification, param1, param2 );
+ FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 );
break;
}
return 0;
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index 74bf0fd..cceca3c 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -596,7 +596,7 @@ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam,
{
static int count = 0;
if (count < 10)
- FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n",
+ FIXME("(%p, %04x, %04lx, %08lx, %08lx) - what to do here ?\n",
lpvObj, uMsg, wParam, lParam, lParamRef);
count++;
return OK;
@@ -746,7 +746,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam,
RETERR16 res = VCPN_OK, cbres;
if (count < 5)
- FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n",
+ FIXME("(%p, %04x, %04lx, %08lx, %08lx) - semi-stub\n",
lpvObj, uMsg, wParam, lParam, lParamRef);
count++;
switch (uMsg)
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index 551fb3e..8338eeb 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -161,7 +161,7 @@ BOOL WINAPI ShellDDEInit(BOOL start)
{
if (!SHDOCVW_LoadShell32())
return FALSE;
- pShellDDEInit = GetProcAddress(SHDOCVW_hshell32, (LPCSTR)188);
+ pShellDDEInit = (void *)GetProcAddress(SHDOCVW_hshell32, (LPCSTR)188);
}
if (pShellDDEInit)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 16ec906..e478078 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -654,7 +654,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
{
browse_info *info;
- TRACE("hwnd=%p msg=%04x 0x%08x 0x%08lx\n", hWnd, msg, wParam, lParam );
+ TRACE("hwnd=%p msg=%04x 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam );
if (msg == WM_INITDIALOG)
return BrsFolder_OnCreate( hWnd, (browse_info*) lParam );
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 37bf2ec..cb95078 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -415,7 +415,7 @@ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length)
*/
static LRESULT WINAPI SHELL_HookProc(INT code, WPARAM wParam, LPARAM lParam)
{
- TRACE("%i, %x, %08lx\n", code, wParam, lParam );
+ TRACE("%i, %lx, %08lx\n", code, wParam, lParam );
if (SHELL_hWnd)
{
@@ -586,7 +586,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
/*************************************************************************
* SHELL_Execute16 [Internal]
*/
-static UINT SHELL_Execute16(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
+static UINT_PTR SHELL_Execute16(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
{
UINT ret;
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index f7c9c59..0b7094a 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -2600,7 +2600,7 @@ ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType,
{
IShellLinkImpl *This = impl_from_IContextMenu(iface);
- FIXME("%p %u %u %p %p %u\n", This,
+ FIXME("%p %lu %u %p %p %u\n", This,
idCmd, uType, pwReserved, pszName, cchMax );
return E_NOTIMPL;
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index f2f72dc..4da6417 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -837,7 +837,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
mymru.dwFlags = MRUF_BINARY_LIST | MRUF_DELAYED_SAVE;
mymru.hKey = HCUbasekey;
mymru.lpszSubKey = "RecentDocs";
- mymru.lpfnCompare = &SHADD_compare_mru;
+ mymru.lpfnCompare = (PROC)SHADD_compare_mru;
mruhandle = CreateMRUListA(&mymru);
if (!mruhandle) {
/* MRU failed */
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 5b2ee4e..c8a4550 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -356,11 +356,11 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
}
else if ((retval = GetLastError()) >= 32)
{
- TRACE("CreateProcess returned error %d\n", retval);
+ TRACE("CreateProcess returned error %ld\n", retval);
retval = ERROR_BAD_FORMAT;
}
- TRACE("returning %u\n", retval);
+ TRACE("returning %lu\n", retval);
psei_out->hInstApp = (HINSTANCE)retval;
if( gcdret )
@@ -1641,7 +1641,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0);
}
- TRACE("retval %u\n", retval);
+ TRACE("retval %lu\n", retval);
HeapFree(GetProcessHeap(), 0, wszApplicationName);
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 1da5ba7..cdd08c9 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -661,7 +661,7 @@ LRESULT WINAPI FileMenu_HandleMenuChar(
HMENU hMenu,
WPARAM wParam)
{
- FIXME("%p 0x%08x\n",hMenu,wParam);
+ FIXME("%p 0x%08lx\n",hMenu,wParam);
return 0;
}
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index e7eafc1..0efd18d 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1579,7 +1579,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara
IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
LPCREATESTRUCTA lpcs;
- TRACE("(hwnd=%p msg=%x wparm=%x lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
+ TRACE("(hwnd=%p msg=%x wparm=%lx lparm=%lx)\n",hWnd, uMessage, wParam, lParam);
switch (uMessage)
{
@@ -1759,7 +1759,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG
if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST))
{
- TRACE("-- key=0x04%x\n",lpmsg->wParam) ;
+ TRACE("-- key=0x04%lx\n",lpmsg->wParam) ;
}
return S_FALSE; /* not handled */
}
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index 5beaf1e..73bdee1 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -407,7 +407,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString(
{
BgCmImpl *This = (BgCmImpl *)iface;
- TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
+ TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
/* test the existence of the menu items, the file dialog enables
the buttons according to this */
@@ -439,7 +439,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg(
{
BgCmImpl *This = (BgCmImpl *)iface;
- FIXME("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
+ FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);
return E_NOTIMPL;
}
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index 6b6dc81..8b9ff0f 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -460,7 +460,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString(
HRESULT hr = E_INVALIDARG;
- TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
+ TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
switch(uFlags)
{
@@ -513,7 +513,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg(
{
ItemCmImpl *This = (ItemCmImpl *)iface;
- TRACE("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
+ TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);
return E_NOTIMPL;
}
diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c
index 0e3c517..3e14860 100644
--- a/dlls/shlwapi/msgbox.c
+++ b/dlls/shlwapi/msgbox.c
@@ -63,7 +63,7 @@ static INT_PTR CALLBACK SHDlgProcEx(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
{
DLGDATAEX *d = (DLGDATAEX *)GetWindowLongPtrW(hDlg, DWLP_USER);
- TRACE("(%p,%u,%d,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d);
+ TRACE("(%p,%u,%ld,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d);
switch (uMsg)
{
@@ -187,7 +187,7 @@ typedef struct tagDLGDATA
/* Dialogue procedure for shlwapi message boxes */
static INT_PTR CALLBACK SHDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("(%p,%u,%d,%ld)\n", hDlg, uMsg, wParam, lParam);
+ TRACE("(%p,%u,%ld,%ld)\n", hDlg, uMsg, wParam, lParam);
switch (uMsg)
{
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 213980c..0360b44 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -1584,7 +1584,7 @@ void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lP
{
enumWndData data;
- TRACE("(%p,%u,%d,%ld,%d)\n", hWnd, uiMsgId, wParam, lParam, bSend);
+ TRACE("(%p,%u,%ld,%ld,%d)\n", hWnd, uiMsgId, wParam, lParam, bSend);
if(hWnd)
{
diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 3e8504d..e9a76b5 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1844,7 +1844,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
{
LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 );
- TRACE("[%p]: msg %s wp %08x lp %08lx\n",
+ TRACE("[%p]: msg %s wp %08lx lp %08lx\n",
hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam );
if( lphc || message == WM_NCCREATE )
@@ -2287,7 +2287,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message,
return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam);
default:
if (message >= WM_USER)
- WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",
+ WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n",
message - WM_USER, wParam, lParam );
break;
}
diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c
index 900128c..50b00fa 100644
--- a/dlls/user32/dde_client.c
+++ b/dlls/user32/dde_client.c
@@ -519,7 +519,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML
case WM_DDE_DATA:
UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi);
- TRACE("Got the result (%08x)\n", uiLo);
+ TRACE("Got the result (%08lx)\n", uiLo);
hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi);
@@ -1262,7 +1262,7 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
WDML_CONV* pConv = NULL;
HSZ hszSrv, hszTpc;
- TRACE("%p %04x %08x %08lx\n", hwnd, iMsg, wParam , lParam);
+ TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam);
if (iMsg == WM_DDE_ACK &&
/* in the initial WM_INITIATE sendmessage */
diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c
index b02db0a..24062c3 100644
--- a/dlls/user32/dde_misc.c
+++ b/dlls/user32/dde_misc.c
@@ -132,7 +132,7 @@ BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam,
ERR("GlobalLock failed (%lx)\n", lParam);
return FALSE;
}
- TRACE("unpacked: low %08x, high %08x\n", params[0], params[1]);
+ TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]);
if (uiLo) *uiLo = params[0];
if (uiHi) *uiHi = params[1];
GlobalUnlock( (HGLOBAL)lParam );
@@ -207,7 +207,7 @@ LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut,
}
params[0] = uiLo;
params[1] = uiHi;
- TRACE("Reusing pack %08x %08x\n", uiLo, uiHi);
+ TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi);
GlobalUnlock( (HGLOBAL)lParam );
return lParam;
diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c
index bb2d583..e047724 100644
--- a/dlls/user32/dde_server.c
+++ b/dlls/user32/dde_server.c
@@ -979,7 +979,7 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND hwndServer, UINT iMsg, WPARAM w
WDML_CONV* pConv;
WDML_XACT* pXAct = NULL;
- TRACE("%p %04x %08x %08lx\n", hwndServer, iMsg, wParam , lParam);
+ TRACE("%p %04x %08lx %08lx\n", hwndServer, iMsg, wParam, lParam);
if (iMsg == WM_DESTROY)
{
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index ad729d0..fbcb5f1 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -220,7 +220,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
p += strlenW( info->windowName ) + 1;
}
- TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %08x, %08x\n",
+ TRACE(" %s %s %ld, %d, %d, %d, %d, %08x, %08x, %08x\n",
debugstr_w( info->className ), debugstr_w( info->windowName ),
info->id, info->x, info->y, info->cx, info->cy,
info->style, info->exStyle, info->helpId );
@@ -869,7 +869,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval )
DIALOGINFO * dlgInfo;
HWND owner;
- TRACE("%p %d\n", hwnd, retval );
+ TRACE("%p %ld\n", hwnd, retval );
if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE )))
{
diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 658aaf8..9b61fb3 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -451,7 +451,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 );
LRESULT result = 0;
- TRACE("hwnd=%p msg=%x (%s) wparam=%x lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam);
+ TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam);
if (!es && msg != WM_NCCREATE)
return DefWindowProcT(hwnd, msg, wParam, lParam, unicode);
@@ -5161,7 +5161,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES
} else if (GWL_EXSTYLE == which) {
; /* FIXME - what is needed here */
} else {
- WARN ("Invalid style change %d\n",which);
+ WARN ("Invalid style change %ld\n",which);
}
return 0;
diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c
index bcc3215..b537b7b 100644
--- a/dlls/user32/hook.c
+++ b/dlls/user32/hook.c
@@ -290,7 +290,7 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L
LRESULT ret;
if (TRACE_ON(relay))
- DPRINTF( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx)\n",
+ DPRINTF( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n",
GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam );
if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam );
@@ -298,7 +298,7 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L
else ret = call_hook_AtoW( proc, id, code, wparam, lparam );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Ret hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx) retval=%08lx\n",
+ DPRINTF( "%04x:Ret hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx) retval=%08lx\n",
GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret );
return ret;
@@ -339,7 +339,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA
h_extra.handle = info->handle;
h_extra.lparam = lparam;
- TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n",
+ TRACE( "calling hook in thread %04x %s code %x wp %lx lp %lx\n",
info->tid, hook_names[info->id-WH_MINHOOK], code, wparam, lparam );
switch(info->id)
@@ -362,7 +362,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA
}
else if (info->proc)
{
- TRACE( "calling hook %p %s code %x wp %x lp %lx module %s\n",
+ TRACE( "calling hook %p %s code %x wp %lx lp %lx module %s\n",
info->proc, hook_names[info->id-WH_MINHOOK], code, wparam,
lparam, debugstr_w(info->module) );
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index 2c3d38c..8048412 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -799,7 +799,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent,
POINT pos;
INT hoverwidth = 0, hoverheight = 0, hittest;
- TRACE("hwnd %p, msg %04x, id %04x, time %u\n", hwnd, uMsg, idEvent, dwTime);
+ TRACE("hwnd %p, msg %04x, id %04lx, time %u\n", hwnd, uMsg, idEvent, dwTime);
GetCursorPos(&pos);
hwnd = WINPOS_WindowFromPoint(hwnd, pos, &hittest);
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index a412ffc..166d176 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2569,7 +2569,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
}
if (descr->style & LBS_COMBOBOX) lphc = descr->lphc;
- TRACE("[%p]: msg %s wp %08x lp %08lx\n",
+ TRACE("[%p]: msg %s wp %08lx lp %08lx\n",
descr->self, SPY_GetMsgName(msg, descr->self), wParam, lParam );
switch(msg)
@@ -3209,7 +3209,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
default:
if ((msg >= WM_USER) && (msg < 0xc000))
- WARN("[%p]: unknown msg %04x wp %08x lp %08lx\n",
+ WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n",
hwnd, msg, wParam, lParam );
}
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 630d58b..06c44d7 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -1036,7 +1036,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
{
MDICLIENTINFO *ci;
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
+ TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
if (!(ci = get_client_info( hwnd ))) return 0;
@@ -1325,7 +1325,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient,
{
MDICLIENTINFO *ci = get_client_info( hwndMDIClient );
- TRACE("%p %p %04x (%s) %08x %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
+ TRACE("%p %p %04x (%s) %08lx %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
if (ci)
{
@@ -1423,7 +1423,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client );
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
+ TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
hwnd = WIN_GetFullHandle( hwnd );
if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam );
@@ -1463,7 +1463,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client );
- TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
+ TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
hwnd = WIN_GetFullHandle( hwnd );
if (!ci) return DefWindowProcW( hwnd, message, wParam, lParam );
@@ -1702,7 +1702,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
default:
return 0;
}
- TRACE("wParam = %04x\n", wParam);
+ TRACE("wParam = %04lx\n", wParam);
SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam);
return 1;
}
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index cf74381..0aa110f 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -226,7 +226,7 @@ static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp,
TRACE("%s ", prefix);
if (mp) {
UINT flags = mp->fType;
- TRACE( "{ ID=0x%x", mp->wID);
+ TRACE( "{ ID=0x%lx", mp->wID);
if ( mp->hSubMenu)
TRACE( ", Sub=%p", mp->hSubMenu);
if (flags) {
@@ -994,7 +994,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
} else
lpitem->rect.bottom += mis.itemHeight;
- TRACE("id=%04x size=%dx%d\n",
+ TRACE("id=%04lx size=%dx%d\n",
lpitem->wID, lpitem->rect.right-lpitem->rect.left,
lpitem->rect.bottom-lpitem->rect.top);
return;
@@ -2448,7 +2448,7 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu, UINT wFlags )
item = &menu->items[menu->FocusedItem];
- TRACE("hMenu %p wID %08x hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType);
+ TRACE("hMenu %p wID %08lx hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType);
if (!(item->fType & MF_POPUP))
{
@@ -3406,7 +3406,7 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
*/
static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
{
- TRACE("hwnd=%p msg=0x%04x wp=0x%04x lp=0x%08lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd=%p msg=0x%04x wp=0x%04lx lp=0x%08lx\n", hwnd, message, wParam, lParam);
switch(message)
{
@@ -3716,9 +3716,9 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags,
MENUITEM *item;
if (IS_STRING_ITEM(flags) && str)
- TRACE("hMenu %p, pos %d, flags %08x, id %04x, str %s\n",
+ TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n",
hMenu, pos, flags, id, debugstr_w(str) );
- else TRACE("hMenu %p, pos %d, flags %08x, id %04x, str %p (not a string)\n",
+ else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n",
hMenu, pos, flags, id, str );
if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE;
@@ -3837,9 +3837,9 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags,
MENUITEM *item;
if (IS_STRING_ITEM(flags))
- TRACE("%p %d %04x %04x %s\n", hMenu, pos, flags, id, debugstr_w(str) );
+ TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) );
else
- TRACE("%p %d %04x %04x %p\n", hMenu, pos, flags, id, str );
+ TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str );
if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) return FALSE;
MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */
@@ -5050,7 +5050,7 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA
{
if ( !(fVirt & FVIRTKEY) && (mask & FALT) == (fVirt & FALT) )
{
- TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", wParam & 0xff);
+ TRACE_(accel)("found accel for WM_CHAR: ('%c')\n", LOWORD(wParam) & 0xff);
goto found;
}
}
@@ -5058,7 +5058,7 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA
{
if(fVirt & FVIRTKEY)
{
- TRACE_(accel)("found accel for virt_key %04x (scan %04x)\n",
+ TRACE_(accel)("found accel for virt_key %04lx (scan %04x)\n",
wParam, 0xff & HIWORD(lParam));
if(mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found;
@@ -5070,7 +5070,7 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA
{
if ((fVirt & FALT) && (lParam & 0x20000000))
{ /* ^^ ALT pressed */
- TRACE_(accel)("found accel for Alt-%c\n", wParam & 0xff);
+ TRACE_(accel)("found accel for Alt-%c\n", LOWORD(wParam) & 0xff);
goto found;
}
}
@@ -5233,7 +5233,7 @@ INT WINAPI TranslateAcceleratorA( HWND hWnd, HACCEL hAccel, LPMSG msg )
return 0;
}
- TRACE_(accel)("hAccel %p, hWnd %p, msg->hwnd %p, msg->message %04x, wParam %08x, lParam %08lx\n",
+ TRACE_(accel)("hAccel %p, hWnd %p, msg->hwnd %p, msg->message %04x, wParam %08lx, lParam %08lx\n",
hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam);
i = 0;
do
@@ -5275,7 +5275,7 @@ INT WINAPI TranslateAcceleratorW( HWND hWnd, HACCEL hAccel, LPMSG msg )
return 0;
}
- TRACE_(accel)("hAccel %p, hWnd %p, msg->hwnd %p, msg->message %04x, wParam %08x, lParam %08lx\n",
+ TRACE_(accel)("hAccel %p, hWnd %p, msg->hwnd %p, msg->message %04x, wParam %08lx, lParam %08lx\n",
hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam);
i = 0;
do
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index ff451d1..7945fa6 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -1337,13 +1337,13 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes
/* send back the value of h on the other side */
push_data( data, &h, sizeof(HGLOBAL) );
lp = uiLo;
- TRACE( "send dde-ack %x %08x => %p\n", uiLo, uiHi, h );
+ TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h );
}
}
else
{
/* uiHi should contain either an atom or 0 */
- TRACE( "send dde-ack %x atom=%x\n", uiLo, uiHi );
+ TRACE( "send dde-ack %lx atom=%lx\n", uiLo, uiHi );
lp = MAKELONG( uiLo, uiHi );
}
break;
@@ -1375,7 +1375,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes
hunlock = (HGLOBAL)uiLo;
}
}
- TRACE( "send ddepack %u %x\n", size, uiHi );
+ TRACE( "send ddepack %u %lx\n", size, uiHi );
break;
case WM_DDE_EXECUTE:
if (info->lparam)
@@ -1442,13 +1442,13 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM
uiLo = *lparam;
memcpy( &hMem, *buffer, size );
uiHi = (UINT_PTR)hMem;
- TRACE("recv dde-ack %x mem=%x[%lx]\n", uiLo, uiHi, GlobalSize( hMem ));
+ TRACE("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem ));
}
else
{
uiLo = LOWORD( *lparam );
uiHi = HIWORD( *lparam );
- TRACE("recv dde-ack %x atom=%x\n", uiLo, uiHi);
+ TRACE("recv dde-ack %lx atom=%lx\n", uiLo, uiHi);
}
*lparam = PackDDElParam( WM_DDE_ACK, uiLo, uiHi );
break;
@@ -1998,7 +1998,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags
if (res) return FALSE;
- TRACE( "got type %d msg %x (%s) hwnd %p wp %x lp %lx\n",
+ TRACE( "got type %d msg %x (%s) hwnd %p wp %lx lp %lx\n",
info.type, info.msg.message,
(info.type == MSG_WINEVENT) ? "MSG_WINEVENT" : SPY_GetMsgName(info.msg.message, info.msg.hwnd),
info.msg.hwnd, info.msg.wParam, info.msg.lParam );
@@ -2046,7 +2046,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags
}
if (TRACE_ON(relay))
- DPRINTF( "%04x:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04x,time=%x)\n",
+ DPRINTF( "%04x:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n",
GetCurrentThreadId(), hook_proc,
data->hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
info.msg.lParam, data->tid, info.msg.time);
@@ -2055,7 +2055,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags
info.msg.lParam, data->tid, info.msg.time );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04x,time=%x)\n",
+ DPRINTF( "%04x:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n",
GetCurrentThreadId(), hook_proc,
data->hook, info.msg.message, info.msg.hwnd, info.msg.wParam,
info.msg.lParam, data->tid, info.msg.time);
@@ -2300,7 +2300,7 @@ static LRESULT retrieve_reply( const struct send_message_info *info,
HeapFree( GetProcessHeap(), 0, reply_data );
- TRACE( "hwnd %p msg %x (%s) wp %x lp %lx got reply %lx (err=%d)\n",
+ TRACE( "hwnd %p msg %x (%s) wp %lx lp %lx got reply %lx (err=%d)\n",
info->hwnd, info->msg, SPY_GetMsgName(info->msg, info->hwnd), info->wparam,
info->lparam, *result, status );
@@ -2317,7 +2317,7 @@ static LRESULT send_inter_thread_message( const struct send_message_info *info,
{
size_t reply_size = 0;
- TRACE( "hwnd %p msg %x (%s) wp %x lp %lx\n",
+ TRACE( "hwnd %p msg %x (%s) wp %lx lp %lx\n",
info->hwnd, info->msg, SPY_GetMsgName(info->msg, info->hwnd), info->wparam, info->lparam );
USER_CheckNotLock();
@@ -2668,7 +2668,7 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
return FALSE;
}
- TRACE( "hwnd %p msg %x (%s) wp %x lp %lx\n",
+ TRACE( "hwnd %p msg %x (%s) wp %lx lp %lx\n",
hwnd, msg, SPY_GetMsgName(msg, hwnd), wparam, lparam );
info.type = MSG_POSTED;
@@ -2931,7 +2931,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg )
if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE;
if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE;
- TRACE_(key)("Translating key %s (%04x), scancode %02x\n",
+ TRACE_(key)("Translating key %s (%04lx), scancode %02x\n",
SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam)));
GetKeyboardState( state );
@@ -3321,13 +3321,13 @@ LONG WINAPI BroadcastSystemMessageA( DWORD flags, LPDWORD recipients, UINT msg,
{
if ((*recipients & BSM_APPLICATIONS) || (*recipients == BSM_ALLCOMPONENTS))
{
- FIXME( "(%08x,%08x,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp );
+ FIXME( "(%08x,%08x,%08x,%08lx,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp );
PostMessageA( HWND_BROADCAST, msg, wp, lp );
return 1;
}
else
{
- FIXME( "(%08x,%08x,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp);
+ FIXME( "(%08x,%08x,%08x,%08lx,%08lx): stub!\n", flags, *recipients, msg, wp, lp);
return -1;
}
}
@@ -3340,13 +3340,13 @@ LONG WINAPI BroadcastSystemMessageW( DWORD flags, LPDWORD recipients, UINT msg,
{
if ((*recipients & BSM_APPLICATIONS) || (*recipients == BSM_ALLCOMPONENTS))
{
- FIXME( "(%08x,%08x,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp );
+ FIXME( "(%08x,%08x,%08x,%08lx,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp );
PostMessageW( HWND_BROADCAST, msg, wp, lp );
return 1;
}
else
{
- FIXME( "(%08x,%08x,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp );
+ FIXME( "(%08x,%08x,%08x,%08lx,%08lx): stub!\n", flags, *recipients, msg, wp, lp );
return -1;
}
}
@@ -3400,7 +3400,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc )
}
SERVER_END_REQ;
- TRACE("Added %p %x %p timeout %d\n", hwnd, id, winproc, timeout );
+ TRACE("Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout );
return ret;
}
@@ -3431,7 +3431,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC
}
SERVER_END_REQ;
- TRACE("Added %p %x %p timeout %d\n", hwnd, id, winproc, timeout );
+ TRACE("Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout );
return ret;
}
@@ -3443,7 +3443,7 @@ BOOL WINAPI KillTimer( HWND hwnd, UINT_PTR id )
{
BOOL ret;
- TRACE("%p %d\n", hwnd, id );
+ TRACE("%p %ld\n", hwnd, id );
SERVER_START_REQ( kill_win_timer )
{
@@ -3464,7 +3464,7 @@ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id )
{
BOOL ret;
- TRACE("%p %d\n", hwnd, id );
+ TRACE("%p %ld\n", hwnd, id );
SERVER_START_REQ( kill_win_timer )
{
diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 575bb39..0410d66 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -1539,7 +1539,7 @@ LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam )
*/
LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
{
- TRACE("hwnd %p WM_SYSCOMMAND %x %lx\n", hwnd, wParam, lParam );
+ TRACE("hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wParam, lParam );
if (!IsWindowEnabled( hwnd )) return 0;
@@ -1621,7 +1621,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
case SC_ARRANGE:
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
- FIXME("unimplemented WM_SYSCOMMAND %04x!\n", wParam);
+ FIXME("unimplemented WM_SYSCOMMAND %04lx!\n", wParam);
break;
}
return 0;
diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
index d24770f..afd961e 100644
--- a/dlls/user32/scroll.c
+++ b/dlls/user32/scroll.c
@@ -772,7 +772,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar,
*/
static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%p wParam=%d lParam=%ld\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p wParam=%ld lParam=%ld\n", hwnd, wParam, lParam);
/* hide caret on first KEYDOWN to prevent flicker */
if ((lParam & PFD_DOUBLEBUFFER_DONTCARE) == 0)
@@ -1547,13 +1547,13 @@ static LRESULT WINAPI ScrollBarWndProc( HWND hwnd, UINT message, WPARAM wParam,
case 0x00ed:
case 0x00ee:
case 0x00ef:
- ERR("unknown Win32 msg %04x wp=%08x lp=%08lx\n",
+ ERR("unknown Win32 msg %04x wp=%08lx lp=%08lx\n",
message, wParam, lParam );
break;
default:
if (message >= WM_USER)
- WARN("unknown msg %04x wp=%04x lp=%08lx\n",
+ WARN("unknown msg %04x wp=%04lx lp=%08lx\n",
message, wParam, lParam );
return DefWindowProcW( hwnd, message, wParam, lParam );
}
diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c
index 52dced6..c29c6d7 100644
--- a/dlls/user32/spy.c
+++ b/dlls/user32/spy.c
@@ -2469,7 +2469,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter)
p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array,
pnmh->code);
if (p) {
- TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=%s<0x%08x>, extra=0x%x\n",
+ TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=%s<0x%08x>, extra=0x%x\n",
pnmh->hwndFrom, pnmh->idFrom, p->name, pnmh->code, p->len);
dumplen = p->len;
@@ -2491,7 +2491,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter)
}
}
else
- TRACE("NMHDR hwndFrom=%p idFrom=0x%08x code=0x%08x\n",
+ TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n",
pnmh->hwndFrom, pnmh->idFrom, pnmh->code);
}
default:
@@ -2524,13 +2524,13 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
switch(iFlag)
{
case SPY_DISPATCHMESSAGE16:
- TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n",
+ TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04lx lp=%08lx\n",
indent, "", HWND_16(hWnd),
debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name, wParam, lParam);
break;
case SPY_DISPATCHMESSAGE:
- TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n",
+ TRACE("%*s(%p) %-16s message [%04x] %s dispatched wp=%08lx lp=%08lx\n",
indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, wParam, lParam);
break;
@@ -2545,11 +2545,11 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
else sprintf( taskName, "tid %04x", GetCurrentThreadId() );
if (iFlag == SPY_SENDMESSAGE16)
- TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n",
+ TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04lx lp=%08lx\n",
indent, "", HWND_16(hWnd), debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, taskName, wParam, lParam );
else
- { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n",
+ { TRACE("%*s(%p) %-16s message [%04x] %s sent from %s wp=%08lx lp=%08lx\n",
indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, taskName, wParam, lParam );
SPY_DumpStructure(&sp_e, TRUE);
@@ -2559,13 +2559,13 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg,
case SPY_DEFWNDPROC16:
if( SPY_ExcludeDWP ) return;
- TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n",
+ TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04lx lp=%08lx\n",
indent, "", HWND_16(hWnd), sp_e.msg_name, msg, wParam, lParam );
break;
case SPY_DEFWNDPROC:
if( SPY_ExcludeDWP ) return;
- TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n",
+ TRACE("%*s(%p) DefWindowProc32: %s [%04x] wp=%08lx lp=%08lx\n",
indent, "", hWnd, sp_e.msg_name,
msg, wParam, lParam );
break;
diff --git a/dlls/user32/static.c b/dlls/user32/static.c
index df35308..8afaca1 100644
--- a/dlls/user32/static.c
+++ b/dlls/user32/static.c
@@ -554,7 +554,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam,
lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style );
break;
default:
- FIXME("STM_SETIMAGE: Unhandled type %x\n", wParam);
+ FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam);
break;
}
STATIC_TryPaintFcn( hwnd, full_style );
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index a164dfb..dcaa601 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -38,13 +38,13 @@ static LRESULT WINAPI hook_dde_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam
{
UINT_PTR lo, hi;
- trace("hook_dde_client_wndproc: %p %04x %08x %08lx\n", hwnd, msg, wparam, lparam);
+ trace("hook_dde_client_wndproc: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam);
switch (msg)
{
case WM_DDE_ACK:
UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi);
- trace("WM_DDE_ACK: status %04x hglobal %p\n", lo, (HGLOBAL)hi);
+ trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi);
break;
default:
@@ -55,7 +55,7 @@ static LRESULT WINAPI hook_dde_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam
static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
{
- trace("dde_server_wndproc: %p %04x %08x %08lx\n", hwnd, msg, wparam, lparam);
+ trace("dde_server_wndproc: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam);
switch (msg)
{
@@ -87,7 +87,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA
trace("server: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam);
UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi);
- trace("%08lx => lo %04x hi %04x\n", lparam, lo, hi);
+ trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi);
ack.bAppReturnCode = 0;
ack.reserved = 0;
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 94eedee..b7d7477 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -245,14 +245,14 @@ static void do_test( HWND hwnd, int seqnr, const KEV td[] )
seqnr + 1, buf);
while( PeekMessage(&msg,hwnd,WM_KEYFIRST,WM_KEYLAST,PM_REMOVE) ) {
if (winetest_debug > 1)
- trace("message[%d] %-15s wParam %04x lParam %08lx time %x\n", i,
+ trace("message[%d] %-15s wParam %04lx lParam %08lx time %x\n", i,
MSGNAME[msg.message - WM_KEYFIRST], msg.wParam, msg.lParam, msg.time);
if( i < kmctr ) {
ok( msg.message == expmsg[i].message &&
msg.wParam == expmsg[i].wParam &&
msg.lParam == expmsg[i].lParam,
"wrong message! expected:\n"
- "message[%d] %-15s wParam %04x lParam %08lx\n",i,
+ "message[%d] %-15s wParam %04lx lParam %08lx\n",i,
MSGNAME[(expmsg[i]).message - WM_KEYFIRST],
expmsg[i].wParam, expmsg[i].lParam );
}
diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index 257de59..125bd9d 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -235,9 +235,9 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA
RECT rc_item, rc_client, rc_clip;
DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lparam;
- trace("%p WM_DRAWITEM %08x %08lx\n", hwnd, wparam, lparam);
+ trace("%p WM_DRAWITEM %08lx %08lx\n", hwnd, wparam, lparam);
- ok(wparam == dis->CtlID, "got wParam=%08x instead of %08x\n",
+ ok(wparam == dis->CtlID, "got wParam=%08lx instead of %08x\n",
wparam, dis->CtlID);
ok(dis->CtlType == ODT_LISTBOX, "wrong CtlType %04x\n", dis->CtlType);
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index b40f678..12da7f0 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -1404,13 +1404,13 @@ static void ok_sequence_(const struct message *expected, const char *context, in
todo_wine {
failcount ++;
ok_( file, line) (FALSE,
- "%s: in msg 0x%04x expecting wParam 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
context, expected->message, expected->wParam, actual->wParam);
}
}
else
ok_( file, line) (expected->wParam == actual->wParam,
- "%s: in msg 0x%04x expecting wParam 0x%x got 0x%x\n",
+ "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n",
context, expected->message, expected->wParam, actual->wParam);
}
if (expected->flags & lparam)
@@ -2510,7 +2510,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("mdi client: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("mdi client: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
switch (message)
{
@@ -2562,7 +2562,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("mdi child: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("mdi child: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
switch (message)
{
@@ -2632,7 +2632,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam,
message != WM_GETICON &&
message != WM_DEVICECHANGE)
{
- trace("mdi frame: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("mdi frame: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
switch (message)
{
@@ -3197,7 +3197,7 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam
{
struct message msg;
- trace("dialog: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("dialog: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -4328,7 +4328,7 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam,
LRESULT ret;
struct message msg;
- trace("button: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("button: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -4468,7 +4468,7 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam,
LRESULT ret;
struct message msg;
- trace("static: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("static: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -5543,7 +5543,7 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel)
{
struct message log_msg;
- trace("accel: %p, %04x, %08x, %08lx\n", msg.hwnd, msg.message, msg.wParam, msg.lParam);
+ trace("accel: %p, %04x, %08lx, %08lx\n", msg.hwnd, msg.message, msg.wParam, msg.lParam);
/* ignore some unwanted messages */
if (msg.message == WM_MOUSEMOVE ||
@@ -5768,7 +5768,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message,
LRESULT ret;
struct message msg;
- trace("%p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("%p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -5779,7 +5779,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message,
{
LONG style = GetWindowLongA(hwnd, GWL_STYLE);
ok((BOOL)wParam == !(style & WS_DISABLED),
- "wrong WS_DISABLED state: %d != %d\n", wParam, !(style & WS_DISABLED));
+ "wrong WS_DISABLED state: %ld != %d\n", wParam, !(style & WS_DISABLED));
break;
}
@@ -5924,7 +5924,7 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam,
LRESULT ret;
struct message msg;
- trace("popup: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("popup: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -5956,7 +5956,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam
LRESULT ret;
struct message msg;
- trace("parent: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -6039,7 +6039,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA
LRESULT ret;
struct message msg;
- trace("dialog: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("dialog: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -6148,10 +6148,10 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP
case WM_KILLFOCUS:
#endif
case WM_SHOWWINDOW:
- trace("WM_SHOWWINDOW %d\n", wParam);
+ trace("WM_SHOWWINDOW %ld\n", wParam);
break;
case WM_SIZE:
- trace("WM_SIZE %d\n", wParam);
+ trace("WM_SIZE %ld\n", wParam);
break;
case WM_MOVE:
trace("WM_MOVE\n");
@@ -6267,7 +6267,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)
HWND hwnd;
char buf[256];
- trace("CBT: %d (%s), %08x, %08lx\n", nCode, code_name, wParam, lParam);
+ trace("CBT: %d (%s), %08lx, %08lx\n", nCode, code_name, wParam, lParam);
ok(cbt_hook_thread_id == GetCurrentThreadId(), "we didn't ask for events from other threads\n");
@@ -6567,7 +6567,7 @@ struct timer_info
DWORD id;
};
-static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT id, DWORD dwTime)
+static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime)
{
}
@@ -6728,7 +6728,7 @@ static LRESULT CALLBACK cbt_global_hook_proc(int nCode, WPARAM wParam, LPARAM lP
HWND hwnd;
char buf[256];
- trace("CBT_2: %d, %08x, %08lx\n", nCode, wParam, lParam);
+ trace("CBT_2: %d, %08lx, %08lx\n", nCode, wParam, lParam);
if (nCode == HCBT_SYSCOMMAND)
{
@@ -7687,7 +7687,7 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L
LRESULT ret;
struct message msg;
- trace("edit: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("edit: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
/* explicitly ignore WM_GETICON message */
if (message == WM_GETICON) return 0;
@@ -7992,7 +7992,7 @@ static void test_PeekMessage(void)
msg.message = 0;
ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE);
ok(ret && msg.message == WM_CHAR && msg.wParam == 'z',
- "got %d and %04x wParam %08x instead of TRUE and WM_CHAR wParam 'z'\n",
+ "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n",
ret, msg.message, msg.wParam);
ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE);
@@ -8050,7 +8050,7 @@ static void test_PeekMessage(void)
msg.message = 0;
ret = PeekMessageA(&msg, 0, WM_CHAR, WM_CHAR, PM_REMOVE);
ok(ret && msg.message == WM_CHAR && msg.wParam == 'z',
- "got %d and %04x wParam %08x instead of TRUE and WM_CHAR wParam 'z'\n",
+ "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n",
ret, msg.message, msg.wParam);
ok_sequence(WmUser, "WmUser", FALSE);
@@ -8100,7 +8100,7 @@ static void test_PeekMessage(void)
else /* workaround for a missing QS_RAWINPUT support */
ret = PeekMessageA(&msg, 0, WM_KEYDOWN, WM_KEYDOWN, PM_REMOVE);
ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N',
- "got %d and %04x wParam %08x instead of TRUE and WM_KEYDOWN wParam 'N'\n",
+ "got %d and %04x wParam %08lx instead of TRUE and WM_KEYDOWN wParam 'N'\n",
ret, msg.message, msg.wParam);
ok_sequence(WmKeyDownSkippedSeq, "WmKeyDownSkippedSeq", FALSE);
@@ -8114,7 +8114,7 @@ static void test_PeekMessage(void)
else /* workaround for a missing QS_RAWINPUT support */
ret = PeekMessageA(&msg, 0, WM_KEYUP, WM_KEYUP, PM_REMOVE);
ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N',
- "got %d and %04x wParam %08x instead of TRUE and WM_KEYUP wParam 'N'\n",
+ "got %d and %04x wParam %08lx instead of TRUE and WM_KEYUP wParam 'N'\n",
ret, msg.message, msg.wParam);
ok_sequence(WmKeyUpSkippedSeq, "WmKeyUpSkippedSeq", FALSE);
@@ -8136,7 +8136,7 @@ static void test_PeekMessage(void)
msg.message = 0;
ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE);
ok(ret && msg.message == WM_CHAR && msg.wParam == 'z',
- "got %d and %04x wParam %08x instead of TRUE and WM_CHAR wParam 'z'\n",
+ "got %d and %04x wParam %08lx instead of TRUE and WM_CHAR wParam 'z'\n",
ret, msg.message, msg.wParam);
ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE);
@@ -8184,7 +8184,7 @@ static void test_PeekMessage(void)
ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE);
ok(ret && msg.message == WM_QUIT,
"got %d and %04x instead of TRUE and WM_QUIT\n", ret, msg.message);
- ok(msg.wParam == 0x1234abcd, "got wParam %08x instead of 0x1234abcd\n", msg.wParam);
+ ok(msg.wParam == 0x1234abcd, "got wParam %08lx instead of 0x1234abcd\n", msg.wParam);
ok(msg.lParam == 0, "got lParam %08lx instead of 0\n", msg.lParam);
ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE);
@@ -8230,7 +8230,7 @@ static void test_quit_message(void)
ret = PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
ok(ret, "PeekMessage failed with error %d\n", GetLastError());
ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message);
- ok(msg.wParam == 0xbeef, "wParam was 0x%x instead of 0xbeef\n", msg.wParam);
+ ok(msg.wParam == 0xbeef, "wParam was 0x%lx instead of 0xbeef\n", msg.wParam);
ret = PostThreadMessage(GetCurrentThreadId(), WM_USER, 0, 0);
ok(ret, "PostMessage failed with error %d\n", GetLastError());
@@ -8243,7 +8243,7 @@ static void test_quit_message(void)
ret = GetMessage(&msg, NULL, 0, 0);
ok(!ret, "GetMessage return %d with error %d instead of FALSE\n", ret, GetLastError());
ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message);
- ok(msg.wParam == 0xbeef, "wParam was 0x%x instead of 0xbeef\n", msg.wParam);
+ ok(msg.wParam == 0xbeef, "wParam was 0x%lx instead of 0xbeef\n", msg.wParam);
ret = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE);
ok( !ret || msg.message != WM_QUIT, "Received WM_QUIT again\n" );
@@ -8254,7 +8254,7 @@ static void test_quit_message(void)
ret = PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
ok(ret, "PeekMessage failed with error %d\n", GetLastError());
ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message);
- ok(msg.wParam == 0xdead, "wParam was 0x%x instead of 0xdead\n", msg.wParam);
+ ok(msg.wParam == 0xdead, "wParam was 0x%lx instead of 0xdead\n", msg.wParam);
ret = PostThreadMessage(GetCurrentThreadId(), WM_USER, 0, 0);
ok(ret, "PostMessage failed with error %d\n", GetLastError());
@@ -8263,7 +8263,7 @@ static void test_quit_message(void)
ret = GetMessage(&msg, NULL, 0, 0);
ok(!ret, "GetMessage return %d with error %d instead of FALSE\n", ret, GetLastError());
ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message);
- ok(msg.wParam == 0xdead, "wParam was 0x%x instead of 0xdead\n", msg.wParam);
+ ok(msg.wParam == 0xdead, "wParam was 0x%lx instead of 0xdead\n", msg.wParam);
ret = GetMessage(&msg, NULL, 0, 0);
ok(ret > 0, "GetMessage failed with error %d\n", GetLastError());
@@ -8880,7 +8880,7 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR
{
struct message msg;
- trace("dialog: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam);
+ trace("dialog: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam);
switch (message)
{
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 632fcc1..36db85e 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -546,7 +546,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
{
MINMAXINFO* minmax = (MINMAXINFO *)lparam;
- trace("hwnd %p, WM_GETMINMAXINFO, %08x, %08lx\n", hwnd, wparam, lparam);
+ trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam);
trace("ptReserved (%d,%d), ptMaxSize (%d,%d), ptMaxPosition (%d,%d)\n"
" ptMinTrackSize (%d,%d), ptMaxTrackSize (%d,%d)\n",
minmax->ptReserved.x, minmax->ptReserved.y,
@@ -643,7 +643,7 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR
{
MINMAXINFO* minmax = (MINMAXINFO *)lparam;
- trace("hwnd %p, WM_GETMINMAXINFO, %08x, %08lx\n", hwnd, wparam, lparam);
+ trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam);
trace("ptReserved (%d,%d), ptMaxSize (%d,%d), ptMaxPosition (%d,%d)\n"
" ptMinTrackSize (%d,%d), ptMaxTrackSize (%d,%d)\n",
minmax->ptReserved.x, minmax->ptReserved.y,
@@ -836,7 +836,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)
"HCBT_SETFOCUS" };
const char *code_name = (nCode >= 0 && nCode <= HCBT_SETFOCUS) ? CBT_code_name[nCode] : "Unknown";
- trace("CBT: %d (%s), %08x, %08lx\n", nCode, code_name, wParam, lParam);
+ trace("CBT: %d (%s), %08lx, %08lx\n", nCode, code_name, wParam, lParam);
/* on HCBT_DESTROYWND window state is undefined */
if (nCode != HCBT_DESTROYWND && IsWindow((HWND)wParam))
@@ -4026,24 +4026,24 @@ static void test_SetWindowLong(void)
SetLastError(0xdeadbeef);
retval = SetWindowLongPtr(NULL, GWLP_WNDPROC, 0);
- ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%x\n", retval);
+ ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%lx\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_WINDOW_HANDLE),
"SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instad of %d\n", GetLastError());
SetLastError(0xdeadbeef);
retval = SetWindowLongPtr(hwndMain, 0xdeadbeef, 0);
- ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%x\n", retval);
+ ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%lx\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_INDEX),
"SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instad of %d\n", GetLastError());
SetLastError(0xdeadbeef);
retval = SetWindowLongPtr(hwndMain, GWLP_WNDPROC, 0);
ok((WNDPROC)retval == main_window_procA,
- "SetWindowLongPtr on invalid window proc should have returned address of main_window_procA instead of 0x%x\n", retval);
+ "SetWindowLongPtr on invalid window proc should have returned address of main_window_procA instead of 0x%lx\n", retval);
ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %d\n", GetLastError());
retval = GetWindowLongPtr(hwndMain, GWLP_WNDPROC);
ok((WNDPROC)retval == main_window_procA,
- "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%x\n", retval);
+ "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%lx\n", retval);
ok(!IsWindowUnicode(hwndMain), "hwndMain shouldn't be Unicode\n");
old_window_procW = (WNDPROC)GetWindowLongPtrW(hwndMain, GWLP_WNDPROC);
@@ -4054,7 +4054,7 @@ static void test_SetWindowLong(void)
ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %d\n", GetLastError());
ok(retval != 0, "SetWindowLongPtr error %d\n", GetLastError());
ok((WNDPROC)retval == old_window_procW,
- "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%x\n", retval);
+ "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%lx\n", retval);
ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n");
/* set it back to ANSI */
diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index c4cf004..302cf3d 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -445,13 +445,13 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES
hwnd = WIN_GetFullHandle( hwnd );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ DPRINTF( "%04x:Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp );
*result = WINPROC_wrapper( proc, hwnd, msg, wp, lp );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n",
+ DPRINTF( "%04x:Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n",
GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result );
return *result;
}
@@ -466,14 +466,14 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES
hwnd = WIN_GetFullHandle( hwnd );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Call dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ DPRINTF( "%04x:Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp );
ret = WINPROC_wrapper( proc, hwnd, msg, wp, lp );
*result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT );
if (TRACE_ON(relay))
- DPRINTF( "%04x:Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx result=%08lx\n",
+ DPRINTF( "%04x:Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n",
GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result );
return ret;
}
@@ -756,7 +756,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg,
{
LRESULT ret = 0;
- TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam);
switch(msg)
@@ -1030,7 +1030,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN
{
LRESULT ret = 0;
- TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam);
switch(msg)
@@ -1617,7 +1617,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
{
LRESULT ret = 0;
- TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n",
+ TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n",
hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam);
switch(msg)
@@ -1964,7 +1964,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
case 1:
break; /* atom, nothing to do */
case 3:
- MESSAGE("DDE_ACK: %x both atom and handle... choosing handle\n", hi);
+ MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi);
/* fall thru */
case 2:
hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 50381a6..2d1b915 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -352,7 +352,7 @@ static void DOSVM_ProcessMessage(MSG *msg)
{
BYTE scan = 0;
- TRACE("got message %04x, wparam=%08x, lparam=%08lx\n",msg->message,msg->wParam,msg->lParam);
+ TRACE("got message %04x, wparam=%08lx, lparam=%08lx\n",msg->message,msg->wParam,msg->lParam);
if ((msg->message>=WM_MOUSEFIRST)&&
(msg->message<=WM_MOUSELAST)) {
DOSVM_Int33Message(msg->message,msg->wParam,msg->lParam);
@@ -503,7 +503,7 @@ DWORD WINAPI DOSVM_Loop( HANDLE hThread )
DOS_SPC *spc = (DOS_SPC *)msg.lParam;
TRACE_(int)("calling %p with arg %08lx\n", spc->proc, spc->arg);
(spc->proc)(spc->arg);
- TRACE_(int)("done, signalling event %x\n", msg.wParam);
+ TRACE_(int)("done, signalling event %lx\n", msg.wParam);
SetEvent( (HANDLE)msg.wParam );
}
break;
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index ab890e9..59fee3d 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -937,7 +937,7 @@ LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
case WM_X11DRV_DELETE_WINDOW:
return SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 );
default:
- FIXME( "got window msg %x hwnd %p wp %x lp %lx\n", msg, hwnd, wp, lp );
+ FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );
return 0;
}
}
diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c
index e41b11f..e89625b 100644
--- a/dlls/winex11.drv/winpos.c
+++ b/dlls/winex11.drv/winpos.c
@@ -1215,7 +1215,7 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
if (!(data = X11DRV_get_win_data( hwnd ))) return;
- TRACE("hwnd %p (%smanaged), command %04x, hittest %d, pos %d,%d\n",
+ TRACE("hwnd %p (%smanaged), command %04lx, hittest %d, pos %d,%d\n",
hwnd, data->managed ? "" : "NOT ", syscommand, hittest, pt.x, pt.y);
/* if we are managed then we let the WM do all the work */
diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c
index 7400f5e..9b5ed76 100644
--- a/dlls/winex11.drv/x11ddraw.c
+++ b/dlls/winex11.drv/x11ddraw.c
@@ -75,7 +75,7 @@ static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
if(message != X11DRV_DD_GrabMessage)
return CallWindowProcA(X11DRV_DD_GrabOldProcedure, hWnd, message, wParam, lParam);
- TRACE("hwnd=%p, grab=%d\n", hWnd, wParam);
+ TRACE("hwnd=%p, grab=%ld\n", hWnd, wParam);
if (wParam)
{
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index ad84ebe..3577bdd 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -80,7 +80,7 @@ static BOOL JOY_LoadDriver(DWORD dwJoyID)
/**************************************************************************
* JOY_Timer [internal]
*/
-static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT wTimer, DWORD dwTime)
+static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTime)
{
int i;
WINE_JOYSTICK* joy;
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index 4b608a7..6af062b 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -39,7 +39,7 @@ START_TEST(mci)
ok(PeekMessageW( &msg, (HWND)-1, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n");
ok(msg.hwnd == NULL, "got %p instead of NULL\n", msg.hwnd);
ok(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY\n", msg.message);
- ok(msg.wParam == MCI_NOTIFY_SUCCESSFUL, "got %08x instead of MCI_NOTIFY_SUCCESSFUL\n", msg.wParam);
+ ok(msg.wParam == MCI_NOTIFY_SUCCESSFUL, "got %08lx instead of MCI_NOTIFY_SUCCESSFUL\n", msg.wParam);
err = mciSendString(command_close_all, NULL, 0, NULL);
todo_wine ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_all, err);
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 0881f16..3139e79 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -717,7 +717,7 @@ UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize)
{
LPWINE_MLD wmld;
- TRACE("(%04X, %p, %d) !\n", uDeviceID, lpCaps, uSize);
+ TRACE("(%04lX, %p, %d) !\n", uDeviceID, lpCaps, uSize);
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -809,7 +809,7 @@ UINT WINAPI midiOutGetDevCapsW(UINT_PTR uDeviceID, LPMIDIOUTCAPSW lpCaps,
{
LPWINE_MLD wmld;
- TRACE("(%u, %p, %u);\n", uDeviceID, lpCaps, uSize);
+ TRACE("(%lu, %p, %u);\n", uDeviceID, lpCaps, uSize);
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -1191,7 +1191,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSi
{
LPWINE_MLD wmld;
- TRACE("(%d, %p, %d);\n", uDeviceID, lpCaps, uSize);
+ TRACE("(%ld, %p, %d);\n", uDeviceID, lpCaps, uSize);
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -1552,7 +1552,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI
*/
lpMidiHdr = (LPMIDIHDR)msg->lParam;
lpData = (LPBYTE)lpMidiHdr->lpData;
- TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBufferLength=%u/%u dwFlags=0x%08x size=%u]\n",
+ TRACE("Adding %s lpMidiHdr=%p [lpData=0x%p dwBufferLength=%u/%u dwFlags=0x%08x size=%lu]\n",
(lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", lpMidiHdr,
lpMidiHdr, lpMidiHdr->dwBufferLength, lpMidiHdr->dwBytesRecorded,
lpMidiHdr->dwFlags, msg->wParam);
@@ -2149,7 +2149,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps,
{
LPWINE_MLD wmld;
- TRACE("(%u %p %u)!\n", uDeviceID, lpCaps, uSize);
+ TRACE("(%lu %p %u)!\n", uDeviceID, lpCaps, uSize);
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -2543,7 +2543,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi
{
LPWINE_MLD wmld;
- TRACE("(%u %p %u)!\n", uDeviceID, lpCaps, uSize);
+ TRACE("(%lu %p %u)!\n", uDeviceID, lpCaps, uSize);
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c
index 2862031..a1dafe6 100644
--- a/dlls/winspool.drv/tests/info.c
+++ b/dlls/winspool.drv/tests/info.c
@@ -2015,7 +2015,7 @@ static void test_DeviceCapabilities(void)
hComdlg32 = LoadLibrary("comdlg32.dll");
assert(hComdlg32);
- pPrintDlgA = GetProcAddress(hComdlg32, "PrintDlgA");
+ pPrintDlgA = (void *)GetProcAddress(hComdlg32, "PrintDlgA");
assert(pPrintDlgA);
memset(&prn_dlg, 0, sizeof(prn_dlg));
diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c
index 85e901d..f225d07 100644
--- a/dlls/wintab32/manager.c
+++ b/dlls/wintab32/manager.c
@@ -192,7 +192,7 @@ BOOL WINAPI WTMgrPacketUnhook(HWTHOOK hHook)
LRESULT WINAPI WTMgrPacketHookNext(HWTHOOK hHook, int nCode,
WPARAM wParam, LPARAM lParam)
{
- FIXME("(%p, %d, %u, %lu): stub\n", hHook, nCode, wParam, lParam);
+ FIXME("(%p, %d, %lu, %lu): stub\n", hHook, nCode, wParam, lParam);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c
index 09c0809..8598953 100644
--- a/dlls/ws2_32/async.c
+++ b/dlls/ws2_32/async.c
@@ -767,7 +767,7 @@ INT WINAPI WSApSetPostRoutine(LPWPUPOSTMESSAGE lpPostRoutine)
WSAEVENT WINAPI WPUCompleteOverlappedRequest(SOCKET s, LPWSAOVERLAPPED overlapped,
DWORD error, DWORD transferred, LPINT errcode)
{
- FIXME("(0x%08x,%p,0x%08x,0x%08x,%p), stub !\n", s, overlapped, error, transferred, errcode);
+ FIXME("(0x%08lx,%p,0x%08x,0x%08x,%p), stub !\n", s, overlapped, error, transferred, errcode);
if (errcode)
*errcode = WSAEINVAL;
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b6ac5fc..8ddcbc5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -226,7 +226,7 @@ struct per_thread_data
};
static INT num_startup; /* reference counter */
-static FARPROC blocking_hook = WSA_DefaultBlockingHook;
+static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook;
/* function prototypes */
static struct WS_hostent *WS_dup_he(const struct hostent* p_he);
@@ -1449,7 +1449,7 @@ static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode )
LPWSAOVERLAPPED ovl = HeapAlloc(GetProcessHeap(), 0, sizeof( WSAOVERLAPPED ));
IO_STATUS_BLOCK *iosb = NULL;
- TRACE("s %d mode %d\n", s, mode);
+ TRACE("s %ld mode %d\n", s, mode);
if (!ovl)
goto out;
@@ -1489,7 +1489,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr,
SOCKET as;
BOOL is_blocking;
- TRACE("socket %04x\n", s );
+ TRACE("socket %04lx\n", s );
is_blocking = _is_blocking(s);
do {
@@ -1531,7 +1531,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen)
int fd = get_sock_fd( s, 0, NULL );
int res = SOCKET_ERROR;
- TRACE("socket %04x, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
+ TRACE("socket %04lx, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
if (fd != -1)
{
@@ -1586,7 +1586,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen)
*/
int WINAPI WS_closesocket(SOCKET s)
{
- TRACE("socket %04x\n", s);
+ TRACE("socket %04lx\n", s);
if (CloseHandle(SOCKET2HANDLE(s))) return 0;
return SOCKET_ERROR;
}
@@ -1598,7 +1598,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
{
int fd = get_sock_fd( s, FILE_READ_DATA, NULL );
- TRACE("socket %04x, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
+ TRACE("socket %04lx, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
if (fd != -1)
{
@@ -1683,7 +1683,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen)
int fd;
int res;
- TRACE("socket: %04x, ptr %p, len %08x\n", s, name, *namelen);
+ TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, *namelen);
/* Check if what we've received is valid. Should we use IsBadReadPtr? */
if( (name == NULL) || (namelen == NULL) )
@@ -1728,7 +1728,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen)
int fd;
int res;
- TRACE("socket: %04x, ptr %p, len %8x\n", s, name, *namelen);
+ TRACE("socket: %04lx, ptr %p, len %8x\n", s, name, *namelen);
/* Check if what we've received is valid. Should we use IsBadReadPtr? */
if( (name == NULL) || (namelen == NULL) )
@@ -1774,7 +1774,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
int fd;
INT ret = 0;
- TRACE("socket: %04x, level 0x%x, name 0x%x, ptr %p, len %d\n",
+ TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n",
s, level, optname, optval, *optlen);
switch(level)
@@ -2195,7 +2195,7 @@ INT WINAPI WSAIoctl(SOCKET s,
LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)
{
- TRACE("%d, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n",
+ TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n",
s, dwIoControlCode, lpvInBuffer, cbInBuffer, lpbOutBuffer,
cbOutBuffer, lpcbBytesReturned, lpOverlapped, lpCompletionRoutine);
@@ -2445,7 +2445,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, WS_u_long *argp)
int fd;
long newcmd = cmd;
- TRACE("socket %04x, cmd %08lx, ptr %p\n", s, cmd, argp);
+ TRACE("socket %04lx, cmd %08lx, ptr %p\n", s, cmd, argp);
switch( cmd )
{
@@ -2527,7 +2527,7 @@ int WINAPI WS_listen(SOCKET s, int backlog)
{
int fd = get_sock_fd( s, FILE_READ_DATA, NULL );
- TRACE("socket %04x, backlog %d\n", s, backlog);
+ TRACE("socket %04lx, backlog %d\n", s, backlog);
if (fd != -1)
{
if (listen(fd, backlog) == 0)
@@ -2760,7 +2760,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
struct ws2_async *wsa;
IO_STATUS_BLOCK* iosb;
- TRACE("socket %04x, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n",
+ TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n",
s, lpBuffers, dwBufferCount, dwFlags,
to, tolen, lpOverlapped, lpCompletionRoutine);
@@ -2940,7 +2940,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
struct linger linger;
struct timeval tval;
- TRACE("socket: %04x, level 0x%x, name 0x%x, ptr %p, len %d\n",
+ TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n",
s, level, optname, optval, optlen);
switch(level)
@@ -3174,7 +3174,7 @@ int WINAPI WS_shutdown(SOCKET s, int how)
unsigned int options, clear_flags = 0;
fd = get_sock_fd( s, 0, &options );
- TRACE("socket %04x, how %i %x\n", s, how, options );
+ TRACE("socket %04lx, how %i %x\n", s, how, options );
if (fd == -1)
return SOCKET_ERROR;
@@ -3667,7 +3667,7 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp
{
int ret;
- TRACE("%08x, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent );
+ TRACE("%08lx, hEvent %p, lpEvent %p\n", s, hEvent, lpEvent );
SERVER_START_REQ( get_socket_event )
{
@@ -3690,7 +3690,7 @@ int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, long lEvent)
{
int ret;
- TRACE("%08x, hEvent %p, event %08x\n", s, hEvent, (unsigned)lEvent );
+ TRACE("%08lx, hEvent %p, event %08x\n", s, hEvent, (unsigned)lEvent );
SERVER_START_REQ( set_socket_event )
{
@@ -3716,7 +3716,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped,
{
DWORD r;
- TRACE( "socket %04x ovl %p trans %p, wait %d flags %p\n",
+ TRACE( "socket %04lx ovl %p trans %p, wait %d flags %p\n",
s, lpOverlapped, lpcbTransfer, fWait, lpdwFlags );
if ( lpOverlapped == NULL )
@@ -3774,7 +3774,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, long lEvent)
{
int ret;
- TRACE("%x, hWnd %p, uMsg %08x, event %08lx\n", s, hWnd, uMsg, lEvent );
+ TRACE("%lx, hWnd %p, uMsg %08x, event %08lx\n", s, hWnd, uMsg, lEvent );
SERVER_START_REQ( set_socket_event )
{
@@ -3864,7 +3864,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol,
/* hack for WSADuplicateSocket */
if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) {
ret = lpProtocolInfo->dwCatalogEntryId;
- TRACE("\tgot duplicate %04x\n", ret);
+ TRACE("\tgot duplicate %04lx\n", ret);
return ret;
}
@@ -3916,7 +3916,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol,
SERVER_END_REQ;
if (ret)
{
- TRACE("\tcreated %04x\n", ret );
+ TRACE("\tcreated %04lx\n", ret );
return ret;
}
@@ -3958,7 +3958,7 @@ int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set)
{
int i = set->fd_count;
- TRACE("(%d,%p(%i))\n", s, set, i);
+ TRACE("(%ld,%p(%i))\n", s, set, i);
while (i--)
if (set->fd_array[i] == s) return 1;
@@ -4017,7 +4017,7 @@ FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc)
*/
INT WINAPI WSAUnhookBlockingHook(void)
{
- blocking_hook = WSA_DefaultBlockingHook;
+ blocking_hook = (FARPROC)WSA_DefaultBlockingHook;
return 0;
}
@@ -4266,7 +4266,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
struct ws2_async *wsa;
IO_STATUS_BLOCK* iosb;
- TRACE("socket %04x, wsabuf %p, nbufs %d, flags %d, from %p, fromlen %d, ovl %p, func %p\n",
+ TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, from %p, fromlen %d, ovl %p, func %p\n",
s, lpBuffers, dwBufferCount, *lpFlags, lpFrom,
(lpFromlen ? *lpFromlen : -1),
lpOverlapped, lpCompletionRoutine);
@@ -4411,7 +4411,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
SOCKET cs;
SOCKADDR src_addr, dst_addr;
- TRACE("Socket %04x, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %d\n",
+ TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %d\n",
s, addr, addrlen, lpfnCondition, dwCallbackData);
@@ -4472,7 +4472,7 @@ int WINAPI WSADuplicateSocketA( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOA
{
HANDLE hProcess;
- TRACE("(%d,%x,%p)\n", s, dwProcessId, lpProtocolInfo);
+ TRACE("(%ld,%x,%p)\n", s, dwProcessId, lpProtocolInfo);
memset(lpProtocolInfo, 0, sizeof(*lpProtocolInfo));
/* FIXME: WS_getsockopt(s, WS_SOL_SOCKET, SO_PROTOCOL_INFO, lpProtocolInfo, sizeof(*lpProtocolInfo)); */
/* I don't know what the real Windoze does next, this is a hack */
@@ -4495,7 +4495,7 @@ int WINAPI WSADuplicateSocketW( SOCKET s, DWORD dwProcessId, LPWSAPROTOCOL_INFOW
{
HANDLE hProcess;
- TRACE("(%d,%x,%p)\n", s, dwProcessId, lpProtocolInfo);
+ TRACE("(%ld,%x,%p)\n", s, dwProcessId, lpProtocolInfo);
memset(lpProtocolInfo, 0, sizeof(*lpProtocolInfo));
hProcess = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwProcessId);
@@ -4808,7 +4808,7 @@ INT WINAPI WSAEnumNameSpaceProvidersW( LPDWORD len, LPWSANAMESPACE_INFOW buffer
*/
BOOL WINAPI WSAGetQOSByName( SOCKET s, LPWSABUF lpQOSName, LPQOS lpQOS )
{
- FIXME( "(0x%04x %p %p) Stub!\n", s, lpQOSName, lpQOS );
+ FIXME( "(0x%04lx %p %p) Stub!\n", s, lpQOSName, lpQOS );
return FALSE;
}
@@ -4914,7 +4914,7 @@ INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA
*/
INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong )
{
- TRACE( "(0x%04x 0x%08x %p)\n", s, netlong, lphostlong );
+ TRACE( "(0x%04lx 0x%08x %p)\n", s, netlong, lphostlong );
if (!lphostlong) return WSAEFAULT;
@@ -4927,7 +4927,7 @@ INT WINAPI WSANtohl( SOCKET s, WS_u_long netlong, WS_u_long* lphostlong )
*/
INT WINAPI WSANtohs( SOCKET s, WS_u_short netshort, WS_u_short* lphostshort )
{
- TRACE( "(0x%04x 0x%08x %p)\n", s, netshort, lphostshort );
+ TRACE( "(0x%04lx 0x%08x %p)\n", s, netshort, lphostshort );
if (!lphostshort) return WSAEFAULT;
@@ -4950,7 +4950,7 @@ INT WINAPI WSAProviderConfigChange( LPHANDLE handle, LPWSAOVERLAPPED overlapped,
*/
INT WINAPI WSARecvDisconnect( SOCKET s, LPWSABUF disconnectdata )
{
- TRACE( "(0x%04x %p)\n", s, disconnectdata );
+ TRACE( "(0x%04lx %p)\n", s, disconnectdata );
return WS_shutdown( s, 0 );
}
diff --git a/include/basetsd.h b/include/basetsd.h
index 84ab6a9..dcdf8fa 100644
--- a/include/basetsd.h
+++ b/include/basetsd.h
@@ -199,9 +199,9 @@ static inline void *ULongToPtr(ULONG32 ul)
#else /* FIXME: defined(_WIN32) */
-typedef int INT_PTR, *PINT_PTR;
+typedef long INT_PTR, *PINT_PTR;
+typedef unsigned long UINT_PTR, *PUINT_PTR;
typedef long LONG_PTR, *PLONG_PTR;
-typedef unsigned int UINT_PTR, *PUINT_PTR;
typedef unsigned long ULONG_PTR, *PULONG_PTR;
typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 4fd8a05..0846dcd 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -36,7 +36,7 @@ static BOOL using_root;
/* window procedure for the desktop window */
static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp )
{
- WINE_TRACE( "got msg %x wp %x lp %lx\n", message, wp, lp );
+ WINE_TRACE( "got msg %x wp %lx lp %lx\n", message, wp, lp );
switch(message)
{
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 1c9dbc7..2b17cc1 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -255,7 +255,7 @@ static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAME *pOpenFile
pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TCHAR));
}
-static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
+static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
{
static OPENFILENAME* pOpenFileName;
OFNOTIFY *pOfNotify;
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index d597a1e..689d128 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -1320,7 +1320,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
break;
case IDS_SCROLL:
case IDS_SEARCH:
- WINE_FIXME("Unhandled yet command: %x\n", wParam);
+ WINE_FIXME("Unhandled yet command: %lx\n", wParam);
break;
default:
return DefWindowProc(hWnd, uMsg, wParam, lParam);
--
1.5.1.6
More information about the wine-patches
mailing list