Re: gdi: Add a stub for GdipCreateFontFamilyFromName

[Michael Stefaniuc]

Adam Petaccia wrote:
> This patch is needed for me to run Tabula Rasa.
>
> This is my first patch, so please tell if I've broken conventions.

Please add the correct declarations for "struct GpFontCollection" and
"struct GpFontFamily". If you cannot find those on MSDN then check Mono;
that one seems to have them too. But please do not cut'n'paste.

bye
    michael
> diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
> index be60843..e0a781c 100644
> --- a/dlls/gdiplus/font.c
> +++ b/dlls/gdiplus/font.c
> @@ -27,6 +27,9 @@
>
> #include "gdiplus.h"
>  #include "gdiplus_private.h"
> +#include "wine/debug.h"
> -
>
> +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
>
> GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
>      GDIPCONST LOGFONTW *logfont, GpFont **font)
> @@ -99,3 +102,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics,
>  return Ok;
>
> }
> -
>
> +GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, struct GpFontCollection *fontCollection, struct GpFontFamily **FontFamily)
> +{
> - FIXME("GdipCreateFontFamilyFromName: stub!\n");
> -
> - return Ok;
>
> +}
> diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
> index 4aac0df..1fbc57a 100644
> --- a/dlls/gdiplus/gdiplus.spec
> +++ b/dlls/gdiplus/gdiplus.spec
> @@ -85,7 +85,7 @@
>  @ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr)
>  @ stub GdipCreateEffect
>  @ stub GdipCreateFont
> -@ stub GdipCreateFontFamilyFromName
> +@ stdcall GdipCreateFontFamilyFromName(ptr ptr ptr)
>  @ stub GdipCreateFontFromDC
>  @ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr)
>  @ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr)
> diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
> index 09ef83f..cd6a7d5 100644
> --- a/dlls/gdiplus/gdiplus_private.h
> +++ b/dlls/gdiplus/gdiplus_private.h
> @@ -184,4 +184,9 @@ struct GpStringFormat{
>      StringAlignment vertalign;
>  };
>
> +struct GpFontCollection{
> +};
> -
>
> +struct GpFontFamily{
> +};
>  #endif

gdi: Add a stub for GdipCreateFontFamilyFromName

[Adam Petaccia]

On Mon, 2008-03-17 at 11:58 +0100, Michael Stefaniuc wrote:
> Adam Petaccia wrote:
> > This patch is needed for me to run Tabula Rasa.
> >
> > This is my first patch, so please tell if I've broken conventions.
>
> Please add the correct declarations for "struct GpFontCollection" and
> "struct GpFontFamily". If you cannot find those on MSDN then check Mono;
> that one seems to have them too. But please do not cut'n'paste.

I believe they are abstract classes with no members of their own, but
I'm not sure how to write that in C. I'll take a look at similar wine
code in a bit, but does anyone have any pointers on where I should
start?
> bye
>    michael
> > diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
> > index be60843..e0a781c 100644
> > --- a/dlls/gdiplus/font.c
> > +++ b/dlls/gdiplus/font.c
> > @@ -27,6 +27,9 @@
> >
> > #include "gdiplus.h"
> >  #include "gdiplus_private.h"
> > +#include "wine/debug.h"
> > -
> >
> > +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
> >
> > GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
> >      GDIPCONST LOGFONTW *logfont, GpFont **font)
> > @@ -99,3 +102,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics,
> >  return Ok;
> >
> > }
> > -
> >
> > +GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, struct GpFontCollection *fontCollection, struct GpFontFamily **FontFamily)
> > +{
> > - FIXME("GdipCreateFontFamilyFromName: stub!\n");
> > -
> > - return Ok;
> >
> > +}
> > diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
> > index 4aac0df..1fbc57a 100644
> > --- a/dlls/gdiplus/gdiplus.spec
> > +++ b/dlls/gdiplus/gdiplus.spec
> > @@ -85,7 +85,7 @@
> >  @ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr)
> >  @ stub GdipCreateEffect
> >  @ stub GdipCreateFont
> > -@ stub GdipCreateFontFamilyFromName
> > +@ stdcall GdipCreateFontFamilyFromName(ptr ptr ptr)
> >  @ stub GdipCreateFontFromDC
> >  @ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr)
> >  @ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr)
> > diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
> > index 09ef83f..cd6a7d5 100644
> > --- a/dlls/gdiplus/gdiplus_private.h
> > +++ b/dlls/gdiplus/gdiplus_private.h
> > @@ -184,4 +184,9 @@ struct GpStringFormat{
> >      StringAlignment vertalign;
> >  };
> >
> > +struct GpFontCollection{
> > +};
> > -
> >
> > +struct GpFontFamily{
> > +};
> >  #endif