[v2 PATCH 2/2] gdi32: Set data size for fonts created from memory.

Nikolay Sivov nsivov at codeweavers.com
Mon Nov 19 04:35:31 CST 2018


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/gdi32/freetype.c   | 1 +
 dlls/gdi32/tests/font.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 99b7d8c8f2..dfbbfa9d78 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5335,6 +5335,7 @@ static void fill_fileinfo_from_face( GdiFont *font, Face *face )
     if (!face->file)
     {
         font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo));
+        font->fileinfo->size.QuadPart = face->font_data_size;
         return;
     }
 
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index c292d28330..3809e2d7a2 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -5123,7 +5123,6 @@ static void test_realization_info(const char *name, DWORD size, BOOL is_memory_r
     ok(ret != 0 || broken(GetLastError() == ERROR_NOACCESS), "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError());
     if (ret)
     {
-    todo_wine_if(is_memory_resource)
         ok(is_memory_resource ? file_info.size.QuadPart == size : file_info.size.QuadPart > 0, "Unexpected file size.\n");
         ok(is_memory_resource ? !file_info.path[0] : file_info.path[0], "Unexpected file path %s.\n",
             wine_dbgstr_w(file_info.path));
-- 
2.19.1




More information about the wine-devel mailing list