Module: wine Branch: master Commit: 93eca9e919f3298f818e8bb7c6617dd92246189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eca9e919f3298f818e8bb7c...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed Nov 21 15:54:02 2018 +0300
gdi32: Set data size for fonts created from memory.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 1f46fc8..96e8e30 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 f492f7b..468e7d9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5139,7 +5139,6 @@ static void test_realization_info(const char *name, DWORD size, BOOL is_memory_r ok(ret != 0, "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));