Module: wine Branch: master Commit: d3e324f878b7d6d482e4d20dc3ee63bc15379b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e324f878b7d6d482e4d20dc3...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Oct 8 19:33:43 2006 +0200
wintab32: Win64 printf format warning fixes.
---
dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 4 ++-- dlls/wintab32/manager.c | 2 +- dlls/wintab32/wintab16.c | 2 +- dlls/wintab32/wintab32.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index d7eed25..4ff7fc3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wintab32.dll IMPORTLIB = libwintab32.$(IMPLIBEXT) IMPORTS = user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ context.c \ diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index b22c2d2..aea9c67 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -68,7 +68,7 @@ static char* DUMPBITS(int x, char* buf)
static inline void DUMPPACKET(WTPACKET packet) { - TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, (UINT)packet.pkStatus, (UINT)packet.pkTime, @@ -94,7 +94,7 @@ static inline void DUMPCONTEXT(LOGCONTEX CHAR bits1[100]; CHAR bits2[100];
- sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li", + sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), (UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index 49aae58..85e901d 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -245,7 +245,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/wintab32/wintab16.c b/dlls/wintab32/wintab16.c index 34773bc..fc35977 100644 --- a/dlls/wintab32/wintab16.c +++ b/dlls/wintab32/wintab16.c @@ -502,7 +502,7 @@ BOOL16 WINAPI WTMgrCsrButtonMap16(HMGR16 BOOL16 WINAPI WTMgrCsrPressureBtnMarks16(HMGR16 hMgr, UINT16 wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(0x%04hx, %hu, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(0x%04hx, %hu, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks);
return FALSE; } diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 8718da9..f621f8e 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -68,7 +68,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, static const WCHAR name[] = {'T','a','b','l','e','t',0}; HMODULE hx11drv;
- TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: