Vincent Povirk : windowscodecs: Always report pixel formats are signed.

Alexandre Julliard julliard at winehq.org
Tue Jun 19 15:36:25 CDT 2012


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

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Mon Apr 16 15:12:51 2012 -0500

windowscodecs: Always report pixel formats are signed.

---

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

diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
index 48106a8..699f3f2 100644
--- a/dlls/windowscodecs/info.c
+++ b/dlls/windowscodecs/info.c
@@ -1122,8 +1122,15 @@ static HRESULT WINAPI PixelFormatInfo_GetCLSID(IWICPixelFormatInfo2 *iface, CLSI
 
 static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *iface, DWORD *pStatus)
 {
-    FIXME("(%p,%p): stub\n", iface, pStatus);
-    return E_NOTIMPL;
+    TRACE("(%p,%p)\n", iface, pStatus);
+
+    if (!pStatus)
+        return E_INVALIDARG;
+
+    /* Pixel formats don't require code, so they are considered signed. */
+    *pStatus = WICComponentSigned;
+
+    return S_OK;
 }
 
 static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor,
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index 3f59d6b..f8c3402 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -194,8 +194,6 @@ static void test_pixelformat_info(void)
     ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr);
     ok(len < 255 && len > 0, "invalid length 0x%x\n", len);
 
-    todo_wine
-    {
     hr = IWICComponentInfo_GetSigningStatus(info, NULL);
     ok(hr == E_INVALIDARG, "GetSigningStatus failed, hr=%x\n", hr);
 
@@ -203,6 +201,8 @@ static void test_pixelformat_info(void)
     ok(hr == S_OK, "GetSigningStatus failed, hr=%x\n", hr);
     ok(signing == WICComponentSigned, "unexpected signing status 0x%x\n", signing);
 
+    todo_wine
+    {
     len = 0xdeadbeef;
     hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len);
     ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr);




More information about the wine-cvs mailing list