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

Mikołaj Zalewski : wininet: Make HttpQueryInfo[AW] work for lpBuffer == NULL and len > 0.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 3fa49f0f0273345cbe030ab8a45de5176e153007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa49f0f0273345cbe030ab8a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 15 16:55:15 2007 -0700 wininet: Make HttpQueryInfo[AW] work for lpBuffer == NULL and len > 0. --- dlls/wininet/http.c | 20 +++++++++++++++----- dlls/wininet/tests/http.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50fbf5a..9ddd885 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1973,6 +1973,8 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, goto lend; } + if (lpBuffer == NULL) + *lpdwBufferLength = 0; bSuccess = HTTP_HttpQueryInfoW( lpwhr, dwInfoLevel, lpBuffer, lpdwBufferLength, lpdwIndex); @@ -2008,11 +2010,19 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, lpdwBufferLength, lpdwIndex ); } - len = (*lpdwBufferLength)*sizeof(WCHAR); - bufferW = HeapAlloc( GetProcessHeap(), 0, len ); - /* buffer is in/out because of HTTP_QUERY_CUSTOM */ - if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) - MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); + if (lpBuffer) + { + len = (*lpdwBufferLength)*sizeof(WCHAR); + bufferW = HeapAlloc( GetProcessHeap(), 0, len ); + /* buffer is in/out because of HTTP_QUERY_CUSTOM */ + if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) + MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); + } else + { + bufferW = NULL; + len = 0; + } + result = HttpQueryInfoW( hHttpRequest, dwInfoLevel, bufferW, &len, lpdwIndex ); if( result ) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 00f417d..d16d93d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -990,6 +990,37 @@ static void HttpHeaders_test(void) ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Second Index Should Not Exist\n"); + + /* a call with NULL will fail but will return the length */ + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + /* even for a len that is too small */ + index = 0; + len = 15; + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + index = 0; + len = 0; + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + /* a working query */ index = 0; len = sizeof(buffer);

1 0

Evan Stade : gdiplus: Fix default value of StringTrimmingCharacter.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: b1237257f086649a204a301c996c29e269a1e7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1237257f086649a204a301c9… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:35 2007 -0700 gdiplus: Fix default value of StringTrimmingCharacter. --- dlls/gdiplus/stringformat.c | 1 + dlls/gdiplus/tests/stringformat.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 6b20d23..e328ffb 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -40,6 +40,7 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->attr = attr; (*format)->lang = lang; + (*format)->trimming = StringTrimmingCharacter; return Ok; } diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 65bec83..9cf46a4 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -43,8 +43,7 @@ static void test_constructor(void) expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); expect(StringAlignmentNear, align); - todo_wine - expect(StringTrimmingCharacter, trimming); + expect(StringTrimmingCharacter, trimming); stat = GdipDeleteStringFormat(format); expect(Ok, stat);

1 0

Evan Stade : gdiplus/tests: Added GpStringFormat tests.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: f46b779451ada547ea9ffd6bc8b86eb71c87c214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46b779451ada547ea9ffd6bc… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:29 2007 -0700 gdiplus/tests: Added GpStringFormat tests. --- dlls/gdiplus/tests/Makefile.in | 3 +- dlls/gdiplus/tests/stringformat.c | 68 +++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 8f0904c..28b2959 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -12,7 +12,8 @@ CTESTS = \ graphicspath.c \ image.c \ matrix.c \ - pen.c + pen.c \ + stringformat.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c new file mode 100644 index 0000000..65bec83 --- /dev/null +++ b/dlls/gdiplus/tests/stringformat.c @@ -0,0 +1,68 @@ +/* + * Unit test suite for string format + * + * 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 void test_constructor(void) +{ + GpStringFormat *format; + GpStatus stat; + INT n; + StringAlignment align, valign; + StringTrimming trimming; + + stat = GdipCreateStringFormat(0, 0, &format); + expect(Ok, stat); + + GdipGetStringFormatAlign(format, &align); + GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatHotkeyPrefix(format, &n); + GdipGetStringFormatTrimming(format, &trimming); + + expect(HotkeyPrefixNone, n); + expect(StringAlignmentNear, align); + expect(StringAlignmentNear, align); + todo_wine + expect(StringTrimmingCharacter, trimming); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); +} + +START_TEST(stringformat) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: Use DrawText instead of TabbedTextOut.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: be66c3c93b0b4089deaedb75ea658c71af102eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be66c3c93b0b4089deaedb75e… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:17 2007 -0700 gdiplus: Use DrawText instead of TabbedTextOut. --- dlls/gdiplus/graphics.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f6e08c5..17d8611 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1287,6 +1287,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; + RECT drawcoord; if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; @@ -1366,15 +1367,16 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string length = j; while(sum < length){ + drawcoord.left = corners[0].x + roundr(ang_sin * (REAL) height); + drawcoord.top = corners[0].y + roundr(ang_cos * (REAL) height); + GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, 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); + DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, DT_NOCLIP | + DT_EXPANDTABS); break; } @@ -1402,10 +1404,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } } - 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); + DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit), + &drawcoord, DT_NOCLIP | DT_EXPANDTABS); sum += fit + (lret < fitcpy ? 1 : 0); height += size.cy;

1 0

Evan Stade : gdiplus: Handle empty layout rectangle in GdipDrawString.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: ca949393087e575b2bdefc66bc97bd991516bc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca949393087e575b2bdefc66b… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:13 2007 -0700 gdiplus: Handle empty layout rectangle in GdipDrawString. --- dlls/gdiplus/graphics.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bbad12d..f6e08c5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1276,7 +1276,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush) { - HRGN rgn; + HRGN rgn = NULL; HFONT gdifont; LOGFONTW lfw; TEXTMETRICW textmet; @@ -1284,7 +1284,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string 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; + INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, + nheight; SIZE size; if(!graphics || !string || !font || !brush || !rect) @@ -1312,16 +1313,24 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string 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); + if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ + rel_width = rel_height = 1.0; + nwidth = nheight = INT_MAX; + } + else{ + 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; + 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; + + nwidth = roundr(rel_width * rect->Width); + nheight = roundr(rel_height * 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). */ @@ -1393,7 +1402,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } } - TabbedTextOutW(graphics->hdc, corners[0].x - roundr(ang_sin * (REAL) height), corners[0].y + roundr(ang_cos * (REAL) height), @@ -1402,7 +1410,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string sum += fit + (lret < fitcpy ? 1 : 0); height += size.cy; - if(height > roundr(rect->Height * rel_height)) + if(height > nheight) break; /* Stop if this was a linewrap (but not if it was a linebreak). */

1 0

Evan Stade : gdiplus: Handle empty layout rectangle in GdipMeasureString.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 44e983925aff41f670be43202055422cdf2aebd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e983925aff41f670be43202… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:09 2007 -0700 gdiplus: Handle empty layout rectangle in GdipMeasureString. --- dlls/gdiplus/graphics.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 754da27..bbad12d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <math.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -1716,6 +1717,10 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix return Ok; } +/* Find the smallest rectangle that bounds the text when it is printed in rect + * according to the format options listed in format. If rect has 0 width and + * height, then just find the smallest rectangle that bounds the text when it's + * printed at location (rect->X, rect-Y). */ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, @@ -1723,7 +1728,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, { HFONT oldfont; WCHAR* stringdup; - INT sum = 0, height = 0, fit, fitcpy, max_width = 0, i, j, lret, nwidth; + INT sum = 0, height = 0, fit, fitcpy, max_width = 0, i, j, lret, nwidth, + nheight; SIZE size; if(!graphics || !string || !font || !rect) @@ -1744,6 +1750,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); nwidth = roundr(rect->Width); + nheight = roundr(rect->Height); + + if((nwidth == 0) && (nheight == 0)) + nwidth = nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ if(!isprintW(string[i]) && (string[i] != '\n')) @@ -1796,7 +1806,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, height += size.cy; max_width = max(max_width, size.cx); - if(height > roundr(rect->Height)) + if(height > nheight) break; /* Stop if this was a linewrap (but not if it was a linebreak). */ @@ -1807,7 +1817,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, bounds->X = rect->X; bounds->Y = rect->Y; bounds->Width = (REAL)max_width; - bounds->Height = min((REAL)height, rect->Height); + bounds->Height = (REAL) min(height, nheight); DeleteObject(SelectObject(graphics->hdc, oldfont));

1 0

Evan Stade : gdiplus/tests: Added GdipAddPathLineI test.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 4e041fe4b92e47d097554798e18d3ced81fcc68c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e041fe4b92e47d097554798e… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:22 2007 -0700 gdiplus/tests: Added GdipAddPathLineI test. --- dlls/gdiplus/tests/graphicspath.c | 43 +++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5896fcd..b2d5ef9 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -503,6 +503,48 @@ static void test_ellipse(void) GdipDeletePath(path); } +static path_test_t linei_path[] = { + {5.00, 5.00, PathPointTypeStart, 0, 0}, /*0*/ + {6.00, 8.00, PathPointTypeLine, 0, 0}, /*1*/ + {409.92, 110.20, PathPointTypeLine, 0, 0}, /*2*/ + {543.96, 156.53, PathPointTypeBezier, 0, 0}, /*3*/ + {625.80, 346.22, PathPointTypeBezier, 0, 0}, /*4*/ + {592.71, 533.88, PathPointTypeBezier, 0, 0}, /*5*/ + {592.47, 535.28, PathPointTypeBezier, 0, 0}, /*6*/ + {592.22, 536.67, PathPointTypeBezier, 0, 0}, /*7*/ + {591.96, 538.06, PathPointTypeBezier, 0, 0}, /*8*/ + {15.00, 15.00, PathPointTypeLine, 0, 0}, /*9*/ + {26.00, 28.00, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*10*/ + {35.00, 35.00, PathPointTypeStart, 0, 0}, /*11*/ + {36.00, 38.00, PathPointTypeLine, 0, 0} /*12*/ + }; + +static void test_linei(void) +{ + GpStatus status; + GpPath *path; + GpPointF points[2]; + + points[0].X = 7.0; + points[0].Y = 11.0; + points[1].X = 13.0; + points[1].Y = 17.0; + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathLineI(path, 5.0, 5.0, 6.0, 8.0); + expect(Ok, status); + GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, -80.0, 100.0); + status = GdipAddPathLineI(path, 15.0, 15.0, 26.0, 28.0); + expect(Ok, status); + GdipClosePathFigure(path); + status = GdipAddPathLineI(path, 35.0, 35.0, 36.0, 38.0); + expect(Ok, status); + + ok_path(path, linei_path, sizeof(linei_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -521,6 +563,7 @@ START_TEST(graphicspath) test_worldbounds(); test_pathpath(); test_ellipse(); + test_linei(); GdiplusShutdown(gdiplusToken); }

1 0

Evan Stade : gdiplus: Handle StringFormatFlagsNoWrap in GdipMeasureString.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: d4107db6bb77b0ad1446f6139dadf8fb3354fdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4107db6bb77b0ad1446f6139… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:04 2007 -0700 gdiplus: Handle StringFormatFlagsNoWrap in GdipMeasureString. --- dlls/gdiplus/graphics.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 81ff9c1..754da27 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1729,13 +1729,14 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics || !string || !font || !rect) return InvalidParameter; - if(format || codepointsfitted || linesfilled){ + if(codepointsfitted || linesfilled){ FIXME("not implemented for given parameters\n"); - if(format) - TRACE("format attr is %d\n", format->attr); return NotImplemented; } + if(format) + TRACE("may be ignoring some format flags: attr %x\n", format->attr); + if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc(length * sizeof(WCHAR)); @@ -1797,6 +1798,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(height > roundr(rect->Height)) break; + + /* Stop if this was a linewrap (but not if it was a linebreak). */ + if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap)) + break; } bounds->X = rect->X;

1 0

Evan Stade : gdiplus: Handle StringFormatFlagsNoWrap in GdipDrawString.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 3f32083ed736dd124e9d95d2d53e9d8e074a1a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f32083ed736dd124e9d95d2d… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:00 2007 -0700 gdiplus: Handle StringFormatFlagsNoWrap in GdipDrawString. --- dlls/gdiplus/graphics.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 19f89a0..81ff9c1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1289,13 +1289,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; - if(format || (brush->bt != BrushTypeSolidColor)){ + if((brush->bt != BrushTypeSolidColor)){ FIXME("not implemented for given parameters\n"); - if(format) - TRACE("format attr is %d\n", format->attr); return NotImplemented; } + if(format) + TRACE("may be ignoring some format flags: attr %x\n", format->attr); + if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc(length * sizeof(WCHAR)); @@ -1402,6 +1403,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(height > roundr(rect->Height * rel_height)) break; + + /* Stop if this was a linewrap (but not if it was a linebreak). */ + if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap)) + break; } DeleteObject(rgn);

1 0

Evan Stade : gdiplus: Fixed 2 GdipDrawString bugs.
by Alexandre Julliard Aug. 16, 2007

Aug. 16, 2007

Module: wine Branch: master Commit: 92aa57bece965ff3355bba8cfcfefe8a90699861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92aa57bece965ff3355bba8cf… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:21:56 2007 -0700 gdiplus: Fixed 2 GdipDrawString bugs. --- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c8a732d..19f89a0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1355,8 +1355,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string length = j; while(sum < length){ - GetTextExtentExPointW(graphics->hdc, stringdup, length, nwidth, - &fit, NULL, &size); + GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, + nwidth, &fit, NULL, &size); fitcpy = fit; if(fit == 0){ @@ -1374,21 +1374,23 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* 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; + else if(fit < (length - sum)){ + 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),

1 0