Module: wine Branch: master Commit: 2ec60930088a3af3d1c570a3a312714a8148353d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ec60930088a3af3d1c570a3a...
Author: Eric Pouech eric.pouech@gmail.com Date: Tue Feb 22 09:43:22 2022 +0100
wintab32: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 22 +++++++++++----------- dlls/wintab32/manager.c | 6 +++--- dlls/wintab32/wintab32.c | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index 56cfd6c2f41..050c78b86d3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wintab32.dll IMPORTLIB = wintab32 IMPORTS = user32 advapi32 diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2da04621934..58ba6b49074 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -102,7 +102,7 @@ static const char* DUMPBITS(int x)
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: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%lx pkChanged: 0x%lx pkSerialNumber: 0x%x pkCursor : %i pkButtons: %lx pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, packet.pkCursor, packet.pkButtons, packet.pkX, packet.pkY, packet.pkZ, packet.pkNormalPressure, packet.pkTangentPressure, @@ -115,19 +115,19 @@ static inline void DUMPCONTEXT(LOGCONTEXTW lc) TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); TRACE("PktRate %x\n", lc.lcPktRate); - TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); - TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); - TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); - TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); - TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); - TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); - TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); - TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); - TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("PktData 0x%04lx %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04lx %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04lx %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %lx, BtnUpMask: %lx\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %li, InOrgY: %li, InOrgZ: %li\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %li, InExtY: %li, InExtZ: %li\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %li, OutOrgY: %li, OutOrgZ: %li\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %li, OutExtY: %li, OutExtZ: %li\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %li, SensY: %li, SensZ: %li\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); TRACE("SysMode: %i\n", lc.lcSysMode); TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); - TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); + TRACE("SysSensX: %li, SysSensY: %li\n", lc.lcSysSensX, lc.lcSysSensY); }
diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index d8d69554582..1a059f55f88 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -59,7 +59,7 @@ BOOL WINAPI WTMgrClose(HMGR hMgr) */ BOOL WINAPI WTMgrContextEnum(HMGR hMgr, WTENUMPROC lpEnumFunc, LPARAM lParam) { - FIXME("(%p, %p, %ld): stub\n", hMgr, lpEnumFunc, lParam); + FIXME("(%p, %p, %Id): stub\n", hMgr, lpEnumFunc, lParam);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -190,7 +190,7 @@ BOOL WINAPI WTMgrPacketUnhook(HWTHOOK hHook) LRESULT WINAPI WTMgrPacketHookNext(HWTHOOK hHook, int nCode, WPARAM wParam, LPARAM lParam) { - FIXME("(%p, %d, %lu, %lu): stub\n", hHook, nCode, wParam, lParam); + FIXME("(%p, %d, %Iu, %Iu): stub\n", hHook, nCode, wParam, lParam);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -243,7 +243,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, UINT wCursor, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index d56706b4223..b13c0573454 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -95,7 +95,7 @@ static HMODULE load_graphics_driver(void)
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { - TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:
-
Alexandre Julliard