Vitaliy Margolen : winex11drv: Do extra error checking when opening XInput device.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Feb 7 04:53:14 CST 2007


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

Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date:   Sun Feb  4 09:43:39 2007 -0700

winex11drv: Do extra error checking when opening XInput device.

---

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

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index f56bf08..c6b65a1 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -367,8 +367,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefa
             target = &devices[loop];
             cursor = &gSysCursor[cursor_target];
 
+            X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL);
             opendevice = pXOpenDevice(data->display,target->id);
-            if (opendevice)
+            if (!X11DRV_check_error() && opendevice)
             {
                 unsigned char map[32];
                 int i;




More information about the wine-cvs mailing list