August 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Added string format constructor.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 73be69c5760fe882b5fa597cd310f293bd8a13c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73be69c5760fe882b5fa597cd… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:59:48 2007 -0700 gdiplus: Added string format constructor. --- dlls/gdiplus/Makefile.in | 3 +- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 5 ++++ dlls/gdiplus/stringformat.c | 45 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index a826644..e47592b 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -18,7 +18,8 @@ C_SRCS = \ imageattributes.c \ matrix.c \ pathiterator.c \ - pen.c + pen.c \ + stringformat.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b4c0c36..f1e7c03 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -130,7 +130,7 @@ @ stub GdipCreateRegionRgnData @ stdcall GdipCreateSolidFill(long ptr) @ stdcall GdipCreateStreamOnFile(ptr long ptr) -@ stub GdipCreateStringFormat +@ stdcall GdipCreateStringFormat(long long ptr) @ stub GdipCreateTexture2 @ stub GdipCreateTexture2I @ stub GdipCreateTexture diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5be21b1..bb73b47 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -174,4 +174,9 @@ struct GpFont{ LOGFONTW lfw; }; +struct GpStringFormat{ + INT attr; + LANGID lang; +}; + #endif diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c new file mode 100644 index 0000000..0836a3b --- /dev/null +++ b/dlls/gdiplus/stringformat.c @@ -0,0 +1,45 @@ +/* + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winnls.h" + +#include "objbase.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, + GpStringFormat **format) +{ + if(!format) + return InvalidParameter; + + *format = GdipAlloc(sizeof(GpStringFormat)); + if(!*format) return OutOfMemory; + + (*format)->attr = attr; + (*format)->lang = lang; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed11b4a..6fe0104 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -244,6 +244,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**) GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); +GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); + #ifdef __cplusplus } #endif

1 0

Evan Stade : gdiplus: Added more font tests.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 510ecb653092fada7d1dc09fbdcce000bd2ff9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=510ecb653092fada7d1dc09fb… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:59:22 2007 -0700 gdiplus: Added more font tests. --- dlls/gdiplus/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index e5d9bca..0bd3f91 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -58,6 +58,40 @@ static void test_logfont(void) expect(0, lfw2.lfQuality); expect(0, lfw2.lfPitchAndFamily); + GdipDeleteFont(font); + + memset(&lfw, 0, sizeof(LOGFONTW)); + lfw.lfHeight = 25; + lfw.lfWidth = 25; + lfw.lfEscapement = lfw.lfOrientation = 50; + lfw.lfItalic = lfw.lfUnderline = lfw.lfStrikeOut = TRUE; + + memset(&lfw2, 0xff, sizeof(LOGFONTW)); + memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); + + stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + expect(Ok, stat); + stat = GdipGetLogFontW(font, graphics, &lfw2); + expect(Ok, stat); + + ok(lfw2.lfHeight < 0, "Expected negative height\n"); + expect(0, lfw2.lfWidth); + expect(0, lfw2.lfEscapement); + expect(0, lfw2.lfOrientation); + ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); + todo_wine{ + expect(TRUE, lfw2.lfItalic); + expect(TRUE, lfw2.lfUnderline); + expect(TRUE, lfw2.lfStrikeOut); + } + expect(0, lfw2.lfCharSet); + expect(0, lfw2.lfOutPrecision); + expect(0, lfw2.lfClipPrecision); + expect(0, lfw2.lfQuality); + expect(0, lfw2.lfPitchAndFamily); + + GdipDeleteFont(font); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); }

1 0

Evan Stade : gdiplus: Fixed conformance of font constructor.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 537112fb52a18454eaa5993ec6b4862dd757043a URL: http://source.winehq.org/git/wine.git/?a=commit;h=537112fb52a18454eaa5993ec… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:59:08 2007 -0700 gdiplus: Fixed conformance of font constructor. --- dlls/gdiplus/font.c | 17 ++++++++++++++++- dlls/gdiplus/tests/font.c | 6 ++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a64ceac..d321ba9 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -31,13 +31,28 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, GDIPCONST LOGFONTW *logfont, GpFont **font) { + HFONT hfont, oldfont; + TEXTMETRICW textmet; + if(!logfont || !font) return InvalidParameter; *font = GdipAlloc(sizeof(GpFont)); if(!*font) return OutOfMemory; - memcpy(&(*font)->lfw, logfont, sizeof(LOGFONTW)); + memcpy(&(*font)->lfw.lfFaceName, logfont->lfFaceName, LF_FACESIZE * + sizeof(WCHAR)); + (*font)->lfw.lfHeight = logfont->lfHeight; + + hfont = CreateFontIndirectW(&(*font)->lfw); + oldfont = SelectObject(hdc, hfont); + GetTextMetricsW(hdc, &textmet); + + (*font)->lfw.lfHeight = -textmet.tmHeight; + (*font)->lfw.lfWeight = textmet.tmWeight; + + SelectObject(hdc, oldfont); + DeleteObject(hfont); return Ok; } diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1326a6a..e5d9bca 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -44,13 +44,11 @@ static void test_logfont(void) stat = GdipGetLogFontW(font, graphics, &lfw2); expect(Ok, stat); - todo_wine - ok(lfw2.lfHeight < 0, "Expected negative height\n"); + ok(lfw2.lfHeight < 0, "Expected negative height\n"); expect(0, lfw2.lfWidth); expect(0, lfw2.lfEscapement); expect(0, lfw2.lfOrientation); - todo_wine - ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); + ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); expect(0, lfw2.lfItalic); expect(0, lfw2.lfUnderline); expect(0, lfw2.lfStrikeOut);

1 0

Evan Stade : gdiplus: Added GdipDeleteFont.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: a364fc325819db40665c7214558da033af73b470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a364fc325819db40665c72145… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:59:15 2007 -0700 gdiplus: Added GdipDeleteFont. --- dlls/gdiplus/font.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index d321ba9..77ee274 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -75,6 +75,16 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, return Ok; } +GpStatus WINGDIPAPI GdipDeleteFont(GpFont* font) +{ + if(!font) + return InvalidParameter; + + GdipFree(font); + + return Ok; +} + /* FIXME: use graphics */ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW *lfw) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c2b9042..b4c0c36 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -140,7 +140,7 @@ @ stub GdipDeleteCachedBitmap @ stdcall GdipDeleteCustomLineCap(ptr) @ stub GdipDeleteEffect -@ stub GdipDeleteFont +@ stdcall GdipDeleteFont(ptr) @ stub GdipDeleteFontFamily @ stdcall GdipDeleteGraphics(ptr) @ stdcall GdipDeleteMatrix(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d2c6db8..ed11b4a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -241,6 +241,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); +GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Added GdipDrawString.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: f7d27e00202a765ff2f8e6529b616f36d14c32af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d27e00202a765ff2f8e6529… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:58:39 2007 -0700 gdiplus: Added GdipDrawString. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 136 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 3 + include/gdiplusgpstubs.h | 2 + 4 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 39253a5..c2189e9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -198,7 +198,7 @@ @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stub GdipDrawRectanglesI -@ stub GdipDrawString +@ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) @ stub GdipEmfToWmfBits @ stub GdipEndContainer @ stub GdipEnumerateMetafileDestPoint diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68ceb4b..3626217 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "wine/unicode.h" #define COBJMACROS #include "objbase.h" @@ -1270,6 +1271,141 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, return Ok; } +GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, + INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, + GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush) +{ + HRGN rgn; + HFONT gdifont; + LOGFONTW lfw; + TEXTMETRICW textmet; + GpPointF pt[2], rectcpy[4]; + POINT corners[4]; + WCHAR* stringdup; + REAL angle, ang_cos, ang_sin, rel_width, rel_height; + INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth; + SIZE size; + + if(!graphics || !string || !font || !brush || !rect) + return InvalidParameter; + + if(format || (brush->bt != BrushTypeSolidColor)){ + FIXME("not implemented for given parameters\n"); + return NotImplemented; + } + + stringdup = GdipAlloc(length * sizeof(WCHAR)); + if(!stringdup) return OutOfMemory; + + save_state = SaveDC(graphics->hdc); + SetBkMode(graphics->hdc, TRANSPARENT); + SetTextColor(graphics->hdc, brush->lb.lbColor); + + rectcpy[3].X = rectcpy[0].X = rect->X; + rectcpy[1].Y = rectcpy[0].Y = rect->Y; + rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; + transform_and_round_points(graphics, corners, rectcpy, 4); + rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) + / rect->Width; + nwidth = roundr(rel_width * rect->Width); + rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) + / rect->Height; + + rgn = CreatePolygonRgn(corners, 4, ALTERNATE); + SelectClipRgn(graphics->hdc, rgn); + + /* Use gdi to find the font, then perform transformations on it (height, + * width, angle). */ + SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + GetTextMetricsW(graphics->hdc, &textmet); + memcpy(&lfw, &font->lfw, sizeof(LOGFONTW)); + + lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); + lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); + angle = gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + ang_cos = cos(angle); + ang_sin = sin(angle); + lfw.lfEscapement = lfw.lfOrientation = -roundr((angle / M_PI) * 1800.0); + + gdifont = CreateFontIndirectW(&lfw); + DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); + + for(i = 0, j = 0; i < length; i++){ + if(!isprintW(string[i]) && (string[i] != '\n')) + continue; + + stringdup[j] = string[i]; + j++; + } + + stringdup[j] = 0; + length = j; + + while(sum < length){ + GetTextExtentExPointW(graphics->hdc, stringdup, length, nwidth, + &fit, NULL, &size); + fitcpy = fit; + + if(fit == 0){ + TabbedTextOutW(graphics->hdc, + corners[0].x + roundr(ang_sin * (REAL) height), + corners[0].y + roundr(ang_cos * (REAL) height), + stringdup + sum, 1, 0, 0, 0); + break; + } + + for(lret = 0; lret < fit; lret++) + if(*(stringdup + sum + lret) == '\n') + break; + + /* Line break code (may look strange, but it imitates windows). */ + if(lret < fit) + fit = lret; /* this is not an off-by-one error */ + else if(*(stringdup + sum + fit) == ' ') + while(*(stringdup + sum + fit) == ' ') + fit++; + else + while(*(stringdup + sum + fit - 1) != ' '){ + fit--; + + if(*(stringdup + sum + fit) == '\t') + break; + + if(fit == 0){ + fit = fitcpy; + break; + } + } + + TabbedTextOutW(graphics->hdc, + corners[0].x - roundr(ang_sin * (REAL) height), + corners[0].y + roundr(ang_cos * (REAL) height), + stringdup + sum, min(length - sum, fit), 0, 0, 0); + + sum += fit + (lret < fitcpy ? 1 : 0); + height += size.cy; + + if(height > roundr(rect->Height * rel_height)) + break; + } + + DeleteObject(rgn); + DeleteObject(gdifont); + + RestoreDC(graphics->hdc, save_state); + + return Ok; +} + GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ba2a3ca..5883f09 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -76,6 +76,9 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GpRectF*,INT); +GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, + GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, + GDIPCONST GpBrush*); GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index d0fc8c4..7b08538 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -37,6 +37,7 @@ class GpPathGradient : public GpBrush {}; class GpLineGradient : public GpBrush {}; class GpTexture : public GpBrush {}; class GpFont {}; +class GpStringFormat {}; #else /* end of c++ declarations */ @@ -56,6 +57,7 @@ typedef struct GpPathGradient GpPathGradient; typedef struct GpLineGradient GpLineGradient; typedef struct GpTexture GpTexture; typedef struct GpFont GpFont; +typedef struct GpStringFormat GpStringFormat; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipGetLogFontW.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 958ece2192c917d24303716b381e9670aac0d20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=958ece2192c917d24303716b3… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:58:52 2007 -0700 gdiplus: Added GdipGetLogFontW. --- dlls/gdiplus/font.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index d02b04d..a64ceac 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -59,3 +59,15 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, return Ok; } + +/* FIXME: use graphics */ +GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, + LOGFONTW *lfw) +{ + if(!font || !graphics || !lfw) + return InvalidParameter; + + memcpy(lfw, &font->lfw, sizeof(LOGFONTW)); + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c2189e9..c2b9042 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -312,7 +312,7 @@ @ stub GdipGetLineTransform @ stub GdipGetLineWrapMode @ stub GdipGetLogFontA -@ stub GdipGetLogFontW +@ stdcall GdipGetLogFontW(ptr ptr ptr) @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @ stub GdipGetMetafileHeaderFromEmf diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5883f09..d2c6db8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -241,6 +241,7 @@ GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); +GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added font tests.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 4202ababb0b17b368ce9cee3fb180dcb19a3aec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202ababb0b17b368ce9cee3f… Author: Evan Stade <estade(a)gmail.com> Date: Tue Aug 14 18:58:59 2007 -0700 gdiplus: Added font tests. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/font.c | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 3771da2..8f0904c 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = gdiplus user32 gdi32 kernel32 CTESTS = \ brush.c \ + font.c \ graphics.c \ graphicspath.c \ image.c \ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c new file mode 100644 index 0000000..1326a6a --- /dev/null +++ b/dlls/gdiplus/tests/font.c @@ -0,0 +1,82 @@ +/* + * Unit test suite for fonts + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static WCHAR arial[] = {'A','r','i','a','l','\0'}; + +static void test_logfont(void) +{ + LOGFONTW lfw, lfw2; + GpFont *font; + GpStatus stat; + GpGraphics *graphics; + HDC hdc = GetDC(0); + + GdipCreateFromHDC(hdc, &graphics); + memset(&lfw, 0, sizeof(LOGFONTW)); + memset(&lfw2, 0xff, sizeof(LOGFONTW)); + memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); + + stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + expect(Ok, stat); + stat = GdipGetLogFontW(font, graphics, &lfw2); + expect(Ok, stat); + + todo_wine + ok(lfw2.lfHeight < 0, "Expected negative height\n"); + expect(0, lfw2.lfWidth); + expect(0, lfw2.lfEscapement); + expect(0, lfw2.lfOrientation); + todo_wine + ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); + expect(0, lfw2.lfItalic); + expect(0, lfw2.lfUnderline); + expect(0, lfw2.lfStrikeOut); + expect(0, lfw2.lfCharSet); + expect(0, lfw2.lfOutPrecision); + expect(0, lfw2.lfClipPrecision); + expect(0, lfw2.lfQuality); + expect(0, lfw2.lfPitchAndFamily); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + +START_TEST(font) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_logfont(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Paul Vriens : crypt32/tests: Use GetModuleHandle and skip.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 16d9123377ece03b1b854d9c2b829541193033db URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d9123377ece03b1b854d9c2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 14 20:38:51 2007 +0200 crypt32/tests: Use GetModuleHandle and skip. --- dlls/crypt32/tests/main.c | 11 ++--------- dlls/crypt32/tests/sip.c | 17 ++++++----------- dlls/crypt32/tests/str.c | 34 ++++++++++++++++++++++++++-------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index e55d2d3..43c07bf 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -225,8 +225,6 @@ static void test_cryptTls(void) DWORD index; BOOL ret; - if (!hCrypt) return; - pI_CryptAllocTls = (I_CryptAllocTlsFunc)GetProcAddress(hCrypt, "I_CryptAllocTls"); pI_CryptDetachTls = (I_CryptDetachTlsFunc)GetProcAddress(hCrypt, @@ -290,8 +288,6 @@ static void test_readTrustedPublisherDWORD(void) { I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc pReadDWORD; - if (!hCrypt) return; - pReadDWORD = (I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc)GetProcAddress( hCrypt, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); @@ -335,8 +331,6 @@ static void test_getDefaultCryptProv(void) I_CryptGetDefaultCryptProvFunc pI_CryptGetDefaultCryptProv; HCRYPTPROV prov; - if (!hCrypt) return; - pI_CryptGetDefaultCryptProv = (I_CryptGetDefaultCryptProvFunc) GetProcAddress(hCrypt, "I_CryptGetDefaultCryptProv"); if (!pI_CryptGetDefaultCryptProv) return; @@ -362,8 +356,6 @@ static void test_CryptInstallOssGlobal(void) int ret,i; I_CryptInstallOssGlobal pI_CryptInstallOssGlobal; - if (!hCrypt) return; - pI_CryptInstallOssGlobal= (I_CryptInstallOssGlobal)GetProcAddress(hCrypt,"I_CryptInstallOssGlobal"); /* passing in some random values to I_CryptInstallOssGlobal, it always returns 9 the first time, then 10, 11 etc.*/ for(i=0;i<30;i++) @@ -375,7 +367,8 @@ static void test_CryptInstallOssGlobal(void) START_TEST(main) { - hCrypt = LoadLibraryA("crypt32.dll"); + hCrypt = GetModuleHandleA("crypt32.dll"); + test_findAttribute(); test_findExtension(); test_findRDNAttr(); diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 5e33655..d47b6fc 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -295,17 +295,12 @@ static void test_SIPLoad(void) "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); - hCrypt = LoadLibraryA("crypt32.dll"); - if (hCrypt) - { - funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); - funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); - funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); - funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); - funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); - } - /* We're not going to use the functions, so we can free already here */ - FreeLibrary(hCrypt); + hCrypt = GetModuleHandleA("crypt32.dll"); + funcCryptSIPGetSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPGetSignedDataMsg"); + funcCryptSIPPutSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPPutSignedDataMsg"); + funcCryptSIPCreateIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPCreateIndirectData"); + funcCryptSIPVerifyIndirectData = (void*)GetProcAddress(hCrypt, "CryptSIPVerifyIndirectData"); + funcCryptSIPRemoveSignedDataMsg = (void*)GetProcAddress(hCrypt, "CryptSIPRemoveSignedDataMsg"); /* All OK */ SetLastError(0xdeadbeef); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index c166e0e..e4cdb77 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -271,7 +271,11 @@ static void test_CertRDNValueToStrW(void) WCHAR buffer[2000]; CERT_RDN_VALUE_BLOB blob = { 0, NULL }; - if (!pCertRDNValueToStrW) return; + if (!pCertRDNValueToStrW) + { + skip("CertRDNValueToStrW is not available\n"); + return; + } /* This crashes ret = pCertRDNValueToStrW(0, NULL, NULL, 0); @@ -319,7 +323,11 @@ static void test_CertNameToStrA(void) { PCCERT_CONTEXT context; - if (!pCertNameToStrA) return; + if (!pCertNameToStrA) + { + skip("CertNameToStrA is not available\n"); + return; + } context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); @@ -392,7 +400,11 @@ static void test_CertNameToStrW(void) { PCCERT_CONTEXT context; - if (!pCertNameToStrW) return; + if (!pCertNameToStrW) + { + skip("CertNameToStrW is not available\n"); + return; + } context = CertCreateCertificateContext(X509_ASN_ENCODING, cert, sizeof(cert)); @@ -473,7 +485,11 @@ static void test_CertStrToNameA(void) DWORD size, i; BYTE buf[100]; - if (!pCertStrToNameA) return; + if (!pCertStrToNameA) + { + skip("CertStrToNameA is not available\n"); + return; + } /* Crash ret = pCertStrToNameA(0, NULL, 0, NULL, NULL, NULL, NULL); @@ -554,7 +570,11 @@ static void test_CertStrToNameW(void) LPCWSTR errorPtr; BYTE buf[100]; - if (!pCertStrToNameW) return; + if (!pCertStrToNameW) + { + skip("CertStrToNameW is not available\n"); + return; + } /* Crash ret = pCertStrToNameW(0, NULL, 0, NULL, NULL, NULL, NULL); @@ -600,7 +620,7 @@ static void test_CertStrToNameW(void) START_TEST(str) { - dll = LoadLibrary("Crypt32.dll"); + dll = GetModuleHandleA("Crypt32.dll"); pCertNameToStrA = (CertNameToStrAFunc)GetProcAddress(dll,"CertNameToStrA"); pCertNameToStrW = (CertNameToStrWFunc)GetProcAddress(dll,"CertNameToStrW"); @@ -619,6 +639,4 @@ START_TEST(str) test_CertNameToStrW(); test_CertStrToNameA(); test_CertStrToNameW(); - - FreeLibrary(dll); }

1 0

Paul Vriens : msvcrt/tests: Remove wrong FreeLibrary and fix typo's.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: 059436d5362a81b1ebb855326fcc8d438541d080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059436d5362a81b1ebb855326… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 14 20:46:32 2007 +0200 msvcrt/tests: Remove wrong FreeLibrary and fix typo's. --- dlls/msvcrt/tests/cpp.c | 5 +---- dlls/msvcrt/tests/string.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fa66349..5ffc27f 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -187,7 +187,7 @@ static void InitFunctionPtrs(void) hMsvcrt = GetModuleHandleA("msvcrt.dll"); if (!hMsvcrt) hMsvcrt = GetModuleHandleA("msvcrtd.dll"); - ok(hMsvcrt != 0, "LoadLibraryA failed\n"); + ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); if (hMsvcrt) { SETNOFAIL(poperator_new, "??_U(a)YAPAXI@Z"); @@ -1004,8 +1004,5 @@ START_TEST(cpp) test_rtti(); test_demangle_datatype(); test_demangle(); - - if (hMsvcrt) - FreeLibrary(hMsvcrt); } #endif /* __i386__ */ diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8ff8bbd..7b434f7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -135,7 +135,7 @@ START_TEST(string) hMsvcrt = GetModuleHandleA("msvcrt.dll"); if (!hMsvcrt) hMsvcrt = GetModuleHandleA("msvcrtd.dll"); - ok(hMsvcrt != 0, "LoadLibraryA failed\n"); + ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp");

1 0

Juan Lang : crypt32: Add initial tests for certificate chains.
by Alexandre Julliard 15 Aug '07

15 Aug '07

Module: wine Branch: master Commit: abd6feaf9350939a6b6886b4ef933a5b83539ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd6feaf9350939a6b6886b4e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:36:29 2007 -0700 crypt32: Add initial tests for certificate chains. --- dlls/crypt32/tests/chain.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 8e5f627..48e1fc6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -102,7 +102,125 @@ static void testCreateCertChainEngine(void) CertCloseStore(store, 0); } +static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, + 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, + 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, + 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, 0x31, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x5a, 0x18, 0x0f, 0x31, 0x36, 0x30, 0x31, 0x30, 0x31, 0x30, + 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, + 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, + 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, + 0x00, 0xa3, 0x16, 0x30, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, + 0x01, 0xff, 0x04, 0x08, 0x30, 0x06, 0x01, 0x01, 0xff, 0x02, 0x01, 0x01 }; + +static void testGetCertChain(void) +{ + BOOL ret; + CERT_CHAIN_ENGINE_CONFIG config = { 0 }; + HCERTCHAINENGINE engine; + PCCERT_CONTEXT cert; + CERT_CHAIN_PARA para = { 0 }; + PCCERT_CHAIN_CONTEXT chain; + HCERTSTORE store; + + /* Basic parameter checks */ + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, + &chain); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Crash + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, + &chain); + */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + sizeof(bigCert)); + todo_wine + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Crash + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); + */ + + /* Tests with an invalid cert (one whose signature is bad) */ + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + ok(!ret, "Expected failure\n"); + para.cbSize = sizeof(para); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + ok(!ret, "Expected failure\n"); + CertFreeCertificateContext(cert); + + /* Tests with a valid cert that doesn't trace back to a trusted root */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, + sizeof(selfSignedCert)); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + todo_wine + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + todo_wine + ok(chain != NULL, "Expected a chain\n"); + if (chain) + { + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT, + "Expected CERT_TRUST_IS_UNTRUSTED_ROOT, got %08x\n", + chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, + "Expected CERT_TRUST_HAS_PREFERRED_ISSUER, got %08x\n", + chain->TrustStatus.dwInfoStatus); + ok(chain->cChain == 1, "Expected 1 chain, got %d\n", chain->cChain); + ok(chain->rgpChain[0]->cElement == 1, + "Expected one chain element, got %d\n", chain->rgpChain[0]->cElement); + ok(chain->rgpChain[0]->pTrustListInfo == NULL, + "Expected no trust list\n"); + CertFreeCertificateChain(chain); + } + + /* A self-signed cert isn't affected by having no chain to a trusted root */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + config.cbSize = sizeof(config); + config.hRestrictedRoot = store; + ret = CertCreateCertificateChainEngine(&config, &engine); + ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); + ret = CertGetCertificateChain(engine, cert, NULL, NULL, &para, 0, NULL, + &chain); + todo_wine + ok(chain != NULL, "Expected a chain\n"); + if (chain) + { + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT, + "Expected CERT_TRUST_IS_UNTRUSTED_ROOT, got %08x\n", + chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, + "Expected CERT_TRUST_HAS_PREFERRED_ISSUER, got %08x\n", + chain->TrustStatus.dwInfoStatus); + ok(chain->cChain == 1, "Expected 1 chain, got %d\n", chain->cChain); + ok(chain->rgpChain[0]->cElement == 1, + "Expected one chain element, got %d\n", chain->rgpChain[0]->cElement); + ok(chain->rgpChain[0]->pTrustListInfo == NULL, + "Expected no trust list\n"); + CertFreeCertificateChain(chain); + } + CertFreeCertificateChainEngine(engine); + CertCloseStore(store, 0); + CertFreeCertificateContext(cert); +} + START_TEST(chain) { testCreateCertChainEngine(); + testGetCertChain(); }

1 0