GDI32: [1/5] freetype.c add more font selecting&linking mechanism support.

Huw D M Davies h.davies1 at physics.ox.ac.uk
Tue Mar 7 08:22:48 CST 2006


On Tue, Mar 07, 2006 at 09:10:12PM +0900, Byeong-Sik Jeon wrote:
> ChangeLog:
> 	init_system_links support .ttc file.
> 	add "Tahoma" registry value for CJK font link.
> 	find_face_from_filename support .ttc file
>

I think you could spilt out the 'add Tahoma registry value' bit from
this patch to make it a little smaller.
 
> --- 000/dlls/gdi/freetype.c	2006-03-07 19:09:53.000000000 +0900
> +++ 001/dlls/gdi/freetype.c	2006-03-07 20:28:14.000000000 +0900
> @@ -909,14 +935,16 @@
>      SYSTEM_LINKS *font_link, *system_font_link;
>      CHILD_FONT *child_font;
>      static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0};
> -    static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0};
> -    static const WCHAR System[] = {'S','y','s','t','e','m',0};
> +    static const char Tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0};

Why don't you just use "tahoma.ttf" in the code where you call
find_face_from_filename, there's no point in initializing a char
string like this.

> @@ -990,15 +1046,15 @@
>         that Tahoma has */
>  
>      system_font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*system_font_link));
> -    system_font_link->font_name = strdupW(System);
> +    system_font_link->font_name = strdupW(defSystem);

Please don't use defSystem here.  That's supposed to be a fallback for
System.  Please leave it as it was.

-- 
Huw Davies
huw at codeweavers.com



More information about the wine-devel mailing list