December 2007 - Wine-Commits

Jeremy White : wintab32: Implement the ability to return the number of devices and cursors.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 3036e7f626dac9e5728029a5951f2d538bf6ccd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3036e7f626dac9e5728029a59… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 24 13:34:46 2007 -0600 wintab32: Implement the ability to return the number of devices and cursors. --- dlls/winex11.drv/wintab.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 4b208da..32db612 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -950,6 +950,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) switch (nIndex) { WORD version; + UINT num; case IFC_WINTABID: { static const WCHAR driver[] = {'W','i','n','e',' ','W','i','n','t','a','b',' ','1','.','1',0}; @@ -964,6 +965,14 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) version = (0x00) | (0x01 << 8); rc = CopyTabletData(lpOutput, &version,sizeof(WORD)); break; + case IFC_NDEVICES: + num = 1; + rc = CopyTabletData(lpOutput, &num,sizeof(num)); + break; + case IFC_NCURSORS: + num = gNumCursors; + rc = CopyTabletData(lpOutput, &num,sizeof(num)); + break; default: FIXME("WTI_INTERFACE unhandled index %i\n",nIndex); rc = 0;

1 0

Alexandre Julliard : wintab32: Fix debug traces to use wine_dbg_sprintf.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 5c6ece129fd36a1e0058a8618a40ccdd8b496c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6ece129fd36a1e0058a8618… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 26 13:25:54 2007 +0100 wintab32: Fix debug traces to use wine_dbg_sprintf. --- dlls/wintab32/context.c | 88 ++++++++++++++++++---------------------------- 1 files changed, 35 insertions(+), 53 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 21163c1..7974972 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -81,66 +81,49 @@ static BOOL is_string_field(UINT wCategory, UINT nIndex) return FALSE; } -static char* DUMPBITS(int x, char* buf) -{ - strcpy(buf,"{"); - if (x&PK_CONTEXT) strcat(buf,"PK_CONTEXT "); - if (x&PK_STATUS) strcat(buf, "PK_STATUS "); - if (x&PK_TIME) strcat(buf, "PK_TIME "); - if (x&PK_CHANGED) strcat(buf, "PK_CHANGED "); - if (x&PK_SERIAL_NUMBER) strcat(buf, "PK_SERIAL_NUMBER "); - if (x&PK_CURSOR) strcat(buf, "PK_CURSOR "); - if (x&PK_BUTTONS) strcat(buf, "PK_BUTTONS "); - if (x&PK_X) strcat(buf, "PK_X "); - if (x&PK_Y) strcat(buf, "PK_Y "); - if (x&PK_Z) strcat(buf, "PK_Z "); - if (x&PK_NORMAL_PRESSURE) strcat(buf, "PK_NORMAL_PRESSURE "); - if (x&PK_TANGENT_PRESSURE) strcat(buf, "PK_TANGENT_PRESSURE "); - if (x&PK_ORIENTATION) strcat(buf, "PK_ORIENTATION "); - if (x&PK_ROTATION) strcat(buf, "PK_ROTATION "); - strcat(buf, "}"); - return buf; +static const char* DUMPBITS(int x) +{ + char buf[200]; + buf[0] = 0; + if (x&PK_CONTEXT) strcat(buf,"PK_CONTEXT "); + if (x&PK_STATUS) strcat(buf, "PK_STATUS "); + if (x&PK_TIME) strcat(buf, "PK_TIME "); + if (x&PK_CHANGED) strcat(buf, "PK_CHANGED "); + if (x&PK_SERIAL_NUMBER) strcat(buf, "PK_SERIAL_NUMBER "); + if (x&PK_CURSOR) strcat(buf, "PK_CURSOR "); + if (x&PK_BUTTONS) strcat(buf, "PK_BUTTONS "); + if (x&PK_X) strcat(buf, "PK_X "); + if (x&PK_Y) strcat(buf, "PK_Y "); + if (x&PK_Z) strcat(buf, "PK_Z "); + if (x&PK_NORMAL_PRESSURE) strcat(buf, "PK_NORMAL_PRESSURE "); + if (x&PK_TANGENT_PRESSURE) strcat(buf, "PK_TANGENT_PRESSURE "); + if (x&PK_ORIENTATION) strcat(buf, "PK_ORIENTATION "); + if (x&PK_ROTATION) strcat(buf, "PK_ROTATION "); + return wine_dbg_sprintf("{%s}",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: %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, - (UINT)packet.pkChanged, - packet.pkSerialNumber, - packet.pkCursor, - (UINT)packet.pkButtons, - packet.pkX, - packet.pkY, - packet.pkZ, - packet.pkNormalPressure, - packet.pkTangentPressure, - packet.pkOrientation.orAzimuth, - packet.pkOrientation.orAltitude, packet.pkOrientation.orTwist, - packet.pkRotation.roPitch, - packet.pkRotation.roRoll, packet.pkRotation.roYaw); + packet.pkContext, packet.pkStatus, packet.pkTime, packet.pkChanged, packet.pkSerialNumber, + packet.pkCursor, packet.pkButtons, packet.pkX, packet.pkY, packet.pkZ, + packet.pkNormalPressure, packet.pkTangentPressure, + packet.pkOrientation.orAzimuth, packet.pkOrientation.orAltitude, packet.pkOrientation.orTwist, + packet.pkRotation.roPitch, packet.pkRotation.roRoll, packet.pkRotation.roYaw); } static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - CHAR mmsg[4000]; - CHAR bits[100]; - 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, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", - wine_dbgstr_w(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, -DUMPBITS(lc.lcMoveMask,bits2), (INT)lc.lcBtnDnMask, (INT)lc.lcBtnUpMask, -(INT)lc.lcInOrgX, (INT)lc.lcInOrgY, (INT)lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, -lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, -lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, -lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, -lc.lcSysSensY); - TRACE("context: %s\n",mmsg); + TRACE("context: %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", + wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, + lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), + lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask, + DUMPBITS(lc.lcMoveMask), lc.lcBtnDnMask, lc.lcBtnUpMask, + lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, + lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, + lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, + lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, + lc.lcSysSensY); } @@ -306,10 +289,9 @@ static LPVOID TABLET_CopyPacketData(LPOPENCONTEXT context, LPVOID lpPkt, LPWTPACKET wtp) { LPBYTE ptr; - CHAR bits[100]; ptr = lpPkt; - TRACE("Packet Bits %s\n",DUMPBITS(context->context.lcPktData,bits)); + TRACE("Packet Bits %s\n",DUMPBITS(context->context.lcPktData)); if (context->context.lcPktData & PK_CONTEXT) ptr+=CopyTabletData(ptr,&wtp->pkContext,sizeof(HCTX));

1 0

Jeremy White : wintab32: Capture the number of buttons earlier, allowing our button maps to be filled in.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: f193197a66c052c81d006e4c7ab40247ef7f0411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f193197a66c052c81d006e4c7… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 24 13:35:13 2007 -0600 wintab32: Capture the number of buttons earlier, allowing our button maps to be filled in. --- dlls/winex11.drv/wintab.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 32db612..c3ad140 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -474,8 +474,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) int shft = 0; X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); - pXGetDeviceButtonMapping(data->display, opendevice, map, 32); - if (X11DRV_check_error()) + cursor->BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32); + if (X11DRV_check_error() || cursor->BUTTONS <= 0) { TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); @@ -606,7 +606,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) int i; Button = (XButtonInfoPtr) any; - cursor->BUTTONS = Button->num_buttons; + TRACE(" ButtonInput %d: [class %d|length %d|num_buttons %d]\n", + class_loop, (int) Button->class, Button->length, Button->num_buttons); cursor->BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf); for (i = 0; i < cursor->BUTTONS; i++) {

1 0

Jeremy White : wintab32: Don't return information for non existent cursors.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: f5adac3b1960ed2803e27346b799eafbe98bc99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5adac3b1960ed2803e27346b… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 24 13:34:34 2007 -0600 wintab32: Don't return information for non existent cursors. --- dlls/winex11.drv/wintab.c | 181 +++++++++++++++++++++++--------------------- 1 files changed, 95 insertions(+), 86 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 11c8bfc..4b208da 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1129,95 +1129,104 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) case WTI_CURSORS+7: case WTI_CURSORS+8: case WTI_CURSORS+9: - tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; - switch (nIndex) + if (wCategory - WTI_CURSORS >= gNumCursors) { - case CSR_NAME: - rc = CopyTabletData(lpOutput, &tgtcursor->NAME, - (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR)); - break; - case CSR_ACTIVE: - rc = CopyTabletData(lpOutput,&tgtcursor->ACTIVE, - sizeof(BOOL)); - break; - case CSR_PKTDATA: - rc = CopyTabletData(lpOutput,&tgtcursor->PKTDATA, - sizeof(WTPKT)); - break; - case CSR_BUTTONS: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONS, - sizeof(BYTE)); - break; - case CSR_BUTTONBITS: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONBITS, - sizeof(BYTE)); - break; - case CSR_BTNNAMES: - FIXME("Button Names not returned correctly\n"); - rc = CopyTabletData(lpOutput,&tgtcursor->BTNNAMES, - tgtcursor->cchBTNNAMES*sizeof(WCHAR)); - break; - case CSR_BUTTONMAP: - rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, - sizeof(BYTE)*32); - break; - case CSR_SYSBTNMAP: - rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, - sizeof(BYTE)*32); - break; - case CSR_NPBTNMARKS: - rc = CopyTabletData(lpOutput,&tgtcursor->NPBTNMARKS, - sizeof(UINT)*2); - break; - case CSR_NPBUTTON: - rc = CopyTabletData(lpOutput,&tgtcursor->NPBUTTON, - sizeof(BYTE)); - break; - case CSR_NPRESPONSE: - FIXME("Not returning CSR_NPRESPONSE correctly\n"); - rc = 0; - break; - case CSR_TPBUTTON: - rc = CopyTabletData(lpOutput,&tgtcursor->TPBUTTON, - sizeof(BYTE)); - break; - case CSR_TPBTNMARKS: - rc = CopyTabletData(lpOutput,&tgtcursor->TPBTNMARKS, - sizeof(UINT)*2); - break; - case CSR_TPRESPONSE: - FIXME("Not returning CSR_TPRESPONSE correctly\n"); - rc = 0; - break; - case CSR_PHYSID: + rc = 0; + WARN("Requested cursor information for non existent cursor %d; only %d cursors\n", + wCategory - WTI_CURSORS, gNumCursors); + } + else + { + tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; + switch (nIndex) { - DWORD id; - id = tgtcursor->PHYSID; - rc = CopyTabletData(lpOutput,&id,sizeof(DWORD)); + case CSR_NAME: + rc = CopyTabletData(lpOutput, &tgtcursor->NAME, + (strlenW(tgtcursor->NAME)+1) * sizeof(WCHAR)); + break; + case CSR_ACTIVE: + rc = CopyTabletData(lpOutput,&tgtcursor->ACTIVE, + sizeof(BOOL)); + break; + case CSR_PKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->PKTDATA, + sizeof(WTPKT)); + break; + case CSR_BUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONS, + sizeof(BYTE)); + break; + case CSR_BUTTONBITS: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONBITS, + sizeof(BYTE)); + break; + case CSR_BTNNAMES: + FIXME("Button Names not returned correctly\n"); + rc = CopyTabletData(lpOutput,&tgtcursor->BTNNAMES, + tgtcursor->cchBTNNAMES*sizeof(WCHAR)); + break; + case CSR_BUTTONMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->BUTTONMAP, + sizeof(BYTE)*32); + break; + case CSR_SYSBTNMAP: + rc = CopyTabletData(lpOutput,&tgtcursor->SYSBTNMAP, + sizeof(BYTE)*32); + break; + case CSR_NPBTNMARKS: + rc = CopyTabletData(lpOutput,&tgtcursor->NPBTNMARKS, + sizeof(UINT)*2); + break; + case CSR_NPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->NPBUTTON, + sizeof(BYTE)); + break; + case CSR_NPRESPONSE: + FIXME("Not returning CSR_NPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_TPBUTTON: + rc = CopyTabletData(lpOutput,&tgtcursor->TPBUTTON, + sizeof(BYTE)); + break; + case CSR_TPBTNMARKS: + rc = CopyTabletData(lpOutput,&tgtcursor->TPBTNMARKS, + sizeof(UINT)*2); + break; + case CSR_TPRESPONSE: + FIXME("Not returning CSR_TPRESPONSE correctly\n"); + rc = 0; + break; + case CSR_PHYSID: + { + DWORD id; + id = tgtcursor->PHYSID; + rc = CopyTabletData(lpOutput,&id,sizeof(DWORD)); + } + break; + case CSR_MODE: + rc = CopyTabletData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); + break; + case CSR_MINPKTDATA: + rc = CopyTabletData(lpOutput,&tgtcursor->MINPKTDATA, + sizeof(UINT)); + break; + case CSR_MINBUTTONS: + rc = CopyTabletData(lpOutput,&tgtcursor->MINBUTTONS, + sizeof(UINT)); + break; + case CSR_CAPABILITIES: + rc = CopyTabletData(lpOutput,&tgtcursor->CAPABILITIES, + sizeof(UINT)); + break; + case CSR_TYPE: + rc = CopyTabletData(lpOutput,&tgtcursor->TYPE, + sizeof(UINT)); + break; + default: + FIXME("WTI_CURSORS unhandled index %i\n",nIndex); + rc = 0; } - break; - case CSR_MODE: - rc = CopyTabletData(lpOutput,&tgtcursor->MODE,sizeof(UINT)); - break; - case CSR_MINPKTDATA: - rc = CopyTabletData(lpOutput,&tgtcursor->MINPKTDATA, - sizeof(UINT)); - break; - case CSR_MINBUTTONS: - rc = CopyTabletData(lpOutput,&tgtcursor->MINBUTTONS, - sizeof(UINT)); - break; - case CSR_CAPABILITIES: - rc = CopyTabletData(lpOutput,&tgtcursor->CAPABILITIES, - sizeof(UINT)); - break; - case CSR_TYPE: - rc = CopyTabletData(lpOutput,&tgtcursor->TYPE, - sizeof(UINT)); - break; - default: - FIXME("WTI_CURSORS unhandled index %i\n",nIndex); - rc = 0; } break; case WTI_DEVICES:

1 0

Jeremy White : wintab32: Compute our physical device characteristics based on the first tablet device that looks like a stylus .
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: d58429d085cdf890d9362a30b36626ca419e5b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58429d085cdf890d9362a30b… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:56:03 2007 -0600 wintab32: Compute our physical device characteristics based on the first tablet device that looks like a stylus. Otherwise, we may be computing based on a mouse or cursor, and then come to incorrect values for our tilt and pressure settings. --- dlls/winex11.drv/wintab.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7065cc8..9b86345 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -528,7 +528,13 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) if (TRACE_ON(wintab32)) trace_axes(Val); - if (!axis_read_complete) + /* FIXME: This is imperfect; we compute our devices capabilities based upon the + ** first pen type device we find. However, a more correct implementation + ** would require acquiring a wide variety of tablets and running through + ** the various inputs to see what the values are. Odds are that a + ** more 'correct' algorithm would condense to this one anyway. + */ + if (!axis_read_complete && Val->num_axes >= 5 && cursor->TYPE == CSR_TYPE_PEN) { Axis = (XAxisInfoPtr) ((char *) Val + sizeof (XValuatorInfo));

1 0

Jeremy White : wintab32: Add constants for cursor types and use them.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 047a969658f1efe7fa3bea7b4c713d123f63ac70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047a969658f1efe7fa3bea7b4… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Dec 24 15:10:43 2007 -0600 wintab32: Add constants for cursor types and use them. --- dlls/winex11.drv/wintab.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 5f7beb3..2a320ac 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -202,6 +202,24 @@ typedef struct tagWTI_DEVICES_INFO /* a null-terminated string containing the devices Plug and Play ID.*/ } WTI_DEVICES_INFO, *LPWTI_DEVICES_INFO; + +/*********************************************************************** + * WACOM WINTAB EXTENSIONS TO SUPPORT CSR_TYPE + * In Wintab 1.2, a CSR_TYPE feature was added. This adds the + * ability to return a type of cursor on a tablet. + * Unfortunately, we cannot get the cursor type directly from X, + * and it is not specified directly anywhere. So we virtualize + * the type here. (This is unfortunate, the kernel module has + * the exact type, but we have no way of getting that module to + * pass us that type). + */ + +#define CSR_TYPE_PEN 0x822 +#define CSR_TYPE_ERASER 0x82a +#define CSR_TYPE_MOUSE_2D 0x007 +#define CSR_TYPE_MOUSE_4D 0x094 + + typedef struct tagWTPACKET { HCTX pkContext; UINT pkStatus; @@ -425,9 +443,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) cursor->NPBTNMARKS[1] = 1 ; cursor->CAPABILITIES = CRC_MULTIMODE; if (strcasecmp(target->name,"stylus")==0) - cursor->TYPE = 0x4825; + cursor->TYPE = CSR_TYPE_PEN; if (strcasecmp(target->name,"eraser")==0) - cursor->TYPE = 0xc85a; + cursor->TYPE = CSR_TYPE_ERASER; any = (XAnyClassPtr) (target->inputclassinfo); @@ -644,7 +662,7 @@ static void motion_event( HWND hwnd, XEvent *event ) TRACE("Received tablet motion event (%p); device id %d, cursor num %d\n",hwnd, (int) motion->deviceid, curnum); /* Set cursor to inverted if cursor is the eraser */ - gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); + gMsgPacket.pkStatus = (cursor->TYPE == CSR_TYPE_ERASER ? TPS_INVERT:0); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(motion->time); gMsgPacket.pkSerialNumber = gSerial++; gMsgPacket.pkCursor = curnum; @@ -673,7 +691,7 @@ static void button_event( HWND hwnd, XEvent *event ) TRACE("Received tablet button %s event\n", (event->type == button_press_type)?"press":"release"); /* Set cursor to inverted if cursor is the eraser */ - gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); + gMsgPacket.pkStatus = (cursor->TYPE == CSR_TYPE_ERASER ? TPS_INVERT:0); set_button_state(curnum, button->deviceid); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time); gMsgPacket.pkSerialNumber = gSerial++; @@ -709,7 +727,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) TRACE("Received tablet proximity event\n"); /* Set cursor to inverted if cursor is the eraser */ - gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); + gMsgPacket.pkStatus = (cursor->TYPE == CSR_TYPE_ERASER ? TPS_INVERT:0); gMsgPacket.pkStatus |= (event->type==proximity_out_type)?TPS_PROXIMITY:0; gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(proximity->time); gMsgPacket.pkSerialNumber = gSerial++;

1 0

Jeremy White : wintab32: Order the cursor array by the standard Wacom promulgates.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 64a929c48353b68cc4cd177d37ed25308abf282b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a929c48353b68cc4cd177d3… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:43 2007 -0600 wintab32: Order the cursor array by the standard Wacom promulgates. --- dlls/winex11.drv/wintab.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 2a320ac..9785d65 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -304,6 +304,55 @@ static int Tablet_ErrorHandler(Display *dpy, XErrorEvent *event, void* arg) return 1; } +static int find_cursor_by_type(int cursor_type, int exclude) +{ + int i; + for (i = 0; i < gNumCursors; i++) + if (i != exclude) + if (gSysCursor[i].TYPE == cursor_type) + return i; + + return -1; +} + +static void swap_cursors(int a, int b) +{ + WTI_CURSORS_INFO temp; + temp = gSysCursor[a]; + gSysCursor[a] = gSysCursor[b]; + gSysCursor[b] = temp; +} + +/* Adobe Photoshop 7.0 relies on the eraser being cursor #2 or #5, and it assumes the stylus is 1. +** If the X configuration is not set up that way, make it +*/ +static void Tablet_FixupCursors(void) +{ + if (gNumCursors >= 1) + if (gSysCursor[1].TYPE != CSR_TYPE_PEN) + { + int stylus; + stylus = find_cursor_by_type(CSR_TYPE_PEN, 1); + if (stylus >= 0) + { + swap_cursors(1, stylus); + TRACE("Swapped cursor %d with stylus slot (1) for compatibility with older programs\n", stylus); + } + } + + if (gNumCursors >= 2) + if (gSysCursor[2].TYPE != CSR_TYPE_ERASER) + { + int eraser; + eraser = find_cursor_by_type(CSR_TYPE_ERASER, 2); + if (eraser >= 0) + { + swap_cursors(2, eraser); + TRACE("Swapped cursor %d with eraser slot (2) for compatibility with older programs\n", eraser); + } + } +} + void X11DRV_LoadTabletInfo(HWND hwnddefault) { const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; @@ -554,9 +603,10 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) } } pXFreeDeviceList(devices); - wine_tsx11_unlock(); gSysDevice.NCSRTYPES = cursor_target+1; gNumCursors = cursor_target+1; + Tablet_FixupCursors(); + wine_tsx11_unlock(); } static int figure_deg(int x, int y)

1 0

Jeremy White : wintab32: Add additional device tracing.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 5132ab4693edfad9704d0dd223778c6e6ad86e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5132ab4693edfad9704d0dd22… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:50 2007 -0600 wintab32: Add additional device tracing. --- dlls/winex11.drv/wintab.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 9785d65..7065cc8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -353,6 +353,15 @@ static void Tablet_FixupCursors(void) } } +static void trace_axes(XValuatorInfoPtr val) +{ + int i; + XAxisInfoPtr axis; + + for (i = 0, axis = val->axes ; i < val->num_axes; i++, axis++) + TRACE(" Axis %d: [resolution %d|min_value %d|max_value %d]\n", i, axis->resolution, axis->min_value, axis->max_value); +} + void X11DRV_LoadTabletInfo(HWND hwnddefault) { const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; @@ -431,7 +440,15 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { int class_loop; - TRACE("Trying device %i(%s)\n",loop,devices[loop].name); + TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %s]\n", + loop, (int) devices[loop].id, devices[loop].name, + XGetAtomName(data->display, devices[loop].type), + devices[loop].num_classes, + devices[loop].use == IsXKeyboard ? "IsXKeyboard" : + devices[loop].use == IsXPointer ? "IsXPointer" : + devices[loop].use == IsXExtensionDevice ? "IsXExtensionDevice" : + "Unknown" + ); if (devices[loop].use == IsXExtensionDevice) { LPWTI_CURSORS_INFO cursor; @@ -503,10 +520,16 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) { switch (any->class) { + case ValuatorClass: + Val = (XValuatorInfoPtr) any; + TRACE(" ValidatorInput %d: [class %d|length %d|num_axes %d|mode %d|motion_buffer %ld]\n", + class_loop, (int) Val->class, Val->length, Val->num_axes, Val->mode, Val->motion_buffer); + if (TRACE_ON(wintab32)) + trace_axes(Val); + if (!axis_read_complete) { - Val = (XValuatorInfoPtr) any; Axis = (XAxisInfoPtr) ((char *) Val + sizeof (XValuatorInfo));

1 0

Jeremy White : wintab32: Correctly handle devices with a device id of 0.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 9267fcd99fb54d58b0928734a7ffe41fc479a4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9267fcd99fb54d58b0928734a… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:56:16 2007 -0600 wintab32: Correctly handle devices with a device id of 0. The XInput macros such as DeviceMotionNotify will correctly return an eventclass of 0 if the device id is 0. Given that, we cannot use eventclass != 0 as a meaningful test, and must instead use the returned type. --- dlls/winex11.drv/wintab.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 9b86345..11c8bfc 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -867,19 +867,19 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) if (the_device->num_classes > 0) { DeviceKeyPress(the_device, key_press_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (key_press_type) event_number++; DeviceKeyRelease(the_device, key_release_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (key_release_type) event_number++; DeviceButtonPress(the_device, button_press_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (button_press_type) event_number++; DeviceButtonRelease(the_device, button_release_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (button_release_type) event_number++; DeviceMotionNotify(the_device, motion_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (motion_type) event_number++; ProximityIn(the_device, proximity_in_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (proximity_in_type) event_number++; ProximityOut(the_device, proximity_out_type, event_list[event_number]); - if (event_list[event_number]) event_number++; + if (proximity_out_type) event_number++; if (key_press_type) X11DRV_register_event_handler( key_press_type, key_event ); if (key_release_type) X11DRV_register_event_handler( key_release_type, key_event );

1 0

Jacek Caban : mshtml: Use IBindCtx passed to Load in BindToStorage call.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 82a199bcee410a32f221595bb07113bfd58ca900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a199bcee410a32f221595bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:48:43 2007 +0100 mshtml: Use IBindCtx passed to Load in BindToStorage call. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 18 +++++++++++------- dlls/mshtml/persist.c | 2 +- dlls/mshtml/task.c | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3e0c8eb..2180184 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -425,7 +425,7 @@ void init_nsevents(NSContainer*); nsresult get_nsinterface(nsISupports*,REFIID,void**); BSCallback *create_bscallback(IMoniker*); -HRESULT start_binding(HTMLDocument*,BSCallback*); +HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 29a3798..b1b5609 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -829,20 +829,24 @@ void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame, IBindStatusCallback_Release(STATUSCLB(callback)); } -HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback) +HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; - IBindCtx *bctx; HRESULT hres; bscallback->doc = doc; call_docview_84(bscallback->doc); - hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx); - if(FAILED(hres)) { - WARN("CreateAsyncBindCtx failed: %08x\n", hres); - on_stop_nsrequest(bscallback); - return hres; + if(bctx) { + RegisterBindStatusCallback(bctx, STATUSCLB(bscallback), NULL, 0); + IBindCtx_AddRef(bctx); + }else { + hres = CreateAsyncBindCtx(0, STATUSCLB(bscallback), NULL, &bctx); + if(FAILED(hres)) { + WARN("CreateAsyncBindCtx failed: %08x\n", hres); + on_stop_nsrequest(bscallback); + return hres; + } } hres = IMoniker_BindToStorage(bscallback->mon, bctx, NULL, &IID_IStream, (void**)&str); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index c48fc64..2f3d5cc 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -429,7 +429,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva return hres; if(!bind_complete) - return start_binding(This, This->bscallback); + return start_binding(This, This->bscallback, pibc); return S_OK; } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index e612d81..b154022 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -214,7 +214,7 @@ static void set_progress(HTMLDocument *doc) static void task_start_binding(HTMLDocument *doc, BSCallback *bscallback) { if(doc) - start_binding(doc, bscallback); + start_binding(doc, bscallback, NULL); IBindStatusCallback_Release(STATUSCLB(bscallback)); }

1 0