libXi: Changes to 'master'

[Peter Hutterer]

 src/XExtInt.c        |    2 +-
 src/XGMotion.c       |    2 +-
 src/XGetCPtr.c       |    2 +-
 src/XGetDCtl.c       |    2 +-
 src/XGetFCtl.c       |    2 +-
 src/XGetKMap.c       |    2 +-
 src/XGetMMap.c       |    2 +-
 src/XGetProp.c       |    2 +-
 src/XGetVers.c       |   28 +++++++++++-----------------
 src/XIAllowEvents.c  |    4 ++--
 src/XIHierarchy.c    |   14 +++++++++-----
 src/XIProperties.c   |    3 ++-
 src/XIQueryDevice.c  |    3 ++-
 src/XIQueryVersion.c |    8 ++++++--
 src/XISelEv.c        |    7 +++++--
 src/XIint.h          |    1 -
 src/XListDProp.c     |    2 +-
 src/XOpenDev.c       |    2 +-
 src/XQueryDv.c       |    2 +-
 19 files changed, 48 insertions(+), 42 deletions(-)

New commits:
commit 29c77457ad86966ae2204b865fb8b437269063c4
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:57 2014 +0200

    Refactor XGetExtensionVersion.
    
    _XiGetExtensionVersion was called from XGetExtensionVersion and from
    _XiCheckExtInit. When called from _XiCheckExtInit, nothing accounted for the
    fact that it can return ((XExtensionVersion *) NoSuchExtension) in case of
    error. Also it recursively calls _XiCheckExtInit potentionally causing multiple
    unlocks if _XiCheckExtInit fails.
    -> Remove it and call directly _XiGetExtensionVersionRequest and only call
    _XiCheckExtInit only from XGetExtensionVersion.
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 5810d0797160a97012664ffe719a59e1b288a525
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:56 2014 +0200

    Fix logic in _XIAllowEvents and prevent double unlock.
    
    Replacing the second _XiCheckExtInit with _XiCheckVersion prevents possible
    double unlock as _XiCheckExtInit actually unlocks the display when it returns
    -1.
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit f699770e7c92da1dbf16892fde83438f0b79c979
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:54 2014 +0200

    XIGetClientPointer: Return False on error.
    
    Not NoSuchExtension which is 1 = True!
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit dc1f8c6ec1ba8135afa185c8e8360c1ed90bf96c
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:53 2014 +0200

    Do not return NoSuchExtension casted to pointer as an error.
    
    Several functions were returning NoSuchExtension casted to a pointer in case of
    an error. Often in parallel with returning NULL in case of another error. It is
    undocumented and certainly wrong.
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 83261c52a17543437882e2863b7f06a92c9039f8
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:52 2014 +0200

    XIChangeHierarchy: Add missing unlock.
    
    When num_changes <= 0 or Xmalloc fails, the display has to be unlocked.
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 22ae8d4f26e92b17e1ce8239a38481933d6f1ca7
Author: Michal Srb <msrb at suse.com>
Date:   Sat Nov 1 20:00:51 2014 +0200

    Fix double unlock when _XiCheckExtInit return -1.
    
    _XiCheckExtInit unlocks the display if it fails and returns -1. Most callers
    account for it properly, but few didn't.
    
    Signed-off-by: Michal Srb <msrb at suse.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>