December 2010 - Wine-commits

Jacek Caban : mshtml: Fixed IOleUndoManager::QueryInterface implementation.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: b4b0d704fd0225d581a56d4c07b42d5a9ed56f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b0d704fd0225d581a56d4c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 20 19:09:34 2010 +0100 mshtml: Fixed IOleUndoManager::QueryInterface implementation. --- dlls/mshtml/service.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 4b9327d..7346195 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -49,19 +49,20 @@ static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFI { UndoManager *This = impl_from_IOleUndoManager(iface); - *ppv = NULL; - if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IOleUndoManager_iface; }else if(IsEqualGUID(riid, &IID_IOleUndoManager)) { TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); *ppv = &This->IOleUndoManager_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface)

1 0

Jacek Caban : jscript: Exception tests clean up.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 8bcc61fb66de5e6d738d73c20f8c42e735bd4962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcc61fb66de5e6d738d73c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 20 19:09:51 2010 +0100 jscript: Exception tests clean up. --- dlls/jscript/tests/api.js | 166 +++++++++++++++++++++++++++++---------------- 1 files changed, 106 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bcc61fb66de5e6d738d7…

1 0

Michael Stefaniuc : hnetcfg: Standardize the COM usage in apps.c.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 97c5c33203d1649dce56c38f4deb14ead417042d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c5c33203d1649dce56c38f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:01 2010 +0100 hnetcfg: Standardize the COM usage in apps.c. --- dlls/hnetcfg/apps.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index fbd603c..81bfe36 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_app { - const INetFwAuthorizedApplicationVtbl *vtbl; + INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) { - return (fw_app *)((char *)iface - FIELD_OFFSET( fw_app, vtbl )); + return CONTAINING_RECORD(iface, fw_app, INetFwAuthorizedApplication_iface); } static ULONG WINAPI fw_app_AddRef( @@ -297,23 +297,23 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_app_vtbl; + fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplication_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; } typedef struct fw_apps { - const INetFwAuthorizedApplicationsVtbl *vtbl; + INetFwAuthorizedApplications INetFwAuthorizedApplications_iface; LONG refs; } fw_apps; static inline fw_apps *impl_from_INetFwAuthorizedApplications( INetFwAuthorizedApplications *iface ) { - return (fw_apps *)((char *)iface - FIELD_OFFSET( fw_apps, vtbl )); + return CONTAINING_RECORD(iface, fw_apps, INetFwAuthorizedApplications_iface); } static ULONG WINAPI fw_apps_AddRef( @@ -490,10 +490,10 @@ HRESULT NetFwAuthorizedApplications_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_apps_vtbl; + fa->INetFwAuthorizedApplications_iface.lpVtbl = &fw_apps_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplications_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Use an iface instead of an vtbl pointer in fw_manager.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 1b7cc1f25985623fc399068858cfbea7d3630d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7cc1f25985623fc39906885… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:08 2010 +0100 hnetcfg: Use an iface instead of an vtbl pointer in fw_manager. --- dlls/hnetcfg/manager.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 7d6a7a5..6192c2d 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -37,13 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_manager { - const INetFwMgrVtbl *vtbl; + INetFwMgr INetFwMgr_iface; LONG refs; } fw_manager; static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface ) { - return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl )); + return CONTAINING_RECORD(iface, fw_manager, INetFwMgr_iface); } static ULONG WINAPI fw_manager_AddRef( @@ -230,10 +230,10 @@ HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; - fm->vtbl = &fw_manager_vtbl; + fm->INetFwMgr_iface.lpVtbl = &fw_manager_vtbl; fm->refs = 1; - *ppObj = &fm->vtbl; + *ppObj = &fm->INetFwMgr_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Use an iface instead of an vtbl pointer in fw_policy.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: e7a01a0c3c4a8b1ceb0131468dd9f3a2d6cd87e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a01a0c3c4a8b1ceb0131468… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:15 2010 +0100 hnetcfg: Use an iface instead of an vtbl pointer in fw_policy. --- dlls/hnetcfg/policy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index cff8973..dd5a1fe 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_policy { - const INetFwPolicyVtbl *vtbl; + INetFwPolicy INetFwPolicy_iface; LONG refs; } fw_policy; static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) { - return (fw_policy *)((char *)iface - FIELD_OFFSET( fw_policy, vtbl )); + return CONTAINING_RECORD(iface, fw_policy, INetFwPolicy_iface); } static ULONG WINAPI fw_policy_AddRef( @@ -186,10 +186,10 @@ HRESULT NetFwPolicy_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_policy_vtbl; + fp->INetFwPolicy_iface.lpVtbl = &fw_policy_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwPolicy_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Standardize the COM usage in port.c.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 2bb60b239f0e11ed59ed80768e5fe216b06d2d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb60b239f0e11ed59ed80768… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:24 2010 +0100 hnetcfg: Standardize the COM usage in port.c. --- dlls/hnetcfg/port.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index af821d6..b81456f 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_port { - const INetFwOpenPortVtbl *vtbl; + INetFwOpenPort INetFwOpenPort_iface; LONG refs; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) { - return (fw_port *)((char *)iface - FIELD_OFFSET( fw_port, vtbl )); + return CONTAINING_RECORD(iface, fw_port, INetFwOpenPort_iface); } static ULONG WINAPI fw_port_AddRef( @@ -330,10 +330,10 @@ static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_port_vtbl; + fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwOpenPort_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; @@ -341,13 +341,13 @@ static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) typedef struct fw_ports { - const INetFwOpenPortsVtbl *vtbl; + INetFwOpenPorts INetFwOpenPorts_iface; LONG refs; } fw_ports; static inline fw_ports *impl_from_INetFwOpenPorts( INetFwOpenPorts *iface ) { - return (fw_ports *)((char *)iface - FIELD_OFFSET( fw_ports, vtbl )); + return CONTAINING_RECORD(iface, fw_ports, INetFwOpenPorts_iface); } static ULONG WINAPI fw_ports_AddRef( @@ -536,10 +536,10 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_ports_vtbl; + fp->INetFwOpenPorts_iface.lpVtbl = &fw_ports_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwOpenPorts_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Use an iface instead of an vtbl pointer in fw_profile.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: a38022ac291480c1fb41f92e8dbfcc3f91a535a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38022ac291480c1fb41f92e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:31 2010 +0100 hnetcfg: Use an iface instead of an vtbl pointer in fw_profile. --- dlls/hnetcfg/profile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index 8536bd7..f1d724d 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_profile { - const INetFwProfileVtbl *vtbl; + INetFwProfile INetFwProfile_iface; LONG refs; } fw_profile; static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface ) { - return (fw_profile *)((char *)iface - FIELD_OFFSET( fw_profile, vtbl )); + return CONTAINING_RECORD(iface, fw_profile, INetFwProfile_iface); } static ULONG WINAPI fw_profile_AddRef( @@ -319,10 +319,10 @@ HRESULT NetFwProfile_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_profile_vtbl; + fp->INetFwProfile_iface.lpVtbl = &fw_profile_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwProfile_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Standardize the COM usage in service.c.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 329b3116441809b31123bf4c61b600afea30d459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329b3116441809b31123bf4c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:38 2010 +0100 hnetcfg: Standardize the COM usage in service.c. --- dlls/hnetcfg/service.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/service.c b/dlls/hnetcfg/service.c index ecfc00c..fa214b6 100644 --- a/dlls/hnetcfg/service.c +++ b/dlls/hnetcfg/service.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_service { - const INetFwServiceVtbl *vtbl; + INetFwService INetFwService_iface; LONG refs; } fw_service; static inline fw_service *impl_from_INetFwService( INetFwService *iface ) { - return (fw_service *)((char *)iface - FIELD_OFFSET( fw_service, vtbl )); + return CONTAINING_RECORD(iface, fw_service, INetFwService_iface); } static ULONG WINAPI fw_service_AddRef( @@ -295,10 +295,10 @@ static HRESULT NetFwService_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_service_vtbl; + fp->INetFwService_iface.lpVtbl = &fw_service_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwService_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; @@ -306,13 +306,13 @@ static HRESULT NetFwService_create( IUnknown *pUnkOuter, LPVOID *ppObj ) typedef struct fw_services { - const INetFwServicesVtbl *vtbl; + INetFwServices INetFwServices_iface; LONG refs; } fw_services; static inline fw_services *impl_from_INetFwServices( INetFwServices *iface ) { - return (fw_services *)((char *)iface - FIELD_OFFSET( fw_services, vtbl )); + return CONTAINING_RECORD(iface, fw_services, INetFwServices_iface); } static ULONG WINAPI fw_services_AddRef( @@ -469,10 +469,10 @@ HRESULT NetFwServices_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); if (!fp) return E_OUTOFMEMORY; - fp->vtbl = &fw_services_vtbl; + fp->INetFwServices_iface.lpVtbl = &fw_services_vtbl; fp->refs = 1; - *ppObj = &fp->vtbl; + *ppObj = &fp->INetFwServices_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXLineImpl.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: cdf56820a03077e6843ca0f470c5e25bd1af580c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf56820a03077e6843ca0f47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:35:15 2010 +0100 d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXLineImpl. --- dlls/d3dx9_36/line.c | 51 +++++++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 5ce98e6..e3a0e73 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -25,14 +25,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const struct ID3DXLineVtbl ID3DXLine_Vtbl; typedef struct ID3DXLineImpl { - const ID3DXLineVtbl *lpVtbl; + ID3DXLine ID3DXLine_iface; LONG ref; } ID3DXLineImpl; +static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface) +{ + return CONTAINING_RECORD(iface, ID3DXLineImpl, ID3DXLine_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine* iface, REFIID riid, LPVOID* object) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); @@ -51,7 +56,7 @@ static HRESULT WINAPI ID3DXLineImpl_QueryInterface(ID3DXLine* iface, REFIID riid static ULONG WINAPI ID3DXLineImpl_AddRef(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); @@ -60,7 +65,7 @@ static ULONG WINAPI ID3DXLineImpl_AddRef(ID3DXLine* iface) static ULONG WINAPI ID3DXLineImpl_Release(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -74,7 +79,7 @@ static ULONG WINAPI ID3DXLineImpl_Release(ID3DXLine* iface) /*** ID3DXLine methods ***/ static HRESULT WINAPI ID3DXLineImpl_GetDevice(ID3DXLine* iface, LPDIRECT3DDEVICE9* device) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%p): stub\n", This, device); @@ -83,7 +88,7 @@ static HRESULT WINAPI ID3DXLineImpl_GetDevice(ID3DXLine* iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXLineImpl_Begin(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -92,7 +97,7 @@ static HRESULT WINAPI ID3DXLineImpl_Begin(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_Draw(ID3DXLine* iface, CONST D3DXVECTOR2* vertexlist, DWORD vertexlistcount, D3DCOLOR color) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%p, %u, %#x): stub\n", This, vertexlist, vertexlistcount, color); @@ -102,7 +107,7 @@ static HRESULT WINAPI ID3DXLineImpl_Draw(ID3DXLine* iface, CONST D3DXVECTOR2* ve static HRESULT WINAPI ID3DXLineImpl_DrawTransform(ID3DXLine* iface, CONST D3DXVECTOR3* vertexlist, DWORD vertexlistcount, CONST D3DXMATRIX* transform, D3DCOLOR color) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%p, %u, %p, %#x): stub\n", This, vertexlist, vertexlistcount, transform, color); @@ -111,7 +116,7 @@ static HRESULT WINAPI ID3DXLineImpl_DrawTransform(ID3DXLine* iface, CONST D3DXVE static HRESULT WINAPI ID3DXLineImpl_SetPattern(ID3DXLine* iface, DWORD pattern) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%#x): stub\n", This, pattern); @@ -120,7 +125,7 @@ static HRESULT WINAPI ID3DXLineImpl_SetPattern(ID3DXLine* iface, DWORD pattern) static DWORD WINAPI ID3DXLineImpl_GetPattern(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -129,7 +134,7 @@ static DWORD WINAPI ID3DXLineImpl_GetPattern(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_SetPatternScale(ID3DXLine* iface, FLOAT scale) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%f): stub\n", This, scale); @@ -138,7 +143,7 @@ static HRESULT WINAPI ID3DXLineImpl_SetPatternScale(ID3DXLine* iface, FLOAT scal static FLOAT WINAPI ID3DXLineImpl_GetPatternScale(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -147,7 +152,7 @@ static FLOAT WINAPI ID3DXLineImpl_GetPatternScale(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_SetWidth(ID3DXLine* iface, FLOAT width) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%f): stub\n", This, width); @@ -156,7 +161,7 @@ static HRESULT WINAPI ID3DXLineImpl_SetWidth(ID3DXLine* iface, FLOAT width) static FLOAT WINAPI ID3DXLineImpl_GetWidth(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -165,7 +170,7 @@ static FLOAT WINAPI ID3DXLineImpl_GetWidth(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_SetAntialias(ID3DXLine* iface, BOOL antialias) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%u): stub\n", This, antialias); @@ -174,7 +179,7 @@ static HRESULT WINAPI ID3DXLineImpl_SetAntialias(ID3DXLine* iface, BOOL antialia static BOOL WINAPI ID3DXLineImpl_GetAntialias(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -183,7 +188,7 @@ static BOOL WINAPI ID3DXLineImpl_GetAntialias(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_SetGLLines(ID3DXLine* iface, BOOL gl_lines) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(%u): stub\n", This, gl_lines); @@ -192,7 +197,7 @@ static HRESULT WINAPI ID3DXLineImpl_SetGLLines(ID3DXLine* iface, BOOL gl_lines) static BOOL WINAPI ID3DXLineImpl_GetGLLines(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -201,7 +206,7 @@ static BOOL WINAPI ID3DXLineImpl_GetGLLines(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_End(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -210,7 +215,7 @@ static HRESULT WINAPI ID3DXLineImpl_End(ID3DXLine* iface) static HRESULT WINAPI ID3DXLineImpl_OnLostDevice(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -218,7 +223,7 @@ static HRESULT WINAPI ID3DXLineImpl_OnLostDevice(ID3DXLine* iface) } static HRESULT WINAPI ID3DXLineImpl_OnResetDevice(ID3DXLine* iface) { - ID3DXLineImpl *This = (ID3DXLineImpl *)iface; + ID3DXLineImpl *This = impl_from_ID3DXLine(iface); FIXME("(%p)->(): stub\n", This); @@ -267,10 +272,10 @@ HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE* line) return E_OUTOFMEMORY; } - object->lpVtbl = &ID3DXLine_Vtbl; + object->ID3DXLine_iface.lpVtbl = &ID3DXLine_Vtbl; object->ref = 1; - *line = (LPD3DXLINE)object; + *line = &object->ID3DXLine_iface; return D3D_OK; }

1 0

Michael Stefaniuc : wmiutils: Use an iface instead of an vtbl pointer in status_code.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: a1f54604886c58418a9443d457b60fce719ffcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f54604886c58418a9443d45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:35:32 2010 +0100 wmiutils: Use an iface instead of an vtbl pointer in status_code. --- dlls/wmiutils/statuscode.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index dfa3872..6a060db 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -37,13 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); typedef struct status_code { - const IWbemStatusCodeTextVtbl *vtbl; + IWbemStatusCodeText IWbemStatusCodeText_iface; LONG refs; } status_code; static inline status_code *impl_from_IWbemStatusCodeText( IWbemStatusCodeText *iface ) { - return (status_code *)((char *)iface - FIELD_OFFSET( status_code, vtbl )); + return CONTAINING_RECORD(iface, status_code, IWbemStatusCodeText_iface); } static ULONG WINAPI status_code_AddRef( @@ -143,10 +143,10 @@ HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); if (!sc) return E_OUTOFMEMORY; - sc->vtbl = &status_code_vtbl; + sc->IWbemStatusCodeText_iface.lpVtbl = &status_code_vtbl; sc->refs = 1; - *ppObj = &sc->vtbl; + *ppObj = &sc->IWbemStatusCodeText_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0