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

Francois Gouget : wineboot: Make sure COBJMACROS is defined before objidl. h is included.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 93b450d4ec413aeb46040cd21b4eea0ff87c36ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b450d4ec413aeb46040cd21… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:22 2008 +0200 wineboot: Make sure COBJMACROS is defined before objidl.h is included. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b57dea9..859e91f 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -54,6 +54,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define WIN32_LEAN_AND_MEAN #include <stdio.h> @@ -65,7 +66,6 @@ #include <wine/unicode.h> #include <wine/debug.h> -#define COBJMACROS #include <shlobj.h> #include <shobjidl.h> #include <shlwapi.h>

1 0

Francois Gouget : services: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1aa72f7e47607e6c553dcb4064cc16475ab0574b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa72f7e47607e6c553dcb406… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:01 2008 +0200 services: Add a trailing '\n' to a couple of Wine traces. --- programs/services/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 63ce0d7..0adeb12 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -541,7 +541,7 @@ DWORD svcctl_ChangeServiceConfigW( if (!validate_service_config(&new_entry)) { - WINE_ERR("The configuration after the change wouldn't be valid"); + WINE_ERR("The configuration after the change wouldn't be valid\n"); service_unlock(service->service_entry); return ERROR_INVALID_PARAMETER; } @@ -1348,7 +1348,7 @@ DWORD RPC_MainLoop(void) if ((err = RpcServerRegisterIf(svcctl_v2_0_s_ifspec, 0, 0)) != ERROR_SUCCESS) { - WINE_ERR("RpcServerRegisterIf failed with error %u", err); + WINE_ERR("RpcServerRegisterIf failed with error %u\n", err); return err; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_navigator implementation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 9c352a11cc4425053b58ea978e6931e9e1cb11cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c352a11cc4425053b58ea978… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 12:34:24 2008 +0200 mshtml: Added IHTMLWindow2::get_navigator implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlwindow.c | 7 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/omnavigator.c | 309 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 25 ++++ 5 files changed, 341 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c352a11cc4425053b58e…

1 0

Jacek Caban : mshtml: Don't crash if nsWebBrowser could not be created.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b024cd6de26174fd379efb769906b08c9d12f629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b024cd6de26174fd379efb769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 13:05:56 2008 +0200 mshtml: Don't crash if nsWebBrowser could not be created. --- dlls/mshtml/nsembed.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5d9b247..e46b8fa 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1602,14 +1602,17 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->editor = NULL; ret->reset_focus = NULL; - if(parent) - nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); - ret->parent = parent; - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_WEBBROWSER_CONTRACTID, NULL, &IID_nsIWebBrowser, (void**)&ret->webbrowser); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("Creating WebBrowser failed: %08x\n", nsres); + heap_free(ret); + return NULL; + } + + if(parent) + nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); + ret->parent = parent; nsres = nsIWebBrowser_SetContainerWindow(ret->webbrowser, NSWBCHROME(ret)); if(NS_FAILED(nsres))

1 0

Jacek Caban : mshtml: Remove unneeded includes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d02c37aa4e4d1d3b0efaa4166bdbd230534b44bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02c37aa4e4d1d3b0efaa4166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 13:14:05 2008 +0200 mshtml: Remove unneeded includes. --- dlls/mshtml/conpoint.c | 3 --- dlls/mshtml/editor.c | 3 --- dlls/mshtml/hlink.c | 3 --- dlls/mshtml/htmlanchor.c | 3 --- dlls/mshtml/htmlbody.c | 3 --- dlls/mshtml/htmlelem.c | 3 --- dlls/mshtml/htmlelem2.c | 4 ---- dlls/mshtml/htmlinput.c | 4 ---- dlls/mshtml/htmlnode.c | 4 ---- dlls/mshtml/htmloption.c | 4 ---- dlls/mshtml/htmlscript.c | 4 ---- dlls/mshtml/htmlselect.c | 4 ---- dlls/mshtml/htmlstyle.c | 4 ---- dlls/mshtml/htmlstylesheet.c | 4 ---- dlls/mshtml/htmltable.c | 4 ---- dlls/mshtml/htmltextarea.c | 4 ---- dlls/mshtml/htmlwindow.c | 4 ---- dlls/mshtml/main.c | 3 --- dlls/mshtml/olecmd.c | 4 ---- dlls/mshtml/selection.c | 4 ---- dlls/mshtml/txtrange.c | 4 ---- 21 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 85cf8dc..0c77e9c 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 756898a..5929603 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "mshtmcid.h" diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 80332a1..60056e3 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -16,10 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 41b71e7..d404925 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 6ad26ee..2ca3f28 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -26,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 145a625..b7fac23 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -16,10 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #define COBJMACROS @@ -27,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winnls.h" #include "ole2.h" #include "shlwapi.h" diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 333f66f..01c88fa 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e6b1798..9c390c8 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1633baa..e098a83 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 0c84989..73af3b0 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 5bf4a18..6c49af5 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3a7faf8..3718e8a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index bf3cb4a..cb24831 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 236831e..b074c25 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index ffef38a..66d55d0 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 5aaa9d4..64245e7 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 63dbbc0..0f57069 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e69672f..0389833 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -30,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "winreg.h" #include "ole2.h" #include "advpub.h" diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index afc3cc8..0b1b477 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "shlguid.h" #include "mshtmdid.h" diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 7de8adf..5eca8e3 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "wine/debug.h" diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index df8ee55..72b9ce0 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -16,17 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdio.h> #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "ole2.h" #include "mshtmcid.h"

1 0

Jacek Caban : jscript: Added IObjectSafety implementation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7d95c210c891755cdc1c0eb0608c91ee2e108dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d95c210c891755cdc1c0eb06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 7 12:35:41 2008 +0200 jscript: Added IObjectSafety implementation. --- dlls/jscript/jscript.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 7d7385a..f058e26 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -32,6 +32,8 @@ typedef struct { const IObjectSafetyVtbl *lpIObjectSafetyVtbl; LONG ref; + + DWORD safeopt; } JScript; #define ACTSCRIPT(x) ((IActiveScript*) &(x)->lpIActiveScriptVtbl) @@ -395,19 +397,35 @@ static ULONG WINAPI JScriptSafety_Release(IObjectSafety *iface) return IActiveScript_Release(ACTSCRIPT(This)); } +#define SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER) + static HRESULT WINAPI JScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) { JScript *This = OBJSAFETY_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + + if(!pdwSupportedOptions || !pdwEnabledOptions) + return E_POINTER; + + *pdwSupportedOptions = SUPPORTED_OPTIONS; + *pdwEnabledOptions = This->safeopt; + + return S_OK; } static HRESULT WINAPI JScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) { JScript *This = OBJSAFETY_THIS(iface); - FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(dwOptionSetMask & ~SUPPORTED_OPTIONS) + return E_FAIL; + + This->safeopt = dwEnabledOptions & dwEnabledOptions; return S_OK; } @@ -439,6 +457,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->lpIActiveScriptPropertyVtbl = &JScriptPropertyVtbl; ret->lpIObjectSafetyVtbl = &JScriptSafetyVtbl; ret->ref = 1; + ret->safeopt = INTERFACE_USES_DISPEX; hres = IActiveScript_QueryInterface(ACTSCRIPT(ret), riid, ppv); IActiveScript_Release(ACTSCRIPT(ret));

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f4c4488df822b0d109998a99d8282b4d364b9ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c4488df822b0d109998a99d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 4 14:23:01 2008 -0500 Spelling fixes. --- dlls/ddraw/main.c | 2 +- dlls/ddraw/tests/visual.c | 8 ++++---- dlls/dplayx/dplayx_global.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- dlls/mapi32/prop.c | 6 +++--- dlls/mciseq/mcimidi.c | 2 +- dlls/mciwave/mciwave.c | 2 +- dlls/mpr/pwcache.c | 4 ++-- dlls/msadp32.acm/msadp32.c | 4 ++-- dlls/mshtml/editor.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/service.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c4488df822b0d109998…

1 0

Vitaliy Margolen : winex11: Properly report state of the caps-lock and num-lock and scroll-lock keys.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: bc325ac268ab0b99e1ce6d5012dd329cacb2357c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc325ac268ab0b99e1ce6d501… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 5 23:36:55 2008 -0600 winex11: Properly report state of the caps-lock and num-lock and scroll-lock keys. --- dlls/winex11.drv/keyboard.c | 134 +++++++++++++++---------------------------- 1 files changed, 46 insertions(+), 88 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index f11a9ee..4be6336 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1139,8 +1139,6 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) return keyc2vkey[e->keycode]; } -static BOOL NumState=FALSE, CapsState=FALSE; - /*********************************************************************** * X11DRV_send_keyboard_input @@ -1265,53 +1263,6 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time } -/********************************************************************** - * KEYBOARD_GenerateMsg - * - * Generate Down+Up messages when NumLock or CapsLock is pressed. - * - * Convention : called with vkey only VK_NUMLOCK or VK_CAPITAL - * - */ -static void KEYBOARD_GenerateMsg( WORD vkey, WORD scan, int Evtype, DWORD event_time ) -{ - BOOL * State = (vkey==VK_NUMLOCK? &NumState : &CapsState); - DWORD up, down; - - if (*State) { - /* The INTERMEDIARY state means : just after a 'press' event, if a 'release' event comes, - don't treat it. It's from the same key press. Then the state goes to ON. - And from there, a 'release' event will switch off the toggle key. */ - *State=FALSE; - TRACE("INTERM : don't treat release of toggle key. key_state_table[%#x] = %#x\n", - vkey,key_state_table[vkey]); - } else - { - down = (vkey==VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0); - up = (vkey==VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0) | KEYEVENTF_KEYUP; - if ( key_state_table[vkey] & 0x1 ) /* it was ON */ - { - if (Evtype!=KeyPress) - { - TRACE("ON + KeyRelease => generating DOWN and UP messages.\n"); - X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); - *State=FALSE; - key_state_table[vkey] &= ~0x01; /* Toggle state to off. */ - } - } - else /* it was OFF */ - if (Evtype==KeyPress) - { - TRACE("OFF + Keypress => generating DOWN and UP messages.\n"); - X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); - *State=TRUE; /* Goes to intermediary state before going to ON */ - key_state_table[vkey] |= 0x01; /* Toggle state to on. */ - } - } -} - /*********************************************************************** * KEYBOARD_UpdateOneState * @@ -1370,6 +1321,16 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) KEYBOARD_UpdateOneState( VK_SHIFT, shift, time ); } +static void update_lock_state(BYTE vkey, WORD scan, DWORD time) +{ + DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; + + if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; + + X11DRV_send_keyboard_input( vkey, scan, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); +} + /*********************************************************************** * X11DRV_KeyEvent * @@ -1443,47 +1404,44 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) TRACE_(key)("keycode 0x%x converted to vkey 0x%x\n", event->keycode, vkey); - if (vkey) - { - switch (vkey & 0xff) - { - case VK_NUMLOCK: - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, event->type, event_time ); - break; - case VK_CAPITAL: - TRACE("Caps Lock event. (type %d). State before : %#.2x\n",event->type,key_state_table[vkey]); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, event->type, event_time ); - TRACE("State after : %#.2x\n",key_state_table[vkey]); - break; - default: - /* Adjust the NUMLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask)) - { - TRACE("Adjusting NumLock state.\n"); - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyPress, event_time ); - KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyRelease, event_time ); - } - /* Adjust the CAPSLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask)) - { - TRACE("Adjusting Caps Lock state.\n"); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyPress, event_time ); - KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyRelease, event_time ); - } - /* Not Num nor Caps : end of intermediary states for both. */ - NumState = FALSE; - CapsState = FALSE; + if (!vkey) return; + + dwFlags = 0; + if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; + if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + - bScan = keyc2scan[event->keycode] & 0xFF; - TRACE_(key)("bScan = 0x%02x.\n", bScan); + /* Note: X sets the below states on key down and clears them on key up. + Windows triggers them on key down. */ - dwFlags = 0; - if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; - if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; + /* Adjust the CAPSLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask) && + vkey != VK_CAPITAL) + { + TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); + update_lock_state(VK_CAPITAL, 0x3A, event_time); + } + + /* Adjust the NUMLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask) && + (vkey & 0xff) != VK_NUMLOCK) + { + TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); + update_lock_state(VK_NUMLOCK, 0x45, event_time); + } - X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + /* Adjust the SCROLLLOCK state if it has been changed outside wine */ + if (!(key_state_table[VK_SCROLL] & 0x01) != !(event->state & ScrollLockMask) && + vkey != VK_SCROLL) + { + TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); + update_lock_state(VK_SCROLL, 0x46, event_time); } - } + + bScan = keyc2scan[event->keycode] & 0xFF; + TRACE_(key)("bScan = 0x%02x.\n", bScan); + + X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); } /**********************************************************************

1 0

Vitaliy Margolen : winex11: Get the ScrollLock mask.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b4d99eebbbca50263a083e0bea602781762179b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d99eebbbca50263a083e0be… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 6 08:25:38 2008 -0600 winex11: Get the ScrollLock mask. --- dlls/winex11.drv/keyboard.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 8bb5717..f11a9ee 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -87,7 +87,7 @@ static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYS static int min_keycode, max_keycode, keysyms_per_keycode; static WORD keyc2vkey[256], keyc2scan[256]; -static int NumLockMask, AltGrMask; /* mask in the XKeyEvent state */ +static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1641,6 +1641,11 @@ void X11DRV_InitKeyboard( Display *display ) NumLockMask = 1 << i; TRACE_(key)("NumLockMask is %x\n", NumLockMask); } + else if (XKeycodeToKeysym(display, *kcp, k) == XK_Scroll_Lock) + { + ScrollLockMask = 1 << i; + TRACE_(key)("ScrollLockMask is %x\n", ScrollLockMask); + } } } XFreeModifiermap(mmp);

1 0

Dmitry Timoshkov : winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 751a71a0449e44a603894fa7e8b6dc27fb31c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=751a71a0449e44a603894fa7e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 13:37:44 2008 +0900 winex11: Change the priority of evaluated window styles to workaround a Metacity bug with handling of utility windows. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 62f215c..919879a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -944,10 +944,10 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) /* set the WM_WINDOW_TYPE */ window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); - else if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0