Alex Henrie : winex11: Return FALSE from LoadTabletInfo if the system isn' t a tablet.
Alexandre Julliard
julliard at winehq.org
Tue Oct 23 16:10:01 CDT 2018
Module: wine
Branch: master
Commit: 4e122bdaddf1a1c6d6211b5d7ce412b23a6efe57
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e122bdaddf1a1c6d6211b5d7ce412b23a6efe57
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Sun Oct 21 16:46:32 2018 -0600
winex11: Return FALSE from LoadTabletInfo if the system isn't a tablet.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46024
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/wintab.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index e4259bf..7a9a3a7 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -761,14 +761,14 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault)
} /* for XListInputDevices */
pXFreeDeviceList(devices);
- if (axis_read_complete)
- gSysDevice.NCSRTYPES = gNumCursors;
- else
+ if (!axis_read_complete)
{
disable_system_cursors();
WARN("Did not find a valid stylus, unable to determine system context parameters. Wintab is disabled.\n");
+ return FALSE;
}
+ gSysDevice.NCSRTYPES = gNumCursors;
return TRUE;
}
More information about the wine-cvs
mailing list