December 2010 - Wine-commits

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in FormatConverter.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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 : windowscodecs: Use an iface instead of a vtbl pointer in PropertyBag.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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 09 Dec '10

09 Dec '10

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: Standardize the COM usage in icnsformat. c.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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 : mmdevapi: Use an iface instead of a vtbl pointer in AEVImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

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 : quartz: Use an iface instead of a vtbl pointer in IEnumRegFiltersImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: e86dff725f293868d60be26ef83cd9e47e7aea74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86dff725f293868d60be26ef… 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 IEnumRegFiltersImpl. --- dlls/quartz/enumregfilters.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c index cadeba5..a116063 100644 --- a/dlls/quartz/enumregfilters.c +++ b/dlls/quartz/enumregfilters.c @@ -28,13 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumRegFiltersImpl { - const IEnumRegFiltersVtbl * lpVtbl; + IEnumRegFilters IEnumRegFilters_iface; LONG refCount; ULONG size; REGFILTER* RegFilters; ULONG uIndex; } IEnumRegFiltersImpl; +static inline IEnumRegFiltersImpl *impl_from_IEnumRegFilters(IEnumRegFilters *iface) +{ + return CONTAINING_RECORD(iface, IEnumRegFiltersImpl, IEnumRegFilters_iface); +} + static const struct IEnumRegFiltersVtbl IEnumRegFiltersImpl_Vtbl; HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size, IEnumRegFilters ** ppEnum) @@ -79,13 +84,13 @@ HRESULT IEnumRegFiltersImpl_Construct(REGFILTER* pInRegFilters, const ULONG size CopyMemory(pRegFilters[i].Name, pInRegFilters[i].Name, (strlenW(pInRegFilters[i].Name)+1)*sizeof(WCHAR)); } - pEnumRegFilters->lpVtbl = &IEnumRegFiltersImpl_Vtbl; + pEnumRegFilters->IEnumRegFilters_iface.lpVtbl = &IEnumRegFiltersImpl_Vtbl; pEnumRegFilters->refCount = 1; pEnumRegFilters->uIndex = 0; pEnumRegFilters->RegFilters = pRegFilters; pEnumRegFilters->size = size; - *ppEnum = (IEnumRegFilters *)(&pEnumRegFilters->lpVtbl); + *ppEnum = &pEnumRegFilters->IEnumRegFilters_iface; return S_OK; } @@ -114,7 +119,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_QueryInterface(IEnumRegFilters * iface static ULONG WINAPI IEnumRegFiltersImpl_AddRef(IEnumRegFilters * iface) { - IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; + IEnumRegFiltersImpl *This = impl_from_IEnumRegFilters(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)\n", iface); @@ -124,7 +129,7 @@ static ULONG WINAPI IEnumRegFiltersImpl_AddRef(IEnumRegFilters * iface) static ULONG WINAPI IEnumRegFiltersImpl_Release(IEnumRegFilters * iface) { - IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; + IEnumRegFiltersImpl *This = impl_from_IEnumRegFilters(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)\n", iface); @@ -147,7 +152,7 @@ static ULONG WINAPI IEnumRegFiltersImpl_Release(IEnumRegFilters * iface) static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cFilters, REGFILTER ** ppRegFilter, ULONG * pcFetched) { ULONG cFetched; - IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; + IEnumRegFiltersImpl *This = impl_from_IEnumRegFilters(iface); unsigned int i; cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex; @@ -193,7 +198,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Skip(IEnumRegFilters * iface, ULONG n) static HRESULT WINAPI IEnumRegFiltersImpl_Reset(IEnumRegFilters * iface) { - IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; + IEnumRegFiltersImpl *This = impl_from_IEnumRegFilters(iface); TRACE("(%p)\n", iface);

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for IoWMIRegistrationControl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: f7192d329e005c92ddacd1e3e08da63e23466d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7192d329e005c92ddacd1e3e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Dec 8 23:17:24 2010 +0100 ntoskrnl.exe: Add stub for IoWMIRegistrationControl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d2c0340..a5c1659 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1550,6 +1550,15 @@ POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE } /***************************************************** + * IoWMIRegistrationControl (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Action) +{ + FIXME("(%p %u ) stub\n", DeviceObject, Action); + return STATUS_SUCCESS; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 06976fd..ef0d50f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -485,7 +485,7 @@ @ stub IoWMIQueryAllDataMultiple @ stub IoWMIQuerySingleInstance @ stub IoWMIQuerySingleInstanceMultiple -@ stub IoWMIRegistrationControl +@ stdcall IoWMIRegistrationControl(ptr long) @ stub IoWMISetNotificationCallback @ stub IoWMISetSingleInstance @ stub IoWMISetSingleItem diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 950d93a..6df5290 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1111,6 +1111,7 @@ NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULO PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); +NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*);

1 0

Thomas Mullaly : urlmon: Added pluggable protocol support to CoInternetParseIUri.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 4e1ff0b8cd8c973dab1bb739a09a212102573712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1ff0b8cd8c973dab1bb739a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Dec 8 21:28:46 2010 -0500 urlmon: Added pluggable protocol support to CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 41 +++++++++++++++--------------------- 2 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c069d84..fd9099c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -62,6 +62,7 @@ }while(0) DEFINE_EXPECT(CombineUrl); +DEFINE_EXPECT(ParseUrl); static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); @@ -83,6 +84,12 @@ static const WCHAR combine_resultW[] = {'z','i','p',':','t','e','s','t',0}; static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; +static const WCHAR parse_urlW[] = {'w','i','n','e','t','e','s','t',':','t','e','s','t',0}; +static const WCHAR parse_resultW[] = {'z','i','p',':','t','e','s','t',0}; + +static PARSEACTION parse_action; +static DWORD parse_flags; + typedef struct _uri_create_flag_test { DWORD flags; HRESULT expected; @@ -9300,8 +9307,17 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - ok(0, "unexpected call %d\n", ParseAction); - return E_NOTIMPL; + CHECK_EXPECT(ParseUrl); + ok(!lstrcmpW(pwzUrl, parse_urlW), "Error: Expected %s, but got %s instead.\n", + wine_dbgstr_w(parse_urlW), wine_dbgstr_w(pwzUrl)); + ok(ParseAction == parse_action, "Error: Expected %d, but got %d.\n", parse_action, ParseAction); + ok(dwParseFlags == parse_flags, "Error: Expected 0x%08x, but got 0x%08x.\n", parse_flags, dwParseFlags); + ok(cchResult == 200, "Error: Got %d.\n", cchResult); + + memcpy(pwzResult, parse_resultW, sizeof(parse_resultW)); + *pcchResult = lstrlenW(parse_resultW); + + return S_OK; } static HRESULT WINAPI InternetProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, @@ -9725,6 +9741,36 @@ static void test_CoInternetParseIUri(void) { } } +static void test_CoInternetParseIUri_Pluggable(void) { + HRESULT hr; + IUri *uri = NULL; + + hr = pCreateUri(parse_urlW, 0, 0, &uri); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, but got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + WCHAR result[200]; + DWORD result_len; + + SET_EXPECT(ParseUrl); + + parse_action = PARSE_CANONICALIZE; + parse_flags = URL_UNESCAPE|URL_ESCAPE_UNSAFE; + + hr = pCoInternetParseIUri(uri, parse_action, parse_flags, result, 200, &result_len, 0); + ok(hr == S_OK, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + + CHECK_CALLED(ParseUrl); + + if(SUCCEEDED(hr)) { + ok(result_len == lstrlenW(parse_resultW), "Error: Expected %d, but got %d.\n", + lstrlenW(parse_resultW), result_len); + ok(!lstrcmpW(result, parse_resultW), "Error: Expected %s, but got %s.\n", + wine_dbgstr_w(parse_resultW), wine_dbgstr_w(result)); + } + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -9831,5 +9877,8 @@ START_TEST(uri) { trace("test CoInternetCombineUrlEx Pluggable...\n"); test_CoInternetCombineUrlEx_Pluggable(); + trace("test CoInternetParseIUri pluggable...\n"); + test_CoInternetParseIUri_Pluggable(); + unregister_protocols(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1cccfe3..681327f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6203,6 +6203,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, !(flags & URL_ESCAPE_SPACES_ONLY) && !(flags & URL_ESCAPE_PERCENT); + /* Check if the dot segments need to be removed from the * path component. */ @@ -6612,6 +6613,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d { HRESULT hr; Uri *uri; + IInternetProtocolInfo *info; TRACE("(%p %d %x %p %d %p %x)\n", pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); @@ -6624,44 +6626,35 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d return E_INVALIDARG; } + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + + info = get_protocol_info(uri->canon_uri); + if(info) { + hr = IInternetProtocolInfo_ParseUrl(info, uri->canon_uri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, 0); + IInternetProtocolInfo_Release(info); + if(SUCCEEDED(hr)) return hr; + } + switch(ParseAction) { case PARSE_CANONICALIZE: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_canonicalize(uri, dwFlags, pwzResult, cchResult, pcchResult); break; case PARSE_FRIENDLY: hr = parse_friendly(pIUri, pwzResult, cchResult, pcchResult); break; case PARSE_ROOTDOCUMENT: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_rootdocument(uri, pwzResult, cchResult, pcchResult); break; case PARSE_DOCUMENT: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_document(uri, pwzResult, cchResult, pcchResult); break; case PARSE_PATH_FROM_URL: - if(!(uri = get_uri_obj(pIUri))) { - *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", - pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); - return E_NOTIMPL; - } hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); break; case PARSE_URL_FROM_PATH:

1 0

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

09 Dec '10

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

Hans Leidekker : msi/tests: Avoid a test failure on 64-bit.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 973821c775cbc6c2bf8d03a6261b82c4ea5ea7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973821c775cbc6c2bf8d03a62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 9 10:28:15 2010 +0100 msi/tests: Avoid a test failure on 64-bit. --- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f026d95..7735d71 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -46,6 +46,7 @@ static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY, LPCWSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static void (WINAPI *pGetSystemInfo)(LPSYSTEM_INFO); +static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -72,6 +73,7 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hadvapi32, RegDeleteKeyExW) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, GetNativeSystemInfo) GET_PROC(hkernel32, GetSystemInfo) GET_PROC(hkernel32, GetSystemWow64DirectoryA) @@ -8283,6 +8285,7 @@ static void test_appsearch_reglocator(void) LPCSTR str; LONG res; UINT r, type = 0; + SYSTEM_INFO si; version = TRUE; if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3))) @@ -8726,28 +8729,34 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, "#-42"), "Expected \"#-42\", got \"%s\"\n", prop); - size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); - if (size == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + memset(&si, 0, sizeof(si)); + if (pGetNativeSystemInfo) pGetNativeSystemInfo(&si); + + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - /* Workaround for Win95 */ - CHAR tempbuf[1]; - size = ExpandEnvironmentStringsA("%PATH%", tempbuf, 0); - } - pathvar = HeapAlloc(GetProcessHeap(), 0, size); - ExpandEnvironmentStringsA("%PATH%", pathvar, size); + size = ExpandEnvironmentStringsA("%PATH%", NULL, 0); + if (size == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + { + /* Workaround for Win95 */ + CHAR tempbuf[1]; + size = ExpandEnvironmentStringsA("%PATH%", tempbuf, 0); + } + pathvar = HeapAlloc(GetProcessHeap(), 0, size); + ExpandEnvironmentStringsA("%PATH%", pathvar, size); - size = 0; - r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + size = 0; + r = MsiGetPropertyA(hpkg, "SIGPROP4", NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); - r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(pathdata, pathvar), - "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); + pathdata = HeapAlloc(GetProcessHeap(), 0, ++size); + r = MsiGetPropertyA(hpkg, "SIGPROP4", pathdata, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(pathdata, pathvar), + "Expected \"%s\", got \"%s\"\n", pathvar, pathdata); - HeapFree(GetProcessHeap(), 0, pathvar); - HeapFree(GetProcessHeap(), 0, pathdata); + HeapFree(GetProcessHeap(), 0, pathvar); + HeapFree(GetProcessHeap(), 0, pathdata); + } size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);

1 0