[Gdiplus 2/4] Implement GdipGetStringFormatMeasurableCharacterRangeCount

[Adam Petaccia]

---
 dlls/gdiplus/stringformat.c       |    6 ++++--
 dlls/gdiplus/tests/stringformat.c |    5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c
index 8a3e8cd..b3a084d 100644
--- a/dlls/gdiplus/stringformat.c
+++ b/dlls/gdiplus/stringformat.c
@@ -141,12 +141,14 @@ GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format,
 GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount(
         GDIPCONST GpStringFormat* format, INT* count)
 {
+    TRACE("%p %p\n", format, count);
+
     if (!(format && count))
         return InvalidParameter;
 
-    FIXME("stub: %p %p\n", format, count);
+    *count = format->charrangecount;
 
-    return NotImplemented;
+    return Ok;
 }
 
 GpStatus WINGDIPAPI GdipGetStringFormatTabStopCount(GDIPCONST GpStringFormat *format,
diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c
index ad52f4f..a9205ec 100644
--- a/dlls/gdiplus/tests/stringformat.c
+++ b/dlls/gdiplus/tests/stringformat.c
@@ -66,12 +66,9 @@ static void test_characterrange(void)
     expect(Ok, stat);
     stat = GdipSetStringFormatMeasurableCharacterRanges(format, 3, ranges);
     expect(Ok, stat);
-todo_wine
-{
     stat = GdipGetStringFormatMeasurableCharacterRangeCount(format, &count);
     expect(Ok, stat);
-    if (stat == Ok) expect(3, count);
-}
+    expect(3, count);
     stat= GdipDeleteStringFormat(format);
     expect(Ok, stat);
 }
-- 
1.5.4.3