January 2011 - Wine-Commits

Vitaliy Margolen : dinput: Pass interface instead of this pointer to joystick poll callback.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 7d650d0b284b6814624ba07cdfa2d90854d801a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d650d0b284b6814624ba07cd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:25:11 2011 -0700 dinput: Pass interface instead of this pointer to joystick poll callback. --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 9 +++++---- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/joystick_private.h | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 7d781c9..e894dc6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -358,7 +358,7 @@ HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) return DIERR_NOTACQUIRED; } - This->joy_polldev(This); + This->joy_polldev(iface); return DI_OK; } @@ -381,7 +381,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( } /* update joystick state */ - This->joy_polldev(This); + This->joy_polldev(iface); /* convert and copy data to user supplied buffer */ fill_DataFormat(ptr, len, &This->js, &This->base.data_format); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1396ea5..d489ef3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -110,7 +110,7 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; -static void joy_polldev(JoystickGenericImpl *This); +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); static INT find_joystick_devices(void) { @@ -544,10 +544,11 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) return DI_NOEFFECT; } -static void joy_polldev(JoystickGenericImpl *This_in) { +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) +{ struct pollfd plfd; - struct js_event jse; - JoystickImpl *This = (JoystickImpl*) This_in; + struct js_event jse; + JoystickImpl *This = (JoystickImpl*) iface; TRACE("(%p)\n", This); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6da6066..1bb3398 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -135,7 +135,7 @@ struct JoystickImpl static void fake_current_js_state(JoystickImpl *ji); static void find_joydevs(void); -static void joy_polldev(JoystickGenericImpl *This); +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); /* This GUID is slightly different from the linux joystick one. Take note. */ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ @@ -731,7 +731,7 @@ static void fake_current_js_state(JoystickImpl *ji) #undef CENTER_AXIS /* convert wine format offset to user format object index */ -static void joy_polldev(JoystickGenericImpl *iface) +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; struct input_event ie; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index fc218d3..2b4ea12 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -517,9 +517,9 @@ static void get_osx_device_elements_props(JoystickImpl *device) } } -static void poll_osx_device_state(JoystickGenericImpl *device_in) +static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *device = (JoystickImpl*)device_in; + JoystickImpl *device = (JoystickImpl*)iface; IOHIDElementRef tIOHIDTopElementRef; IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index ebbd325..dfa0dfa 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -33,7 +33,7 @@ #define MAX_PROPS 164 struct JoystickGenericImpl; -typedef void joy_polldev_handler(struct JoystickGenericImpl *This); +typedef void joy_polldev_handler(LPDIRECTINPUTDEVICE8A iface); typedef struct JoystickGenericImpl {

1 0

Nikolay Sivov : oleaut32: Use alloc/ free helpers for all typelib parse methods.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: a90d2efd536c54cc21475d4e77f34554a30040b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90d2efd536c54cc21475d4e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 3 17:32:43 2011 +0300 oleaut32: Use alloc/free helpers for all typelib parse methods. --- dlls/oleaut32/typelib.c | 260 ++++++++++++++++++++++------------------------- 1 files changed, 122 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a90d2efd536c54cc21475…

1 0

Vitaliy Margolen : dinput: Rename IDirectInputDevice2AImpl into IDirectInputDeviceImpl.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 179b862738aae3b84b87c8e421cef868fe60e87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=179b862738aae3b84b87c8e42… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:25:07 2011 -0700 dinput: Rename IDirectInputDevice2AImpl into IDirectInputDeviceImpl. --- dlls/dinput/device.c | 34 +++++++++++++++++----------------- dlls/dinput/device_private.h | 4 ++-- dlls/dinput/dinput_main.c | 18 +++++++++--------- dlls/dinput/joystick_private.h | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=179b862738aae3b84b87c…

1 0

Jacek Caban : mshtml: Don' t prefer to forward a few more calls in nsIURL implementation.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 64c1b7922e28b1ffff8d9a60fa6b82627f98de27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1b7922e28b1ffff8d9a60f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 14:52:51 2011 +0100 mshtml: Don't prefer to forward a few more calls in nsIURL implementation. --- dlls/mshtml/nsio.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ed098e3..e5cfa78 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1933,9 +1933,6 @@ static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath) TRACE("(%p)->(%p)\n", This, aPath); - if(This->nsuri) - return nsIURI_GetPath(This->nsuri, aPath); - return get_uri_string(This, Uri_PROPERTY_PATH, aPath); } @@ -2060,9 +2057,6 @@ static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePa TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aRelativePath), _retval); - if(This->nsuri) - return nsIURI_Resolve(This->nsuri, aRelativePath, _retval); - nsACString_GetData(aRelativePath, &patha); path = heap_strdupAtoW(patha); if(!path) @@ -2184,9 +2178,6 @@ static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) TRACE("(%p)->(%p)\n", This, aQuery); - if(This->nsurl) - return nsIURL_GetQuery(This->nsurl, aQuery); - return get_uri_string(This, Uri_PROPERTY_QUERY, aQuery); }

1 0

Jacek Caban : mshtml: Use IUri for nsURL::[Get|Set]Password implementation.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 0aefffe9b4570374d8fc1874ab5e1cb438ba9eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aefffe9b4570374d8fc1874a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 14:52:34 2011 +0100 mshtml: Use IUri for nsURL::[Get|Set]Password implementation. --- dlls/mshtml/nsio.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e7f8a70..ed098e3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1780,26 +1780,33 @@ static nsresult NSAPI nsURI_GetPassword(nsIURL *iface, nsACString *aPassword) TRACE("(%p)->(%p)\n", This, aPassword); - if(This->nsuri) - return nsIURI_GetPassword(This->nsuri, aPassword); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_PASSWORD, aPassword); } static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPassword) { nsWineURI *This = NSURI_THIS(iface); + const char *passa; + WCHAR *pass; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPassword)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetPassword(This->nsuri, aPassword); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aPassword, &passa); + pass = heap_strdupAtoW(passa); + if(!pass) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetPassword(This->uri_builder, pass); + heap_free(pass); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort)

1 0

Nikolay Sivov : oleaut32/tests: Cleanup some test macros.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 4e17e38aa2b451849550f22b1e6dfa91a0c5c328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e17e38aa2b451849550f22b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 17:26:44 2011 +0300 oleaut32/tests: Cleanup some test macros. --- dlls/oleaut32/tests/typelib.c | 4 +- dlls/oleaut32/tests/vartype.c | 275 +++++++++++++++++++---------------------- 2 files changed, 129 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e17e38aa2b451849550f…

1 0

Vitaliy Margolen : dinput: COM cleanup - use interface instead of lpvtbl in joystick effects.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 0adc4708548d824ddad1bc3d73d655dfcbad033b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adc4708548d824ddad1bc3d7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:24:34 2011 -0700 dinput: COM cleanup - use interface instead of lpvtbl in joystick effects. --- dlls/dinput/effect_linuxinput.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7802271..e35a96f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -49,9 +49,9 @@ static const IDirectInputEffectVtbl LinuxInputEffectVtbl; typedef struct LinuxInputEffectImpl LinuxInputEffectImpl; struct LinuxInputEffectImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; + GUID guid; struct ff_effect effect; /* Effect data */ int gain; /* Effect gain */ @@ -60,6 +60,10 @@ struct LinuxInputEffectImpl struct list *entry; /* Entry into the parent's list of effects */ }; +static inline LinuxInputEffectImpl *impl_from_IDirectInputEffect(IDirectInputEffect *iface) +{ + return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); +} /****************************************************************************** * DirectInputEffect Functional Helper @@ -244,14 +248,14 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); return InterlockedIncrement(&(This->ref)); } static HRESULT WINAPI LinuxInputEffectImpl_Download( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); @@ -281,7 +285,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectGuid( LPDIRECTINPUTEFFECT iface, LPGUID pguid) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%p)\n", This, pguid); @@ -312,7 +316,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( DWORD dwFlags) { HRESULT diErr = DI_OK; - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); /* Major conversion factors are: @@ -474,7 +478,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_QueryInterface( REFIID riid, void **ppvObject) { - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%s,%p)\n", This, debugstr_guid(riid), ppvObject); @@ -495,7 +499,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Start( DWORD dwFlags) { struct input_event event; - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%d,%d)\n", This, dwIterations, dwFlags); @@ -527,8 +531,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( LPDIRECTINPUTEFFECT iface, LPCDIEFFECT peff, DWORD dwFlags) -{ - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; +{ + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); DWORD type = _typeFromGUID(&This->guid); HRESULT retval = DI_OK; @@ -727,7 +731,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Stop( LPDIRECTINPUTEFFECT iface) { struct input_event event; - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); @@ -743,7 +747,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Stop( static HRESULT WINAPI LinuxInputEffectImpl_Unload( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); /* Erase the downloaded effect */ @@ -758,7 +762,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Unload( static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); if (ref == 0) @@ -786,7 +790,7 @@ HRESULT linuxinput_create_effect( HEAP_ZERO_MEMORY, sizeof(LinuxInputEffectImpl)); DWORD type = _typeFromGUID(rguid); - newEffect->lpVtbl = &LinuxInputEffectVtbl; + newEffect->IDirectInputEffect_iface.lpVtbl = &LinuxInputEffectVtbl; newEffect->ref = 1; newEffect->guid = *rguid; newEffect->fd = fd;

1 0

Nikolay Sivov : oleaut32: Use structure size instead of hardcoded values.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 30b516b8d4ddff15c1824f14811ce48f4346c038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b516b8d4ddff15c1824f148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 13:41:44 2011 +0300 oleaut32: Use structure size instead of hardcoded values. --- dlls/oleaut32/typelib2.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 82915a7..fdf712b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1976,7 +1976,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( insert = alloc_cyclic_list_item(CyclicListFunc); if(!insert) return E_OUTOFMEMORY; - insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); + insert->u.data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MSFT_FuncRecord, HelpContext)+ + sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); if(!insert->u.data) { HeapFree(GetProcessHeap(), 0, insert); return E_OUTOFMEMORY; @@ -1984,7 +1985,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* fill out the basic type information */ typedata = insert->u.data; - typedata[0] = 0x18 + pFuncDesc->cParams*(num_defaults?16:12); + typedata[0] = FIELD_OFFSET(MSFT_FuncRecord, HelpContext) + pFuncDesc->cParams*(num_defaults?16:12); ctl2_encode_typedesc(This->typelib, &pFuncDesc->elemdescFunc.tdesc, &typedata[1], NULL, NULL, &decoded_size); typedata[2] = pFuncDesc->wFuncFlags; typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | (unsigned short)(pFuncDesc->oVft?pFuncDesc->oVft+1:0); @@ -2048,7 +2049,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( } /* update type data size */ - This->typedata->next->u.val += 0x18 + pFuncDesc->cParams*(num_defaults?16:12); + This->typedata->next->u.val += FIELD_OFFSET(MSFT_FuncRecord, HelpContext) + pFuncDesc->cParams*(num_defaults?16:12); /* Increment the number of function elements */ This->typeinfo->cElement += 1;

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed methods/arguments.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: f88d7bc8ca2e67d4b04870dc6295aaf04661c4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d7bc8ca2e67d4b04870dc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 16:05:10 2011 +0300 oleview: Fix some crashes on unnamed methods/arguments. --- programs/oleview/typelib.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 771305f..d2d6d00 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -631,7 +631,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszStdCall); AddToTLDataStrW(tld, wszSpace); } - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); for(j=0; j<pFuncDesc->cParams; j++) @@ -701,8 +701,11 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszAfter); AddToTLDataStrW(tld, wszSpace); if (j+1 < namesNo) { - AddToTLDataStrW(tld, bstrParamNames[j+1]); - SysFreeString(bstrParamNames[j+1]); + if (bstrParamNames[j+1]) + { + AddToTLDataStrW(tld, bstrParamNames[j+1]); + SysFreeString(bstrParamNames[j+1]); + } } else { AddToTLDataStrW(tld, szRhs); }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIDOMEventListener iface.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: c8d6a502f0c98c47443136ebb6cfd28bc3e16838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d6a502f0c98c47443136ebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 12:19:35 2011 +0100 mshtml: COM cleanup for the nsIDOMEventListener iface. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/nsevents.c | 55 +++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36ea68e..bc0b5fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,8 +624,6 @@ struct HTMLDocumentNode { struct list plugin_hosts; }; -#define NSEVENTLIST(x) ((nsIDOMEventListener*) &(x)->lpDOMEventListenerVtbl) - #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 85d6e56..f6a1ed6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; + nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; } nsEventListener; @@ -67,25 +67,28 @@ static LONG release_listener(nsDocumentEventListener *This) return ref; } -#define NSEVENTLIST_THIS(iface) DEFINE_THIS(nsEventListener, DOMEventListener, iface) +static inline nsEventListener *impl_from_nsIDOMEventListener(nsIDOMEventListener *iface) +{ + return CONTAINING_RECORD(iface, nsEventListener, nsIDOMEventListener_iface); +} static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *iface, nsIIDRef riid, void **result) { - nsEventListener *This = NSEVENTLIST_THIS(iface); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; } if(*result) { - nsIWebBrowserChrome_AddRef(NSEVENTLIST(This)); + nsIWebBrowserChrome_AddRef(&This->nsIDOMEventListener_iface); return NS_OK; } @@ -95,19 +98,19 @@ static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *ifa static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; - LONG ref = InterlockedIncrement(&This->ref); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + LONG ref = InterlockedIncrement(&This->This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%d\n", This->This, ref); return ref; } static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); - return release_listener(This); + return release_listener(This->This); } static BOOL is_doc_child_focus(NSContainer *nscontainer) @@ -121,7 +124,8 @@ static BOOL is_doc_child_focus(NSContainer *nscontainer) static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -140,7 +144,8 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -160,7 +165,8 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; if(!doc) @@ -220,7 +226,8 @@ static void handle_docobj_load(HTMLDocumentObj *doc) static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; @@ -263,7 +270,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; const PRUnichar *type; nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; @@ -299,8 +307,6 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } -#undef NSEVENTLIST_THIS - #define EVENTLISTENER_VTBL(handler) \ { \ nsDOMEventListener_QueryInterface, \ @@ -332,7 +338,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, static void init_listener(nsEventListener *This, nsDocumentEventListener *listener, const nsIDOMEventListenerVtbl *vtbl) { - This->lpDOMEventListenerVtbl = vtbl; + This->nsIDOMEventListener_iface.lpVtbl = vtbl; This->This = listener; } @@ -350,7 +356,8 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ return; } - init_event(target, type, NSEVENTLIST(&doc->nsevent_listener->htmlevent_listener), TRUE); + init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, + TRUE); nsIDOMEventTarget_Release(target); } @@ -395,10 +402,10 @@ void init_nsevents(HTMLDocumentNode *doc) return; } - init_event(target, wsz_blur, NSEVENTLIST(&listener->blur_listener), TRUE); - init_event(target, wsz_focus, NSEVENTLIST(&listener->focus_listener), TRUE); - init_event(target, wsz_keypress, NSEVENTLIST(&listener->keypress_listener), FALSE); - init_event(target, wsz_load, NSEVENTLIST(&listener->load_listener), TRUE); + init_event(target, wsz_blur, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_focus, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_keypress, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, wsz_load, &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); }

1 0