Dmitry Timoshkov : windowscodecs: Add a stubbed out IWICMetadataBlockReader to TIFF decoder.
Alexandre Julliard
julliard at winehq.org
Thu Jun 7 13:39:18 CDT 2012
Module: wine
Branch: master
Commit: 34229e5fb6238a872b9f239711d1490e0b040145
URL: http://source.winehq.org/git/wine.git/?a=commit;h=34229e5fb6238a872b9f239711d1490e0b040145
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Wed Jun 6 18:44:11 2012 +0900
windowscodecs: Add a stubbed out IWICMetadataBlockReader to TIFF decoder.
---
dlls/windowscodecs/tiffformat.c | 71 +++++++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 79e5c60..1040fa6 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -33,6 +33,7 @@
#include "winbase.h"
#include "objbase.h"
#include "wincodec.h"
+#include "wincodecsdk.h"
#include "wincodecs_private.h"
@@ -231,6 +232,7 @@ typedef struct {
typedef struct {
IWICBitmapFrameDecode IWICBitmapFrameDecode_iface;
+ IWICMetadataBlockReader IWICMetadataBlockReader_iface;
LONG ref;
TiffDecoder *parent;
UINT index;
@@ -240,6 +242,7 @@ typedef struct {
} TiffFrameDecode;
static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl;
+static const IWICMetadataBlockReaderVtbl TiffFrameDecode_BlockVtbl;
static inline TiffDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface)
{
@@ -251,6 +254,11 @@ static inline TiffFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDe
return CONTAINING_RECORD(iface, TiffFrameDecode, IWICBitmapFrameDecode_iface);
}
+static inline TiffFrameDecode *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface)
+{
+ return CONTAINING_RECORD(iface, TiffFrameDecode, IWICMetadataBlockReader_iface);
+}
+
static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
{
uint16 photometric, bps, samples, planar;
@@ -690,6 +698,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface,
if (result)
{
result->IWICBitmapFrameDecode_iface.lpVtbl = &TiffFrameDecode_Vtbl;
+ result->IWICMetadataBlockReader_iface.lpVtbl = &TiffFrameDecode_BlockVtbl;
result->ref = 1;
result->parent = This;
result->index = index;
@@ -744,6 +753,10 @@ static HRESULT WINAPI TiffFrameDecode_QueryInterface(IWICBitmapFrameDecode *ifac
{
*ppv = This;
}
+ else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid))
+ {
+ *ppv = &This->IWICMetadataBlockReader_iface;
+ }
else
{
*ppv = NULL;
@@ -1098,6 +1111,64 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl = {
TiffFrameDecode_GetThumbnail
};
+static HRESULT WINAPI TiffFrameDecode_Block_QueryInterface(IWICMetadataBlockReader *iface,
+ REFIID iid, void **ppv)
+{
+ TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface);
+ return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv);
+}
+
+static ULONG WINAPI TiffFrameDecode_Block_AddRef(IWICMetadataBlockReader *iface)
+{
+ TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface);
+ return IWICBitmapFrameDecode_AddRef(&This->IWICBitmapFrameDecode_iface);
+}
+
+static ULONG WINAPI TiffFrameDecode_Block_Release(IWICMetadataBlockReader *iface)
+{
+ TiffFrameDecode *This = impl_from_IWICMetadataBlockReader(iface);
+ return IWICBitmapFrameDecode_Release(&This->IWICBitmapFrameDecode_iface);
+}
+
+static HRESULT WINAPI TiffFrameDecode_Block_GetContainerFormat(IWICMetadataBlockReader *iface,
+ GUID *guid)
+{
+ FIXME("(%p,%p): stub\n", iface, guid);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI TiffFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface,
+ UINT *count)
+{
+ FIXME("(%p,%p): stub\n", iface, count);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI TiffFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockReader *iface,
+ UINT index, IWICMetadataReader **reader)
+{
+ FIXME("(%p,%u,%p): stub\n", iface, index, reader);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI TiffFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface,
+ IEnumUnknown **enum_metadata)
+{
+ FIXME("(%p,%p): stub\n", iface, enum_metadata);
+ return E_NOTIMPL;
+}
+
+static const IWICMetadataBlockReaderVtbl TiffFrameDecode_BlockVtbl =
+{
+ TiffFrameDecode_Block_QueryInterface,
+ TiffFrameDecode_Block_AddRef,
+ TiffFrameDecode_Block_Release,
+ TiffFrameDecode_Block_GetContainerFormat,
+ TiffFrameDecode_Block_GetCount,
+ TiffFrameDecode_Block_GetReaderByIndex,
+ TiffFrameDecode_Block_GetEnumerator
+};
+
HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv)
{
HRESULT ret;
More information about the wine-cvs
mailing list