April 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLDocument2::onkeypress implementation.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 1c277a26bbefb23c1d0cc38aea52c3bab2755515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c277a26bbefb23c1d0cc38ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:12 2012 +0200 mshtml: Added IHTMLDocument2::onkeypress implementation. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1d483d4..a5b20bc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1103,15 +1103,19 @@ static HRESULT WINAPI HTMLDocument_get_onkeydown(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onkeypress(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_KEYPRESS, &v); } static HRESULT WINAPI HTMLDocument_get_onkeypress(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_KEYPRESS, p); } static HRESULT WINAPI HTMLDocument_put_onmouseup(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7454549..2d8dc83 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -77,6 +77,9 @@ static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; static const WCHAR keydownW[] = {'k','e','y','d','o','w','n',0}; static const WCHAR onkeydownW[] = {'o','n','k','e','y','d','o','w','n',0}; +static const WCHAR keypressW[] = {'k','e','y','p','r','e','s','s',0}; +static const WCHAR onkeypressW[] = {'o','n','k','e','y','p','r','e','s','s',0}; + static const WCHAR keyupW[] = {'k','e','y','u','p',0}; static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; @@ -169,6 +172,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {keypressW, onkeypressW, EVENTT_KEY, DISPID_EVMETH_ONKEYPRESS, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {keyupW, onkeyupW, EVENTT_KEY, DISPID_EVMETH_ONKEYUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 70056b3..ef39caf 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -28,6 +28,7 @@ typedef enum { EVENTID_ERROR, EVENTID_FOCUS, EVENTID_KEYDOWN, + EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, EVENTID_MOUSEDOWN,

1 0

Marcus Meissner : winealsa.drv: Fixed buffer to RegEnumKeyExW.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 272535b948e8af27e2d291edeae6c4eb7bd988e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272535b948e8af27e2d291ede… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 9 23:52:37 2012 +0200 winealsa.drv: Fixed buffer to RegEnumKeyExW. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 66e8baf..e3c1d15 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -710,7 +710,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name); + key_name_size = sizeof(key_name)/sizeof(WCHAR); if(RegEnumKeyExW(devices_key, i, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break;

1 0

Jacek Caban : mshtml: Added better IHTMLWindow2::get_opener stub.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 8e71096fd1ec7a5909a791770a67ac092de6d4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e71096fd1ec7a5909a791770… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:03 2012 +0200 mshtml: Added better IHTMLWindow2::get_opener stub. --- dlls/mshtml/htmlwindow.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 294f551..4242a77 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -711,8 +711,11 @@ static HRESULT WINAPI HTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v) static HRESULT WINAPI HTMLWindow2_get_opener(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) returning empty\n", This, p); + + V_VT(p) = VT_EMPTY; + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigator **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 267ac9e..b951724 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4483,6 +4483,7 @@ static void test_window(IHTMLDocument2 *doc) IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; + VARIANT v; BSTR str; HRESULT hres; @@ -4545,6 +4546,11 @@ static void test_window(IHTMLDocument2 *doc) !strcmp_wa(str, "[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + V_VT(&v) = VT_ERROR; + hres = IHTMLWindow2_get_opener(window, &v); + ok(hres == S_OK, "get_opener failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(opener) = %d\n", V_VT(&v)); + test_window_name(window, NULL); set_window_name(window, "test"); test_window_length(window, 0);

1 0

Erich Hoover : ws2_32: Implement IPV6_UNICAST_IF socket option.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 1d49c6692991bbbd102102a508b2409e5e5f5f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d49c6692991bbbd102102a50… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 9 13:06:30 2012 -0600 ws2_32: Implement IPV6_UNICAST_IF socket option. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5d20459..fd384a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -401,6 +401,9 @@ static const int ws_ipv6_map[][2] = MAP_OPTION( IPV6_MULTICAST_LOOP ), MAP_OPTION( IPV6_UNICAST_HOPS ), MAP_OPTION( IPV6_V6ONLY ), +#ifdef IPV6_UNICAST_IF + MAP_OPTION( IPV6_UNICAST_IF ), +#endif }; static const int ws_af_map[][2] = @@ -2884,6 +2887,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: +#ifdef IPV6_UNICAST_IF + case WS_IPV6_UNICAST_IF: +#endif if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); @@ -4302,6 +4308,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: +#ifdef IPV6_UNICAST_IF + case WS_IPV6_UNICAST_IF: +#endif convert_sockopt(&level, &optname); break; case WS_IPV6_DONTFRAG:

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXLineImpl_QueryInterface().
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 1718a6cf1c557264f9cf7a886c401540fe003a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1718a6cf1c557264f9cf7a886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:42 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXLineImpl_QueryInterface(). --- dlls/d3dx9_36/line.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 2a9d6e9..d9ec2e0 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -40,15 +40,13 @@ static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface) /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine* iface, REFIID riid, LPVOID* object) { - ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXLine)) { ID3DXLine_AddRef(iface); - *object = This; + *object = iface; return S_OK; }

1 0

Austin English : ntdll: Give a better error message if signal context functions aren't defined.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 132da2c4281c48525f8976555627761758c12bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=132da2c4281c48525f8976555… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 9 14:04:23 2012 -0500 ntdll: Give a better error message if signal context functions aren't defined. --- dlls/ntdll/signal_i386.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6763344..3b07e77 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,7 +100,7 @@ typedef struct * signal context platform-specific definitions */ -#ifdef linux +#if defined (__linux__) typedef ucontext_t SIGCONTEXT; @@ -178,9 +178,7 @@ __ASM_GLOBAL_FUNC(vm86_enter, # define __HAVE_VM86 #endif -#endif /* linux */ - -#ifdef BSDI +#elif defined (__BSDI__) #include <machine/frame.h> typedef struct trapframe SIGCONTEXT; @@ -206,9 +204,7 @@ typedef struct trapframe SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* bsdi */ - -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <machine/trap.h> @@ -239,9 +235,7 @@ typedef struct sigcontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* __FreeBSD__ */ - -#ifdef __OpenBSD__ +#elif defined (__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@ -273,9 +267,7 @@ typedef struct sigcontext SIGCONTEXT; #define T_MCHK T_MACHK #define T_XMMFLT T_XFTRAP -#endif /* __OpenBSD__ */ - -#if defined(__svr4__) || defined(_SCO_DS) || defined(__sun) +#elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun) #ifdef _SCO_DS #include <sys/regset.h> @@ -323,9 +315,7 @@ typedef struct ucontext SIGCONTEXT; #define FPU_sig(context) NULL /* FIXME */ #define FPUX_sig(context) NULL /* FIXME */ -#endif /* svr4 || SCO_DS */ - -#ifdef __APPLE__ +#elif defined (__APPLE__) # include <sys/ucontext.h> typedef ucontext_t SIGCONTEXT; @@ -375,9 +365,7 @@ typedef ucontext_t SIGCONTEXT; #define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->fs.fpu_fcw) #endif -#endif /* __APPLE__ */ - -#if defined(__NetBSD__) +#elif defined(__NetBSD__) # include <sys/ucontext.h> # include <sys/types.h> # include <signal.h> @@ -411,7 +399,9 @@ typedef ucontext_t SIGCONTEXT; #define T_MCHK T_MCA #define T_XMMFLT T_XMM -#endif /* __NetBSD__ */ +#else +#error You must define the signal context functions for your platform +#endif /* linux */ WINE_DEFAULT_DEBUG_CHANNEL(seh);

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXMatrixStackImpl_QueryInterface ().
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 4522b07c86eafe334a249221a18e4bd0271db029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4522b07c86eafe334a249221a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:41 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXMatrixStackImpl_QueryInterface(). --- dlls/d3dx9_36/math.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b9271e0..10a6cb9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -801,17 +801,21 @@ static inline ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack return CONTAINING_RECORD(iface, ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); } -static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppobj) +static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **out) { - ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXMatrixStack)) + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DXMatrixStack) + || IsEqualGUID(riid, &IID_IUnknown)) { - ID3DXMatrixStack_AddRef(iface); - *ppobj = This; - return S_OK; + ID3DXMatrixStack_AddRef(iface); + *out = iface; + return S_OK; } - *ppobj = NULL; - WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DDeviceImpl.
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: daedd0077d3a52629df4cdf605bc453a06e964cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=daedd0077d3a52629df4cdf60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:40 2012 +0200 ddraw: Get rid of IDirect3DDeviceImpl. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 45 +- dlls/ddraw/device.c | 3231 +++++++++++++++++++------------------------- dlls/ddraw/executebuffer.c | 38 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/material.c | 6 +- dlls/ddraw/surface.c | 12 +- dlls/ddraw/vertexbuffer.c | 6 +- dlls/ddraw/viewport.c | 2 +- 9 files changed, 1471 insertions(+), 1881 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daedd0077d3a52629df4c…

1 0

Henri Verbeet : ddraw: Properly retrieve an interface pointer in IDirect3DDeviceImpl_7_GetTexture ().
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 96fa113513e110ab1aaa56c266064b5e7a7a41d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fa113513e110ab1aaa56c26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:39 2012 +0200 ddraw: Properly retrieve an interface pointer in IDirect3DDeviceImpl_7_GetTexture(). --- dlls/ddraw/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 47ee68a..89404ee 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4563,6 +4563,7 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, { IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface); struct wined3d_texture *wined3d_texture; + struct ddraw_surface *surface; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture); @@ -4582,7 +4583,8 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, return hr; } - *Texture = wined3d_texture_get_parent(wined3d_texture); + surface = wined3d_texture_get_parent(wined3d_texture); + *Texture = &surface->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*Texture); wined3d_texture_decref(wined3d_texture); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC().
by Alexandre Julliard April 10, 2012

April 10, 2012

Module: wine Branch: master Commit: 9cb7ca004a3d9a87466485fcbc2e3df3b71fac93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb7ca004a3d9a87466485fcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:38 2012 +0200 ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC(). --- dlls/ddraw/ddraw.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2ef51da..a777d35 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2471,6 +2471,7 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_surface *wined3d_surface; + struct ddraw_surface *surface_impl; HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); @@ -2485,7 +2486,8 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, return DDERR_NOTFOUND; } - *Surface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *Surface = &surface_impl->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*Surface); TRACE("Returning surface %p.\n", Surface); return DD_OK;

1 0