Vincent Povirk : windowscodecs: Implement TiffFrameEncode_Initialize.
Alexandre Julliard
julliard at winehq.org
Wed Apr 6 11:36:36 CDT 2011
Module: wine
Branch: master
Commit: 2cad663198357b4fb0bda3f2f2bb8cde0c4dcc64
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cad663198357b4fb0bda3f2f2bb8cde0c4dcc64
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Tue Mar 29 16:30:59 2011 -0500
windowscodecs: Implement TiffFrameEncode_Initialize.
---
dlls/windowscodecs/tiffformat.c | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 98e2376..65a65a5 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -1136,6 +1136,8 @@ typedef struct TiffFrameEncode {
IWICBitmapFrameEncode IWICBitmapFrameEncode_iface;
LONG ref;
TiffEncoder *parent;
+ /* fields below are protected by parent->lock */
+ BOOL initialized;
} TiffFrameEncode;
static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface)
@@ -1195,8 +1197,22 @@ static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface)
static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface,
IPropertyBag2 *pIEncoderOptions)
{
- FIXME("(%p,%p): stub\n", iface, pIEncoderOptions);
- return E_NOTIMPL;
+ TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface);
+ TRACE("(%p,%p)\n", iface, pIEncoderOptions);
+
+ EnterCriticalSection(&This->parent->lock);
+
+ if (This->initialized)
+ {
+ LeaveCriticalSection(&This->parent->lock);
+ return WINCODEC_ERR_WRONGSTATE;
+ }
+
+ This->initialized = TRUE;
+
+ LeaveCriticalSection(&This->parent->lock);
+
+ return S_OK;
}
static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface,
@@ -1443,6 +1459,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface,
result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl;
result->ref = 1;
result->parent = This;
+ result->initialized = FALSE;
IWICBitmapEncoder_AddRef(iface);
*ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;
More information about the wine-cvs
mailing list