December 2010 - Wine-Commits

Michael Stefaniuc : strmbase: Use an iface instead of a vtbl pointer in IEnumPinsImpl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: f25a867c8780043de1f0ad182b2ffa6b2ed5c0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25a867c8780043de1f0ad182… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:21 2010 +0100 strmbase: Use an iface instead of a vtbl pointer in IEnumPinsImpl. --- dlls/strmbase/enumpins.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index bff1d90..13c7c6e 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); typedef struct IEnumPinsImpl { - const IEnumPinsVtbl * lpVtbl; + IEnumPins IEnumPins_iface; LONG refCount; ULONG uIndex; BaseFilter *base; @@ -39,6 +39,11 @@ typedef struct IEnumPinsImpl DWORD Version; } IEnumPinsImpl; +static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) +{ + return CONTAINING_RECORD(iface, IEnumPinsImpl, IEnumPins_iface); +} + static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum) @@ -54,7 +59,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p *ppEnum = NULL; return E_OUTOFMEMORY; } - pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; + pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; pEnumPins->receive_pin = receive_pin; @@ -62,7 +67,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->receive_version = receive_version; pEnumPins->base = base; IBaseFilter_AddRef((IBaseFilter*)base); - *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); + *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = receive_version(base); TRACE("Created new enumerator (%p)\n", *ppEnum); @@ -93,7 +98,7 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); @@ -103,7 +108,7 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -120,7 +125,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); HRESULT hr = S_OK; ULONG i = 0; @@ -161,7 +166,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("(%u)\n", cPins); @@ -177,7 +182,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("IEnumPinsImpl::Reset()\n"); This->Version = This->receive_version(This->base); @@ -189,7 +194,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) { HRESULT hr; - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("(%p)\n", ppEnum);

1 0

Michael Stefaniuc : mmdevapi: Use an iface instead of a vtbl pointer in AEVImpl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 8e77be63f4d4dd50f04e42fe39079019ecf1d759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e77be63f4d4dd50f04e42fe3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:41 2010 +0100 mmdevapi: Use an iface instead of a vtbl pointer in AEVImpl. --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 0a0dbc4..881cc41 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -54,10 +54,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl; typedef struct AEVImpl { - const IAudioEndpointVolumeExVtbl *lpVtbl; + IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; } AEVImpl; +static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx *iface) +{ + return CONTAINING_RECORD(iface, AEVImpl, IAudioEndpointVolumeEx_iface); +} + HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) { AEVImpl *This; @@ -65,7 +70,7 @@ HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) *ppv = (IAudioEndpointVolume*)This; if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &AEVImpl_Vtbl; + This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; return S_OK; } @@ -77,7 +82,7 @@ static void AudioEndpointVolume_Destroy(AEVImpl *This) static HRESULT WINAPI AEV_QueryInterface(IAudioEndpointVolumeEx *iface, REFIID riid, void **ppv) { - AEVImpl *This = (AEVImpl*)iface; + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -95,7 +100,7 @@ static HRESULT WINAPI AEV_QueryInterface(IAudioEndpointVolumeEx *iface, REFIID r static ULONG WINAPI AEV_AddRef(IAudioEndpointVolumeEx *iface) { - AEVImpl *This = (AEVImpl*)iface; + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) new ref %u\n", This, ref); return ref; @@ -103,7 +108,7 @@ static ULONG WINAPI AEV_AddRef(IAudioEndpointVolumeEx *iface) static ULONG WINAPI AEV_Release(IAudioEndpointVolumeEx *iface) { - AEVImpl *This = (AEVImpl*)iface; + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) new ref %u\n", This, ref); if (!ref)

1 0

Michael Stefaniuc : windowscodecs: Standardize the COM usage in icnsformat. c.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 31aec425609f9cf964f8fcd22e27d866b79bca2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31aec425609f9cf964f8fcd22… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:36 2010 +0100 windowscodecs: Standardize the COM usage in icnsformat.c. --- dlls/windowscodecs/icnsformat.c | 54 +++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index fb86e27..bc765a7 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -76,7 +76,7 @@ static void *load_libicns(void) } typedef struct IcnsEncoder { - const IWICBitmapEncoderVtbl *lpVtbl; + IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; IStream *stream; icns_family_t *icns_family; @@ -86,8 +86,13 @@ typedef struct IcnsEncoder { CRITICAL_SECTION lock; } IcnsEncoder; +static inline IcnsEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, IcnsEncoder, IWICBitmapEncoder_iface); +} + typedef struct IcnsFrameEncode { - const IWICBitmapFrameEncodeVtbl *lpVtbl; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; IcnsEncoder *encoder; LONG ref; BOOL initialized; @@ -99,10 +104,15 @@ typedef struct IcnsFrameEncode { BOOL committed; } IcnsFrameEncode; +static inline IcnsFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, IcnsFrameEncode, IWICBitmapFrameEncode_iface); +} + static HRESULT WINAPI IcnsFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -110,7 +120,7 @@ static HRESULT WINAPI IcnsFrameEncode_QueryInterface(IWICBitmapFrameEncode *ifac if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = &This->lpVtbl; + *ppv = &This->IWICBitmapFrameEncode_iface; } else { @@ -124,7 +134,7 @@ static HRESULT WINAPI IcnsFrameEncode_QueryInterface(IWICBitmapFrameEncode *ifac static ULONG WINAPI IcnsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -134,7 +144,7 @@ static ULONG WINAPI IcnsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -160,7 +170,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) static HRESULT WINAPI IcnsFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr = S_OK; TRACE("(%p,%p)\n", iface, pIEncoderOptions); @@ -182,7 +192,7 @@ end: static HRESULT WINAPI IcnsFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr = S_OK; TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); @@ -206,7 +216,7 @@ end: static HRESULT WINAPI IcnsFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr = S_OK; TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); @@ -227,7 +237,7 @@ end: static HRESULT WINAPI IcnsFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr = S_OK; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); @@ -271,7 +281,7 @@ static HRESULT WINAPI IcnsFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI IcnsFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr = S_OK; UINT i; int ret; @@ -341,7 +351,7 @@ end: static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; WICPixelFormatGUID guid; @@ -408,7 +418,7 @@ end: static HRESULT WINAPI IcnsFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + IcnsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); icns_element_t *icns_element = NULL; icns_image_t mask; icns_element_t *mask_element = NULL; @@ -519,7 +529,7 @@ static const IWICBitmapFrameEncodeVtbl IcnsEncoder_FrameVtbl = { static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -541,7 +551,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII static ULONG WINAPI IcnsEncoder_AddRef(IWICBitmapEncoder *iface) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -551,7 +561,7 @@ static ULONG WINAPI IcnsEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI IcnsEncoder_Release(IWICBitmapEncoder *iface) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -573,7 +583,7 @@ static ULONG WINAPI IcnsEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI IcnsEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); int ret; HRESULT hr = S_OK; @@ -644,7 +654,7 @@ static HRESULT WINAPI IcnsEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitma static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr = S_OK; IcnsFrameEncode *frameEncode = NULL; @@ -668,7 +678,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, hr = E_OUTOFMEMORY; goto end; } - frameEncode->lpVtbl = &IcnsEncoder_FrameVtbl; + frameEncode->IWICBitmapFrameEncode_iface.lpVtbl = &IcnsEncoder_FrameVtbl; frameEncode->encoder = This; frameEncode->ref = 1; frameEncode->initialized = FALSE; @@ -677,7 +687,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, memset(&frameEncode->icns_image, 0, sizeof(icns_image_t)); frameEncode->lines_written = 0; frameEncode->committed = FALSE; - *ppIFrameEncode = (IWICBitmapFrameEncode*)frameEncode; + *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; This->outstanding_commits++; IUnknown_AddRef((IUnknown*)This); @@ -689,7 +699,7 @@ end: static HRESULT WINAPI IcnsEncoder_Commit(IWICBitmapEncoder *iface) { - IcnsEncoder *This = (IcnsEncoder*)iface; + IcnsEncoder *This = impl_from_IWICBitmapEncoder(iface); icns_byte_t *buffer = NULL; icns_size_t buffer_size; int ret; @@ -772,7 +782,7 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(IcnsEncoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &IcnsEncoder_Vtbl; + This->IWICBitmapEncoder_iface.lpVtbl = &IcnsEncoder_Vtbl; This->ref = 1; This->stream = NULL; This->icns_family = NULL;

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in PropertyBag.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 7e106986cb76e8055fa3fbd8bb54d7b796d117ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e106986cb76e8055fa3fbd8b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:37 2010 +0100 windowscodecs: Use an iface instead of a vtbl pointer in PropertyBag. --- dlls/windowscodecs/propertybag.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index ca40b3b..43c88c7 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -34,14 +34,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct PropertyBag { - const IPropertyBag2Vtbl *lpVtbl; + IPropertyBag2 IPropertyBag2_iface; LONG ref; } PropertyBag; +static inline PropertyBag *impl_from_IPropertyBag2(IPropertyBag2 *iface) +{ + return CONTAINING_RECORD(iface, PropertyBag, IPropertyBag2_iface); +} + static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag2 *iface, REFIID iid, void **ppv) { - PropertyBag *This = (PropertyBag*)iface; + PropertyBag *This = impl_from_IPropertyBag2(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -63,7 +68,7 @@ static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag2 *iface, REFIID ii static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface) { - PropertyBag *This = (PropertyBag*)iface; + PropertyBag *This = impl_from_IPropertyBag2(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -73,7 +78,7 @@ static ULONG WINAPI PropertyBag_AddRef(IPropertyBag2 *iface) static ULONG WINAPI PropertyBag_Release(IPropertyBag2 *iface) { - PropertyBag *This = (PropertyBag*)iface; + PropertyBag *This = impl_from_IPropertyBag2(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -138,10 +143,10 @@ extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyBag)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &PropertyBag_Vtbl; + This->IPropertyBag2_iface.lpVtbl = &PropertyBag_Vtbl; This->ref = 1; - *ppPropertyBag2 = (IPropertyBag2*)This; + *ppPropertyBag2 = &This->IPropertyBag2_iface; return S_OK; }

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in FlipRotator.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: d11c0f3801345feaad525c86e3d43fc866c9bbed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11c0f3801345feaad525c86e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:36 2010 +0100 windowscodecs: Use an iface instead of a vtbl pointer in FlipRotator. --- dlls/windowscodecs/fliprotate.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index dbbb957..45ec509 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct FlipRotator { - const IWICBitmapFlipRotatorVtbl *lpVtbl; + IWICBitmapFlipRotator IWICBitmapFlipRotator_iface; LONG ref; IWICBitmapSource *source; int flip_x; @@ -43,10 +43,15 @@ typedef struct FlipRotator { CRITICAL_SECTION lock; /* must be held when initialized */ } FlipRotator; +static inline FlipRotator *impl_from_IWICBitmapFlipRotator(IWICBitmapFlipRotator *iface) +{ + return CONTAINING_RECORD(iface, FlipRotator, IWICBitmapFlipRotator_iface); +} + static HRESULT WINAPI FlipRotator_QueryInterface(IWICBitmapFlipRotator *iface, REFIID iid, void **ppv) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -69,7 +74,7 @@ static HRESULT WINAPI FlipRotator_QueryInterface(IWICBitmapFlipRotator *iface, R static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -79,7 +84,7 @@ static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface) static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -98,7 +103,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) static HRESULT WINAPI FlipRotator_GetSize(IWICBitmapFlipRotator *iface, UINT *puiWidth, UINT *puiHeight) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); if (!This->source) @@ -135,7 +140,7 @@ static HRESULT WINAPI FlipRotator_CopyPalette(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); HRESULT hr; UINT y; UINT srcy, srcwidth, srcheight; @@ -194,7 +199,7 @@ static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_Initialize(IWICBitmapFlipRotator *iface, IWICBitmapSource *pISource, WICBitmapTransformOptions options) { - FlipRotator *This = (FlipRotator*)iface; + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); HRESULT hr=S_OK; TRACE("(%p,%p,%u)\n", iface, pISource, options); @@ -253,7 +258,7 @@ HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) This = HeapAlloc(GetProcessHeap(), 0, sizeof(FlipRotator)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &FlipRotator_Vtbl; + This->IWICBitmapFlipRotator_iface.lpVtbl = &FlipRotator_Vtbl; This->ref = 1; This->source = NULL; This->flip_x = 0; @@ -262,7 +267,7 @@ HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FlipRotator.lock"); - *fliprotator = (IWICBitmapFlipRotator*)This; + *fliprotator = &This->IWICBitmapFlipRotator_iface; return S_OK; }

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in FormatConverter.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: cbee3a561ea68a33a6d32ee898efb5f0e8950f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbee3a561ea68a33a6d32ee89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:35 2010 +0100 windowscodecs: Use an iface instead of a vtbl pointer in FormatConverter. --- dlls/windowscodecs/converter.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6d965e9..663e3d4 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -66,7 +66,7 @@ struct pixelformatinfo { }; typedef struct FormatConverter { - const IWICFormatConverterVtbl *lpVtbl; + IWICFormatConverter IWICFormatConverter_iface; LONG ref; IWICBitmapSource *source; const struct pixelformatinfo *dst_format, *src_format; @@ -76,6 +76,11 @@ typedef struct FormatConverter { CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; +static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter *iface) +{ + return CONTAINING_RECORD(iface, FormatConverter, IWICFormatConverter_iface); +} + static void make_grayscale_palette(WICColor *colors, UINT num_colors) { int i, v; @@ -799,7 +804,7 @@ static const struct pixelformatinfo *get_formatinfo(const WICPixelFormatGUID *fo static HRESULT WINAPI FormatConverter_QueryInterface(IWICFormatConverter *iface, REFIID iid, void **ppv) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -822,7 +827,7 @@ static HRESULT WINAPI FormatConverter_QueryInterface(IWICFormatConverter *iface, static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -832,7 +837,7 @@ static ULONG WINAPI FormatConverter_AddRef(IWICFormatConverter *iface) static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -851,7 +856,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) static HRESULT WINAPI FormatConverter_GetSize(IWICFormatConverter *iface, UINT *puiWidth, UINT *puiHeight) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); @@ -864,7 +869,7 @@ static HRESULT WINAPI FormatConverter_GetSize(IWICFormatConverter *iface, static HRESULT WINAPI FormatConverter_GetPixelFormat(IWICFormatConverter *iface, WICPixelFormatGUID *pPixelFormat) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); TRACE("(%p,%p): stub\n", iface, pPixelFormat); @@ -879,7 +884,7 @@ static HRESULT WINAPI FormatConverter_GetPixelFormat(IWICFormatConverter *iface, static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, double *pDpiX, double *pDpiY) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); TRACE("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); @@ -899,7 +904,7 @@ static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); WICRect rc; HRESULT hr; TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); @@ -929,7 +934,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; static INT fixme=0; GUID srcFormat; @@ -989,7 +994,7 @@ static HRESULT WINAPI FormatConverter_CanConvert(IWICFormatConverter *iface, REFWICPixelFormatGUID srcPixelFormat, REFWICPixelFormatGUID dstPixelFormat, BOOL *pfCanConvert) { - FormatConverter *This = (FormatConverter*)iface; + FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; TRACE("(%p,%s,%s,%p)\n", iface, debugstr_guid(srcPixelFormat), @@ -1037,7 +1042,7 @@ HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** p This = HeapAlloc(GetProcessHeap(), 0, sizeof(FormatConverter)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &FormatConverter_Vtbl; + This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; InitializeCriticalSection(&This->lock);

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in BaseMemAllocator.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: bf247fad13ec5e60a56bf1f0c3457d7428cf54c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf247fad13ec5e60a56bf1f0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:34 2010 +0100 quartz: Use an iface instead of a vtbl pointer in BaseMemAllocator. --- dlls/quartz/memallocator.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 575af9d..4858c02 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct BaseMemAllocator { - const IMemAllocatorVtbl * lpVtbl; + IMemAllocator IMemAllocator_iface; LONG ref; ALLOCATOR_PROPERTIES props; @@ -52,6 +52,11 @@ typedef struct BaseMemAllocator CRITICAL_SECTION *pCritSect; } BaseMemAllocator; +static inline BaseMemAllocator *impl_from_IMemAllocator(IMemAllocator *iface) +{ + return CONTAINING_RECORD(iface, BaseMemAllocator, IMemAllocator_iface); +} + static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; @@ -70,7 +75,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), { assert(fnAlloc && fnFree && fnDestroyed); - pMemAlloc->lpVtbl = &BaseMemAllocator_VTable; + pMemAlloc->IMemAllocator_iface.lpVtbl = &BaseMemAllocator_VTable; pMemAlloc->ref = 1; ZeroMemory(&pMemAlloc->props, sizeof(pMemAlloc->props)); @@ -93,7 +98,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REFIID riid, LPVOID * ppv) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); TRACE("(%p)->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -116,7 +121,7 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); @@ -126,7 +131,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->() Release from %d\n", iface, ref + 1); @@ -145,7 +150,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pRequest, ALLOCATOR_PROPERTIES *pActual) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual); @@ -178,7 +183,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, pProps); @@ -194,7 +199,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->()\n", This); @@ -238,7 +243,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->()\n", This); @@ -279,7 +284,7 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSample ** pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime, DWORD dwFlags) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr = S_OK; /* NOTE: The pStartTime and pEndTime parameters are not applied to the sample. @@ -339,7 +344,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; HRESULT hr = S_OK;

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in EnumMonikerImpl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 80db15faa1dc4af449484a032310890b33d7c94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80db15faa1dc4af449484a032… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:54:07 2010 +0100 quartz: Use an iface instead of a vtbl pointer in EnumMonikerImpl. --- dlls/quartz/enummoniker.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 0cc804a..ba4e687 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct EnumMonikerImpl { - const IEnumMonikerVtbl *lpVtbl; + IEnumMoniker IEnumMoniker_iface; LONG ref; IMoniker ** ppMoniker; ULONG nMonikerCount; @@ -40,6 +40,11 @@ typedef struct EnumMonikerImpl static const IEnumMonikerVtbl EnumMonikerImpl_Vtbl; +static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) +{ + return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); +} + static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface); HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum) @@ -56,14 +61,14 @@ HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnum if (!pemi) return E_OUTOFMEMORY; - pemi->lpVtbl = &EnumMonikerImpl_Vtbl; + pemi->IEnumMoniker_iface.lpVtbl = &EnumMonikerImpl_Vtbl; pemi->ref = 1; pemi->ppMoniker = CoTaskMemAlloc(nMonikerCount * sizeof(IMoniker*)); memcpy(pemi->ppMoniker, ppMoniker, nMonikerCount*sizeof(IMoniker*)); pemi->nMonikerCount = nMonikerCount; pemi->index = 0; - *ppEnum = (IEnumMoniker *)pemi; + *ppEnum = &pemi->IEnumMoniker_iface; return S_OK; } @@ -76,7 +81,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( REFIID riid, LPVOID *ppvObj) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); if (This == NULL || ppvObj == NULL) return E_POINTER; @@ -99,7 +104,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( */ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref; if (This == NULL) return E_POINTER; @@ -116,7 +121,7 @@ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) */ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->() Release from %d\n", iface, ref + 1); @@ -139,7 +144,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) { ULONG fetched; - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -164,7 +169,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMon static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->(%d)\n", iface, celt); @@ -175,7 +180,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) static HRESULT WINAPI EnumMonikerImpl_Reset(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->()\n", iface);

1 0

Hans Leidekker : msi: Don' t try to install or remove ODBC drivers if the component is disabled.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: b376f41766301b3a52fd552658332efcc0b3fb2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b376f41766301b3a52fd55265… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 9 10:27:56 2010 +0100 msi: Don't try to install or remove ODBC drivers if the component is disabled. --- dlls/msi/action.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15c04c9..2cccdc9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5953,8 +5953,9 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) LPWSTR driver, driver_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *driver_file = NULL, *setup_file = NULL; + MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR desc, file_key; + LPCWSTR desc, file_key, component; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5965,6 +5966,17 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) static const WCHAR usage_fmt[] = { 'F','i','l','e','U','s','a','g','e','=','1',0}; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6035,8 +6047,9 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) LPWSTR translator, translator_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *translator_file = NULL, *setup_file = NULL; + MSICOMPONENT *comp; MSIRECORD *uirow; - LPCWSTR desc, file_key; + LPCWSTR desc, file_key, component; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -6045,6 +6058,17 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static const WCHAR setup_fmt[] = { 'S','e','t','u','p','=','%','s',0}; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); file_key = MSI_RecordGetString( rec, 4 ); @@ -6108,8 +6132,9 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; LPWSTR attrs; - LPCWSTR desc, driver; + LPCWSTR desc, driver, component; WORD request = ODBC_ADD_SYS_DSN; INT registration; DWORD len; @@ -6119,6 +6144,17 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString(rec, 3); driver = MSI_RecordGetString(rec, 4); registration = MSI_RecordGetInteger(rec, 5); @@ -6196,9 +6232,21 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; DWORD usage; - LPCWSTR desc; + LPCWSTR desc, component; + + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } desc = MSI_RecordGetString( rec, 3 ); if (!SQLRemoveDriverW( desc, FALSE, &usage )) @@ -6222,9 +6270,21 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; DWORD usage; - LPCWSTR desc; + LPCWSTR desc, component; + + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } desc = MSI_RecordGetString( rec, 3 ); if (!SQLRemoveTranslatorW( desc, &usage )) @@ -6248,9 +6308,10 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSICOMPONENT *comp; MSIRECORD *uirow; LPWSTR attrs; - LPCWSTR desc, driver; + LPCWSTR desc, driver, component; WORD request = ODBC_REMOVE_SYS_DSN; INT registration; DWORD len; @@ -6258,6 +6319,17 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; + component = MSI_RecordGetString( rec, 2 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!comp->Enabled) + { + TRACE("component is disabled\n"); + return ERROR_SUCCESS; + } + desc = MSI_RecordGetString( rec, 3 ); driver = MSI_RecordGetString( rec, 4 ); registration = MSI_RecordGetInteger( rec, 5 );

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in IEnumFiltersImpl.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 70f1c34300766eea5e346b97901423f01fcdd978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f1c34300766eea5e346b979… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:53:33 2010 +0100 quartz: Use an iface instead of a vtbl pointer in IEnumFiltersImpl. --- dlls/quartz/enumfilters.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index ab1f6ec..2b9dc53 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumFiltersImpl { - const IEnumFiltersVtbl * lpVtbl; + IEnumFilters IEnumFilters_iface; LONG refCount; IBaseFilter ** ppFilters; int nFilters; @@ -35,6 +35,11 @@ typedef struct IEnumFiltersImpl static const struct IEnumFiltersVtbl IEnumFiltersImpl_Vtbl; +static inline IEnumFiltersImpl *impl_from_IEnumFilters(IEnumFilters *iface) +{ + return CONTAINING_RECORD(iface, IEnumFiltersImpl, IEnumFilters_iface); +} + HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) { /* Note: The incoming IBaseFilter interfaces are not AddRef'd here as in Windows, @@ -50,7 +55,7 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn return E_OUTOFMEMORY; } - pEnumFilters->lpVtbl = &IEnumFiltersImpl_Vtbl; + pEnumFilters->IEnumFilters_iface.lpVtbl = &IEnumFiltersImpl_Vtbl; pEnumFilters->refCount = 1; pEnumFilters->uIndex = 0; pEnumFilters->nFilters = nFilters; @@ -63,7 +68,7 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn memcpy(pEnumFilters->ppFilters, ppFilters, nFilters * sizeof(IBaseFilter*)); - *ppEnum = (IEnumFilters *)(&pEnumFilters->lpVtbl); + *ppEnum = &pEnumFilters->IEnumFilters_iface; return S_OK; } @@ -91,7 +96,7 @@ static HRESULT WINAPI IEnumFiltersImpl_QueryInterface(IEnumFilters * iface, REFI static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->()\n", iface); @@ -101,7 +106,7 @@ static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface) static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->()\n", iface); @@ -120,7 +125,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters { ULONG cFetched; ULONG i; - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; @@ -147,7 +152,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->(%u)\n", iface, cFilters); @@ -161,7 +166,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->()\n", iface); @@ -172,7 +177,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters ** ppEnum) { HRESULT hr; - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->(%p)\n", iface, ppEnum);

1 0