November 2011 - Wine-Commits

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (tapi.h).
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 04757b1b853b28fd452d1525a137aa589f5bdee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04757b1b853b28fd452d1525a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 10 01:42:55 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (tapi.h). --- include/tapi.h | 58 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/tapi.h b/include/tapi.h index ca2c4c8..564b118 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -37,7 +37,7 @@ typedef HANDLE HLINEAPP, *LPHLINEAPP; typedef HANDLE HPHONE, *LPHPHONE; typedef HANDLE HPHONEAPP, *LPHPHONEAPP; -#define TAPIERR_REQUESTFAILED -16L +#define TAPIERR_REQUESTFAILED __MSABI_LONG(-16) #define LINEERR_ALLOCATED 0x80000001 #define LINEERR_BADDEVICEID 0x80000002 #define LINEERR_BEARERMODEUNAVAIL 0x80000003 @@ -196,34 +196,34 @@ typedef HANDLE HPHONEAPP, *LPHPHONEAPP; /* tapi callback messages */ -#define LINE_ADDRESSSTATE 0L -#define LINE_CALLINFO 1L -#define LINE_CALLSTATE 2L -#define LINE_CLOSE 3L -#define LINE_DEVSPECIFIC 4L -#define LINE_DEVSPECIFICFEATURE 5L -#define LINE_GATHERDIGITS 6L -#define LINE_GENERATE 7L -#define LINE_LINEDEVSTATE 8L -#define LINE_MONITORDIGITS 9L -#define LINE_MONITORMEDIA 10L -#define LINE_MONITORTONE 11L -#define LINE_REPLY 12L -#define LINE_REQUEST 13L -#define PHONE_BUTTON 14L -#define PHONE_CLOSE 15L -#define PHONE_DEVSPECIFIC 16L -#define PHONE_REPLY 17L -#define PHONE_STATE 18L -#define LINE_CREATE 19L -#define PHONE_CREATE 20L - -#define LINE_AGENTSPECIFIC 21L -#define LINE_AGENTSTATUS 22L -#define LINE_APPNEWCALL 23L -#define LINE_PROXYREQUEST 24L -#define LINE_REMOVE 25L -#define PHONE_REMOVE 26L +#define LINE_ADDRESSSTATE __MSABI_LONG(0) +#define LINE_CALLINFO __MSABI_LONG(1) +#define LINE_CALLSTATE __MSABI_LONG(2) +#define LINE_CLOSE __MSABI_LONG(3) +#define LINE_DEVSPECIFIC __MSABI_LONG(4) +#define LINE_DEVSPECIFICFEATURE __MSABI_LONG(5) +#define LINE_GATHERDIGITS __MSABI_LONG(6) +#define LINE_GENERATE __MSABI_LONG(7) +#define LINE_LINEDEVSTATE __MSABI_LONG(8) +#define LINE_MONITORDIGITS __MSABI_LONG(9) +#define LINE_MONITORMEDIA __MSABI_LONG(10) +#define LINE_MONITORTONE __MSABI_LONG(11) +#define LINE_REPLY __MSABI_LONG(12) +#define LINE_REQUEST __MSABI_LONG(13) +#define PHONE_BUTTON __MSABI_LONG(14) +#define PHONE_CLOSE __MSABI_LONG(15) +#define PHONE_DEVSPECIFIC __MSABI_LONG(16) +#define PHONE_REPLY __MSABI_LONG(17) +#define PHONE_STATE __MSABI_LONG(18) +#define LINE_CREATE __MSABI_LONG(19) +#define PHONE_CREATE __MSABI_LONG(20) + +#define LINE_AGENTSPECIFIC __MSABI_LONG(21) +#define LINE_AGENTSTATUS __MSABI_LONG(22) +#define LINE_APPNEWCALL __MSABI_LONG(23) +#define LINE_PROXYREQUEST __MSABI_LONG(24) +#define LINE_REMOVE __MSABI_LONG(25) +#define PHONE_REMOVE __MSABI_LONG(26) /* these are used as Param1 of line_callstate messages */ #define LINECALLSTATE_IDLE 0x00000001 #define LINECALLSTATE_OFFERING 0x00000002

1 0

Nikolay Sivov : msxml3: Implement get_nodeTypeValue() for attributes without a type.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: dd9a2effd5efa09388e76e0282f2e3f206cbbdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9a2effd5efa09388e76e028… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 13:42:41 2011 +0300 msxml3: Implement get_nodeTypeValue() for attributes without a type. --- dlls/msxml3/attribute.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index b67a5b4..fc96658 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -448,11 +448,40 @@ static HRESULT WINAPI domattr_get_definition( static HRESULT WINAPI domattr_get_nodeTypedValue( IXMLDOMAttribute *iface, - VARIANT* var1) + VARIANT* value) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - FIXME("(%p)->(%p)\n", This, var1); - return return_null_var(var1); + IXMLDOMDocument *doc; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, value); + + hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); + if (hr == S_OK) + { + IXMLDOMDocument2 *doc2; + + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + IXMLDOMDocument_Release(doc); + + if (hr == S_OK) + { + VARIANT schemas; + + hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); + IXMLDOMDocument2_Release(doc2); + + if (hr != S_OK) + return IXMLDOMAttribute_get_value(iface, value); + else + { + FIXME("need to query schema for attribute type\n"); + VariantClear(&schemas); + } + } + } + + return return_null_var(value); } static HRESULT WINAPI domattr_put_nodeTypedValue(

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: ccf369ad0897e8308cd97d04f121614826bcd0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf369ad0897e8308cd97d04f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Nov 9 10:27:50 2011 +0100 po: Update Italian translation. --- po/it.po | 74 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 38 deletions(-) diff --git a/po/it.po b/po/it.po index 50ab75e..c4b752b 100644 --- a/po/it.po +++ b/po/it.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-10-31 19:18+0100\n" +"PO-Revision-Date: 2011-11-09 10:22+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -246,7 +246,7 @@ msgstr "Dettagli" #: comdlg32.rc:59 msgid "Browse to Desktop" -msgstr "Vai al desktop" +msgstr "Vai alla Scrivania" #: comdlg32.rc:123 msgid "Regular" @@ -1010,7 +1010,7 @@ msgstr "Ottieni CRL" #: crypt32.rc:132 msgid "Revoke Request" -msgstr "Revoca richiesta" +msgstr "Richiesta di revoca" #: crypt32.rc:133 msgid "Query Pending" @@ -2040,73 +2040,71 @@ msgstr "%uMB usati, %uMB disponibili" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Ovest" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Europeo centrale" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Cirillico" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Verde" +msgstr "Greco" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Turco" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Ebreo" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabo" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltico" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamita" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thai" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "pannello" +msgstr "Giapponese" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Hangul" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Hangul (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -2284,7 +2282,7 @@ msgstr "&Informazioni su Internet Explorer..." #: ieframe.rc:67 msgctxt "home page" msgid "Home" -msgstr "Inizio" +msgstr "Pagina iniziale" #: ieframe.rc:68 winhlp32.rc:66 msgid "Print..." @@ -6119,7 +6117,7 @@ msgstr "&Copia sfondo" #: shdoclc.rc:44 msgid "Set as &Desktop Item" -msgstr "Aggiungi come &oggetto del Desktop" +msgstr "Aggiungi come &oggetto della Scrivania" #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 msgid "Select &All" @@ -6192,7 +6190,7 @@ msgstr "Im&posta come sfondo" #: shdoclc.rc:74 shdoclc.rc:154 shdoclc.rc:178 msgid "Set as &Desktop Item..." -msgstr "Aggiungi come &oggetto del Desktop..." +msgstr "Aggiungi come &oggetto della Scrivania..." #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 @@ -9636,7 +9634,7 @@ msgstr "&Linea di comando:" #: progman.rc:171 msgid "&Working directory:" -msgstr "&Directory di &lavoro:" +msgstr "Cartella di &lavoro:" #: progman.rc:173 msgid "&Key combination:" @@ -10510,11 +10508,11 @@ msgstr "Non si aggiorna automaticamente" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "Affianca le finestre orizzontalmente sul desktop" +msgstr "Affianca le finestre orizzontalmente sulla scrivania " #: taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "Affianca le finestre verticalmente sul desktop" +msgstr "Affianca le finestre verticalmente sulla scrivania " #: taskmgr.rc:207 msgid "Minimizes the windows" @@ -10526,7 +10524,7 @@ msgstr "Massimizza le finestre" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "Impila le finestre diagonalmente sul desktop" +msgstr "Impila le finestre diagonalmente sulla scrivania" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" @@ -10942,7 +10940,7 @@ msgstr "Grafica" #: winecfg.rc:38 msgid "Desktop Integration" -msgstr "Integrazione del desktop" +msgstr "Integrazione della Scrivania" #: winecfg.rc:39 msgid "Audio" @@ -11125,11 +11123,11 @@ msgstr "Controlli - Testo" #: winecfg.rc:99 msgid "Menu Background" -msgstr "Menu - Sfondo" +msgstr "Menù - Sfondo" #: winecfg.rc:100 msgid "Menu Text" -msgstr "Menu - Testo" +msgstr "Menù - Testo" #: winecfg.rc:101 msgid "Scrollbar" @@ -11233,11 +11231,11 @@ msgstr "Titolo inattivo - Gradiente della barra" #: winecfg.rc:126 msgid "Menu Highlight" -msgstr "Menu - Selezione" +msgstr "Menù - Selezione" #: winecfg.rc:127 msgid "Menu Bar" -msgstr "Menu - Barra" +msgstr "Menù - Barra" #: wineconsole.rc:57 msgid " Options " @@ -11265,7 +11263,7 @@ msgstr "Controlli" #: wineconsole.rc:66 msgid "Popup menu" -msgstr "Menu a comparsa" +msgstr "Menù a comparsa" #: wineconsole.rc:67 msgid "&Control" @@ -11281,7 +11279,7 @@ msgstr "Modifica rapida" #: wineconsole.rc:70 msgid "&enable" -msgstr "&Abilita" +msgstr "&abilita" #: wineconsole.rc:72 msgid "Command history" @@ -11313,7 +11311,7 @@ msgstr " Configurazione " #: wineconsole.rc:100 msgid "Buffer zone" -msgstr "Buffer" +msgstr "Zona del buffer" #: wineconsole.rc:101 msgid "&Width :" @@ -11325,7 +11323,7 @@ msgstr "&Altezza:" #: wineconsole.rc:108 msgid "Window size" -msgstr "Dimensione finestra" +msgstr "Dimensione della finestra" #: wineconsole.rc:109 msgid "W&idth :"

1 0

Jacek Caban : mshtml: Wine Gecko 1.4 release.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 2e5f73e4d75cc510d761fb2bd3adf58c8ca72a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5f73e4d75cc510d761fb2bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:42 2011 +0100 mshtml: Wine Gecko 1.4 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/editor.c | 12 +-- dlls/mshtml/htmldoc.c | 37 ++--- dlls/mshtml/htmldoc3.c | 16 +-- dlls/mshtml/htmldoc5.c | 11 +- dlls/mshtml/htmlimg.c | 4 +- dlls/mshtml/htmlwindow.c | 17 +-- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsiface.idl | 439 ++++++++++++++++++++++++++++------------------ dlls/mshtml/nsio.c | 26 +++- 10 files changed, 318 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5f73e4d75cc510d761f…

1 0

Hans Leidekker : scrrun: Add a version resource.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: bdbd17c72af28da249806aa033e1f6e53d68c562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbd17c72af28da249806aa03… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:15 2011 +0100 scrrun: Add a version resource. --- dlls/scrrun/Makefile.in | 2 ++ dlls/scrrun/scrrun.rc | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index 46d8748..38f7652 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -2,4 +2,6 @@ MODULE = scrrun.dll C_SRCS = scrrun.c +RC_SRCS = scrrun.rc + @MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.rc b/dlls/scrrun/scrrun.rc new file mode 100644 index 0000000..66dcaa8 --- /dev/null +++ b/dlls/scrrun/scrrun.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +#define WINE_FILEDESCRIPTION_STR "Wine ScrRun dll" +#define WINE_FILENAME_STR "scrrun.dll" +#define WINE_FILEVERSION 5,8,7600,16385 +#define WINE_FILEVERSION_STR "5.8.7600.16385" +#define WINE_PRODUCTVERSION 5,8,7600,16385 +#define WINE_PRODUCTVERSION_STR "5.8.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : winex11: Still process all MotionNotify events when using XInput2.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 9716d1c8619e5fe68d1ad3ab9a18b106499b3fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716d1c8619e5fe68d1ad3ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 15:45:13 2011 +0100 winex11: Still process all MotionNotify events when using XInput2. --- dlls/winex11.drv/event.c | 47 ++++++++++++++++++++++----------------------- dlls/winex11.drv/mouse.c | 2 - dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 00915cf..1b3478d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -310,37 +310,36 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; case MotionNotify: - if (prev->xany.window == next->xany.window && next->type == MotionNotify) + switch (next->type) { - TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); - return MERGE_DISCARD; + case MotionNotify: + if (prev->xany.window == next->xany.window) + { + TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + } + break; +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + return MERGE_KEEP; } break; -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: + if (prev->xcookie.extension != xinput2_opcode) break; + if (prev->xcookie.evtype != XI_RawMotion) break; + switch (next->type) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; - if (thread_data->warp_serial) break; - switch (next->type) - { - case MotionNotify: - if (next->xany.window == thread_data->clip_window && - next->xmotion.time - thread_data->last_motion_notify < 1000) - { - TRACE( "ignoring MotionNotify for clip window\n" ); - return MERGE_IGNORE; - } - break; - case GenericEvent: - if (next->xcookie.extension != xinput2_opcode) break; - if (next->xcookie.evtype != XI_RawMotion) break; - return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); - } + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); +#endif } break; -#endif } return MERGE_HANDLE; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 112b4cf..d4249f4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1387,9 +1387,7 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (event->time - thread_data->last_motion_notify < 1000) return; if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; - thread_data->last_motion_notify = event->time; } send_mouse_input( hwnd, event->window, event->state, &input ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4967866..dbc0629 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,7 +548,6 @@ struct x11drv_thread_data HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ - Time last_motion_notify; /* time of last mouse motion */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ unsigned long warp_serial; /* serial number of last pointer warp request */

1 0

Alexandre Julliard : winex11: Use the motion event time to decide when to update the cursor.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: ef292465bebe13a0dcb52a65a940505f0149f728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef292465bebe13a0dcb52a65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 14:53:34 2011 +0100 winex11: Use the motion event time to decide when to update the cursor. --- dlls/winex11.drv/mouse.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 83c714a..112b4cf 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -548,10 +548,10 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!clip_hwnd) return; if (thread_data->clip_window != window) return; if (InterlockedExchangePointer( (void **)&cursor_window, clip_hwnd ) != clip_hwnd || - GetTickCount() - last_cursor_change > 100) + input->u.mi.time - last_cursor_change > 100) { sync_window_cursor( window ); - last_cursor_change = GetTickCount(); + last_cursor_change = input->u.mi.time; } input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; @@ -578,10 +578,10 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - GetTickCount() - last_cursor_change > 100) + input->u.mi.time - last_cursor_change > 100) { sync_window_cursor( data->whole_window ); - last_cursor_change = GetTickCount(); + last_cursor_change = input->u.mi.time; } if (hwnd != GetDesktopWindow())

1 0

Vitaliy Margolen : dinput: Return correct key names for num_lock and pause.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 5bb094c9a21d078d4fec26ef45529e84f3f73e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb094c9a21d078d4fec26ef4… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Nov 8 10:59:20 2011 -0700 dinput: Return correct key names for num_lock and pause. Scan codes and DIK codes for num_lock and pause are reversed. --- dlls/dinput/keyboard.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c23a023..3ca7d97 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -410,12 +410,14 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwHow) { HRESULT res; + LONG scan; res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (!GetKeyNameTextA((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | - (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, + scan = DIDFT_GETINSTANCE(pdidoi->dwType); + if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + if (!GetKeyNameTextA((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -429,14 +431,15 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwHow) { HRESULT res; + LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (!GetKeyNameTextW((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | - (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, - pdidoi->tszName, - sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) + scan = DIDFT_GETINSTANCE(pdidoi->dwType); + if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, + pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Octavian Voicu : ddraw: Make IDirectDrawClipperImpl_[GS] etHWnd function names consistent with SDK.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 8a6a1570745dfa823de6d90119ff98741f9d7b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6a1570745dfa823de6d9011… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Nov 9 17:17:13 2011 +0200 ddraw: Make IDirectDrawClipperImpl_[GS]etHWnd function names consistent with SDK. --- dlls/ddraw/clipper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8fd248..43d50ca 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -106,7 +106,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) } /***************************************************************************** - * IDirectDrawClipper::SetHwnd + * IDirectDrawClipper::SetHWnd * * Assigns a hWnd to the clipper interface. * @@ -120,7 +120,7 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) * *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(IDirectDrawClipper *iface, DWORD dwFlags, +static HRESULT WINAPI IDirectDrawClipperImpl_SetHWnd(IDirectDrawClipper *iface, DWORD dwFlags, HWND hWnd) { IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); @@ -200,9 +200,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(IDirectDrawClipper *ifa } /***************************************************************************** - * IDirectDrawClipper::GetHwnd + * IDirectDrawClipper::GetHWnd * - * Returns the hwnd assigned with SetHwnd + * Returns the hwnd assigned with SetHWnd * * Arguments: * hWndPtr: Address to store the HWND at @@ -292,7 +292,7 @@ static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = IDirectDrawClipperImpl_Initialize, IDirectDrawClipperImpl_IsClipListChanged, IDirectDrawClipperImpl_SetClipList, - IDirectDrawClipperImpl_SetHwnd + IDirectDrawClipperImpl_SetHWnd }; HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper)

1 0

Hans Leidekker : imm32: Validate the window handle passed to ImmGetContext.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 21a477e161589630ed94e5561a595c63155e0e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a477e161589630ed94e5561… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:06:49 2011 +0100 imm32: Validate the window handle passed to ImmGetContext. --- dlls/imm32/imm.c | 8 +++++++- dlls/imm32/tests/imm32.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index a8392ff..decdcae 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1360,9 +1360,15 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { - HIMC rc = NULL; + HIMC rc; TRACE("%p\n", hWnd); + + if (!IsWindow(hWnd)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return NULL; + } if (!IMM_GetThreadData()->defaultContext) IMM_GetThreadData()->defaultContext = ImmCreateContext(); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 39bedb2..eca4d5e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -557,6 +557,22 @@ static void test_ImmIsUIMessage(void) } } +static void test_ImmGetContext(void) +{ + HIMC himc; + DWORD err; + + SetLastError(0xdeadbeef); + himc = ImmGetContext((HWND)0xffffffff); + err = GetLastError(); + ok(himc == NULL, "ImmGetContext succeeded\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "got %u\n", err); + + himc = ImmGetContext(hwnd); + ok(himc != NULL, "ImmGetContext failed\n"); + ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); +} + START_TEST(imm32) { if (init()) { @@ -567,6 +583,7 @@ START_TEST(imm32) { test_ImmAssociateContextEx(); test_ImmThreads(); test_ImmIsUIMessage(); + test_ImmGetContext(); } cleanup(); }

1 0