November 2010 - Wine-commits

Alexandre Julliard : msdmo: Don' t use an interface pointer for an internal function.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: e59ac81c5e2a0acab249379b5c2c524fe87e5836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ac81c5e2a0acab249379b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 12:25:53 2010 +0100 msdmo: Don't use an interface pointer for an internal function. --- dlls/msdmo/dmoreg.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 2c55296..0d5d397 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -333,12 +333,10 @@ lend: /************************************************************************** -* IEnumDMO_Destructor +* IEnumDMOImpl_Destructor */ -static BOOL IEnumDMO_Destructor(IEnumDMO* iface) +static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This) { - IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - TRACE("%p\n", This); if (This->hkey) @@ -418,7 +416,7 @@ static IEnumDMO * IEnumDMO_Constructor( lerr: if(!ret) { - IEnumDMO_Destructor((IEnumDMO*)lpedmo); + IEnumDMOImpl_Destructor(lpedmo); HeapFree(GetProcessHeap(),0,lpedmo); lpedmo = NULL; } @@ -477,7 +475,7 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) if (!refCount) { - IEnumDMO_Destructor((IEnumDMO*)This); + IEnumDMOImpl_Destructor(This); HeapFree(GetProcessHeap(),0,This); } return refCount;

1 0

Michael Stefaniuc : pstorec: Use an iface instead of a vtbl pointer in PStore_impl.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: d2a6d95d5a222a139d6d3d1c75e75a1ddd02f486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a6d95d5a222a139d6d3d1c7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 10:33:22 2010 +0100 pstorec: Use an iface instead of a vtbl pointer in PStore_impl. --- dlls/pstorec/pstorec.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 493501f..b2e729b 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -33,10 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(pstores); typedef struct { - const IPStoreVtbl *lpVtbl; + IPStore IPStore_iface; LONG ref; } PStore_impl; +static inline PStore_impl *impl_from_IPStore(IPStore *iface) +{ + return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { TRACE("%p %x %p\n", hinst, fdwReason, fImpLoad); @@ -62,7 +67,7 @@ static HRESULT WINAPI PStore_fnQueryInterface( REFIID riid, LPVOID *ppvObj) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %s\n",This,debugstr_guid(riid)); @@ -87,7 +92,7 @@ static HRESULT WINAPI PStore_fnQueryInterface( */ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %u\n", This, This->ref); @@ -99,7 +104,7 @@ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) */ static ULONG WINAPI PStore_fnRelease(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); LONG ref; TRACE("%p %u\n", This, This->ref); @@ -359,7 +364,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, if( !ips ) return E_OUTOFMEMORY; - ips->lpVtbl = &pstores_vtbl; + ips->IPStore_iface.lpVtbl = &pstores_vtbl; ips->ref = 1; *ppProvider = (IPStore*) ips;

1 0

Michael Stefaniuc : explorerframe: Use iface instead of vtbl pointers in NSTC2Impl.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5b40a664a99cfed6f751bcf7a108a2423a889c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b40a664a99cfed6f751bcf7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 12:51:54 2010 +0100 explorerframe: Use iface instead of vtbl pointers in NSTC2Impl. --- dlls/explorerframe/nstc.c | 83 ++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b40a664a99cfed6f751b…

1 0

Maarten Lankhorst : quartz: Unset time in dsoundrender if it cannot be obtained.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: f4a0ca85af1a06131402c3fdcdcdc7d7936395ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a0ca85af1a06131402c3fdc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 29 10:44:13 2010 +0100 quartz: Unset time in dsoundrender if it cannot be obtained. --- dlls/quartz/dsoundrender.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 759ba07..bb7fc2d 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -342,8 +342,10 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) + if (FAILED(hr)) { ERR("Cannot get sample time (%x)\n", hr); + tStart = tStop = -1; + } IMediaSample_IsDiscontinuity(pSample);

1 0

Michael Stefaniuc : windowscodecs: Standardize the COM usage in icoformat.c .
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 5f15f9b8b7cc4f7fd1ce192dc72e4eb84138a22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15f9b8b7cc4f7fd1ce192dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 00:58:53 2010 +0100 windowscodecs: Standardize the COM usage in icoformat.c. --- dlls/windowscodecs/icoformat.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 33fea1f..e6a590f 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -57,7 +57,7 @@ typedef struct #include "poppack.h" typedef struct { - const IWICBitmapDecoderVtbl *lpVtbl; + IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; BOOL initialized; IStream *stream; @@ -66,16 +66,26 @@ typedef struct { } IcoDecoder; typedef struct { - const IWICBitmapFrameDecodeVtbl *lpVtbl; + IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; LONG ref; UINT width, height; BYTE *bits; } IcoFrameDecode; +static inline IcoDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) +{ + return CONTAINING_RECORD(iface, IcoDecoder, IWICBitmapDecoder_iface); +} + +static inline IcoFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, IcoFrameDecode, IWICBitmapFrameDecode_iface); +} + static HRESULT WINAPI IcoFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { - IcoFrameDecode *This = (IcoFrameDecode*)iface; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -98,7 +108,7 @@ static HRESULT WINAPI IcoFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface) { - IcoFrameDecode *This = (IcoFrameDecode*)iface; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -108,7 +118,7 @@ static ULONG WINAPI IcoFrameDecode_AddRef(IWICBitmapFrameDecode *iface) static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface) { - IcoFrameDecode *This = (IcoFrameDecode*)iface; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -125,7 +135,7 @@ static ULONG WINAPI IcoFrameDecode_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI IcoFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - IcoFrameDecode *This = (IcoFrameDecode*)iface; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); *puiWidth = This->width; *puiHeight = This->height; @@ -159,7 +169,7 @@ static HRESULT WINAPI IcoFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, static HRESULT WINAPI IcoFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - IcoFrameDecode *This = (IcoFrameDecode*)iface; + IcoFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); return copy_pixels(32, This->bits, This->width, This->height, This->width * 4, @@ -392,7 +402,7 @@ end: static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -413,7 +423,7 @@ static HRESULT WINAPI IcoDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -423,7 +433,7 @@ static ULONG WINAPI IcoDecoder_AddRef(IWICBitmapDecoder *iface) static ULONG WINAPI IcoDecoder_Release(IWICBitmapDecoder *iface) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -449,7 +459,7 @@ static HRESULT WINAPI IcoDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); LARGE_INTEGER seek; HRESULT hr; ULONG bytesread; @@ -540,7 +550,7 @@ static HRESULT WINAPI IcoDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI IcoDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%p)\n", iface, pCount); if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; @@ -554,7 +564,7 @@ static HRESULT WINAPI IcoDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - IcoDecoder *This = (IcoDecoder*)iface; + IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); IcoFrameDecode *result=NULL; LARGE_INTEGER seek; ULARGE_INTEGER offset, length; @@ -586,7 +596,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, goto fail; } - result->lpVtbl = &IcoFrameDecode_Vtbl; + result->IWICBitmapFrameDecode_iface.lpVtbl = &IcoFrameDecode_Vtbl; result->ref = 1; result->bits = NULL; @@ -677,7 +687,7 @@ HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(IcoDecoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &IcoDecoder_Vtbl; + This->IWICBitmapDecoder_iface.lpVtbl = &IcoDecoder_Vtbl; This->ref = 1; This->stream = NULL; This->initialized = FALSE;

1 0

Michael Stefaniuc : windowscodecs: Standardize the COM usage in jpegformat. c.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 682600b7fc24f800f6913d012064f84b346b2b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682600b7fc24f800f6913d012… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 00:59:20 2010 +0100 windowscodecs: Standardize the COM usage in jpegformat.c. --- dlls/windowscodecs/jpegformat.c | 43 +++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index c3cd455..e7a22c9 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -126,8 +126,8 @@ static void emit_message_fn(j_common_ptr cinfo, int msg_level) } typedef struct { - const IWICBitmapDecoderVtbl *lpVtbl; - const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + IWICBitmapDecoder IWICBitmapDecoder_iface; + IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; LONG ref; BOOL initialized; BOOL cinfo_initialized; @@ -140,20 +140,25 @@ typedef struct { CRITICAL_SECTION lock; } JpegDecoder; -static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) +static inline JpegDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { - return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); + return CONTAINING_RECORD(iface, JpegDecoder, IWICBitmapDecoder_iface); } -static inline JpegDecoder *decoder_from_frame(IWICBitmapFrameDecode *iface) +static inline JpegDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) { - return CONTAINING_RECORD(iface, JpegDecoder, lpFrameVtbl); + return CONTAINING_RECORD(iface, JpegDecoder, IWICBitmapFrameDecode_iface); +} + +static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) +{ + return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); } static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { - JpegDecoder *This = (JpegDecoder*)iface; + JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -174,7 +179,7 @@ static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFII static ULONG WINAPI JpegDecoder_AddRef(IWICBitmapDecoder *iface) { - JpegDecoder *This = (JpegDecoder*)iface; + JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -184,7 +189,7 @@ static ULONG WINAPI JpegDecoder_AddRef(IWICBitmapDecoder *iface) static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) { - JpegDecoder *This = (JpegDecoder*)iface; + JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -258,7 +263,7 @@ static void source_mgr_term_source(j_decompress_ptr cinfo) static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - JpegDecoder *This = (JpegDecoder*)iface; + JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); int ret; LARGE_INTEGER seek; jmp_buf jmpbuf; @@ -407,7 +412,7 @@ static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - JpegDecoder *This = (JpegDecoder*)iface; + JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; @@ -415,7 +420,7 @@ static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, if (index != 0) return E_INVALIDARG; IWICBitmapDecoder_AddRef(iface); - *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; return S_OK; } @@ -462,20 +467,20 @@ static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *if static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) { - JpegDecoder *This = decoder_from_frame(iface); + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); return IUnknown_AddRef((IUnknown*)This); } static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) { - JpegDecoder *This = decoder_from_frame(iface); + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); return IUnknown_Release((IUnknown*)This); } static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - JpegDecoder *This = decoder_from_frame(iface); + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); *puiWidth = This->cinfo.output_width; *puiHeight = This->cinfo.output_height; TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); @@ -485,7 +490,7 @@ static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - JpegDecoder *This = decoder_from_frame(iface); + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p)\n", iface, pPixelFormat); if (This->cinfo.out_color_space == JCS_RGB) memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); @@ -513,7 +518,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - JpegDecoder *This = decoder_from_frame(iface); + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); UINT bpp; UINT stride; UINT data_size; @@ -673,8 +678,8 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegDecoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &JpegDecoder_Vtbl; - This->lpFrameVtbl = &JpegDecoder_Frame_Vtbl; + This->IWICBitmapDecoder_iface.lpVtbl = &JpegDecoder_Vtbl; + This->IWICBitmapFrameDecode_iface.lpVtbl = &JpegDecoder_Frame_Vtbl; This->ref = 1; This->initialized = FALSE; This->cinfo_initialized = FALSE;

1 0

Michael Stefaniuc : windowscodecs: Standardize the COM usage in pngformat.c .
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 2854f06105d1b6c4b6f779cdbd8ef1eef0765226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2854f06105d1b6c4b6f779cdb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 00:59:35 2010 +0100 windowscodecs: Standardize the COM usage in pngformat.c. --- dlls/windowscodecs/pngformat.c | 43 ++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 791df56..9923097 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -160,8 +160,8 @@ static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message } typedef struct { - const IWICBitmapDecoderVtbl *lpVtbl; - const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + IWICBitmapDecoder IWICBitmapDecoder_iface; + IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; LONG ref; png_structp png_ptr; png_infop info_ptr; @@ -174,9 +174,14 @@ typedef struct { CRITICAL_SECTION lock; /* must be held when png structures are accessed or initialized is set */ } PngDecoder; -static inline PngDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) +static inline PngDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { - return CONTAINING_RECORD(iface, PngDecoder, lpFrameVtbl); + return CONTAINING_RECORD(iface, PngDecoder, IWICBitmapDecoder_iface); +} + +static inline PngDecoder *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, PngDecoder, IWICBitmapFrameDecode_iface); } static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; @@ -184,7 +189,7 @@ static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { - PngDecoder *This = (PngDecoder*)iface; + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -205,7 +210,7 @@ static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID static ULONG WINAPI PngDecoder_AddRef(IWICBitmapDecoder *iface) { - PngDecoder *This = (PngDecoder*)iface; + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -215,7 +220,7 @@ static ULONG WINAPI PngDecoder_AddRef(IWICBitmapDecoder *iface) static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) { - PngDecoder *This = (PngDecoder*)iface; + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -391,7 +396,7 @@ static void end_callback(png_structp png_ptr, png_infop info) static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - PngDecoder *This = (PngDecoder*)iface; + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); LARGE_INTEGER seek; HRESULT hr=S_OK; png_bytep *row_pointers=NULL; @@ -519,7 +524,7 @@ static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - PngDecoder *This = (PngDecoder*)iface; + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; @@ -528,7 +533,7 @@ static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, IWICBitmapDecoder_AddRef(iface); - *ppIBitmapFrame = (void*)(&This->lpFrameVtbl); + *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; return S_OK; } @@ -573,20 +578,20 @@ static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *ifa static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); return IUnknown_AddRef((IUnknown*)This); } static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); return IUnknown_Release((IUnknown*)This); } static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); *puiWidth = This->width; *puiHeight = This->height; TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); @@ -596,7 +601,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p)\n", iface, pPixelFormat); memcpy(pPixelFormat, This->format, sizeof(GUID)); @@ -607,7 +612,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); png_uint_32 ret, xres, yres; int unit_type; @@ -636,7 +641,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); png_uint_32 ret; png_colorp png_palette; int num_palette; @@ -695,7 +700,7 @@ end: static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - PngDecoder *This = impl_from_frame(iface); + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); return copy_pixels(This->bpp, This->image_bits, @@ -758,8 +763,8 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &PngDecoder_Vtbl; - This->lpFrameVtbl = &PngDecoder_FrameVtbl; + This->IWICBitmapDecoder_iface.lpVtbl = &PngDecoder_Vtbl; + This->IWICBitmapFrameDecode_iface.lpVtbl = &PngDecoder_FrameVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL;

1 0

Michael Stefaniuc : windowscodecs: Standardize the COM usage in info.c.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: cbea26039159e1220695888fd901cb59450758f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbea26039159e1220695888fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 01:00:41 2010 +0100 windowscodecs: Standardize the COM usage in info.c. --- dlls/windowscodecs/info.c | 90 +++++++++++++++++++++++++++----------------- 1 files changed, 55 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbea26039159e12206958…

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in ImagingFactory.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: e97fb5036d58f076f49ce909fd5d208da8799606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97fb5036d58f076f49ce909f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 01:00:50 2010 +0100 windowscodecs: Use an iface instead of a vtbl pointer in ImagingFactory. --- dlls/windowscodecs/imgfactory.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 5c81b98..a2e8e7f 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -36,14 +36,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { - const IWICImagingFactoryVtbl *lpIWICImagingFactoryVtbl; + IWICImagingFactory IWICImagingFactory_iface; LONG ref; } ImagingFactory; +static inline ImagingFactory *impl_from_IWICImagingFactory(IWICImagingFactory *iface) +{ + return CONTAINING_RECORD(iface, ImagingFactory, IWICImagingFactory_iface); +} + static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, REFIID iid, void **ppv) { - ImagingFactory *This = (ImagingFactory*)iface; + ImagingFactory *This = impl_from_IWICImagingFactory(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -64,7 +69,7 @@ static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, R static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory *iface) { - ImagingFactory *This = (ImagingFactory*)iface; + ImagingFactory *This = impl_from_IWICImagingFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -74,7 +79,7 @@ static ULONG WINAPI ImagingFactory_AddRef(IWICImagingFactory *iface) static ULONG WINAPI ImagingFactory_Release(IWICImagingFactory *iface) { - ImagingFactory *This = (ImagingFactory*)iface; + ImagingFactory *This = impl_from_IWICImagingFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -428,7 +433,7 @@ HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** pp This = HeapAlloc(GetProcessHeap(), 0, sizeof(ImagingFactory)); if (!This) return E_OUTOFMEMORY; - This->lpIWICImagingFactoryVtbl = &ImagingFactory_Vtbl; + This->IWICImagingFactory_iface.lpVtbl = &ImagingFactory_Vtbl; This->ref = 1; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv);

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in PaletteImpl.
by Alexandre Julliard 29 Nov '10

29 Nov '10

Module: wine Branch: master Commit: 4313084308ba08329b3814d61fa0de654734bace URL: http://source.winehq.org/git/wine.git/?a=commit;h=4313084308ba08329b3814d61… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 01:01:05 2010 +0100 windowscodecs: Use an iface instead of a vtbl pointer in PaletteImpl. --- dlls/windowscodecs/palette.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 40ab190..ec74d13 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { - const IWICPaletteVtbl *lpIWICPaletteVtbl; + IWICPalette IWICPalette_iface; LONG ref; UINT count; WICColor *colors; @@ -43,10 +43,15 @@ typedef struct { CRITICAL_SECTION lock; /* must be held when count, colors, or type is accessed */ } PaletteImpl; +static inline PaletteImpl *impl_from_IWICPalette(IWICPalette *iface) +{ + return CONTAINING_RECORD(iface, PaletteImpl, IWICPalette_iface); +} + static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, void **ppv) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -67,7 +72,7 @@ static HRESULT WINAPI PaletteImpl_QueryInterface(IWICPalette *iface, REFIID iid, static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -77,7 +82,7 @@ static ULONG WINAPI PaletteImpl_AddRef(IWICPalette *iface) static ULONG WINAPI PaletteImpl_Release(IWICPalette *iface) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -103,7 +108,7 @@ static HRESULT WINAPI PaletteImpl_InitializePredefined(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, WICColor *pColors, UINT colorCount) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); WICColor *new_colors; TRACE("(%p,%p,%u)\n", iface, pColors, colorCount); @@ -147,7 +152,7 @@ static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, WICBitmapPaletteType *pePaletteType) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%p)\n", iface, pePaletteType); @@ -162,7 +167,7 @@ static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCount) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%p)\n", iface, pcCount); @@ -178,7 +183,7 @@ static HRESULT WINAPI PaletteImpl_GetColorCount(IWICPalette *iface, UINT *pcCoun static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, WICColor *pColors, UINT *pcActualColors) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%i,%p,%p)\n", iface, colorCount, pColors, pcActualColors); @@ -199,7 +204,7 @@ static HRESULT WINAPI PaletteImpl_GetColors(IWICPalette *iface, UINT colorCount, static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBlackWhite) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%p)\n", iface, pfIsBlackWhite); @@ -217,7 +222,7 @@ static HRESULT WINAPI PaletteImpl_IsBlackWhite(IWICPalette *iface, BOOL *pfIsBla static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGrayscale) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); TRACE("(%p,%p)\n", iface, pfIsGrayscale); @@ -242,7 +247,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { - PaletteImpl *This = (PaletteImpl*)iface; + PaletteImpl *This = impl_from_IWICPalette(iface); int i; TRACE("(%p,%p)\n", iface, pfHasAlpha); @@ -286,7 +291,7 @@ HRESULT PaletteImpl_Create(IWICPalette **palette) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PaletteImpl)); if (!This) return E_OUTOFMEMORY; - This->lpIWICPaletteVtbl = &PaletteImpl_Vtbl; + This->IWICPalette_iface.lpVtbl = &PaletteImpl_Vtbl; This->ref = 1; This->count = 0; This->colors = NULL;

1 0