June 2008 - Wine-Commits - list.winehq.org

Adam Petaccia : gdiplus: Tests for GetGeneric*.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: bda6adc5e7ce3dbb3555d20e190475a6e0b93795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda6adc5e7ce3dbb3555d20e1… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:52 2008 -0400 gdiplus: Tests for GetGeneric*. --- dlls/gdiplus/tests/font.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b653089..5cc9bc2 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -31,6 +31,13 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_logfont(void) { LOGFONTW lfw, lfw2; @@ -147,6 +154,47 @@ static void test_fontfamily (void) } +static void test_getgenerics (void) +{ + GpStatus stat; + GpFontFamily** family; + WCHAR familyName[LF_FACESIZE]; + ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); + + family = GdipAlloc (sizeof (GpFontFamily*)); + + stat = GdipGetGenericFontFamilySansSerif (family); + expect (Ok, stat); + stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + expect (Ok, stat); + ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) || + (lstrcmpiW(familyName,MSSansSerif) == 0), + "Expected Microsoft Sans Serif or MS Sans Serif, got %s\n", + debugstr_w(familyName)); + stat = GdipDeleteFontFamily (*family); + expect (Ok, stat); + + stat = GdipGetGenericFontFamilySerif (family); + expect (Ok, stat); + stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + expect (Ok, stat); + ok (lstrcmpiW(familyName, TimesNewRoman) == 0, + "Expected Times New Roman, got %s\n", debugstr_w(familyName)); + stat = GdipDeleteFontFamily (*family); + expect (Ok, stat); + + stat = GdipGetGenericFontFamilyMonospace (family); + expect (Ok, stat); + stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + expect (Ok, stat); + ok (lstrcmpiW(familyName, CourierNew) == 0, + "Expected Courier New, got %s\n", debugstr_w(familyName)); + stat = GdipDeleteFontFamily (*family); + expect (Ok, stat); + + GdipFree (family); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -161,6 +209,7 @@ START_TEST(font) test_logfont(); test_fontfamily(); + test_getgenerics(); GdiplusShutdown(gdiplusToken); }

1 0

Adam Petaccia : gdiplus: Tests for FontFamily.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: ced3d81b1a06750e20882bb42ce9354663bd557b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced3d81b1a06750e20882bb42… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:51 2008 -0400 gdiplus: Tests for FontFamily. --- dlls/gdiplus/tests/font.c | 56 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 71e6f9a..b653089 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -24,7 +24,12 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -static WCHAR arial[] = {'A','r','i','a','l','\0'}; +static const WCHAR arial[] = {'A','r','i','a','l','\0'}; +static const WCHAR nonexistant[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; +static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; +static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; +static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; +static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static void test_logfont(void) { @@ -94,6 +99,54 @@ static void test_logfont(void) ReleaseDC(0, hdc); } +static void test_fontfamily (void) +{ + GpFontFamily** family = NULL; + WCHAR itsName[LF_FACESIZE]; + GpStatus stat; + + /* FontFamily can not be NULL */ + stat = GdipCreateFontFamilyFromName (arial , NULL, family); + expect (InvalidParameter, stat); + + family = GdipAlloc (sizeof (GpFontFamily*)); + + /* FontFamily must be able to actually find the family. + * If it can't, any subsequent calls should fail + * + * We currently fail (meaning we don't) because we don't actually + * test to see if we can successfully get a family + */ + stat = GdipCreateFontFamilyFromName (nonexistant, NULL, family); + expect (FontFamilyNotFound, stat); + stat = GdipGetFamilyName (*family,itsName, LANG_NEUTRAL); + expect (InvalidParameter, stat); + ok ((lstrcmpiW(itsName,nonexistant) != 0), + "Expected a non-zero value for nonexistant font!\n"); + stat = GdipDeleteFontFamily(*family); + expect (InvalidParameter, stat); + + stat = GdipCreateFontFamilyFromName (arial, NULL, family); + expect (Ok, stat); + + stat = GdipGetFamilyName (*family, itsName, LANG_NEUTRAL); + expect (Ok, stat); + expect (0, lstrcmpiW(itsName,arial)); + + if (0) + { + /* Crashes on Windows XP SP2, Vista, and so Wine as well */ + stat = GdipGetFamilyName (*family, NULL, LANG_NEUTRAL); + expect (Ok, stat); + } + + stat = GdipDeleteFontFamily(*family); + expect (Ok, stat); + + if (family) GdipFree (family); +} + + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -107,6 +160,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_logfont(); + test_fontfamily(); GdiplusShutdown(gdiplusToken); }

1 0

Adam Petaccia : gdiplus: Implement GdipGetGeneric*.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: d6bad2d6de6e9175ff7c32521d3a9f5e209abe3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bad2d6de6e9175ff7c32521… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:50 2008 -0400 gdiplus: Implement GdipGetGeneric*. --- dlls/gdiplus/font.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 6 ++-- include/gdiplusflat.h | 4 +++ 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f38261d..fe514a3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -278,3 +278,68 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return Ok; } + +/***************************************************************************** + * GdipGetGenericFontFamilyMonospace [GDIPLUS.@] + * + * Obtains a serif family (Courier New on Windows) + * + * PARAMS + * **nativeFamily [I] Where the font will be stored + * + * RETURNS + * InvalidParameter if nativeFamily is NULL. + * Ok otherwise. + */ +GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamily) +{ + static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; + + if (nativeFamily == NULL) return InvalidParameter; + + return GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); +} + +/***************************************************************************** + * GdipGetGenericFontFamilySerif [GDIPLUS.@] + * + * Obtains a serif family (Times New Roman on Windows) + * + * PARAMS + * **nativeFamily [I] Where the font will be stored + * + * RETURNS + * InvalidParameter if nativeFamily is NULL. + * Ok otherwise. + */ +GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) +{ + static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; + + if (nativeFamily == NULL) return InvalidParameter; + + return GdipCreateFontFamilyFromName(TimesNewRoman, NULL, nativeFamily); +} + +/***************************************************************************** + * GdipGetGenericFontFamilySansSerif [GDIPLUS.@] + * + * Obtains a serif family (Microsoft Sans Serif on Windows) + * + * PARAMS + * **nativeFamily [I] Where the font will be stored + * + * RETURNS + * InvalidParameter if nativeFamily is NULL. + * Ok otherwise. + */ +GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamily) +{ + /* FIXME: On Windows this is called Microsoft Sans Serif, this shouldn't + * affect anything */ + static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + + if (nativeFamily == NULL) return InvalidParameter; + + return GdipCreateFontFamilyFromName(MSSansSerif, NULL, nativeFamily); +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0b093a4..7b71fc8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -272,9 +272,9 @@ @ stub GdipGetFontSize @ stub GdipGetFontStyle @ stub GdipGetFontUnit -@ stub GdipGetGenericFontFamilyMonospace -@ stub GdipGetGenericFontFamilySansSerif -@ stub GdipGetGenericFontFamilySerif +@ stdcall GdipGetGenericFontFamilyMonospace(ptr) +@ stdcall GdipGetGenericFontFamilySansSerif(ptr) +@ stdcall GdipGetGenericFontFamilySerif(ptr) @ stub GdipGetHatchBackgroundColor @ stub GdipGetHatchForegroundColor @ stub GdipGetHatchStyle diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fb4fbfc..b4cde21 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -353,6 +353,10 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); +GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**); +GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**); +GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily**); + GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*);

1 0

Adam Petaccia : gdiplus: Implement GdipGetFamilyName.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: ce4b414845234eb78c507c0b0c0dc441436388f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4b414845234eb78c507c0b0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:49 2008 -0400 gdiplus: Implement GdipGetFamilyName. --- dlls/gdiplus/font.c | 33 +++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ec591c1..f38261d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -219,6 +219,39 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, return Ok; } +/******************************************************************************* + * GdipGetFamilyName [GDIPLUS.@] + * + * Returns the family name into name + * + * PARAMS + * *family [I] Family to retrieve from + * *name [O] WCHARS of the family name + * LANGID [I] charset + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter if family is NULL + * + * NOTES + * If name is a NULL ptr, then both XP and Vista will crash (so we do as well) + */ +GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, + WCHAR *name, LANGID language) +{ + if (family == NULL) + return InvalidParameter; + + TRACE("%p, %p, %d\n", family, name, language); + + if (language != LANG_NEUTRAL) + FIXME("No support for handling of multiple languages!\n"); + + lstrcpynW (name, family->FamilyName, LF_FACESIZE); + + return Ok; +} + /***************************************************************************** * GdipDeleteFontFamily [GDIPLUS.@] diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b88298e..0b093a4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -264,7 +264,7 @@ @ stub GdipGetEncoderParameterList @ stub GdipGetEncoderParameterListSize @ stub GdipGetFamily -@ stub GdipGetFamilyName +@ stdcall GdipGetFamilyName(ptr ptr long) @ stub GdipGetFontCollectionFamilyCount @ stub GdipGetFontCollectionFamilyList @ stub GdipGetFontHeight diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cb6ca01..fb4fbfc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -351,6 +351,7 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); +GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Adam Petaccia : gdiplus: Implement GdipDeleteFontFamily.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: d5b8c9d8704ef2c5af60e8f48290d6d642630e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b8c9d8704ef2c5af60e8f48… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:48 2008 -0400 gdiplus: Implement GdipDeleteFontFamily. --- dlls/gdiplus/font.c | 27 +++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index b3e49c4..ec591c1 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -218,3 +218,30 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, return Ok; } + + +/***************************************************************************** + * GdipDeleteFontFamily [GDIPLUS.@] + * + * Removes the specified FontFamily + * + * PARAMS + * *FontFamily [I] The family to delete + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter if FontFamily is NULL. + * + */ +GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) +{ + if (!FontFamily) + return InvalidParameter; + TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName)); + + if (FontFamily->FamilyName) GdipFree (FontFamily->FamilyName); + if (FontFamily->tmw) GdipFree (FontFamily->tmw); + GdipFree (FontFamily); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2af90ea..b88298e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -141,7 +141,7 @@ @ stdcall GdipDeleteCustomLineCap(ptr) @ stub GdipDeleteEffect @ stdcall GdipDeleteFont(ptr) -@ stub GdipDeleteFontFamily +@ stdcall GdipDeleteFontFamily(ptr) @ stdcall GdipDeleteGraphics(ptr) @ stdcall GdipDeleteMatrix(ptr) @ stdcall GdipDeletePath(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index aa9c6dc..cb6ca01 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -350,6 +350,7 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**); +GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

Adam Petaccia : gdiplus: Implement GdipCreateFontFamilyFromName.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: e8e1d0f6fe51507195fdaaee5e07cef5ca97a9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e1d0f6fe51507195fdaaee5… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:47 2008 -0400 gdiplus: Implement GdipCreateFontFamilyFromName. --- dlls/gdiplus/font.c | 88 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 9 ++++ include/gdiplusflat.h | 3 + include/gdiplusgpstubs.h | 4 ++ 5 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 82523ce..b3e49c4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -22,6 +22,10 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); #include "objbase.h" @@ -130,3 +134,87 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) return Ok; } + +/* Borrowed from GDI32 */ +static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, + const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const WCHAR *name) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, 0)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + +/******************************************************************************* + * GdipCreateFontFamilyFromName [GDIPLUS.@] + * + * Creates a font family object based on a supplied name + * + * PARAMS + * name [I] Name of the font + * fontCollection [I] What font collection (if any) the font belongs to (may be NULL) + * FontFamily [O] Pointer to the resulting FontFamily object + * + * RETURNS + * SUCCESS: Ok + * FAILURE: FamilyNotFound if the requested FontFamily does not exist on the system + * FAILURE: Invalid parameter if FontFamily or name is NULL + * + * NOTES + * If fontCollection is NULL then the object is not part of any collection + * + */ + +GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, + GpFontCollection *fontCollection, + GpFontFamily **FontFamily) +{ + GpFontFamily* ffamily; + HDC hdc; + HFONT hFont; + LOGFONTW lfw; + + TRACE("%s, %p %p\n", debugstr_w(name), fontCollection, FontFamily); + + if (!(name && FontFamily)) + return InvalidParameter; + if (fontCollection) + FIXME("No support for FontCollections yet!\n"); + if (!is_font_installed(name)) + return FontFamilyNotFound; + + ffamily = GdipAlloc(sizeof (GpFontFamily)); + if (!ffamily) return OutOfMemory; + ffamily->tmw = GdipAlloc(sizeof (TEXTMETRICW)); + if (!ffamily->tmw) {GdipFree (ffamily); return OutOfMemory;} + + hdc = GetDC(0); + lstrcpynW(lfw.lfFaceName, name, sizeof(WCHAR) * LF_FACESIZE); + hFont = CreateFontIndirectW (&lfw); + SelectObject(hdc, hFont); + + GetTextMetricsW(hdc, ffamily->tmw); + + ffamily->FamilyName = GdipAlloc(LF_FACESIZE * sizeof (WCHAR)); + if (!ffamily->FamilyName) + { + GdipFree(ffamily); + return OutOfMemory; + } + + lstrcpynW(ffamily->FamilyName, name, sizeof(WCHAR) * LF_FACESIZE); + + *FontFamily = ffamily; + ReleaseDC(0, hdc); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8d7c892..2af90ea 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(wstr ptr ptr) @ stdcall GdipCreateFontFromDC(long ptr) @ stdcall GdipCreateFontFromLogfontA(long ptr ptr) @ stdcall GdipCreateFontFromLogfontW(long ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 539254b..acda374 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -185,4 +185,13 @@ struct GpStringFormat{ StringAlignment vertalign; }; +struct GpFontCollection{ + GpFontFamily* FontFamilies; +}; + +struct GpFontFamily{ + TEXTMETRICW* tmw; + WCHAR* FamilyName; +}; + #endif diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 07c60f1..aa9c6dc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -348,6 +348,9 @@ GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); +GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, + GpFontCollection*, GpFontFamily**); + GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index c5e676d..e2f8ab7 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -37,6 +37,8 @@ class GpPathGradient : public GpBrush {}; class GpLineGradient : public GpBrush {}; class GpTexture : public GpBrush {}; class GpFont {}; +class GpFontCollection {}; +class GpFontFamily {}; class GpStringFormat {}; class GpRegion {}; class CGpEffect {}; @@ -59,6 +61,8 @@ typedef struct GpPathGradient GpPathGradient; typedef struct GpLineGradient GpLineGradient; typedef struct GpTexture GpTexture; typedef struct GpFont GpFont; +typedef struct GpFontCollection GpFontCollection; +typedef struct GpFontFamily GpFontFamily; typedef struct GpStringFormat GpStringFormat; typedef struct GpRegion GpRegion; typedef struct CGpEffect CGpEffect;

1 0

Huw Davies : localspl: Ensure that we load winspool before spoolss to work around a circular dependence .
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 2ea9e28dbd26229224c3545d15b4b79bf8c354f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea9e28dbd26229224c3545d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 25 17:12:25 2008 +0100 localspl: Ensure that we load winspool before spoolss to work around a circular dependence. --- dlls/localspl/tests/localmon.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 4d75a4c..26eea89 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -1356,6 +1356,7 @@ START_TEST(localmon) DWORD numentries; DWORD res; + LoadLibraryA("winspool.drv"); /* This DLL does not exist on Win9x */ hdll = LoadLibraryA("localspl.dll"); if (!hdll) {

1 0

H. Verbeet : d3d9: Unset the pixel shader at the end of cnd_test().
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 674b3b84e964d8552ae92388bfec44c13f7f9623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674b3b84e964d8552ae92388b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 25 17:09:35 2008 +0200 d3d9: Unset the pixel shader at the end of cnd_test(). This prevents failures in subsequent tests when no PS2.0 support is present. --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 56159fd..611a589 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4891,6 +4891,9 @@ static void cnd_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %s\n", DXGetErrorString9(hr)); + /* This is the 1.4 test. The coissue doesn't change the behavior here, but keep in mind * that we swapped the values in c1 and c2 to make the other tests return some color */

1 0

H. Verbeet : d3d: Allow more imprecision in the texop test.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 873c0afb82ac6e1744dacee750524fb60daabb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=873c0afb82ac6e1744dacee75… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 25 17:09:16 2008 +0200 d3d: Allow more imprecision in the texop test. --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 893a93f..5dbc125 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1260,7 +1260,7 @@ static void texop_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x (%s)\n", hr, DXGetErrorString8(hr)); color = getPixelColor(device, 320, 240); - ok(color_match(color, test_data[i].result, 1), "Operation %s returned color 0x%08x, expected 0x%08x\n", + ok(color_match(color, test_data[i].result, 3), "Operation %s returned color 0x%08x, expected 0x%08x\n", test_data[i].name, color, test_data[i].result); } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1a9b5fc..56159fd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9202,7 +9202,7 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x (%s)\n", hr, DXGetErrorString9(hr)); color = getPixelColor(device, 320, 240); - ok(color_match(color, test_data[i].result, 1), "Operation %s returned color 0x%08x, expected 0x%08x\n", + ok(color_match(color, test_data[i].result, 3), "Operation %s returned color 0x%08x, expected 0x%08x\n", test_data[i].name, color, test_data[i].result); }

1 0

James Hawkins : msi: Don' t overwrite a file that has a greater or equal version to the source file.
by Alexandre Julliard June 25, 2008

June 25, 2008

Module: wine Branch: master Commit: 89a8cfdb537a1c48bdc48d26f038fb7744c79040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a8cfdb537a1c48bdc48d26f… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 23 23:41:22 2008 -0500 msi: Don't overwrite a file that has a greater or equal version to the source file. --- dlls/msi/files.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c6e70d9..08c1959 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -459,6 +459,24 @@ done: return ret; } +/* compares the version of a file read from the filesystem and + * the version specified in the File table + */ +static int msi_compare_file_version(MSIFILE *file) +{ + WCHAR version[MAX_PATH]; + DWORD size; + UINT r; + + size = MAX_PATH; + version[0] = '\0'; + r = MsiGetFileVersionW(file->TargetPath, version, &size, NULL, NULL); + if (r != ERROR_SUCCESS) + return 0; + + return lstrcmpW(version, file->Version); +} + void msi_free_media_info( MSIMEDIAINFO *mi ) { msi_free( mi->disk_prompt ); @@ -802,6 +820,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) continue; } + if (MsiGetFileVersionW(file->TargetPath, NULL, NULL, NULL, NULL) == ERROR_SUCCESS && + msi_compare_file_version(file) >= 0) + { + TRACE("Destination file version greater, not overwriting\n"); + continue; + } + if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) { @@ -972,24 +997,6 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package) return rc; } -/* compares the version of a file read from the filesystem and - * the version specified in the File table - */ -static int msi_compare_file_version( MSIFILE *file ) -{ - WCHAR version[MAX_PATH]; - DWORD size; - UINT r; - - size = MAX_PATH; - version[0] = '\0'; - r = MsiGetFileVersionW( file->TargetPath, version, &size, NULL, NULL ); - if ( r != ERROR_SUCCESS ) - return 0; - - return lstrcmpW( version, file->Version ); -} - UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { MSIFILE *file;

1 0