[2/4] Revert "windowscodecs: Add a stubbed out IWICMetadataBlockReader interface."

[Vincent Povirk]

-------------- next part --------------
From 1b563de480f3cb982cb84dbd1ea673690de5901f Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent at codeweavers.com>
Date: Wed, 30 May 2012 14:55:35 -0500
Subject: [PATCH 2/4] Revert "windowscodecs: Add a stubbed out
 IWICMetadataBlockReader interface."

This reverts commit 882c1026a865a703711f2d78235075320b02f48c.
---
 dlls/windowscodecs/metadatahandler.c |   69 ----------------------------------
 dlls/windowscodecs/tests/metadata.c  |    2 +-
 2 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index ffe6763..afcff21 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -39,7 +39,6 @@ typedef struct MetadataHandler {
     IWICMetadataWriter IWICMetadataWriter_iface;
     LONG ref;
     IWICPersistStream IWICPersistStream_iface;
-    IWICMetadataBlockReader IWICMetadataBlockReader_iface;
     const MetadataHandlerVtbl *vtable;
     MetadataItem *items;
     DWORD item_count;
@@ -56,11 +55,6 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if
     return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface);
 }
 
-static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface)
-{
-    return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface);
-}
-
 static void MetadataHandler_FreeItems(MetadataHandler *This)
 {
     int i;
@@ -98,10 +92,6 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface,
     {
         *ppv = &This->IWICPersistStream_iface;
     }
-    else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid))
-    {
-        *ppv = &This->IWICMetadataBlockReader_iface;
-    }
     else
     {
         *ppv = NULL;
@@ -327,64 +317,6 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = {
     MetadataHandler_SaveEx
 };
 
-static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface,
-    REFIID iid, void **ppv)
-{
-    MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface);
-    return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv);
-}
-
-static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface)
-{
-    MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface);
-    return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface);
-}
-
-static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface)
-{
-    MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface);
-    return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface);
-}
-
-static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat(
-        IWICMetadataBlockReader *iface, GUID *guid)
-{
-    FIXME("(%p,%p): stub\n", iface, guid);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount(
-        IWICMetadataBlockReader *iface, UINT *count)
-{
-    FIXME("(%p,%p): stub\n", iface, count);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex(
-        IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader)
-{
-    FIXME("(%p,%u,%p): stub\n", iface, index, reader);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator(
-        IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata)
-{
-    FIXME("(%p,%p): stub\n", iface, enum_metadata);
-    return E_NOTIMPL;
-}
-
-static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl =
-{
-    MetadataHandler_MetadataBlockReader_QueryInterface,
-    MetadataHandler_MetadataBlockReader_AddRef,
-    MetadataHandler_MetadataBlockReader_Release,
-    MetadataHandler_MetadataBlockReader_GetContainerFormat,
-    MetadataHandler_MetadataBlockReader_GetCount,
-    MetadataHandler_MetadataBlockReader_GetReaderByIndex,
-    MetadataHandler_MetadataBlockReader_GetEnumerator
-};
-
 HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv)
 {
     MetadataHandler *This;
@@ -401,7 +333,6 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO
 
     This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl;
     This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl;
-    This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl;
     This->ref = 1;
     This->vtable = vtable;
     This->items = NULL;
diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c
index 5cde494..1292bbf 100644
--- a/dlls/windowscodecs/tests/metadata.c
+++ b/dlls/windowscodecs/tests/metadata.c
@@ -199,7 +199,7 @@ static void test_metadata_unknown(void)
     }
 
     hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader);
-    todo_wine ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr);
+    ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr);
 
     if (SUCCEEDED(hr))
         IWICMetadataBlockReader_Release(blockreader);
-- 
1.7.9.5