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

Andrew Talbot : gdi32: Pass correct pointer value to HeapFree().
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 1dcc70ac17f7f82ccee3b3187a89461955426174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcc70ac17f7f82ccee3b3187… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 26 23:00:36 2008 +0100 gdi32: Pass correct pointer value to HeapFree(). --- dlls/gdi32/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 20a009a..91e41e7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2910,13 +2910,13 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a */ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) { - ABC *abc; + ABC *abc, *abc_base; unsigned int i, size = sizeof(ABC) * (last - first + 1); BOOL ret; TRACE("%p, %d, %d, %p - partial stub\n", hdc, first, last, abcf); - abc = HeapAlloc( GetProcessHeap(), 0, size ); + abc = abc_base = HeapAlloc( GetProcessHeap(), 0, size ); if (!abc) return FALSE; ret = GetCharABCWidthsW( hdc, first, last, abc ); @@ -2929,7 +2929,7 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a abcf->abcfC = abc->abcC; } } - HeapFree( GetProcessHeap(), 0, abc ); + HeapFree( GetProcessHeap(), 0, abc_base ); return ret; }

1 0

Nikolay Sivov : gdiplus: Added GdipGetPenStartCap.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: b672dad1b672d191b16a0de2baae70da6df23af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b672dad1b672d191b16a0de2b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:26:57 2008 +0400 gdiplus: Added GdipGetPenStartCap. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 334b566..2c5b7df 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -364,7 +364,7 @@ @ stdcall GdipGetPenLineJoin(ptr ptr) @ stdcall GdipGetPenMiterLimit(ptr ptr) @ stub GdipGetPenMode -@ stub GdipGetPenStartCap +@ stdcall GdipGetPenStartCap(ptr ptr) @ stub GdipGetPenTransform @ stub GdipGetPenUnit @ stub GdipGetPenWidth diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 709e185..d43fb3a 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -227,6 +227,16 @@ GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit) return Ok; } +GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap) +{ + if(!pen || !startCap) + return InvalidParameter; + + *startCap = pen->startcap; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { if(!pen || !brush) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fb2b2c8..f46dab2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -52,6 +52,7 @@ GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*); GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*); +GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Nikolay Sivov : gdiplus: Implemetned GdipGetPenUnit.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: c4b7281f066248f60f7ebec0acf19d299c2e2861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b7281f066248f60f7ebec0a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:27:03 2008 +0400 gdiplus: Implemetned GdipGetPenUnit. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2c5b7df..4a40da9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -366,7 +366,7 @@ @ stub GdipGetPenMode @ stdcall GdipGetPenStartCap(ptr ptr) @ stub GdipGetPenTransform -@ stub GdipGetPenUnit +@ stdcall GdipGetPenUnit(ptr ptr) @ stub GdipGetPenWidth @ stdcall GdipGetPixelOffsetMode(ptr ptr) @ stdcall GdipGetPointCount(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index d43fb3a..00729db 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -237,6 +237,16 @@ GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap) return Ok; } +GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit) +{ + if(!pen || !unit) + return InvalidParameter; + + *unit = pen->unit; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { if(!pen || !brush) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f46dab2..ade1fed 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -53,6 +53,7 @@ GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*); GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*); +GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenWidth.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 314396ae9cc853a111c9fb37c4def0af50308412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314396ae9cc853a111c9fb37c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:27:09 2008 +0400 gdiplus: Implemented GdipGetPenWidth. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4a40da9..8933e66 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -367,7 +367,7 @@ @ stdcall GdipGetPenStartCap(ptr ptr) @ stub GdipGetPenTransform @ stdcall GdipGetPenUnit(ptr ptr) -@ stub GdipGetPenWidth +@ stdcall GdipGetPenWidth(ptr ptr) @ stdcall GdipGetPixelOffsetMode(ptr ptr) @ stdcall GdipGetPointCount(ptr ptr) @ stub GdipGetPropertyCount diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 00729db..a3d697f 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -247,6 +247,16 @@ GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit) return Ok; } +GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width) +{ + if(!pen || !width) + return InvalidParameter; + + *width = pen->width; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { if(!pen || !brush) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ade1fed..2504457 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -54,6 +54,7 @@ GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*); GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipGetPenUnit(GpPen*,GpUnit*); +GpStatus WINGDIPAPI GdipGetPenWidth(GpPen*,REAL*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Nikolay Sivov : gdiplus: Implemented GdipCloneImageAttributes.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 71310541f49e8930cfcce393567eb9bc4b7cb2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=71310541f49e8930cfcce3935… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:26:33 2008 +0400 gdiplus: Implemented GdipCloneImageAttributes. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 264127d..ad79d0c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -53,7 +53,7 @@ @ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily @ stub GdipCloneImage -@ stub GdipCloneImageAttributes +@ stdcall GdipCloneImageAttributes(ptr ptr) @ stdcall GdipCloneMatrix(ptr ptr) @ stdcall GdipClonePath(ptr ptr) @ stdcall GdipClonePen(ptr ptr) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 858ea15..dcee68b 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -27,6 +27,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, + GpImageAttributes **cloneImageattr) +{ + if(!imageattr || !cloneImageattr) + return InvalidParameter; + + **cloneImageattr = *imageattr; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) { if(!imageattr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3891f0f..87c9398 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -336,6 +336,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*); GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*); +GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenEndCap.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 6eadf3da08fc3b358536c1c32612b148e78a6c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eadf3da08fc3b358536c1c32… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:26:43 2008 +0400 gdiplus: Implemented GdipGetPenEndCap. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ad79d0c..e76b9e1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -359,7 +359,7 @@ @ stub GdipGetPenDashCount @ stdcall GdipGetPenDashOffset(ptr ptr) @ stdcall GdipGetPenDashStyle(ptr ptr) -@ stub GdipGetPenEndCap +@ stdcall GdipGetPenEndCap(ptr ptr) @ stub GdipGetPenFillType @ stub GdipGetPenLineJoin @ stub GdipGetPenMiterLimit diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index f6214f1..29d99d5 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -197,6 +197,16 @@ GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) return Ok; } +GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap) +{ + if(!pen || !endCap) + return InvalidParameter; + + *endCap = pen->endcap; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { if(!pen || !brush) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 87c9398..e78ff07 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -49,6 +49,7 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); +GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenLineJoin, GdipGetPenMiterLimit.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: cf55dba6a15772012494ed7fd8e1357486f6e980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf55dba6a15772012494ed7fd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:26:49 2008 +0400 gdiplus: Implemented GdipGetPenLineJoin, GdipGetPenMiterLimit. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/pen.c | 20 ++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e76b9e1..334b566 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -361,8 +361,8 @@ @ stdcall GdipGetPenDashStyle(ptr ptr) @ stdcall GdipGetPenEndCap(ptr ptr) @ stub GdipGetPenFillType -@ stub GdipGetPenLineJoin -@ stub GdipGetPenMiterLimit +@ stdcall GdipGetPenLineJoin(ptr ptr) +@ stdcall GdipGetPenMiterLimit(ptr ptr) @ stub GdipGetPenMode @ stub GdipGetPenStartCap @ stub GdipGetPenTransform diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 29d99d5..709e185 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -207,6 +207,26 @@ GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap) return Ok; } +GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin) +{ + if(!pen || !lineJoin) + return InvalidParameter; + + *lineJoin = pen->join; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit) +{ + if(!pen || !miterLimit) + return InvalidParameter; + + *miterLimit = pen->miterlimit; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) { if(!pen || !brush) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e78ff07..fb2b2c8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -50,6 +50,8 @@ GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*); +GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*); +GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Maarten Lankhorst : quartz: Fix Render and RenderFile.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: d54c53a4b64223cb5744571b9f56064543e385c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54c53a4b64223cb5744571b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 26 11:26:53 2008 -0700 quartz: Fix Render and RenderFile. RenderFile should add a source filter and call Render on each output pin, while Render() should try to connect, first directly to any existing renderers, and then using intermediates. It uses recursion since this is the only possible way to implement Render sanely. --- dlls/quartz/filtergraph.c | 400 +++++++++++++++++++++++---------------------- 1 files changed, 206 insertions(+), 194 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d54c53a4b64223cb57445…

1 0

Joris Huizer : gdiplus: font: Ensure to release resources.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 4cafd76f2ddba6830a8e155dce3a1157b57bc347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cafd76f2ddba6830a8e155dc… Author: Joris Huizer <jorishuizer(a)debian> Date: Thu Jun 26 22:13:29 2008 +0200 gdiplus: font: Ensure to release resources. --- dlls/gdiplus/font.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0bb9fc7..4b784f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -42,6 +42,7 @@ static inline REAL get_dpi (void) HDC hdc = GetDC(0); GdipCreateFromHDC (hdc, &graphics); GdipGetDpiX(graphics, &dpi); + GdipDeleteGraphics(graphics); ReleaseDC (0, hdc); return dpi; @@ -351,7 +352,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, { GpFontFamily* ffamily; HDC hdc; - HFONT hFont; + HFONT hFont, hfont_old; LOGFONTW lfw; TRACE("%s, %p %p\n", debugstr_w(name), fontCollection, FontFamily); @@ -371,14 +372,17 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, hdc = GetDC(0); lstrcpynW(lfw.lfFaceName, name, sizeof(WCHAR) * LF_FACESIZE); hFont = CreateFontIndirectW (&lfw); - SelectObject(hdc, hFont); + hfont_old = SelectObject(hdc, hFont); GetTextMetricsW(hdc, ffamily->tmw); + DeleteObject(SelectObject(hdc, hfont_old)); ffamily->FamilyName = GdipAlloc(LF_FACESIZE * sizeof (WCHAR)); if (!ffamily->FamilyName) { + GdipFree(ffamily->tmw); GdipFree(ffamily); + ReleaseDC(0, hdc); return OutOfMemory; }

1 0

Joris Huizer : gdiplus: Change tmw field of GpFontFamily into an embedded structure.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 002b7c82be640f47135007b484773e1adb924a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002b7c82be640f47135007b48… Author: Joris Huizer <jorishuizer(a)debian> Date: Thu Jun 26 22:25:28 2008 +0200 gdiplus: Change tmw field of GpFontFamily into an embedded structure. --- dlls/gdiplus/font.c | 10 +++------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 4b784f6..86a3223 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -94,7 +94,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, { WCHAR facename[LF_FACESIZE]; LOGFONTW* lfw; - TEXTMETRICW* tmw; + const TEXTMETRICW* tmw; GpStatus stat; if ((!fontFamily && fontFamily->FamilyName && font)) @@ -107,7 +107,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, if (stat != Ok) return stat; *font = GdipAlloc(sizeof(GpFont)); - tmw = fontFamily->tmw; + tmw = &fontFamily->tmw; lfw = &((*font)->lfw); ZeroMemory(&(*lfw), sizeof(*lfw)); @@ -366,21 +366,18 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, 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); hfont_old = SelectObject(hdc, hFont); - GetTextMetricsW(hdc, ffamily->tmw); + GetTextMetricsW(hdc, &ffamily->tmw); DeleteObject(SelectObject(hdc, hfont_old)); ffamily->FamilyName = GdipAlloc(LF_FACESIZE * sizeof (WCHAR)); if (!ffamily->FamilyName) { - GdipFree(ffamily->tmw); GdipFree(ffamily); ReleaseDC(0, hdc); return OutOfMemory; @@ -448,7 +445,6 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) 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_private.h b/dlls/gdiplus/gdiplus_private.h index 6042835..b8269f2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -192,7 +192,7 @@ struct GpFontCollection{ }; struct GpFontFamily{ - TEXTMETRICW* tmw; + TEXTMETRICW tmw; WCHAR* FamilyName; };

1 0