On 6/25/07, Michael Stefaniuc <mstefani(a)redhat.de> wrote:
> I have no way to test this patch as i don't have a Mac.
>
> bye
> michael
> ---
> dlls/gdi32/freetype.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
> index 424fb3d..bcf16ae 100644
> --- a/dlls/gdi32/freetype.c
> +++ b/dlls/gdi32/freetype.c
> @@ -590,6 +590,7 @@ static char **expand_mac_font(const char *path)
> unsigned short *num_faces_ptr, num_faces, face;
> AsscEntry *assoc;
> Handle fond;
> + ResType fond_res = 0x464f4e44 /* 'FOND' */;
>
> fond = Get1IndResource('FOND', idx);
> if(!fond) break;
Did you mean to replace 'FOND' in the Get1IndResource call with fond_res?
> @@ -605,6 +606,7 @@ static char **expand_mac_font(const char *path)
> for(face = 0; face < num_faces; face++, assoc++)
> {
> Handle sfnt;
> + ResType sfnt_res = 0x73666e74 /* 'sfnt' */
> unsigned short size, font_id;
> char *output;
>
> @@ -617,7 +619,7 @@ static char **expand_mac_font(const char *path)
> }
>
> TRACE("trying to load sfnt id %04x\n", font_id);
> - sfnt = GetResource('sfnt', font_id);
> + sfnt = GetResource(sfnt_res, font_id);
> if(!sfnt)
> {
> TRACE("can't get sfnt resource %04x\n", font_id);
> --
> 1.5.0.6
>
--
James Hawkins