Dmitry Timoshkov : windowscodecs: Implement PixelFormatInfo_GetSpecVersion.

Alexandre Julliard julliard at winehq.org
Tue Jul 3 10:58:24 CDT 2012


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

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Jul  2 16:13:21 2012 +0900

windowscodecs: Implement PixelFormatInfo_GetSpecVersion.

---

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

diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
index 4c7fcc2..1bfbfc7 100644
--- a/dlls/windowscodecs/info.c
+++ b/dlls/windowscodecs/info.c
@@ -1238,8 +1238,12 @@ static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UI
 static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion,
     WCHAR *wzSpecVersion, UINT *pcchActual)
 {
-    FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual);
-    return E_NOTIMPL;
+    PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface);
+
+    TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual);
+
+    return ComponentInfo_GetStringValue(This->classkey, specversion_valuename,
+        cchSpecVersion, wzSpecVersion, pcchActual);
 }
 
 static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName,
diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c
index 1cd84c1..cae64ff 100644
--- a/dlls/windowscodecs/tests/info.c
+++ b/dlls/windowscodecs/tests/info.c
@@ -209,8 +209,8 @@ static void test_pixelformat_info(void)
 
     len = 0xdeadbeef;
     hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len);
-    todo_wine ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr);
-    todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */
+    ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr);
+    ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */
 
     memset(&guid, 0xaa, sizeof(guid));
     hr = IWICComponentInfo_GetVendorGUID(info, &guid);




More information about the wine-cvs mailing list