Jeremy White : wintab32: If we could not find a stylus sort of device, we haven't found a tablet.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 659494660e77c4fbe0186f92fab3724d02d1619e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=659494660e77c4fbe0186f92fa...

Author: Jeremy White <jwhite(a)codeweavers.com>
Date:   Mon Dec 31 10:00:13 2007 -0600

wintab32: If we could not find a stylus sort of device, we haven't found a tablet.

---

 dlls/winex11.drv/wintab.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 335d7f5..3f6abb1 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -724,9 +724,16 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
 
     }
     pXFreeDeviceList(devices);
-    gSysDevice.NCSRTYPES = cursor_target+1;
-    gNumCursors = cursor_target+1;
-    Tablet_FixupCursors();
+
+    if (axis_read_complete)
+    {
+        gSysDevice.NCSRTYPES = cursor_target+1;
+        gNumCursors = cursor_target+1;
+        Tablet_FixupCursors();
+    }
+    else
+        WARN("Did not find a valid stylus cursor with >= 5 axes, returning 0 valid devices.\n");
+
     wine_tsx11_unlock();
 }