June 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DMaterial2 iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 0586dd8bbe19c52b8f369e9b2b7d0e0b10639620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0586dd8bbe19c52b8f369e9b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:44:03 2011 +0200 ddraw: COM cleanup for the IDirect3DMaterial2 iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 46 +++++++++++++++++++++++++++---------------- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 982f555..33f1484 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4627,7 +4627,7 @@ static HRESULT WINAPI d3d2_CreateMaterial(IDirect3D2 *iface, IDirect3DMaterial2 TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? (IDirect3DMaterial2 *)&((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial2_vtbl : NULL; + *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial2_iface : NULL; TRACE("Returning material %p.\n", *material); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0dbbb52..1ef875f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -415,7 +415,7 @@ void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_ struct IDirect3DMaterialImpl { const IDirect3DMaterial3Vtbl *lpVtbl; - const IDirect3DMaterial2Vtbl *IDirect3DMaterial2_vtbl; + IDirect3DMaterial2 IDirect3DMaterial2_iface; const IDirect3DMaterialVtbl *IDirect3DMaterial_vtbl; LONG ref; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index e137bfc..96905ac 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -36,9 +36,9 @@ static inline IDirect3DMaterialImpl *material_from_material1(IDirect3DMaterial * return (IDirect3DMaterialImpl *)((char*)iface - FIELD_OFFSET(IDirect3DMaterialImpl, IDirect3DMaterial_vtbl)); } -static inline IDirect3DMaterialImpl *material_from_material2(IDirect3DMaterial2 *iface) +static inline IDirect3DMaterialImpl *impl_from_IDirect3DMaterial2(IDirect3DMaterial2 *iface) { - return (IDirect3DMaterialImpl *)((char*)iface - FIELD_OFFSET(IDirect3DMaterialImpl, IDirect3DMaterial2_vtbl)); + return CONTAINING_RECORD(iface, IDirect3DMaterialImpl, IDirect3DMaterial2_iface); } /***************************************************************************** @@ -84,8 +84,8 @@ IDirect3DMaterialImpl_QueryInterface(IDirect3DMaterial3 *iface, return S_OK; } if ( IsEqualGUID( &IID_IDirect3DMaterial2, riid ) ) { - IDirect3DMaterial_AddRef((IDirect3DMaterial2 *)&This->IDirect3DMaterial2_vtbl); - *obp = &This->IDirect3DMaterial2_vtbl; + IDirect3DMaterial_AddRef(&This->IDirect3DMaterial2_iface); + *obp = &This->IDirect3DMaterial2_iface; TRACE(" Creating IDirect3DMaterial2 interface %p\n", *obp); return S_OK; } @@ -329,9 +329,11 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface, IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle); - return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)material_from_material2(iface), lpDirect3DDevice2 ? + return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)This, lpDirect3DDevice2 ? (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle); } @@ -344,12 +346,14 @@ static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface (IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle); } -static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface, REFIID riid, - LPVOID* obp) +static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(IDirect3DMaterial2 *iface, REFIID riid, + void **obp) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); - return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material2(iface), riid, obp); + return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)This, riid, obp); } static HRESULT WINAPI IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface, REFIID riid, @@ -360,11 +364,13 @@ static HRESULT WINAPI IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material1(iface), riid, obp); } -static ULONG WINAPI IDirect3DMaterialImpl_2_AddRef(LPDIRECT3DMATERIAL2 iface) +static ULONG WINAPI IDirect3DMaterialImpl_2_AddRef(IDirect3DMaterial2 *iface) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p.\n", iface); - return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material2(iface)); + return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)This); } static ULONG WINAPI IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface) @@ -374,11 +380,13 @@ static ULONG WINAPI IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface) return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material1(iface)); } -static ULONG WINAPI IDirect3DMaterialImpl_2_Release(LPDIRECT3DMATERIAL2 iface) +static ULONG WINAPI IDirect3DMaterialImpl_2_Release(IDirect3DMaterial2 *iface) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p.\n", iface); - return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material2(iface)); + return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)This); } static ULONG WINAPI IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface) @@ -388,12 +396,14 @@ static ULONG WINAPI IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface) return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material1(iface)); } -static HRESULT WINAPI IDirect3DMaterialImpl_2_SetMaterial(LPDIRECT3DMATERIAL2 iface, +static HRESULT WINAPI IDirect3DMaterialImpl_2_SetMaterial(IDirect3DMaterial2 *iface, LPD3DMATERIAL lpMat) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p, material %p.\n", iface, lpMat); - return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat); + return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)This, lpMat); } static HRESULT WINAPI IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL iface, @@ -404,12 +414,14 @@ static HRESULT WINAPI IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL ifa return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat); } -static HRESULT WINAPI IDirect3DMaterialImpl_2_GetMaterial(LPDIRECT3DMATERIAL2 iface, +static HRESULT WINAPI IDirect3DMaterialImpl_2_GetMaterial(IDirect3DMaterial2 *iface, LPD3DMATERIAL lpMat) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + TRACE("iface %p, material %p.\n", iface, lpMat); - return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)material_from_material2(iface), lpMat); + return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)This, lpMat); } static HRESULT WINAPI IDirect3DMaterialImpl_1_GetMaterial(LPDIRECT3DMATERIAL iface, @@ -486,7 +498,7 @@ static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) { material->lpVtbl = &d3d_material3_vtbl; - material->IDirect3DMaterial2_vtbl = &d3d_material2_vtbl; + material->IDirect3DMaterial2_iface.lpVtbl = &d3d_material2_vtbl; material->IDirect3DMaterial_vtbl = &d3d_material1_vtbl; material->ref = 1; material->ddraw = ddraw;

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirect3DMaterial iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: e3a32e8d957497a1756da29db009f533787d2037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a32e8d957497a1756da29db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:54:33 2011 +0200 ddraw: COM cleanup for the IDirect3DMaterial iface. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/material.c | 46 +++++++++++++++++++++++++++---------------- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 33f1484..51e8c8c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4644,7 +4644,7 @@ static HRESULT WINAPI d3d1_CreateMaterial(IDirect3D *iface, IDirect3DMaterial ** TRACE("iface %p, material %p, outer_unknown %p.\n", iface, material, outer_unknown); hr = d3d3_CreateMaterial(&This->IDirect3D3_iface, &material3, outer_unknown); - *material = material3 ? (IDirect3DMaterial *)&((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial_vtbl : NULL; + *material = material3 ? &((IDirect3DMaterialImpl *)material3)->IDirect3DMaterial_iface : NULL; TRACE("Returning material %p.\n", *material); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1ef875f..d2b6ea9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -416,7 +416,7 @@ struct IDirect3DMaterialImpl { const IDirect3DMaterial3Vtbl *lpVtbl; IDirect3DMaterial2 IDirect3DMaterial2_iface; - const IDirect3DMaterialVtbl *IDirect3DMaterial_vtbl; + IDirect3DMaterial IDirect3DMaterial_iface; LONG ref; /* IDirect3DMaterial2 fields */ diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 96905ac..10ce340 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -31,9 +31,9 @@ static void dump_material(const D3DMATERIAL *mat) TRACE(" dwSize : %d\n", mat->dwSize); } -static inline IDirect3DMaterialImpl *material_from_material1(IDirect3DMaterial *iface) +static inline IDirect3DMaterialImpl *impl_from_IDirect3DMaterial(IDirect3DMaterial *iface) { - return (IDirect3DMaterialImpl *)((char*)iface - FIELD_OFFSET(IDirect3DMaterialImpl, IDirect3DMaterial_vtbl)); + return CONTAINING_RECORD(iface, IDirect3DMaterialImpl, IDirect3DMaterial_iface); } static inline IDirect3DMaterialImpl *impl_from_IDirect3DMaterial2(IDirect3DMaterial2 *iface) @@ -78,8 +78,8 @@ IDirect3DMaterialImpl_QueryInterface(IDirect3DMaterial3 *iface, return S_OK; } if ( IsEqualGUID( &IID_IDirect3DMaterial, riid ) ) { - IDirect3DMaterial_AddRef((IDirect3DMaterial *)&This->IDirect3DMaterial_vtbl); - *obp = &This->IDirect3DMaterial_vtbl; + IDirect3DMaterial_AddRef(&This->IDirect3DMaterial_iface); + *obp = &This->IDirect3DMaterial_iface; TRACE(" Creating IDirect3DMaterial interface %p\n", *obp); return S_OK; } @@ -340,9 +340,11 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *ifac static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, IDirect3DDevice *lpDirect3DDevice, D3DMATERIALHANDLE *lpHandle) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle); - return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)material_from_material1(iface), lpDirect3DDevice ? + return IDirect3DMaterial3_GetHandle((IDirect3DMaterial3 *)This, lpDirect3DDevice ? (IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle); } @@ -356,12 +358,14 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(IDirect3DMaterial2 return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)This, riid, obp); } -static HRESULT WINAPI IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface, REFIID riid, - LPVOID* obp) +static HRESULT WINAPI IDirect3DMaterialImpl_1_QueryInterface(IDirect3DMaterial *iface, REFIID riid, + void **obp) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); - return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)material_from_material1(iface), riid, obp); + return IDirect3DMaterial3_QueryInterface((IDirect3DMaterial3 *)This, riid, obp); } static ULONG WINAPI IDirect3DMaterialImpl_2_AddRef(IDirect3DMaterial2 *iface) @@ -373,11 +377,13 @@ static ULONG WINAPI IDirect3DMaterialImpl_2_AddRef(IDirect3DMaterial2 *iface) return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)This); } -static ULONG WINAPI IDirect3DMaterialImpl_1_AddRef(LPDIRECT3DMATERIAL iface) +static ULONG WINAPI IDirect3DMaterialImpl_1_AddRef(IDirect3DMaterial *iface) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p.\n", iface); - return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)material_from_material1(iface)); + return IDirect3DMaterial3_AddRef((IDirect3DMaterial3 *)This); } static ULONG WINAPI IDirect3DMaterialImpl_2_Release(IDirect3DMaterial2 *iface) @@ -389,11 +395,13 @@ static ULONG WINAPI IDirect3DMaterialImpl_2_Release(IDirect3DMaterial2 *iface) return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)This); } -static ULONG WINAPI IDirect3DMaterialImpl_1_Release(LPDIRECT3DMATERIAL iface) +static ULONG WINAPI IDirect3DMaterialImpl_1_Release(IDirect3DMaterial *iface) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p.\n", iface); - return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)material_from_material1(iface)); + return IDirect3DMaterial3_Release((IDirect3DMaterial3 *)This); } static HRESULT WINAPI IDirect3DMaterialImpl_2_SetMaterial(IDirect3DMaterial2 *iface, @@ -406,12 +414,14 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_SetMaterial(IDirect3DMaterial2 *if return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)This, lpMat); } -static HRESULT WINAPI IDirect3DMaterialImpl_1_SetMaterial(LPDIRECT3DMATERIAL iface, +static HRESULT WINAPI IDirect3DMaterialImpl_1_SetMaterial(IDirect3DMaterial *iface, LPD3DMATERIAL lpMat) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p, material %p.\n", iface, lpMat); - return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat); + return IDirect3DMaterial3_SetMaterial((IDirect3DMaterial3 *)This, lpMat); } static HRESULT WINAPI IDirect3DMaterialImpl_2_GetMaterial(IDirect3DMaterial2 *iface, @@ -424,12 +434,14 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_GetMaterial(IDirect3DMaterial2 *if return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)This, lpMat); } -static HRESULT WINAPI IDirect3DMaterialImpl_1_GetMaterial(LPDIRECT3DMATERIAL iface, +static HRESULT WINAPI IDirect3DMaterialImpl_1_GetMaterial(IDirect3DMaterial *iface, LPD3DMATERIAL lpMat) { + IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + TRACE("iface %p, material %p.\n", iface, lpMat); - return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)material_from_material1(iface), lpMat); + return IDirect3DMaterial3_GetMaterial((IDirect3DMaterial3 *)This, lpMat); } @@ -499,7 +511,7 @@ void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) { material->lpVtbl = &d3d_material3_vtbl; material->IDirect3DMaterial2_iface.lpVtbl = &d3d_material2_vtbl; - material->IDirect3DMaterial_vtbl = &d3d_material1_vtbl; + material->IDirect3DMaterial_iface.lpVtbl = &d3d_material1_vtbl; material->ref = 1; material->ddraw = ddraw; }

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IWineDXGIFactory iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: a26925d38fc067b7d8e398f3bfb94744e4d8275c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26925d38fc067b7d8e398f3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:56:55 2011 +0200 dxgi: COM cleanup for the IWineDXGIFactory iface. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 98fdea8..5af04b4 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -77,7 +77,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSP /* IDXGIFactory */ struct dxgi_factory { - const struct IWineDXGIFactoryVtbl *vtbl; + IWineDXGIFactory IWineDXGIFactory_iface; LONG refcount; struct wined3d *wined3d; UINT adapter_count; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 71e9fe1..dd1ec5e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -122,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, UINT adapter_idx, IDXGIAdapter **adapter) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); @@ -258,7 +263,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac static struct wined3d * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); TRACE("iface %p\n", iface); @@ -294,7 +299,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) HRESULT hr; UINT i; - factory->vtbl = &dxgi_factory_vtbl; + factory->IWineDXGIFactory_iface.lpVtbl = &dxgi_factory_vtbl; factory->refcount = 1; EnterCriticalSection(&dxgi_cs); @@ -332,7 +337,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) goto fail; } - hr = dxgi_adapter_init(adapter, (IWineDXGIFactory *)factory, i); + hr = dxgi_adapter_init(adapter, &factory->IWineDXGIFactory_iface, i); if (FAILED(hr)) { UINT j;

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IWineDXGIDevice iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 31510a1acf0c8aae1571fd891ecfe51b7df47829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31510a1acf0c8aae1571fd891… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 10:00:30 2011 +0200 dxgi: COM cleanup for the IWineDXGIDevice iface. --- dlls/dxgi/device.c | 23 +++++++++++++++-------- dlls/dxgi/dxgi_private.h | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8c61d67..f7ad811 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -24,11 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGIDevice_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *iface, REFIID riid, void **object) { - struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -56,7 +61,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) { - struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -66,7 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { - struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -134,7 +139,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { - struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); WINED3DDEVICE_CREATION_PARAMETERS create_parameters; HRESULT hr; @@ -244,7 +249,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic static struct wined3d_device * STDMETHODCALLTYPE dxgi_device_get_wined3d_device(IWineDXGIDevice *iface) { - struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); TRACE("iface %p\n", iface); @@ -287,6 +292,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *iface, WINED3DPRESENT_PARAMETERS *present_parameters, struct wined3d_swapchain **wined3d_swapchain) { + struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); struct dxgi_swapchain *object; HRESULT hr; @@ -300,7 +306,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i return E_OUTOFMEMORY; } - hr = dxgi_swapchain_init(object, (struct dxgi_device *)iface, present_parameters); + hr = dxgi_swapchain_init(object, This, present_parameters); if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); @@ -348,7 +354,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l void *layer_base; HRESULT hr; - device->vtbl = &dxgi_device_vtbl; + device->IWineDXGIDevice_iface.lpVtbl = &dxgi_device_vtbl; device->refcount = 1; layer_base = device + 1; @@ -381,7 +387,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l adapter_ordinal = IWineDXGIAdapter_get_ordinal(wine_adapter); IWineDXGIAdapter_Release(wine_adapter); - hr = IUnknown_QueryInterface((IUnknown *)device, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); + hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, &IID_IWineDXGIDeviceParent, + (void **)&dxgi_device_parent); if (FAILED(hr)) { ERR("DXGI device should implement IWineD3DDeviceParent.\n"); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5af04b4..023e68e 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -89,7 +89,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) DECLSPEC_HIDDEN; /* IDXGIDevice */ struct dxgi_device { - const struct IWineDXGIDeviceVtbl *vtbl; + IWineDXGIDevice IWineDXGIDevice_iface; IUnknown *child_layer; LONG refcount; struct wined3d_device *wined3d_device;

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IWineDXGIAdapter iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 2486da825033d5b1749ad4bfcbb1142e5564f1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2486da825033d5b1749ad4bfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 10:09:02 2011 +0200 dxgi: COM cleanup for the IWineDXGIAdapter iface. --- dlls/dxgi/adapter.c | 19 ++++++++++++------- dlls/dxgi/dxgi_private.h | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d4f757b..bf27a60 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface) static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -100,7 +105,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *i static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); TRACE("iface %p, riid %s, parent %p\n", iface, debugstr_guid(riid), parent); @@ -112,7 +117,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface, UINT output_idx, IDXGIOutput **output) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); @@ -132,7 +137,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); WINED3DADAPTER_IDENTIFIER adapter_id; char description[128]; struct wined3d *wined3d; @@ -187,7 +192,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface) { - struct dxgi_adapter *This = (struct dxgi_adapter *)iface; + struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); TRACE("iface %p, returning %u\n", iface, This->ordinal); @@ -217,7 +222,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent { struct dxgi_output *output; - adapter->vtbl = &dxgi_adapter_vtbl; + adapter->IWineDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->parent = parent; adapter->refcount = 1; adapter->ordinal = ordinal; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 023e68e..82cb0b0 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -112,7 +112,7 @@ void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) /* IDXGIAdapter */ struct dxgi_adapter { - const struct IWineDXGIAdapterVtbl *vtbl; + IWineDXGIAdapter IWineDXGIAdapter_iface; IWineDXGIFactory *parent; LONG refcount; UINT ordinal;

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IDXGISurface iface.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 219a830273b634a43fa9face5e324b4c4375ec0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=219a830273b634a43fa9face5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 10:11:55 2011 +0200 dxgi: COM cleanup for the IDXGISurface iface. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/surface.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 82cb0b0..047e083 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -135,7 +135,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device /* IDXGISurface */ struct dxgi_surface { - const struct IDXGISurfaceVtbl *vtbl; + IDXGISurface IDXGISurface_iface; const struct IUnknownVtbl *inner_unknown_vtbl; IUnknown *outer_unknown; LONG refcount; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 6296c1a..4a5ea02 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -42,7 +42,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *ifa || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef((IUnknown *)This); + IDXGISurface_AddRef(&This->IDXGISurface_iface); *object = This; return S_OK; } @@ -79,25 +79,31 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) return refcount; } +static inline struct dxgi_surface *impl_from_IDXGISurface(IDXGISurface *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_surface, IDXGISurface_iface); +} + /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface *iface, REFIID riid, + void **object) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = impl_from_IDXGISurface(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_QueryInterface(This->outer_unknown, riid, object); } static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface *iface) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = impl_from_IDXGISurface(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_AddRef(This->outer_unknown); } static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface *iface) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = impl_from_IDXGISurface(iface); TRACE("Forwarding to outer IUnknown\n"); return IUnknown_Release(This->outer_unknown); } @@ -130,7 +136,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = impl_from_IDXGISurface(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -141,7 +147,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REF static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) { - struct dxgi_surface *This = (struct dxgi_surface *)iface; + struct dxgi_surface *This = impl_from_IDXGISurface(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); @@ -199,7 +205,7 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) { - surface->vtbl = &dxgi_surface_vtbl; + surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl;

1 0

Hans Leidekker : msi: Factor out common code to execute custom action commands.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 880ef2bb3522aefe84faf34a00b09699c184a48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=880ef2bb3522aefe84faf34a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:33:35 2011 +0200 msi: Factor out common code to execute custom action commands. --- dlls/msi/custom.c | 201 +++++++++++++---------------------------------------- 1 files changed, 50 insertions(+), 151 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a23175..1a1b052 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -972,55 +972,39 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, return r; } -static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, - LPCWSTR target, const INT type, LPCWSTR action) +static HANDLE execute_command( const WCHAR *exe, WCHAR *arg, const WCHAR *dir ) { STARTUPINFOW si; PROCESS_INFORMATION info; - BOOL rc; - INT len; - WCHAR *deformated = NULL; - WCHAR *cmd; - static const WCHAR spc[] = {' ',0}; - MSIBINARY *binary; - UINT r; - - memset(&si,0,sizeof(STARTUPINFOW)); - - if (!(binary = get_temp_binary( package, source, FALSE ))) - return ERROR_FUNCTION_FAILED; - - deformat_string(package,target,&deformated); - - len = strlenW( binary->tmpfile ) + 2; - if (deformated) - len += strlenW(deformated); + BOOL ret; - cmd = msi_alloc(sizeof(WCHAR)*len); - - strcpyW( cmd, binary->tmpfile ); - if (deformated) + memset( &si, 0, sizeof(STARTUPINFOW) ); + ret = CreateProcessW( exe, arg, NULL, NULL, FALSE, 0, NULL, dir, &si, &info ); + if (!ret) { - strcatW(cmd,spc); - strcatW(cmd,deformated); - msi_free(deformated); + WARN("unable to execute command %u\n", GetLastError()); + return INVALID_HANDLE_VALUE; } + CloseHandle( info.hThread ); + return info.hProcess; +} - TRACE("executing exe %s\n", debugstr_w(cmd)); +static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + MSIBINARY *binary; + HANDLE handle; + WCHAR *arg; - rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, szCRoot, &si, &info); - msi_free(cmd); + if (!(binary = get_temp_binary( package, source, FALSE ))) return ERROR_FUNCTION_FAILED; - if ( !rc ) - { - ERR("Unable to execute command %s\n", debugstr_w(cmd)); - return ERROR_SUCCESS; - } - CloseHandle( info.hThread ); - - r = wait_process_handle(package, type, info.hProcess, action); + deformat_string( package, target, &arg ); + TRACE("exe %s arg %s\n", debugstr_w(binary->tmpfile), debugstr_w(arg)); - return r; + handle = execute_command( binary->tmpfile, arg, szCRoot ); + msi_free( arg ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); } static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, @@ -1049,53 +1033,19 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - STARTUPINFOW si; - PROCESS_INFORMATION info; - BOOL rc; - WCHAR *deformated; - WCHAR *cmd; - INT len; - static const WCHAR spc[] = {' ',0}; MSIFILE *file; + HANDLE handle; + WCHAR *arg; - memset(&si,0,sizeof(STARTUPINFOW)); - - file = msi_get_loaded_file(package, source); - if( !file ) - return ERROR_FUNCTION_FAILED; - - len = lstrlenW( file->TargetPath ); - - deformat_string(package,target,&deformated); - if (deformated) - len += strlenW(deformated); - len += 2; - - cmd = msi_alloc(len * sizeof(WCHAR)); - - lstrcpyW( cmd, file->TargetPath); - if (deformated) - { - strcatW(cmd, spc); - strcatW(cmd, deformated); - - msi_free(deformated); - } - - TRACE("executing exe %s\n", debugstr_w(cmd)); - - rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, szCRoot, &si, &info); + if (!(file = msi_get_loaded_file( package, source ))) return ERROR_FUNCTION_FAILED; - if ( !rc ) - { - ERR("Unable to execute command %s\n", debugstr_w(cmd)); - msi_free(cmd); - return ERROR_SUCCESS; - } - msi_free(cmd); - CloseHandle( info.hThread ); + deformat_string( package, target, &arg ); + TRACE("exe %s arg %s\n", debugstr_w(file->TargetPath), debugstr_w(arg)); - return wait_process_handle(package, type, info.hProcess, action); + handle = execute_command( file->TargetPath, arg, szCRoot ); + msi_free( arg ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); } static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, @@ -1132,90 +1082,39 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - STARTUPINFOW si; - PROCESS_INFORMATION info; - WCHAR *prop; - BOOL rc; - WCHAR *deformated; - WCHAR *cmd; - INT len; - static const WCHAR spc[] = {' ',0}; - - memset(&si,0,sizeof(STARTUPINFOW)); - memset(&info,0,sizeof(PROCESS_INFORMATION)); - - prop = msi_dup_property( package->db, source ); - if (!prop) - return ERROR_SUCCESS; - - deformat_string(package,target,&deformated); - len = strlenW(prop) + 2; - if (deformated) - len += strlenW(deformated); - - cmd = msi_alloc(sizeof(WCHAR)*len); - - strcpyW(cmd,prop); - if (deformated) - { - strcatW(cmd,spc); - strcatW(cmd,deformated); - - msi_free(deformated); - } - msi_free(prop); - - TRACE("executing exe %s\n", debugstr_w(cmd)); - - rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, szCRoot, &si, &info); + WCHAR *exe, *arg; + HANDLE handle; - if ( !rc ) - { - ERR("Unable to execute command %s\n", debugstr_w(cmd)); - msi_free(cmd); - return ERROR_SUCCESS; - } - msi_free(cmd); + if (!(exe = msi_dup_property( package->db, source ))) return ERROR_SUCCESS; - CloseHandle( info.hThread ); + deformat_string( package, target, &arg ); + TRACE("exe %s arg %s\n", debugstr_w(exe), debugstr_w(arg)); - return wait_process_handle(package, type, info.hProcess, action); + handle = execute_command( exe, arg, szCRoot ); + msi_free( arg ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); } static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - LPWSTR filename; const WCHAR *workingdir; - STARTUPINFOW si; - PROCESS_INFORMATION info; - BOOL rc; - - memset(&si, 0, sizeof(STARTUPINFOW)); + HANDLE handle; + WCHAR *cmd; workingdir = msi_get_target_folder( package, source ); if (!workingdir) return ERROR_FUNCTION_FAILED; - deformat_string(package, target, &filename); - if (!filename) return ERROR_FUNCTION_FAILED; - - TRACE("executing exe %s with working directory %s\n", - debugstr_w(filename), debugstr_w(workingdir)); - - rc = CreateProcessW(NULL, filename, NULL, NULL, FALSE, 0, NULL, - workingdir, &si, &info); + deformat_string( package, target, &cmd ); + if (!cmd) return ERROR_FUNCTION_FAILED; - if ( !rc ) - { - ERR("Unable to execute command %s with working directory %s\n", - debugstr_w(filename), debugstr_w(workingdir)); - msi_free(filename); - return ERROR_SUCCESS; - } - msi_free(filename); - CloseHandle( info.hThread ); + TRACE("cmd %s dir %s\n", debugstr_w(cmd), debugstr_w(workingdir)); - return wait_process_handle(package, type, info.hProcess, action); + handle = execute_command( NULL, cmd, workingdir ); + msi_free( cmd ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); } static DWORD ACTION_CallScript( const GUID *guid )

1 0

Hans Leidekker : msi: Reorder dialog functions to avoid forward declarations.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: ddb25cd8a142a44055e73d87d377c6ba7c2a48cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb25cd8a142a44055e73d87d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:33:50 2011 +0200 msi: Reorder dialog functions to avoid forward declarations. --- dlls/msi/dialog.c | 813 +++++++++++++++++++++++++---------------------------- 1 files changed, 380 insertions(+), 433 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddb25cd8a142a44055e73…

1 0

Hans Leidekker : msi: Revert 8321276cd34486bc6bf1e07c0e99c73423288854.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 5e37c1a2b77cc40a1b7f896da65b57b4baa13390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e37c1a2b77cc40a1b7f896da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:34:06 2011 +0200 msi: Revert 8321276cd34486bc6bf1e07c0e99c73423288854. --- dlls/msi/dialog.c | 71 +---------------------------------------------------- 1 files changed, 1 insertions(+), 70 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index dc87790..f9d704a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -899,38 +899,6 @@ static UINT msi_dialog_control_event( MSIRECORD *rec, LPVOID param ) return ERROR_SUCCESS; } -struct rec_list -{ - struct list entry; - MSIRECORD *rec; -}; - -static UINT add_rec_to_list( MSIRECORD *rec, LPVOID param ) -{ - struct rec_list *add_rec; - struct list *records = param; - - msiobj_addref( &rec->hdr ); - - add_rec = msi_alloc( sizeof( *add_rec ) ); - if (!add_rec) - { - msiobj_release( &rec->hdr ); - return ERROR_OUTOFMEMORY; - } - - add_rec->rec = rec; - list_add_tail( records, &add_rec->entry ); - return ERROR_SUCCESS; -} - -static inline void remove_rec_from_list( struct rec_list *rec_entry ) -{ - msiobj_release( &rec_entry->rec->hdr ); - list_remove( &rec_entry->entry ); - msi_free( rec_entry ); -} - static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) { static const WCHAR query[] = { @@ -940,15 +908,11 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, '`','C','o','n','t','r','o','l','_','`',' ','=',' ','\'','%','s','\'',' ', 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','i','n','g','`',0}; MSIQUERY *view = NULL; - struct rec_list *rec_entry, *next; - struct list events; UINT r; if (HIWORD(param) != BN_CLICKED) return ERROR_SUCCESS; - list_init( &events ); - r = MSI_OpenQuery( dialog->package->db, &view, query, dialog->name, control->name ); if (r != ERROR_SUCCESS) { @@ -956,41 +920,8 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, return 0; } - r = MSI_IterateRecords( view, 0, add_rec_to_list, &events ); + r = MSI_IterateRecords( view, 0, msi_dialog_control_event, dialog ); msiobj_release( &view->hdr ); - if (r != ERROR_SUCCESS) - goto done; - - /* handle all SetProperty events first */ - LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) - { - LPCWSTR event = MSI_RecordGetString( rec_entry->rec, 3 ); - - if (event[0] != '[') - continue; - - r = msi_dialog_control_event( rec_entry->rec, dialog ); - remove_rec_from_list( rec_entry ); - - if (r != ERROR_SUCCESS) - goto done; - } - - /* handle all other events */ - LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) - { - r = msi_dialog_control_event( rec_entry->rec, dialog ); - remove_rec_from_list( rec_entry ); - - if (r != ERROR_SUCCESS) - goto done; - } - -done: - LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) - { - remove_rec_from_list( rec_entry ); - } return r; }

1 0

Hans Leidekker : msi: Fully initialize the MSISTORAGESVIEW and MSISTREAMSVIEW structures.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 8aa8b9b654157a0154d5534c74e49b0389eab1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa8b9b654157a0154d5534c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:34:22 2011 +0200 msi: Fully initialize the MSISTORAGESVIEW and MSISTREAMSVIEW structures. --- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 56f252f..22c9188 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -557,7 +557,7 @@ UINT STORAGES_CreateView(MSIDATABASE *db, MSIVIEW **view) TRACE("(%p, %p)\n", db, view); - sv = msi_alloc(sizeof(MSISTORAGESVIEW)); + sv = msi_alloc_zero( sizeof(MSISTORAGESVIEW) ); if (!sv) return ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index c9c2d3e..579dad1 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -566,7 +566,7 @@ UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) TRACE("(%p, %p)\n", db, view); - sv = msi_alloc(sizeof(MSISTREAMSVIEW)); + sv = msi_alloc_zero( sizeof(MSISTREAMSVIEW) ); if (!sv) return ERROR_FUNCTION_FAILED;

1 0