John Klehm : winex11.drv: Report correctly when wintab is disabled.

Alexandre Julliard julliard at winehq.org
Mon Nov 30 10:42:44 CST 2009


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

Author: John Klehm <xixsimplicityxix at gmail.com>
Date:   Thu Nov 26 00:16:03 2009 -0600

winex11.drv: Report correctly when wintab is disabled.

---

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

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 30f3e85..c333539 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -1125,8 +1125,12 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
             switch (nIndex)
             {
                 case 0:
-                    rc = CopyTabletData(lpOutput, &gSysContext,
-                            sizeof(LOGCONTEXTW));
+                    /* report 0 if wintab is disabled */
+                    if (0 == gNumCursors)
+                        rc = 0;
+                    else
+                        rc = CopyTabletData(lpOutput, &gSysContext,
+                                sizeof(LOGCONTEXTW));
                     break;
                 case CTX_NAME:
                     rc = CopyTabletData(lpOutput, gSysContext.lcName,




More information about the wine-cvs mailing list