ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windowscodecs: Use an iface instead of a vtbl pointer in BmpEncoder.

This commit is contained in:
Michael Stefaniuc 2011-01-11 00:43:15 +01:00 committed by Alexandre Julliard
parent 346e766d53
commit d341bea673
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/windowscodecs/bmpencode.c
View File

@ -412,16 +412,21 @@ static const IWICBitmapFrameEncodeVtbl BmpFrameEncode_Vtbl = {
}; };
typedef struct BmpEncoder { typedef struct BmpEncoder {
const IWICBitmapEncoderVtbl *lpVtbl; IWICBitmapEncoder IWICBitmapEncoder_iface;
LONG ref; LONG ref;
IStream *stream; IStream *stream;
BmpFrameEncode *frame; BmpFrameEncode *frame;
} BmpEncoder; } BmpEncoder;
static inline BmpEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface)
{
return CONTAINING_RECORD(iface, BmpEncoder, IWICBitmapEncoder_iface);
}
static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid,
void **ppv) void **ppv)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv);
if (!ppv) return E_INVALIDARG; if (!ppv) return E_INVALIDARG;
@ -443,7 +448,7 @@ static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID
static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%u\n", iface, ref);
@ -453,7 +458,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface)
static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref); TRACE("(%p) refcount=%u\n", iface, ref);
@ -471,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface)
static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface,
IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) IStream *pIStream, WICBitmapEncoderCacheOption cacheOption)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption);
@ -523,7 +528,7 @@ static HRESULT WINAPI BmpEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap
static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface,
IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
BmpFrameEncode *encode; BmpFrameEncode *encode;
HRESULT hr; HRESULT hr;
@ -565,7 +570,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface,
static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface)
{ {
BmpEncoder *This = (BmpEncoder*)iface; BmpEncoder *This = impl_from_IWICBitmapEncoder(iface);
TRACE("(%p)\n", iface); TRACE("(%p)\n", iface);
if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE; if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE;
@ -610,13 +615,13 @@ HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpEncoder)); This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpEncoder));
if (!This) return E_OUTOFMEMORY; if (!This) return E_OUTOFMEMORY;
This->lpVtbl = &BmpEncoder_Vtbl; This->IWICBitmapEncoder_iface.lpVtbl = &BmpEncoder_Vtbl;
This->ref = 1; This->ref = 1;
This->stream = NULL; This->stream = NULL;
This->frame = NULL; This->frame = NULL;
ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv);
IUnknown_Release((IUnknown*)This); IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface);
return ret; return ret;
} }