From 414358acee2c87418b7a661288570f62839a641a Mon Sep 17 00:00:00 2001 From: John Klehm Date: Sun, 12 Oct 2008 15:40:06 -0500 Subject: winex11.drv: Improve tracing of wintab WTInfo --- dlls/winex11.drv/wintab.c | 67 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c6545e7..c0ba91e 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1079,6 +1079,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) switch(wCategory) { case 0: + TRACE("category: NULL. Asking for needed buffer size"); /* return largest necessary buffer */ TRACE("%i cursors\n",gNumCursors); if (gNumCursors>0) @@ -1088,29 +1089,35 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) } break; case WTI_INTERFACE: + TRACE("category: WTI_INTERFACE\n"); switch (nIndex) { WORD version; UINT num; case IFC_WINTABID: { + TRACE("index: IFC_WINTABID\n"); static const WCHAR driver[] = {'W','i','n','e',' ','W','i','n','t','a','b',' ','1','.','1',0}; rc = CopyTabletData(lpOutput, driver, (strlenW(driver) + 1) * sizeof(WCHAR)); break; } case IFC_SPECVERSION: + TRACE("index: IFC_SPECVERSION\n"); version = (0x01) | (0x01 << 8); rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); break; case IFC_IMPLVERSION: + TRACE("index: IFC_IMPLVERSION\n"); version = (0x00) | (0x01 << 8); rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); break; case IFC_NDEVICES: + TRACE("index: IFC_NDEVICES\n"); num = 1; rc = CopyTabletData(lpOutput, &num,sizeof(num)); break; case IFC_NCURSORS: + TRACE("index: IFC_NCURSORS\n"); num = gNumCursors; rc = CopyTabletData(lpOutput, &num,sizeof(num)); break; @@ -1119,100 +1126,158 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) rc = 0; } break; + case WTI_STATUS: + TRACE("category: WTI_STATUS\n"); + switch (nIndex) + { + case STA_CONTEXTS: + TRACE("index: STA_CONTEXTS\n"); + break; + case STA_SYSCTXS: + TRACE("index: STA_SYSCTXS\n"); + break; + case STA_PKTRATE: + TRACE("index: STA_PKTRATE\n"); + break; + case STA_PKTDATA: + TRACE("index: STA_PKTDATA\n"); + break; + case STA_MANAGERS: + TRACE("index: STA_MANAGERS\n"); + break; + case STA_SYSTEM: + TRACE("index: STA_SYSTEM\n"); + break; + case STA_BUTTONUSE: + TRACE("index: STA_BUTTONUSE\n"); + break; + case STA_SYSBTNUSE: + TRACE("index: STA_SYSBTNUSE\n"); + break; + default: + TRACE("index: unknown! = %i\n", nIndex); + } + break; case WTI_DEFSYSCTX: case WTI_DDCTXS: + case WTI_DSCTXS: case WTI_DEFCONTEXT: + TRACE("category: WTI_DEFSYSCTX, WTI_DDCTXS, WTI_DSCTXS, WTI_DEFCONTEXT: %u\n", wCategory); switch (nIndex) { case 0: + TRACE("index: NULL\n"); rc = CopyTabletData(lpOutput, &gSysContext, sizeof(LOGCONTEXTW)); break; case CTX_NAME: - rc = CopyTabletData(lpOutput, gSysContext.lcName, + TRACE("index: CTX_NAME\n"); + rc = CopyTabletData(lpOutput, &gSysContext.lcName, (strlenW(gSysContext.lcName)+1) * sizeof(WCHAR)); break; case CTX_OPTIONS: + TRACE("index: CTX_OPTIONS\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcOptions, sizeof(UINT)); break; case CTX_STATUS: + TRACE("index: CTX_STATUS\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcStatus, sizeof(UINT)); break; case CTX_LOCKS: + TRACE("index: CTX_LOCKS\n"); rc= CopyTabletData (lpOutput, &gSysContext.lcLocks, sizeof(UINT)); break; case CTX_MSGBASE: + TRACE("index: CTX_MSGBASE\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcMsgBase, sizeof(UINT)); break; case CTX_DEVICE: + TRACE("index: CTX_DEVICE\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcDevice, sizeof(UINT)); break; case CTX_PKTRATE: + TRACE("index: CTX_PKTRATE\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcPktRate, sizeof(UINT)); break; case CTX_PKTDATA: + TRACE("index: CTX_PKTDATA\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcPktData, sizeof(WTPKT)); break; case CTX_PKTMODE: + TRACE("index: CTX_PKTMODE\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcPktMode, sizeof(WTPKT)); break; case CTX_MOVEMASK: + TRACE("index: CTX_MOVEMASK\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcMoveMask, sizeof(WTPKT)); break; case CTX_BTNDNMASK: + TRACE("index: CTX_BTNDNMASK\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcBtnDnMask, sizeof(DWORD)); break; case CTX_BTNUPMASK: + TRACE("index: CTX_BTNUPMASK\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcBtnUpMask, sizeof(DWORD)); break; case CTX_INORGX: + TRACE("index: CTX_INORGX\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgX, sizeof(LONG)); break; case CTX_INORGY: + TRACE("index: CTX_INORGY\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgY, sizeof(LONG)); break; case CTX_INORGZ: + TRACE("index: CTX_INORGZ\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcInOrgZ, sizeof(LONG)); break; case CTX_INEXTX: + TRACE("index: CTX_INORGZ\n"); + rc = CopyTabletData(lpOutput, &gSysContext.lcInExtX, sizeof(LONG)); break; case CTX_INEXTY: + TRACE("index: CTX_INEXTY\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcInExtY, sizeof(LONG)); break; case CTX_INEXTZ: + TRACE("index: CTX_INEXTZ\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcInExtZ, sizeof(LONG)); break; case CTX_OUTORGX: + TRACE("index: CTX_OUTORGX\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgX, sizeof(LONG)); break; case CTX_OUTORGY: + TRACE("index: CTX_OUTORGY\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgY, sizeof(LONG)); break; case CTX_OUTORGZ: + TRACE("index: CTX_OUTORGZ\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcOutOrgZ, sizeof(LONG)); break; case CTX_OUTEXTX: + TRACE("index: CTX_OUTORGX\n"); rc = CopyTabletData(lpOutput, &gSysContext.lcOutExtX, sizeof(LONG)); break; -- 1.6.0.2