[try2][Gdiplus] Use liberation fonts if Microsoft Core fonts can't be found

Adam Petaccia adam at tpetaccia.com
Fri Aug 1 19:01:14 CDT 2008

This series of patches fixes some issues with GdipGetGeneric* functions
when msttcorefonts weren't installed. Now we attempt to fall back to Red Hat's
very similar Liberation Fonts, and failing that we fall back to Tahoma, just
like native.

Also, this should make the font tests Valgrind clean.

(try 2):
    Go on Vitaly Lipatov's advice to add font replacements to the registry
    Fall back to Tahoma, like native. Make the tests cope with this.
    Only complain once about missing fonts.
    Don't skip all the tests if we're missing one font.
    Add a patch to solve problems with Windows 98 failures, and just skip
        the tests if necessary.
 tools/wine.inf.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 4d10778..f6c5888 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -284,11 +284,13 @@ HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x000
 HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%"
+HKLM,%FontSubStr%,"Arial",,"Liberation Sans"
 HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186"
 HKLM,%FontSubStr%,"Arial CE,238",,"Arial,238"
 HKLM,%FontSubStr%,"Arial CYR,204",,"Arial,204"
 HKLM,%FontSubStr%,"Arial Greek,161",,"Arial,161"
 HKLM,%FontSubStr%,"Arial TUR,162",,"Arial,162"
+HKLM,%FontSubStr%,"Courier New",,"Liberation Mono"
 HKLM,%FontSubStr%,"Courier New Baltic,186",,"Courier New,186"
 HKLM,%FontSubStr%,"Courier New CE,238",,"Courier New,238"
 HKLM,%FontSubStr%,"Courier New CYR,204",,"Courier New,204"
@@ -296,8 +298,10 @@ HKLM,%FontSubStr%,"Courier New Greek,161",,"Courier New,161"
 HKLM,%FontSubStr%,"Courier New TUR,162",,"Courier New,162"
 HKLM,%FontSubStr%,"Helv",,"MS Sans Serif"
+HKLM,%FontSubStr%,"Microsoft Sans Serif",,"Liberation Sans"
 HKLM,%FontSubStr%,"MS Shell Dlg 2",,"Tahoma"
 HKLM,%FontSubStr%,"Times",,"Times New Roman"
+HKLM,%FontSubStr%,"Times New Roman",,"Liberation Serif"
 HKLM,%FontSubStr%,"Times New Roman Baltic,186",,"Times New Roman,186"
 HKLM,%FontSubStr%,"Times New Roman CE,238",,"Times New Roman,238"
 HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"

More information about the wine-patches mailing list