April 2011 - Wine-commits - list.winehq.org

André Hentschel : dbghelp: Implement sparc_get_addr.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: f2fc5e6e175ce1132a1d6ecce0099398df75cdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fc5e6e175ce1132a1d6ecce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 13 20:43:37 2011 +0200 dbghelp: Implement sparc_get_addr. --- dlls/dbghelp/cpu_sparc.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c index 1de9436..6a788b9 100644 --- a/dlls/dbghelp/cpu_sparc.c +++ b/dlls/dbghelp/cpu_sparc.c @@ -32,15 +32,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { - switch (ca) + addr->Mode = AddrModeFlat; + addr->Segment = 0; /* don't need segment */ + switch (ca) { - case cpu_addr_pc: - case cpu_addr_stack: - case cpu_addr_frame: - default: - FIXME("not done for Sparc\n"); +#ifdef __sparc__ + case cpu_addr_pc: addr->Offset = ctx->pc; return TRUE; + case cpu_addr_stack: addr->Offset = ctx->o6; return TRUE; + case cpu_addr_frame: addr->Offset = ctx->i6; return TRUE; +#endif + default: addr->Mode = -1; + return FALSE; } - return FALSE; } static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context)

1 0

André Hentschel : winedbg: Implement adjust_pc_for_break on Sparc.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 59ca0059b6db2d0467895f687b01aff5c64ed1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ca0059b6db2d0467895f687… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 13 20:43:43 2011 +0200 winedbg: Implement adjust_pc_for_break on Sparc. --- programs/winedbg/be_sparc.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_sparc.c b/programs/winedbg/be_sparc.c index 546518a..3435759 100644 --- a/programs/winedbg/be_sparc.c +++ b/programs/winedbg/be_sparc.c @@ -125,8 +125,13 @@ static void be_sparc_clear_watchpoint(CONTEXT* ctx, unsigned idx) static int be_sparc_adjust_pc_for_break(CONTEXT* ctx, BOOL way) { - dbg_printf("not done for Sparc\n"); - return 0; + if (way) + { + ctx->pc--; + return -1; + } + ctx->pc++; + return 1; } static int be_sparc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: f136dd184a0fc29ba35d4ea3bf3fbcc5feff83d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f136dd184a0fc29ba35d4ea3b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Apr 13 23:42:08 2011 +0200 po: Update French translation. --- po/fr.po | 36 +++++++++++++----------------------- 1 files changed, 13 insertions(+), 23 deletions(-) diff --git a/po/fr.po b/po/fr.po index 80792f5..c5b19d3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-02-10 15:38+0100\n" +"PO-Revision-Date: 2011-04-13 23:40+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2193,36 +2193,32 @@ msgstr "" "Configurer le navigateur internet de Wine et d'autres paramètres associés" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "&Enregistrer la configuration lors de la fermeture" +msgstr "Paramètres de sécurité pour la zone : " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Personnaliser" +msgstr "Personnalisée" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Très basse" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "&Basse" +msgstr "Basse" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Moyenne" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Augmentée" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Haute" +msgstr "Haute" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -4365,7 +4361,6 @@ msgid "Window has no system menu\n" msgstr "La fenêtre ne comporte pas de menu système\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" msgstr "Style de boîte de message invalide\n" @@ -7803,7 +7798,6 @@ msgid "&Always on Top" msgstr "&Toujours visible" #: clock.rc:42 -#, fuzzy msgid "&About Clock" msgstr "À &propos de l'horloge" @@ -8704,9 +8698,8 @@ msgid "&Replace...\tCtrl+H" msgstr "Rem&placer...\tCtrl+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" -msgstr "&Sommaire" +msgstr "&Sommaire\tF1" #: notepad.rc:59 msgid "&About Notepad" @@ -9143,12 +9136,11 @@ msgstr "&Options" #: progman.rc:42 msgid "&Arrange automatically" -msgstr "Réorg&anisation automatique" +msgstr "Réorganisation &automatique" #: progman.rc:43 -#, fuzzy msgid "&Minimize on run" -msgstr "&Réduire à l'utilisation" +msgstr "&Réduire lors de l'exécution" #: progman.rc:44 winefile.rc:73 msgid "&Save settings on exit" @@ -9171,9 +9163,8 @@ msgid "&Arrange Icons" msgstr "&Réorganiser les icônes" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Gestionnaire de programmes" +msgstr "À &propos du gestionnaire de programmes" #: progman.rc:60 msgid "Program Manager" @@ -11101,9 +11092,8 @@ msgid "Large" msgstr "Grande" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "&Utiliser l'aide" +msgstr "&Utiliser l'aide\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Detlef Riekenberg : po: Update German translation.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 5aa5a8d877323883da0c67eaa19aa77d3eb52526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa5a8d877323883da0c67eaa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Apr 14 00:23:22 2011 +0200 po: Update German translation. --- po/de.po | 34 +++++++++++++--------------------- 1 files changed, 13 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index d8889c7..bee69c3 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-01-12 20:41+0100\n" -"Last-Translator: André Hentschel\n" +"PO-Revision-Date: 2011-04-13 19:56+0200\n" +"Last-Translator: Detlef Riekenberg\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -2198,36 +2198,32 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Wine Internet Browser und zugehörige Einstellungen anpassen." #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "&Einstellungen beim Beenden speichern" +msgstr "Sicherheitseinstellungen für Zone: " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Anpassen" +msgstr "Benutzerdefiniert" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Sehr niedrig" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "Nie&drig" +msgstr "Niedrig" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Mittelmäßig" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Erhöht" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Hoch" +msgstr "Hoch" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -8849,7 +8845,6 @@ msgid "&Replace...\tCtrl+H" msgstr "Erset&zen...\tStrg+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" msgstr "&Inhalt" @@ -9321,9 +9316,8 @@ msgid "&Arrange Icons" msgstr "&Symbole anordnen" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Programm-Manager" +msgstr "Ü&ber Programm-Manager" #: progman.rc:60 msgid "Program Manager" @@ -11158,7 +11152,7 @@ msgstr "%s von %s frei" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "Spiel" #: winemine.rc:35 msgid "&New\tF2" @@ -11166,7 +11160,7 @@ msgstr "&Neu\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Merker" #: winemine.rc:39 msgid "&Beginner" @@ -11185,14 +11179,12 @@ msgid "&Custom..." msgstr "Benutzer&definiert..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" msgstr "&Beste Zeiten" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "Ü&ber Wine" +msgstr "Ü&ber WineMine" #: winemine.rc:27 msgid "WineMine"

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 646d5aa01db3fc6c0a925e431a828f829fda887e URL: http://source.winehq.org/git/wine.git/?a=commit;h=646d5aa01db3fc6c0a925e431… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Apr 13 19:25:41 2011 +0200 po: Update Polish translation. --- po/pl.po | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/po/pl.po b/po/pl.po index e69f651..e3b9cc2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2015,13 +2015,12 @@ msgid "Default MidiOut Device" msgstr "Standardowe urządzenie Device" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Ustawienia standardowe" +msgstr "Ustawienia regionalne" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uMB użytych, %uMB dostępnych" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -2029,7 +2028,7 @@ msgstr "Opcje" #: hhctrl.rc:70 msgid "S&ync" -msgstr "" +msgstr "S&ynchronizuj" #: hhctrl.rc:71 shdoclc.rc:38 winhlp32.rc:86 msgid "&Back" @@ -2187,36 +2186,32 @@ msgstr "" "ustawienia" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "&Zapisz ustawienia przy zakończeniu" +msgstr "&Poziom zabezpieczeń dla tej strefy" #: inetcpl.rc:31 -#, fuzzy msgid "Custom" msgstr "Dostosuj" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Najniższy" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "N&iska" +msgstr "Niski" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Średni" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Wysoki" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Wysoka" +msgstr "Najwyższy" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -5199,9 +5194,8 @@ msgid "Invalid driver\n" msgstr "Niepoprawny sterownik\n" #: winerror.mc:3646 -#, fuzzy msgid "Invalid object resolver set\n" -msgstr "Niepoprawny obiekt\n" +msgstr "Ustawiono niepoprawny przelicznik obiektu\n" #: winerror.mc:3651 msgid "Incomplete RPC send\n" @@ -9270,9 +9264,8 @@ msgid "&Multi String Value" msgstr "&Dana wielotekstowa (MULTISZ)" #: regedit.rc:52 regedit.rc:103 -#, fuzzy msgid "&Expandable String Value" -msgstr "&Wartość ciągu" +msgstr "Wartość ciągu &rozwijalnego" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" @@ -11014,9 +11007,8 @@ msgid "Large" msgstr "Duże" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "Pomo&c" +msgstr "Jak korzystać z pomo&cy\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Francois Gouget : qcap: Ifdef-out code that is not used if V4L support is missing.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 6a48fcec48a0cb274884522e336b73606d21495f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a48fcec48a0cb274884522e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 12 19:39:40 2011 +0200 qcap: Ifdef-out code that is not used if V4L support is missing. --- dlls/qcap/yuv.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 5896ee5..608e571 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #include "windef.h" @@ -30,6 +31,9 @@ #include "qcap_main.h" #include "wine/debug.h" +/* This is not used if V4L support is missing */ +#ifdef HAVE_LINUX_VIDEODEV_H + WINE_DEFAULT_DEBUG_CHANNEL(qcap); static int yuv_xy[256]; /* Gray value */ @@ -192,3 +196,4 @@ void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned } } } +#endif

1 0

Hans Leidekker : msi: Check the return value of MSIREG_OpenUpgradeCodesKey (valgrind).
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 846811be594b8ce3b391662d9d35a2b5fc91ca49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846811be594b8ce3b391662d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:39:55 2011 +0200 msi: Check the return value of MSIREG_OpenUpgradeCodesKey (valgrind). --- dlls/msi/action.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3244b6d..8267aa9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5293,8 +5293,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) WCHAR squashed_pc[SQUISH_GUID_SIZE]; MSIRECORD *uirow; LPWSTR upgrade_code; - HKEY hkey, props; - HKEY upgrade; + HKEY hkey, props, upgrade_key; UINT rc; /* FIXME: also need to publish if the product is in advertise mode */ @@ -5325,11 +5324,14 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) upgrade_code = msi_dup_property(package->db, szUpgradeCode); if (upgrade_code) { - MSIREG_OpenUpgradeCodesKey(upgrade_code, &upgrade, TRUE); - squash_guid(package->ProductCode, squashed_pc); - msi_reg_set_val_str(upgrade, squashed_pc, NULL); - RegCloseKey(upgrade); - msi_free(upgrade_code); + rc = MSIREG_OpenUpgradeCodesKey( upgrade_code, &upgrade_key, TRUE ); + if (rc == ERROR_SUCCESS) + { + squash_guid( package->ProductCode, squashed_pc ); + msi_reg_set_val_str( upgrade_key, squashed_pc, NULL ); + RegCloseKey( upgrade_key ); + } + msi_free( upgrade_code ); } done:

1 0

Alexandre Julliard : configure: Add a check for XInput2 headers.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 77e05ce4e5c4cc33c3e28802819416014f8786bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e05ce4e5c4cc33c3e288028… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 18:51:50 2011 +0200 configure: Add a check for XInput2 headers. --- configure | 21 +++++++++++++++++++++ configure.ac | 10 ++++++++++ include/config.h.in | 3 +++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 8e8d044..77d6484 100755 --- a/configure +++ b/configure @@ -806,6 +806,7 @@ with_xcomposite with_xcursor with_xinerama with_xinput +with_xinput2 with_xml with_xrandr with_xrender @@ -1497,6 +1498,7 @@ Optional Packages: --without-xcursor do not use the Xcursor extension --without-xinerama do not use Xinerama (multi-monitor support) --without-xinput do not use the Xinput extension + --without-xinput2 do not use the Xinput 2 extension --without-xml do not use XML --without-xrandr do not use Xrandr (resolution changes) --without-xrender do not use the Xrender extension @@ -2722,6 +2724,12 @@ if test "${with_xinput+set}" = set; then : fi +# Check whether --with-xinput2 was given. +if test "${with_xinput2+set}" = set; then : + withval=$with_xinput2; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi +fi + + # Check whether --with-xml was given. if test "${with_xml+set}" = set; then : withval=$with_xml; @@ -8035,6 +8043,7 @@ fi X11/Xcursor/Xcursor.h \ X11/extensions/shape.h \ X11/extensions/XInput.h \ + X11/extensions/XInput2.h \ X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ @@ -8231,6 +8240,18 @@ This is an error since --with-xinput was requested." "$LINENO" 5 ;; esac fi + if test "x$ac_cv_lib_soname_Xi" != x + then + if test "$ac_cv_header_X11_extensions_XInput2_h" != "yes"; then : + case "x$with_xinput2" in + x) as_fn_append wine_notices "|XInput2 headers not found, the XInput 2 extension won't be supported." ;; + xno) ;; + *) as_fn_error $? "XInput2 headers not found, the XInput 2 extension won't be supported. +This is an error since --with-xinput2 was requested." "$LINENO" 5 ;; +esac +fi + fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5 diff --git a/configure.ac b/configure.ac index e82d193..6047744 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,8 @@ AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) +AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]), + [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi]) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) @@ -937,6 +939,7 @@ then X11/Xcursor/Xcursor.h \ X11/extensions/shape.h \ X11/extensions/XInput.h \ + X11/extensions/XInput2.h \ X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ @@ -975,6 +978,13 @@ then WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"], [libxi ${notice_platform}development files not found, the Xinput extension won't be supported.]) + dnl *** Check for X input 2 extension + if test "x$ac_cv_lib_soname_Xi" != x + then + WINE_NOTICE_WITH(xinput2,[test "$ac_cv_header_X11_extensions_XInput2_h" != "yes"], + [XInput2 headers not found, the XInput 2 extension won't be supported.]) + fi + dnl *** Check for X Shm extension if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 19a6b48..8800d72 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1094,6 +1094,9 @@ /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ #undef HAVE_X11_EXTENSIONS_XINERAMA_H +/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XINPUT2_H + /* Define to 1 if you have the <X11/extensions/XInput.h> header file. */ #undef HAVE_X11_EXTENSIONS_XINPUT_H

1 0

Alexandre Julliard : winex11: Add handlers for the XInput2 raw mouse events .
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: 338fe8b9acf5085172662e9cf3109370dad77a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=338fe8b9acf5085172662e9cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 18:56:37 2011 +0200 winex11: Add handlers for the XInput2 raw mouse events. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 115 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 117 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a05e906..d3ed4b0 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -140,7 +140,7 @@ static x11drv_event_handler handlers[MAX_EVENT_HANDLERS] = NULL, /* 32 ColormapNotify */ X11DRV_ClientMessage, /* 33 ClientMessage */ X11DRV_MappingNotify, /* 34 MappingNotify */ - NULL /* 35 GenericEvent */ + X11DRV_GenericEvent /* 35 GenericEvent */ }; static const char * event_names[MAX_EVENT_HANDLERS] = diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1716916..e3774dc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -25,6 +25,9 @@ #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <stdarg.h> +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif #ifdef SONAME_LIBXCURSOR # include <X11/Xcursor/Xcursor.h> @@ -1089,3 +1092,115 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) send_mouse_input( hwnd, event->window, event->state, &input ); } + +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + +/*********************************************************************** + * X11DRV_RawButtonPress + */ +static void X11DRV_RawButtonPress( XIRawEvent *event ) +{ + int button = event->detail - 1; + INPUT input; + + if (button >= NB_BUTTONS) return; + + TRACE( "button %u\n", button ); + + input.type = INPUT_MOUSE; + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = button_down_data[button]; + input.u.mi.dwFlags = button_down_flags[button]; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + update_user_time( event->time ); + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + + +/*********************************************************************** + * X11DRV_RawButtonRelease + */ +static void X11DRV_RawButtonRelease( XIRawEvent *event ) +{ + int button = event->detail - 1; + INPUT input; + + if (button >= NB_BUTTONS) return; + + TRACE( "button %u\n", button ); + + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = button_up_data[button]; + input.u.mi.dwFlags = button_up_flags[button]; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + + +/*********************************************************************** + * X11DRV_RawMotion + */ +static void X11DRV_RawMotion( XIRawEvent *event ) +{ + const double *values = event->valuators.values; + INPUT input; + + if (!event->valuators.mask_len) return; + + input.u.mi.dx = 0; + input.u.mi.dy = 0; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + if (XIMaskIsSet( event->valuators.mask, 0 )) input.u.mi.dx = *values++; + if (XIMaskIsSet( event->valuators.mask, 1 )) input.u.mi.dy = *values++; + + TRACE( "pos %d,%d\n", input.u.mi.dx, input.u.mi.dy ); + + input.type = INPUT_MOUSE; + __wine_send_input( 0, &input ); +} + +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ + + +/*********************************************************************** + * X11DRV_GenericEvent + */ +void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + XGenericEventCookie *event = &xev->xcookie; + + if (!event->data) return; + + switch (event->evtype) + { + case XI_RawButtonPress: + X11DRV_RawButtonPress( event->data ); + break; + + case XI_RawButtonRelease: + X11DRV_RawButtonRelease( event->data ); + break; + + case XI_RawMotion: + X11DRV_RawMotion( event->data ); + break; + + default: + TRACE( "Unhandled event %#x\n", event->evtype ); + break; + } +#endif +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5f6c5cf..ae91fc9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -728,6 +728,7 @@ extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event ); +extern void X11DRV_GenericEvent( HWND hwnd, XEvent *event ); extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );

1 0

Alexandre Julliard : winex11: Retrieve raw mouse events through XInput2 while the cursor is clipped.
by Alexandre Julliard 14 Apr '11

14 Apr '11

Module: wine Branch: master Commit: bd3ec1a973fef5ff46a6242aa4e04dd4b7a40799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3ec1a973fef5ff46a6242aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 20:18:30 2011 +0200 winex11: Retrieve raw mouse events through XInput2 while the cursor is clipped. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 178 +++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 3 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 179 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d3ed4b0..62aea5e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -795,7 +795,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == clip_window) clipping_cursor = 0; + if (event->xany.window == clip_window) clipping_window_unmapped(); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e3774dc..a1c913f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -128,6 +128,17 @@ static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +static BOOL xinput2_available; +static int xinput2_opcode; +static int xinput2_core_pointer; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(XIFreeDeviceInfo); +MAKE_FUNCPTR(XIQueryDevice); +MAKE_FUNCPTR(XIQueryVersion); +MAKE_FUNCPTR(XISelectEvents); +#undef MAKE_FUNCPTR +#endif /*********************************************************************** * X11DRV_Xcursor_Init @@ -239,6 +250,124 @@ void sync_window_cursor( Window window ) } /*********************************************************************** + * enable_xinput2 + */ +static void enable_xinput2(void) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + struct x11drv_thread_data *data = x11drv_thread_data(); + XIDeviceInfo *devices; + XIEventMask mask; + unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; + int i, count; + + if (!xinput2_available) return; + + if (data->xi2_state == xi_unknown) + { + int major = 2, minor = 0; + wine_tsx11_lock(); + if (!pXIQueryVersion( data->display, &major, &minor )) data->xi2_state = xi_disabled; + else + { + data->xi2_state = xi_unavailable; + WARN( "X Input 2 not available\n" ); + } + wine_tsx11_unlock(); + } + if (data->xi2_state == xi_unavailable) return; + + wine_tsx11_lock(); + devices = pXIQueryDevice( data->display, XIAllDevices, &count ); + for (i = 0; i < count; ++i) + { + if (devices[i].use != XIMasterPointer) continue; + TRACE( "Using %u (%s) as core pointer\n", + devices[i].deviceid, debugstr_a(devices[i].name) ); + xinput2_core_pointer = devices[i].deviceid; + break; + } + + mask.mask = mask_bits; + mask.mask_len = sizeof(mask_bits); + memset( mask_bits, 0, sizeof(mask_bits) ); + + XISetMask( mask_bits, XI_RawButtonPress ); + XISetMask( mask_bits, XI_RawButtonRelease ); + XISetMask( mask_bits, XI_RawMotion ); + + for (i = 0; i < count; ++i) + { + if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + { + TRACE( "Device %u (%s) is attached to the core pointer\n", + devices[i].deviceid, debugstr_a(devices[i].name) ); + mask.deviceid = devices[i].deviceid; + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + data->xi2_state = xi_enabled; + } + } + + pXIFreeDeviceInfo( devices ); + wine_tsx11_unlock(); +#endif +} + +/*********************************************************************** + * disable_xinput2 + */ +static void disable_xinput2(void) +{ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + struct x11drv_thread_data *data = x11drv_thread_data(); + XIEventMask mask; + XIDeviceInfo *devices; + int i, count; + + if (data->xi2_state != xi_enabled) return; + + TRACE( "disabling\n" ); + data->xi2_state = xi_disabled; + + mask.mask = NULL; + mask.mask_len = 0; + + wine_tsx11_lock(); + devices = pXIQueryDevice( data->display, XIAllDevices, &count ); + for (i = 0; i < count; ++i) + { + if (devices[i].use == XISlavePointer && devices[i].attachment == xinput2_core_pointer) + { + mask.deviceid = devices[i].deviceid; + pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + } + } + pXIFreeDeviceInfo( devices ); + wine_tsx11_unlock(); +#endif +} + +/*********************************************************************** + * clipping_window_unmapped + * + * Turn off clipping when the window got unmapped. + */ +void clipping_window_unmapped(void) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + + clipping_cursor = 0; + if (data->xi2_state == xi_enabled) + { + RECT rect; + GetClipCursor( &rect ); + if (EqualRect( &rect, &clip_rect )) return; /* still clipped */ + disable_xinput2(); + } +} + + +/*********************************************************************** * send_mouse_input * * Update the various window states on a mouse event. @@ -254,7 +383,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU { input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - __wine_send_input( hwnd, input ); + if (x11drv_thread_data()->xi2_state != xi_enabled) __wine_send_input( hwnd, input ); return; } @@ -913,14 +1042,16 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) */ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) { - Display *display = thread_init_display(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); + + if (data->xi2_state == xi_enabled) return TRUE; TRACE( "warping to (%d,%d)\n", x, y ); wine_tsx11_lock(); - XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, + XWarpPointer( data->display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); - XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ + XFlush( data->display ); /* avoids bad mouse lag in games that do their own mouse warping */ wine_tsx11_unlock(); return TRUE; } @@ -983,6 +1114,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (clipping_cursor) { + enable_xinput2(); sync_window_cursor( clip_window ); clip_rect = *clip; return TRUE; @@ -996,6 +1128,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) XUnmapWindow( display, clip_window ); wine_tsx11_unlock(); clipping_cursor = 0; + disable_xinput2(); return TRUE; } @@ -1175,6 +1308,42 @@ static void X11DRV_RawMotion( XIRawEvent *event ) /*********************************************************************** + * X11DRV_XInput2_Init + */ +void X11DRV_XInput2_Init(void) +{ +#if defined(SONAME_LIBXI) && defined(HAVE_X11_EXTENSIONS_XINPUT2_H) + int event, error; + void *libxi_handle = wine_dlopen( SONAME_LIBXI, RTLD_NOW, NULL, 0 ); + + if (!libxi_handle) + { + WARN( "couldn't load %s\n", SONAME_LIBXI ); + return; + } +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libxi_handle, #f, NULL, 0))) \ + { \ + WARN("Failed to load %s.\n", #f); \ + return; \ + } + + LOAD_FUNCPTR(XIFreeDeviceInfo); + LOAD_FUNCPTR(XIQueryDevice); + LOAD_FUNCPTR(XIQueryVersion); + LOAD_FUNCPTR(XISelectEvents); +#undef LOAD_FUNCPTR + + wine_tsx11_lock(); + xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error ); + wine_tsx11_unlock(); +#else + TRACE( "X Input 2 support not compiled in.\n" ); +#endif +} + + +/*********************************************************************** * X11DRV_GenericEvent */ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) @@ -1183,6 +1352,7 @@ void X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) XGenericEventCookie *event = &xev->xcookie; if (!event->data) return; + if (event->extension != xinput2_opcode) return; switch (event->evtype) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ae91fc9..8d05e27 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -258,6 +258,7 @@ extern void X11DRV_OpenGL_Cleanup(void); extern void X11DRV_Xcursor_Init(void); extern void X11DRV_BITMAP_Init(void); extern void X11DRV_FONT_Init( int log_pixels_x, int log_pixels_y ); +extern void X11DRV_XInput2_Init(void); extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ); extern XImage *X11DRV_DIB_CreateXImage( int width, int height, int depth ); @@ -550,6 +551,7 @@ struct x11drv_thread_data XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ HKL kbd_layout; /* active keyboard layout */ + enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void); @@ -823,6 +825,7 @@ extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( Window window ); +extern void clipping_window_unmapped(void); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9ac20c3..cb6d793 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -595,6 +595,7 @@ static BOOL process_attach(void) #ifdef SONAME_LIBXCOMPOSITE X11DRV_XComposite_Init(); #endif + X11DRV_XInput2_Init(); #ifdef HAVE_XKB if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL );

1 0