July 2008 - Wine-commits - list.winehq.org

Adam Petaccia : gdiplus: Stub GdipGetCellAscent.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 15831e0a0a952e45861f77f37bfcf9aa364a1a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15831e0a0a952e45861f77f37… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:33 2008 -0400 gdiplus: Stub GdipGetCellAscent. --- dlls/gdiplus/font.c | 9 +++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index c2556cd..a5e3b01 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -491,6 +491,15 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return Ok; } +GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellAscent) +{ + if (!(family && CellAscent)) return InvalidParameter; + + FIXME("stub!\n"); + + return NotImplemented; +} + /******************************************************************************* * GdipGetEmHeight [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 971eafd..d054503 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -242,7 +242,7 @@ @ stub GdipGetAdjustableArrowCapWidth @ stub GdipGetAllPropertyItems @ stdcall GdipGetBrushType(ptr ptr) -@ stub GdipGetCellAscent +@ stdcall GdipGetCellAscent(ptr long ptr) @ stub GdipGetCellDescent @ stdcall GdipGetClip(ptr ptr) @ stub GdipGetClipBounds diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index aba8bd9..cd940f0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -378,6 +378,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); +GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*);

1 0

Adam Petaccia : gdiplus: Stub GdipGetEmHeight.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 33cb831f24c494feae5be0fccc10c0ed94478ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cb831f24c494feae5be0fcc… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:30 2008 -0400 gdiplus: Stub GdipGetEmHeight. --- dlls/gdiplus/font.c | 24 ++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 988a568..c2556cd 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -492,6 +492,30 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) } /******************************************************************************* + * GdipGetEmHeight [GDIPLUS.@] + * + * Gets the height of the specified family in EmHeights + * + * PARAMS + * family [I] Family to retrieve from + * style [I] (optional) style + * EmHeight [O] return value + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter + */ +GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, UINT16* EmHeight) +{ + if (!(family && EmHeight)) return InvalidParameter; + + FIXME("Stub!\n"); + + return NotImplemented; +} + + +/******************************************************************************* * GdipGetLineSpacing [GDIPLUS.@] * * Returns the line spacing in design units diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4af8fb8..971eafd 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -260,7 +260,7 @@ @ stdcall GdipGetDpiY(ptr ptr) @ stub GdipGetEffectParameterSize @ stub GdipGetEffectParameters -@ stub GdipGetEmHeight +@ stdcall GdipGetEmHeight(ptr long ptr) @ stub GdipGetEncoderParameterList @ stub GdipGetEncoderParameterListSize @ stub GdipGetFamily diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0cc3448..aba8bd9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -378,6 +378,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); +GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**);

1 0

Adam Petaccia : gdiplus: Stub GdipGetLineSpacing.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 45c3d74cadbe32d6bc247b775b3c1b72665c3864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c3d74cadbe32d6bc247b775… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:27 2008 -0400 gdiplus: Stub GdipGetLineSpacing. --- dlls/gdiplus/font.c | 24 ++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0919b66..988a568 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -491,6 +491,30 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return Ok; } +/******************************************************************************* + * GdipGetLineSpacing [GDIPLUS.@] + * + * Returns the line spacing in design units + * + * PARAMS + * family [I] Family to retrieve from + * style [I] (Optional) font style + * LineSpacing [O] Return value + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter (family or LineSpacing was NULL) + */ +GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, + INT style, UINT16* LineSpacing) +{ + if (!(family && LineSpacing)) return InvalidParameter; + + FIXME("stub!\n"); + + return NotImplemented; +} + /***************************************************************************** * GdipGetGenericFontFamilyMonospace [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 741c569..4af8fb8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -308,7 +308,7 @@ @ stub GdipGetLinePresetBlendCount @ stdcall GdipGetLineRect(ptr ptr) @ stdcall GdipGetLineRectI(ptr ptr) -@ stub GdipGetLineSpacing +@ stdcall GdipGetLineSpacing(ptr long ptr) @ stub GdipGetLineTransform @ stub GdipGetLineWrapMode @ stub GdipGetLogFontA diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5532966..0cc3448 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -378,6 +378,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); +GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily**); GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily**);

1 0

Adam Petaccia : gdiplus: test_getgenerics: Don' t use a pointer-to-pointer construct.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 148f184c236594ce6e47c9da386abae2eb2be27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=148f184c236594ce6e47c9da3… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:01 2008 -0400 gdiplus: test_getgenerics: Don't use a pointer-to-pointer construct. --- dlls/gdiplus/tests/font.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 38d807b..2178c84 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -187,42 +187,38 @@ static void test_fontfamily (void) static void test_getgenerics (void) { GpStatus stat; - GpFontFamily** family; + GpFontFamily* family; WCHAR familyName[LF_FACESIZE]; ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); - family = GdipAlloc (sizeof (GpFontFamily*)); - - stat = GdipGetGenericFontFamilySansSerif (family); + stat = GdipGetGenericFontFamilySansSerif (&family); expect (Ok, stat); - stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + 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); + stat = GdipDeleteFontFamily (family); expect (Ok, stat); - stat = GdipGetGenericFontFamilySerif (family); + stat = GdipGetGenericFontFamilySerif (&family); expect (Ok, stat); - stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + 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); + stat = GdipDeleteFontFamily (family); expect (Ok, stat); - stat = GdipGetGenericFontFamilyMonospace (family); + stat = GdipGetGenericFontFamilyMonospace (&family); expect (Ok, stat); - stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL); + 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); + stat = GdipDeleteFontFamily (family); expect (Ok, stat); - - GdipFree (family); } START_TEST(font)

1 0

Adam Petaccia : gdiplus: Stub GdipCloneFontFamily.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: cbce6180676c013837d2c16d6f43f5d6c035d52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbce6180676c013837d2c16d6… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:06 2008 -0400 gdiplus: Stub GdipCloneFontFamily. --- dlls/gdiplus/font.c | 22 ++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6319252..6ad0502 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -396,6 +396,28 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, } /******************************************************************************* + * GdipCloneFontFamily [GDIPLUS.@] + * + * Creates a deep copy of a Font Family object + * + * PARAMS + * FontFamily [I] Font to clone + * clonedFontFamily [O] The resulting cloned font + * + * RETURNS + * SUCCESS: Ok + */ +GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** clonedFontFamily) +{ + if (!(FontFamily && clonedFontFamily)) return InvalidParameter; + + FIXME("stub: %p (%s), %p\n", FontFamily, + debugstr_w(FontFamily->FamilyName), clonedFontFamily); + + return NotImplemented; +} + +/******************************************************************************* * GdipGetFamilyName [GDIPLUS.@] * * Returns the family name into name diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 35657aa..741c569 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -51,7 +51,7 @@ @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) @ stdcall GdipCloneFont(ptr ptr) -@ stub GdipCloneFontFamily +@ stdcall GdipCloneFontFamily(ptr ptr) @ stdcall GdipCloneImage(ptr ptr) @ stdcall GdipCloneImageAttributes(ptr ptr) @ stdcall GdipCloneMatrix(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0859ad7..5532966 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -375,6 +375,7 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**); +GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID);

1 0

Adam Petaccia : gdiplus: Implement GdipCloneFontFamily.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 638f63d13f7a046d13ad0b69018af372c63f79eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=638f63d13f7a046d13ad0b690… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:22 2008 -0400 gdiplus: Implement GdipCloneFontFamily. --- dlls/gdiplus/font.c | 19 +++++++++++++++++-- dlls/gdiplus/tests/font.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6ad0502..0919b66 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -411,10 +411,25 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** { if (!(FontFamily && clonedFontFamily)) return InvalidParameter; - FIXME("stub: %p (%s), %p\n", FontFamily, + TRACE("stub: %p (%s), %p\n", FontFamily, debugstr_w(FontFamily->FamilyName), clonedFontFamily); - return NotImplemented; + *clonedFontFamily = GdipAlloc(sizeof(GpFontFamily)); + if (!*clonedFontFamily) return OutOfMemory; + + **clonedFontFamily = *FontFamily; + + (*clonedFontFamily)->FamilyName = GdipAlloc(sizeof(WCHAR) * LF_FACESIZE); + if (!(*clonedFontFamily)->FamilyName) + { + GdipFree (clonedFontFamily); + return OutOfMemory; + } + + lstrcpynW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName, + LF_FACESIZE); + + return Ok; } /******************************************************************************* diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2178c84..0aa597d 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -150,7 +150,7 @@ static void test_logfont(void) static void test_fontfamily (void) { - GpFontFamily* family; + GpFontFamily *family, *clonedFontFamily; WCHAR itsName[LF_FACESIZE]; GpStatus stat; @@ -180,7 +180,16 @@ static void test_fontfamily (void) expect (Ok, stat); } + /* Make sure we don't read old data */ + ZeroMemory (itsName, sizeof(itsName)); + stat = GdipCloneFontFamily(family, &clonedFontFamily); + expect (Ok, stat); GdipDeleteFontFamily(family); + stat = GdipGetFamilyName(clonedFontFamily, itsName, LANG_NEUTRAL); + expect(Ok, stat); + expect(0, lstrcmpiW(itsName, arial)); + + GdipDeleteFontFamily(clonedFontFamily); }

1 0

Adam Petaccia : gdiplus: Valgrind: fix warnings about using uninitialized memory, and leaking memory.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 7e245060ef73aa37d5924551d62ae23c5ad477e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e245060ef73aa37d5924551d… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:25:41 2008 -0400 gdiplus: Valgrind: fix warnings about using uninitialized memory, and leaking memory. --- dlls/gdiplus/font.c | 3 +++ dlls/gdiplus/tests/font.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 78de0a6..6319252 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -370,6 +370,9 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, hdc = GetDC(0); lstrcpynW(lfw.lfFaceName, name, sizeof(WCHAR) * LF_FACESIZE); + lfw.lfCharSet = DEFAULT_CHARSET; + lfw.lfEscapement = lfw.lfOrientation = 0; + hFont = CreateFontIndirectW (&lfw); hfont_old = SelectObject(hdc, hFont); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 59a8d53..1aed45f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -76,6 +76,8 @@ static void test_createfont(void) expect (i, unit); GdipDeleteFont(font); } + + GdipDeleteFontFamily(fontfamily); } static void test_logfont(void)

1 0

Adam Petaccia : gdiplus: test_fontfamily: Don' t use a pointer-to-pointer construct.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 45ee7577c49c672c7684d83513def38f327288a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ee7577c49c672c7684d8351… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:25:56 2008 -0400 gdiplus: test_fontfamily: Don't use a pointer-to-pointer construct. --- dlls/gdiplus/tests/font.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1aed45f..38d807b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -150,49 +150,37 @@ static void test_logfont(void) static void test_fontfamily (void) { - GpFontFamily** family = NULL; + GpFontFamily* family; WCHAR itsName[LF_FACESIZE]; GpStatus stat; /* FontFamily can not be NULL */ - stat = GdipCreateFontFamilyFromName (arial , NULL, family); + stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); 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 + * If it can't, any subsequent calls should fail. */ - stat = GdipCreateFontFamilyFromName (nonexistant, NULL, family); + stat = GdipCreateFontFamilyFromName (nonexistant, NULL, &family); expect (FontFamilyNotFound, stat); - stat = GdipGetFamilyName (*family,itsName, LANG_NEUTRAL); - expect (InvalidParameter, stat); - ok ((lstrcmpiW(itsName,nonexistant) != 0), + 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); + stat = GdipCreateFontFamilyFromName (arial, NULL, &family); expect (Ok, stat); - stat = GdipGetFamilyName (*family, itsName, LANG_NEUTRAL); + stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName,arial)); + expect (0, lstrcmpiW(itsName, arial)); if (0) { /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (*family, NULL, LANG_NEUTRAL); + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); expect (Ok, stat); } - stat = GdipDeleteFontFamily(*family); - expect (Ok, stat); - - GdipFree (family); + GdipDeleteFontFamily(family); }

1 0

Jeff Smith : gdiplus: Fix spec definition of GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: f3b14ac72319e83f07aa492c9146c59c18b86539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b14ac72319e83f07aa492c9… Author: Jeff Smith <whydoubt(a)yahoo.com> Date: Thu Jul 3 23:12:14 2008 -0500 gdiplus: Fix spec definition of GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 04e0eb5..35657aa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -75,7 +75,7 @@ @ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @ stub GdipCreateBitmapFromGdiDib @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) -@ stdcall GdipCreateBitmapFromHBITMAP(ptr ptr ptr) +@ stdcall GdipCreateBitmapFromHBITMAP(long long ptr) @ stub GdipCreateBitmapFromHICON @ stub GdipCreateBitmapFromResource @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr)

1 0

Jeff Smith : gdiplus: Remove duplicate forward declaration of class GpGraphics.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 27ee7c0119524d5003a8647f866cf42711424793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ee7c0119524d5003a8647f8… Author: Jeff Smith <whydoubt(a)yahoo.com> Date: Thu Jul 3 22:32:12 2008 -0500 gdiplus: Remove duplicate forward declaration of class GpGraphics. --- include/gdiplusgpstubs.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index e2f8ab7..a1878f6 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -22,7 +22,6 @@ #ifdef __cplusplus class GpGraphics {}; -class GpGraphics {}; class GpBrush {}; class GpSolidFill : public GpBrush {}; class GpPath {};

1 0