October 2020 - Wine-commits

Alexandre Julliard : gdi32: Move the kerning pairs data into the generic font structure.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: df335e3405c19fb9e91c1fd696bb58892aab30c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df335e3405c19fb9e91c1fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 11:50:07 2020 +0100 gdi32: Move the kerning pairs data into the generic font structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 18 +++++++++++++++--- dlls/gdi32/freetype.c | 49 +++++++++++------------------------------------- dlls/gdi32/gdi_private.h | 4 +++- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6fe211eac3d..27aa129c0de 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -426,6 +426,7 @@ struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_ font->refcount = 1; font->matrix.eM11 = font->matrix.eM22 = 1.0; font->scale_y = 1.0; + font->kern_count = -1; if (file) { @@ -468,6 +469,7 @@ void free_gdi_font( struct gdi_font *font ) HeapFree( GetProcessHeap(), 0, font->otm.otmpFaceName ); HeapFree( GetProcessHeap(), 0, font->otm.otmpFullName ); HeapFree( GetProcessHeap(), 0, font->gm ); + HeapFree( GetProcessHeap(), 0, font->kern_pairs ); HeapFree( GetProcessHeap(), 0, font ); } @@ -1179,17 +1181,27 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, static DWORD CDECL font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR *pairs ) { struct font_physdev *physdev = get_font_dev( dev ); - DWORD ret; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetKerningPairs ); return dev->funcs->pGetKerningPairs( dev, count, pairs ); } + EnterCriticalSection( &font_cs ); - ret = font_funcs->pGetKerningPairs( physdev->font, count, pairs ); + if (physdev->font->kern_count == -1) + physdev->font->kern_count = font_funcs->get_kerning_pairs( physdev->font, + &physdev->font->kern_pairs ); LeaveCriticalSection( &font_cs ); - return ret; + + if (count && pairs) + { + count = min( count, physdev->font->kern_count ); + memcpy( pairs, physdev->font->kern_pairs, count * sizeof(*pairs) ); + } + else count = physdev->font->kern_count; + + return count; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 01a66600063..16fb92dd73b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -302,8 +302,6 @@ typedef struct { struct tagGdiFont { struct gdi_font *gdi_font; - DWORD total_kern_pairs; - KERNINGPAIR *kern_pairs; struct list child_fonts; /* the following members can be accessed without locking, they are never modified after creation */ @@ -4021,8 +4019,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) { GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - ret->total_kern_pairs = (DWORD)-1; - ret->kern_pairs = NULL; list_init(&ret->child_fonts); ret->gdi_font = font; font->private = ret; @@ -4048,7 +4044,6 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); - HeapFree(GetProcessHeap(), 0, font->kern_pairs); HeapFree(GetProcessHeap(), 0, font->GSUB_Table); HeapFree(GetProcessHeap(), 0, font); } @@ -7458,31 +7453,18 @@ static DWORD parse_format0_kern_subtable(GdiFont *font, } /************************************************************* - * freetype_GetKerningPairs + * freetype_get_kerning_pairs */ -static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cPairs, KERNINGPAIR *kern_pair ) +static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *gdi_font, KERNINGPAIR **pairs ) { GdiFont *font = get_font_ptr(gdi_font); - DWORD length; + DWORD length, count = 0; void *buf; const struct TT_kern_table *tt_kern_table; const struct TT_kern_subtable *tt_kern_subtable; USHORT i, nTables; USHORT *glyph_to_char; - if (font->total_kern_pairs != (DWORD)-1) - { - if (cPairs && kern_pair) - { - cPairs = min(cPairs, font->total_kern_pairs); - memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - } - else cPairs = font->total_kern_pairs; - return cPairs; - } - - font->total_kern_pairs = 0; - length = freetype_get_font_data(gdi_font, MS_KERN_TAG, 0, NULL, 0); if (length == GDI_ERROR) @@ -7563,21 +7545,19 @@ static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cP */ if (tt_kern_subtable_copy.coverage.bits.format == 0) { - DWORD new_chunk, old_total = font->total_kern_pairs; + DWORD new_chunk, old_total = count; new_chunk = parse_format0_kern_subtable(font, (const struct TT_format0_kern_subtable *)(tt_kern_subtable + 1), glyph_to_char, NULL, 0); - font->total_kern_pairs += new_chunk; + count += new_chunk; - if (!font->kern_pairs) - font->kern_pairs = HeapAlloc(GetProcessHeap(), 0, - font->total_kern_pairs * sizeof(*font->kern_pairs)); + if (!*pairs) + *pairs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(**pairs)); else - font->kern_pairs = HeapReAlloc(GetProcessHeap(), 0, font->kern_pairs, - font->total_kern_pairs * sizeof(*font->kern_pairs)); + *pairs = HeapReAlloc(GetProcessHeap(), 0, *pairs, count * sizeof(**pairs)); parse_format0_kern_subtable(font, (const struct TT_format0_kern_subtable *)(tt_kern_subtable + 1), - glyph_to_char, font->kern_pairs + old_total, new_chunk); + glyph_to_char, *pairs + old_total, new_chunk); } else TRACE("skipping kerning table format %u\n", tt_kern_subtable_copy.coverage.bits.format); @@ -7587,14 +7567,7 @@ static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cP HeapFree(GetProcessHeap(), 0, glyph_to_char); HeapFree(GetProcessHeap(), 0, buf); - - if (cPairs && kern_pair) - { - cPairs = min(cPairs, font->total_kern_pairs); - memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - } - else cPairs = font->total_kern_pairs; - return cPairs; + return count; } static const struct font_backend_funcs font_funcs = @@ -7603,7 +7576,6 @@ static const struct font_backend_funcs font_funcs = freetype_FontIsLinked, freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, - freetype_GetKerningPairs, freetype_SelectFont, freetype_AddFontResourceEx, freetype_RemoveFontResourceEx, @@ -7616,6 +7588,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_outline, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, + freetype_get_kerning_pairs, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1f744d1bf2b..8036dfb986b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -313,6 +313,8 @@ struct gdi_font DWORD gm_size; struct glyph_metrics **gm; OUTLINETEXTMETRICW otm; + KERNINGPAIR *kern_pairs; + int kern_count; /* the following members can be accessed without locking, they are never modified after creation */ void *private; /* font backend private data */ DWORD handle; @@ -359,7 +361,6 @@ struct font_backend_funcs BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); - DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *pAddFontResourceEx)( LPCWSTR file, DWORD flags, PVOID pdv ); @@ -377,6 +378,7 @@ struct font_backend_funcs GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); + DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair ); void (CDECL *destroy_font)( struct gdi_font *font ); };

1 0

Alexandre Julliard : gdi32: Move the fonts directory helper functions out of freetype.c.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: f3a75923a671e5bc07eaec43c79369e0b8974e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a75923a671e5bc07eaec43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:03:21 2020 +0100 gdi32: Move the fonts directory helper functions out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/font.c | 43 ++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 60 +++++++----------------------------------------- dlls/gdi32/gdi_private.h | 4 ++++ 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a94abad599d..3b78f5e132f 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -52,4 +52,4 @@ C_SRCS = \ RC_SRCS = gdi32.rc -freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" +font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 27aa129c0de..2331c7cf784 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -350,6 +350,49 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifndef WINE_FONT_DIR +#define WINE_FONT_DIR "fonts" +#endif + +void get_font_dir( WCHAR *path ) +{ + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + + if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) + { + const char fontdir[] = WINE_FONT_DIR; + strcatW( path, slashW ); + MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); + } + else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) + { + strcatW( path, fontsW ); + } + if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); + else path[1] = '\\'; /* change \??\ to \\?\ */ +} + +void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) +{ + static const WCHAR slashW[] = {'\\',0}; + + get_font_dir( path ); + strcatW( path, slashW ); + strcatW( path, file ); +} + +void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) +{ + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + + GetWindowsDirectoryW( path, MAX_PATH ); + strcatW( path, fontsW ); + strcatW( path, file ); +} + /* realized font objects */ #define FIRST_FONT_HANDLE 1 diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 16fb92dd73b..7129acfeb5c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -225,10 +225,6 @@ MAKE_FUNCPTR(FcPatternGetString); #define GASP_GRIDFIT 0x01 #define GASP_DOGRAY 0x02 -#ifndef WINE_FONT_DIR -#define WINE_FONT_DIR "fonts" -#endif - /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -2858,46 +2854,6 @@ static void load_mac_fonts(void) #endif -static void get_font_dir( WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - - if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) - { - const char fontdir[] = WINE_FONT_DIR; - strcatW( path, slashW ); - MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); - } - else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) - { - strcatW( path, fontsW ); - } - if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); - else path[1] = '\\'; /* change \??\ to \\?\ */ -} - -static void get_data_dir_path( LPCWSTR file, WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\','\0'}; - - get_font_dir( path ); - strcatW( path, slashW ); - strcatW( path, file ); -} - -static void get_winfonts_dir_path(LPCWSTR file, WCHAR *path) -{ - static const WCHAR slashW[] = {'\\','\0'}; - - GetWindowsDirectoryW(path, MAX_PATH); - strcatW(path, fontsW); - strcatW(path, slashW); - strcatW(path, file); -} - static void load_system_fonts(void) { HKEY hkey; @@ -2910,10 +2866,10 @@ static void load_system_fonts(void) dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && type == REG_SZ) { - get_winfonts_dir_path( data, pathW ); + get_fonts_win_dir_path( data, pathW ); if (!add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) { - get_data_dir_path( data, pathW ); + get_fonts_data_dir_path( data, pathW ); add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); } } @@ -3110,12 +3066,12 @@ static INT CDECL freetype_AddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ - get_winfonts_dir_path( file, path ); + get_fonts_win_dir_path( file, path ); ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); /* Try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ if (!ret) { - get_data_dir_path( file, path ); + get_fonts_data_dir_path( file, path ); ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); } } @@ -3163,11 +3119,11 @@ static BOOL CDECL freetype_RemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID if (!ret && !strchrW(file, '\\')) { - get_winfonts_dir_path( file, path ); + get_fonts_win_dir_path( file, path ); ret = remove_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); if (!ret) { - get_data_dir_path( file, path ); + get_fonts_data_dir_path( file, path ); ret = remove_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); } } @@ -3615,10 +3571,10 @@ static void init_font_list(void) { WCHAR pathW[MAX_PATH]; - get_winfonts_dir_path( data, pathW ); + get_fonts_win_dir_path( data, pathW ); if (!add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) { - get_data_dir_path( data, pathW ); + get_fonts_data_dir_path( data, pathW ); add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); } } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8036dfb986b..d7680464b6a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -382,6 +382,10 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; +extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; +extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; +extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; + extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the Add/RemoveFontResource() implementation out of freetype.c.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 047bf2522304c8b5772902404f7683d4b746fe08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=047bf2522304c8b577290240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:04:36 2020 +0100 gdi32: Move the Add/RemoveFontResource() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 110 ++++++++++++++++++++++++++++++++++++++--------- dlls/gdi32/freetype.c | 86 +++++++----------------------------- dlls/gdi32/gdi_private.h | 11 ++++- 3 files changed, 114 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=047bf2522304c8b57729…

1 0

Alexandre Julliard : gdi32: Move the AddFontMemResourceEx() implementation out of freetype.c.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: f6d9908e4864efd59e26c41129aeef6880c53b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d9908e4864efd59e26c411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:05:19 2020 +0100 gdi32: Move the AddFontMemResourceEx() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 44 +++++++++++++++++++++++++++++--------------- dlls/gdi32/freetype.c | 35 +++++++++-------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2e926fa52fc..af87c66498f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5429,34 +5429,48 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) /*********************************************************************** * AddFontMemResourceEx (GDI32.@) */ -HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) +HANDLE WINAPI AddFontMemResourceEx( PVOID ptr, DWORD size, PVOID pdv, DWORD *pcFonts ) { HANDLE ret; DWORD num_fonts; + void *copy; - if (!pbFont || !cbFont || !pcFonts) + if (!ptr || !size || !pcFonts) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } if (!font_funcs) return NULL; + if (!(copy = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + memcpy( copy, ptr, size ); + EnterCriticalSection( &font_cs ); - ret = font_funcs->pAddFontMemResourceEx( pbFont, cbFont, pdv, &num_fonts ); + num_fonts = font_funcs->add_mem_font( copy, size, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); LeaveCriticalSection( &font_cs ); - if (ret) + + if (!num_fonts) { - __TRY - { - *pcFonts = num_fonts; - } - __EXCEPT_PAGE_FAULT - { - WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); - RemoveFontMemResourceEx(ret); - ret = 0; - } - __ENDTRY + HeapFree( GetProcessHeap(), 0, copy ); + return NULL; + } + + /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? + * For now return something unique but quite random + */ + ret = (HANDLE)((INT_PTR)copy ^ 0x87654321); + + __TRY + { + *pcFonts = num_fonts; + } + __EXCEPT_PAGE_FAULT + { + WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); + RemoveFontMemResourceEx( ret ); + ret = 0; } + __ENDTRY + TRACE( "Returning handle %p\n", ret ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 286af040355..9ed6077443f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2107,6 +2107,14 @@ static INT CDECL freetype_add_font( const WCHAR *file, DWORD flags ) return ret; } +/************************************************************* + * freetype_add_mem_font + */ +static INT CDECL freetype_add_mem_font( void *ptr, SIZE_T size, DWORD flags ) +{ + return AddFontToList( NULL, NULL, ptr, size, flags ); +} + /************************************************************* * freetype_remove_font */ @@ -3049,31 +3057,6 @@ static void delete_external_font_keys(void) if(winnt_key) RegCloseKey(winnt_key); } -/************************************************************* - * freetype_AddFontMemResourceEx - * - */ -static HANDLE CDECL freetype_AddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) -{ - PVOID pFontCopy = HeapAlloc(GetProcessHeap(), 0, cbFont); - - TRACE("Copying %d bytes of data from %p to %p\n", cbFont, pbFont, pFontCopy); - memcpy(pFontCopy, pbFont, cbFont); - - *pcFonts = AddFontToList(NULL, NULL, pFontCopy, cbFont, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); - if (*pcFonts == 0) - { - TRACE("AddFontToList failed\n"); - HeapFree(GetProcessHeap(), 0, pFontCopy); - return 0; - } - /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? - * For now return something unique but quite random - */ - TRACE("Returning handle %lx\n", ((INT_PTR)pFontCopy)^0x87654321); - return (HANDLE)(((INT_PTR)pFontCopy)^0x87654321); -} - static WCHAR *get_ttf_file_name( LPCWSTR font_file, LPCWSTR font_path ) { WCHAR *fullname; @@ -7477,9 +7460,9 @@ static const struct font_backend_funcs font_funcs = freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, freetype_SelectFont, - freetype_AddFontMemResourceEx, freetype_CreateScalableFontResource, freetype_add_font, + freetype_add_mem_font, freetype_remove_font, freetype_alloc_font, freetype_get_font_data, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4fd59cfd9bc..32cdace5c7d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,10 +370,10 @@ struct font_backend_funcs DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); - HANDLE (CDECL *pAddFontMemResourceEx)( void *font, DWORD size, PVOID pdv, DWORD *count ); BOOL (CDECL *pCreateScalableFontResource)( DWORD hidden, LPCWSTR resource, LPCWSTR font_file, LPCWSTR font_path ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); + INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); BOOL (CDECL *alloc_font)( struct gdi_font *font );

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 08166d7a2d076c27aa963b032c1871a1bf97df64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08166d7a2d076c27aa963b03… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:19 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7eafe53be8..9c70926330e 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -253,7 +253,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE); + check_interface(filter, &IID_IVMRFilterConfig9, FALSE); check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5f95f547e33..aa4187404c6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -605,7 +605,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMFilterMiscFlags_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) *out = &filter->IVMRFilterConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) *out = &filter->IVMRMixerBitmap9_iface;

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: ef8acacaefe6aa5415366fc77824ab3515a74e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8acacaefe6aa5415366fc7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:20 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 6 +++--- dlls/quartz/vmr9.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9c70926330e..39592afce66 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -257,7 +257,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); @@ -290,7 +290,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -317,7 +317,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aa4187404c6..fb5a846c24b 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -613,7 +613,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter)) *out = &filter->IVMRMonitorConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig9 in renderless mode.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: f708161a478072d06866003a2c1e75e51736371f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f708161a478072d06866003a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:21 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig9 in renderless mode. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d09caea14e..7f8ce5b26f4 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -322,7 +322,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo2, FALSE); todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index fb5a846c24b..8bad3f5bdb7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -613,7 +613,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) + && filter->mode != VMR9Mode_Renderless && is_vmr9(filter)) *out = &filter->IVMRMonitorConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 80fa0b93a69a8784d35fc672136240fa701595be URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fa0b93a69a8784d35fc672… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:22 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7f8ce5b26f4..b682aa10adf 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -254,7 +254,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8bad3f5bdb7..5bbc107cc2d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -603,7 +603,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface;

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9.
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: a6d1ee860c620e802f2f3619bb495704c7e80d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d1ee860c620e802f2f3619… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:23 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index b682aa10adf..df18bd5f2d5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5bbc107cc2d..a24dbc62977 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -611,7 +611,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count) *out = &filter->IVMRMixerControl9_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig) && !is_vmr9(filter)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && filter->mode != VMR9Mode_Renderless && is_vmr9(filter))

1 0

Giovanni Mascellani : d2d1: Implement D2D1SinCos().
by Alexandre Julliard 26 Oct '20

26 Oct '20

Module: wine Branch: master Commit: 4f6bd00a8495c80fd6faf940cef09e875bf1a5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6bd00a8495c80fd6faf940… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:27 2020 +0330 d2d1: Implement D2D1SinCos(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 8 ++++++++ dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..943347d7884 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,14 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + TRACE("angle %.8e, s %p, c %p.\n", angle, s, c); + + *s = sinf(angle); + *c = cosf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..df1df01c051 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,36 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + unsigned int i; + float s, c; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0f, 0.0f, 1.0f}, + {1.0f, 8.41470957e-001f, 5.40302277e-001f}, + {2.0f, 9.09297407e-001f, -4.16146845e-001f}, + {M_PI / 2.0f, 1.0f, -4.37113883e-008f}, + {M_PI, -8.74227766e-008f, -1.0f}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), + "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), + "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9507,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c);

1 0