Alexandre Julliard : windowscodecs: Fix some broken tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a7d08fcb6e5a28bc46238bb486dfbc7b9c1ed7c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a7d08fcb6e5a28bc46238bb486...

Author: Alexandre Julliard 
Date:   Fri Jun 15 16:00:33 2012 +0200

windowscodecs: Fix some broken tests.

---

dlls/windowscodecs/info.c       |    1 +
 dlls/windowscodecs/tests/info.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
index 2677ca7..92d0542 100644
--- a/dlls/windowscodecs/info.c
+++ b/dlls/windowscodecs/info.c
@@ -1086,6 +1086,7 @@ static HRESULT WINAPI PixelFormatInfo_GetComponentType(IWICPixelFormatInfo2 *ifa
     WICComponentType *pType)
 {
     TRACE("(%p,%p)\n", iface, pType);
+    if (!pType) return E_INVALIDARG;
     *pType = WICPixelFormat;
     return S_OK;
 }
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index 3d7ecc8..0e09bab 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -130,7 +130,7 @@ static void test_pixelformat_info(void)
     DWORD signing;

hr = get_component_info(&GUID_WICPixelFormat32bppBGRA, &info);
-    todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr);
+    ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr);

if (FAILED(hr))
         return;
@@ -189,6 +189,8 @@ static void test_pixelformat_info(void)
     ok(hr == S_OK, "GetComponentType failed, hr=%x\n", hr);
     ok(componenttype == WICPixelFormat, "unexpected component type 0x%x\n", componenttype);

+    todo_wine
+    {
     len = 0xdeadbeef;
     hr = IWICComponentInfo_GetFriendlyName(info, 0, NULL, &len);
     ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr);
@@ -216,6 +218,7 @@ static void test_pixelformat_info(void)
     hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len);
     ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr);
     ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */
+    }

IWICComponentInfo_Release(info);
 }