Fonts (+liberation again...)

[Louis. Lenders]

Skipped content of type multipart/alternative-------------- next part --------------
diff --git a/Make.rules.in b/Make.rules.in
index a32b276..257598e 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -126,7 +126,7 @@ LINTS  = $(C_SRCS:.c=.ln)
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c
+.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .ttf2sfd .man.in .man _c.c _i.c _p.c _s.c
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -179,6 +179,9 @@ LINTS  = $(C_SRCS:.c=.ln)
 .c.ok:
 	$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
 
+.ttf2sfd.sfd:
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/$< $< $@
+
 .sfd.ttf:
 	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
diff --git a/configure b/configure
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 2a69d6a..35d1e71 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -47,11 +47,16 @@ BITMAP_FONTS  = \
 	vgas1257.fon \
 	vgas874.fon
 
+TTF2SFD = \
+        arial.sfd
+
 TRUETYPE_FONTS = \
-	marlett.ttf
+	marlett.ttf \
+        arial.ttf
 
 FONTS = \
 	$(BITMAP_FONTS) \
+	$(TTF2SFD) \
 	$(TRUETYPE_FONTS)
 
 all: $(FONTS)
diff --git a/fonts/arial.ttf2sfd b/fonts/arial.ttf2sfd
new file mode 100644
index 0000000..2ce704e
--- /dev/null
+++ b/fonts/arial.ttf2sfd
@@ -0,0 +1,3 @@
+Open("/usr/share/fonts/liberation/LiberationSans-Regular.ttf");
+SetFontNames("ArialMT", "Arial", "Arial");
+Generate($2);
diff --git a/include/setupapi.h b/include/setupapi.h
diff --git a/tools/wine.inf b/tools/wine.inf