dwrite: Implement MapCharacters() for custom fallback.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>

dwrite: Implement MapCharacters() for custom fallback.
d37eb0f1 · Nikolay Sivov · Alexandre Julliard · d800cd74 · d37eb0f1 · d37eb0f1
Commit d37eb0f1 authored Jul 18, 2022 by Nikolay Sivov Committed by Alexandre Julliard Jul 22, 2022
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 255 additions and 30 deletions

analyzer.c dlls/dwrite/analyzer.c +242 -10

layout.c dlls/dwrite/tests/layout.c +13 -20

No files found.
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -4937,12 +4937,11 @@ static void test_FontFallbackBuilder(void)
    font = (void*)0xdeadbeef;
    hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
        DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
-todo_wine {
    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(mappedlength == 1, "got %u\n", mappedlength);
-    ok(scale == 1.0f, "got %f\n", scale);
-    ok(font == NULL, "got %p\n", font);
-}
+    ok(mappedlength == 1, "Unexpected length %u.\n", mappedlength);
+    ok(scale == 1.0f, "Unexpected scale %f.\n", scale);
+    ok(!font, "Unexpected font instance %p.\n", font);
+
    IDWriteFontFallback_Release(fallback);

    /* remap with custom collection */
@@ -4959,12 +4958,10 @@ todo_wine {
    font = NULL;
    hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
        DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
-todo_wine {
    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(mappedlength == 1, "got %u\n", mappedlength);
-    ok(scale == 5.0f, "got %f\n", scale);
-    ok(font != NULL, "got %p\n", font);
-}
+    ok(mappedlength == 1, "Unexpected length %u.\n", mappedlength);
+    ok(scale == 5.0f, "Unexpected scale %f.\n", scale);
+    ok(font != NULL, "Expected font instance %p.\n", font);
    if (font)
        IDWriteFont_Release(font);

@@ -4984,12 +4981,10 @@ todo_wine {
    font = NULL;
    hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
        DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
-todo_wine {
    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(mappedlength == 1, "got %u\n", mappedlength);
-    ok(scale == 5.0f, "got %f\n", scale);
-    ok(font != NULL, "got %p\n", font);
-}
+    ok(mappedlength == 1, "Unexpected length %u.\n", mappedlength);
+    ok(scale == 5.0f, "Unexpected scale %f.\n", scale);
+    ok(font != NULL, "Expected font instance %p.\n", font);
    if (font)
        IDWriteFont_Release(font);

@@ -5010,12 +5005,10 @@ todo_wine {
    font = NULL;
    hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
        DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
-todo_wine {
    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    ok(mappedlength == 1, "got %u\n", mappedlength);
-    ok(scale == 5.0f, "got %f\n", scale);
-    ok(font != NULL, "got %p\n", font);
-}
+    ok(mappedlength == 1, "Unexpected length %u.\n", mappedlength);
+    ok(scale == 5.0f, "Unexpected scale %f.\n", scale);
+    ok(font != NULL, "Expected font instance %p.\n", font);
    if (font)
        IDWriteFont_Release(font);