March 2010 - Wine-Commits - list.winehq.org

Eric Pouech : winedbg: Add some missing symbol flags to pick up local/ parameters variables in symbol pickers.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: eef72ad2ff9cb10d5aac855dd60edf78255a9ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef72ad2ff9cb10d5aac855dd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 30 21:37:15 2010 +0200 winedbg: Add some missing symbol flags to pick up local/parameters variables in symbol pickers. --- programs/winedbg/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 1e32bc6..6602785 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -227,7 +227,7 @@ enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_d if (sgv->num - sgv->num_thunks > 1 && (sgv->syms[i].flags & SYMFLAG_THUNK) && !DBG_IVAR(AlwaysShowThunks)) continue; dbg_printf("[%d]: ", i + 1); - if (sgv->syms[i].flags & SYMFLAG_LOCAL) + if (sgv->syms[i].flags & (SYMFLAG_LOCAL | SYMFLAG_PARAMETER)) { dbg_printf("%s %sof %s\n", sgv->syms[i].flags & SYMFLAG_PARAMETER ? "Parameter" : "Local variable", @@ -276,7 +276,7 @@ enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv_data* { if (sgv->num - sgv->num_thunks > 1 && (sgv->syms[i].flags & SYMFLAG_THUNK) && !DBG_IVAR(AlwaysShowThunks)) continue; - if (sgv->syms[i].flags & SYMFLAG_LOCAL) + if (sgv->syms[i].flags & (SYMFLAG_LOCAL | SYMFLAG_PARAMETER)) { if (local == -1) local = i;

1 0

Eric Pouech : winedbg: Allow backtraces to properly return address outside functions.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: d49fe171f77a0ff5501efc653d602380d82592a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49fe171f77a0ff5501efc653… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 30 21:37:22 2010 +0200 winedbg: Allow backtraces to properly return address outside functions. --- programs/winedbg/stack.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 4b2286c..7ba2773 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -83,6 +83,15 @@ static BOOL stack_get_frame(int nf, IMAGEHLP_STACK_FRAME* ihsf) { memset(ihsf, 0, sizeof(*ihsf)); ihsf->InstructionOffset = dbg_curr_thread->frames[nf].linear_pc; + /* if we're not the first frame, InstructionOffset is the return address + * after the call instruction (at least on most processors I know of). + * However, there are cases where this address is outside of the current function. + * This happens when the called function is marked <NO RETURN>, in which + * case the compiler can omit the epilog (gcc 4 does it) + * Therefore, we decrement InstructionOffset in order to ensure that + * the considered address is really inside the current function. + */ + if (nf) ihsf->InstructionOffset--; ihsf->FrameOffset = dbg_curr_thread->frames[nf].linear_frame; ihsf->StackOffset = dbg_curr_thread->frames[nf].linear_stack; return TRUE;

1 0

Vincent Povirk : gdiplus: Add a test for GdipMeasureString.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 0bc54fb4fb074cc66e19c533160cd67be22fbd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc54fb4fb074cc66e19c5331… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 12:19:34 2010 -0500 gdiplus: Add a test for GdipMeasureString. --- dlls/gdiplus/tests/graphics.c | 93 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0585321..959fbb0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -25,7 +25,8 @@ #include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) +#define expectf_(expected, got, precision) ok(fabs(expected - got) < precision, "Expected %.2f, got %.2f\n", expected, got) +#define expectf(expected, got) expectf_(expected, got, 0.0001) #define TABLE_LEN (23) static HWND hwnd; @@ -2406,13 +2407,15 @@ static void test_string_functions(void) GpGraphics *graphics; GpFontFamily *family; GpFont *font; - RectF rc; + RectF rc, char_bounds, bounds; GpBrush *brush; ARGB color = 0xff000000; HDC hdc = GetDC( hwnd ); const WCHAR fontname[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; const WCHAR fontname2[] = {'C','o','u','r','i','e','r',0}; const WCHAR teststring[] = {'o','o',' ','o','\n','o',0}; + REAL char_width, char_height; + INT codepointsfitted, linesfilled; ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -2459,6 +2462,92 @@ static void test_string_functions(void) status = GdipDrawString(graphics, teststring, 6, font, &rc, NULL, brush); expect(Ok, status); + status = GdipMeasureString(NULL, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(InvalidParameter, status); + + status = GdipMeasureString(graphics, NULL, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(InvalidParameter, status); + + status = GdipMeasureString(graphics, teststring, 6, NULL, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(InvalidParameter, status); + + status = GdipMeasureString(graphics, teststring, 6, font, NULL, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(InvalidParameter, status); + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, NULL, &codepointsfitted, &linesfilled); + expect(InvalidParameter, status); + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, NULL, &linesfilled); + expect(Ok, status); + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, NULL); + expect(Ok, status); + + status = GdipMeasureString(graphics, teststring, 1, font, &rc, NULL, &char_bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, char_bounds.X); + expectf(0.0, char_bounds.Y); + ok(char_bounds.Width > 0, "got %0.2f\n", bounds.Width); + ok(char_bounds.Height > 0, "got %0.2f\n", bounds.Height); + expect(1, codepointsfitted); + todo_wine expect(1, linesfilled); + + status = GdipMeasureString(graphics, teststring, 2, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + ok(bounds.Width > char_bounds.Width, "got %0.2f, expected at least %0.2f\n", bounds.Width, char_bounds.Width); + expectf(char_bounds.Height, bounds.Height); + expect(2, codepointsfitted); + todo_wine expect(1, linesfilled); + char_width = bounds.Width - char_bounds.Width; + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(char_bounds.Width + char_width * 3, bounds.Width, 0.01); + ok(bounds.Height > char_bounds.Height, "got %0.2f, expected at least %0.2f\n", bounds.Height, char_bounds.Height); + expect(6, codepointsfitted); + todo_wine expect(2, linesfilled); + char_height = bounds.Height - char_bounds.Height; + + /* Cut off everything after the first space. */ + rc.Width = char_bounds.Width + char_width * 2.5; + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(char_bounds.Width + char_width, bounds.Width, 0.01); + expectf_(char_bounds.Height + char_height * 2, bounds.Height, 0.01); + expect(6, codepointsfitted); + todo_wine expect(3, linesfilled); + + /* Cut off everything including the first space. */ + rc.Width = char_bounds.Width + char_width * 1.5; + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(char_bounds.Width + char_width, bounds.Width, 0.01); + expectf_(char_bounds.Height + char_height * 2, bounds.Height, 0.01); + expect(6, codepointsfitted); + todo_wine expect(3, linesfilled); + + /* Cut off everything after the first character. */ + rc.Width = char_bounds.Width + char_width * 0.5; + + status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf_(char_bounds.Width, bounds.Width, 0.01); + todo_wine expectf_(char_bounds.Height + char_height * 3, bounds.Height, 0.05); + expect(6, codepointsfitted); + todo_wine expect(4, linesfilled); + GdipDeleteBrush(brush); GdipDeleteFont(font); GdipDeleteFontFamily(family);

1 0

Vincent Povirk : gdiplus: Fix the linesfilled calculation in GdipMeasureString.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 21109a40fb2a42a751cfc4216940b2ff3845f6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=21109a40fb2a42a751cfc4216… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 14:22:06 2010 -0500 gdiplus: Fix the linesfilled calculation in GdipMeasureString. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e8c4d0a..f6f5812 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3516,7 +3516,7 @@ static GpStatus measure_string_callback(GpGraphics *graphics, *args->codepointsfitted = index + length; if (args->linesfilled) - *args->linesfilled += bounds->Height; + (*args->linesfilled)++; return Ok; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 959fbb0..0a6490e 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2490,7 +2490,7 @@ static void test_string_functions(void) ok(char_bounds.Width > 0, "got %0.2f\n", bounds.Width); ok(char_bounds.Height > 0, "got %0.2f\n", bounds.Height); expect(1, codepointsfitted); - todo_wine expect(1, linesfilled); + expect(1, linesfilled); status = GdipMeasureString(graphics, teststring, 2, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); expect(Ok, status); @@ -2499,7 +2499,7 @@ static void test_string_functions(void) ok(bounds.Width > char_bounds.Width, "got %0.2f, expected at least %0.2f\n", bounds.Width, char_bounds.Width); expectf(char_bounds.Height, bounds.Height); expect(2, codepointsfitted); - todo_wine expect(1, linesfilled); + expect(1, linesfilled); char_width = bounds.Width - char_bounds.Width; status = GdipMeasureString(graphics, teststring, 6, font, &rc, NULL, &bounds, &codepointsfitted, &linesfilled); @@ -2509,7 +2509,7 @@ static void test_string_functions(void) expectf_(char_bounds.Width + char_width * 3, bounds.Width, 0.01); ok(bounds.Height > char_bounds.Height, "got %0.2f, expected at least %0.2f\n", bounds.Height, char_bounds.Height); expect(6, codepointsfitted); - todo_wine expect(2, linesfilled); + expect(2, linesfilled); char_height = bounds.Height - char_bounds.Height; /* Cut off everything after the first space. */ @@ -2522,7 +2522,7 @@ static void test_string_functions(void) expectf_(char_bounds.Width + char_width, bounds.Width, 0.01); expectf_(char_bounds.Height + char_height * 2, bounds.Height, 0.01); expect(6, codepointsfitted); - todo_wine expect(3, linesfilled); + expect(3, linesfilled); /* Cut off everything including the first space. */ rc.Width = char_bounds.Width + char_width * 1.5; @@ -2534,7 +2534,7 @@ static void test_string_functions(void) expectf_(char_bounds.Width + char_width, bounds.Width, 0.01); expectf_(char_bounds.Height + char_height * 2, bounds.Height, 0.01); expect(6, codepointsfitted); - todo_wine expect(3, linesfilled); + expect(3, linesfilled); /* Cut off everything after the first character. */ rc.Width = char_bounds.Width + char_width * 0.5;

1 0

Vincent Povirk : gdiplus: Add tests for GdipDrawString.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 0f919e365b7cc135e60be74af287a1909c7991ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f919e365b7cc135e60be74af… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 10:24:06 2010 -0500 gdiplus: Add tests for GdipDrawString. --- dlls/gdiplus/tests/graphics.c | 68 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e33ff5f..0585321 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2400,6 +2400,73 @@ static void test_GdipGetNearestColor(void) ReleaseDC(hwnd, hdc); } +static void test_string_functions(void) +{ + GpStatus status; + GpGraphics *graphics; + GpFontFamily *family; + GpFont *font; + RectF rc; + GpBrush *brush; + ARGB color = 0xff000000; + HDC hdc = GetDC( hwnd ); + const WCHAR fontname[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; + const WCHAR fontname2[] = {'C','o','u','r','i','e','r',0}; + const WCHAR teststring[] = {'o','o',' ','o','\n','o',0}; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreateFontFamilyFromName(fontname, NULL, &family); + + if (status != Ok) + { + /* Wine doesn't have Courier New? */ + todo_wine expect(Ok, status); + status = GdipCreateFontFamilyFromName(fontname2, NULL, &family); + } + + expect(Ok, status); + + status = GdipCreateFont(family, 10.0, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + status = GdipCreateSolidFill(color, (GpSolidFill**)&brush); + expect(Ok, status); + + rc.X = 0; + rc.Y = 0; + rc.Width = 100.0; + rc.Height = 100.0; + + status = GdipDrawString(NULL, teststring, 6, font, &rc, NULL, brush); + expect(InvalidParameter, status); + + status = GdipDrawString(graphics, NULL, 6, font, &rc, NULL, brush); + expect(InvalidParameter, status); + + status = GdipDrawString(graphics, teststring, 6, NULL, &rc, NULL, brush); + expect(InvalidParameter, status); + + status = GdipDrawString(graphics, teststring, 6, font, NULL, NULL, brush); + expect(InvalidParameter, status); + + status = GdipDrawString(graphics, teststring, 6, font, &rc, NULL, NULL); + expect(InvalidParameter, status); + + status = GdipDrawString(graphics, teststring, 6, font, &rc, NULL, brush); + expect(Ok, status); + + GdipDeleteBrush(brush); + GdipDeleteFont(font); + GdipDeleteFontFamily(family); + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2452,6 +2519,7 @@ START_TEST(graphics) test_clear(); test_textcontrast(); test_fromMemoryBitmap(); + test_string_functions(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Vincent Povirk : gdiplus: Rewrite GdipDrawString to share code with GdipMeasureString.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 2cde94a89e058ce9fc2acc64413398c533111db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cde94a89e058ce9fc2acc644… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 14:15:48 2010 -0500 gdiplus: Rewrite GdipDrawString to share code with GdipMeasureString. --- dlls/gdiplus/graphics.c | 347 ++++++++++++++++++++--------------------------- 1 files changed, 145 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cde94a89e058ce9fc2ac…

1 0

Vincent Povirk : gdiplus: Rewrite GdipMeasureString using a helper function .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 3cee74c61d1e4065259739721eb50083c5a47960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cee74c61d1e4065259739721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 13:41:04 2010 -0500 gdiplus: Rewrite GdipMeasureString using a helper function. --- dlls/gdiplus/graphics.c | 178 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 131 insertions(+), 47 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 722d7f4..afbe571 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3550,61 +3550,37 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result); } -GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, - GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, - GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, - INT regionCount, GpRegion** regions) -{ - FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), - length, font, layoutRect, stringFormat, regionCount, regions); +typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics, + GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + INT lineno, const RectF *bounds, void *user_data); - if (!(graphics && string && font && layoutRect && stringFormat && regions)) - return InvalidParameter; - - return NotImplemented; -} - -/* 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, +static GpStatus gdip_format_string(GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, RectF *bounds, - INT *codepointsfitted, INT *linesfilled) + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + gdip_format_string_callback callback, void *user_data) { - HFONT oldfont; WCHAR* stringdup; - INT sum = 0, height = 0, fit, fitcpy, max_width = 0, i, j, lret, nwidth, - nheight, lineend; + INT sum = 0, height = 0, fit, fitcpy, i, j, lret, nwidth, + nheight, lineend, lineno = 0; + RectF bounds; + StringAlignment halign; + GpStatus stat = Ok; SIZE size; - TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, - debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, - bounds, codepointsfitted, linesfilled); - - if(!graphics || !string || !font || !rect || !bounds) - return InvalidParameter; - - if(linesfilled) *linesfilled = 0; - if(codepointsfitted) *codepointsfitted = 0; - - if(format) - TRACE("may be ignoring some format flags: attr %x\n", format->attr); - if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; - oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); nwidth = roundr(rect->Width); nheight = roundr(rect->Height); - if((nwidth == 0) && (nheight == 0)) - nwidth = nheight = INT_MAX; + if (nwidth == 0) nwidth = INT_MAX; + if (nheight == 0) nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ + /* FIXME: This makes the indexes passed to callback inaccurate. */ if(!isprintW(string[i]) && (string[i] != '\n')) continue; @@ -3612,9 +3588,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, j++; } - stringdup[j] = 0; length = j; + if (format) halign = format->align; + else halign = StringAlignmentNear; + while(sum < length){ GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, nwidth, &fit, NULL, &size); @@ -3657,12 +3635,38 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend, nwidth, &j, NULL, &size); - sum += fit + (lret < fitcpy ? 1 : 0); - if(codepointsfitted) *codepointsfitted = sum; + bounds.Width = size.cx; + + if(height + size.cy > nheight) + bounds.Height = nheight - (height + size.cy); + else + bounds.Height = size.cy; + + bounds.Y = rect->Y + height; + switch (halign) + { + case StringAlignmentNear: + default: + bounds.X = rect->X; + break; + case StringAlignmentCenter: + bounds.X = rect->X + (rect->Width/2) - (bounds.Width/2); + break; + case StringAlignmentFar: + bounds.X = rect->X + rect->Width - bounds.Width; + break; + } + + stat = callback(graphics, stringdup, sum, lineend, + font, rect, format, lineno, &bounds, user_data); + + if (stat != Ok) + break; + + sum += fit + (lret < fitcpy ? 1 : 0); height += size.cy; - if(linesfilled) *linesfilled += size.cy; - max_width = max(max_width, size.cx); + lineno++; if(height > nheight) break; @@ -3672,12 +3676,92 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, break; } + GdipFree(stringdup); + + return stat; +} + +GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, + GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, + GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, + INT regionCount, GpRegion** regions) +{ + FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), + length, font, layoutRect, stringFormat, regionCount, regions); + + if (!(graphics && string && font && layoutRect && stringFormat && regions)) + return InvalidParameter; + + return NotImplemented; +} + +struct measure_string_args { + RectF *bounds; + INT *codepointsfitted; + INT *linesfilled; +}; + +static GpStatus measure_string_callback(GpGraphics *graphics, + GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + INT lineno, const RectF *bounds, void *user_data) +{ + struct measure_string_args *args = user_data; + + if (bounds->Width > args->bounds->Width) + args->bounds->Width = bounds->Width; + + if (bounds->Height + bounds->Y > args->bounds->Height + args->bounds->Y) + args->bounds->Height = bounds->Height + bounds->Y - args->bounds->Y; + + if (args->codepointsfitted) + *args->codepointsfitted = index + length; + + if (args->linesfilled) + *args->linesfilled += bounds->Height; + + 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, + INT *codepointsfitted, INT *linesfilled) +{ + HFONT oldfont; + struct measure_string_args args; + + TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, + debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, + bounds, codepointsfitted, linesfilled); + + if(!graphics || !string || !font || !rect || !bounds) + return InvalidParameter; + + if(linesfilled) *linesfilled = 0; + if(codepointsfitted) *codepointsfitted = 0; + + if(format) + TRACE("may be ignoring some format flags: attr %x\n", format->attr); + + oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + bounds->X = rect->X; bounds->Y = rect->Y; - bounds->Width = (REAL)max_width; - bounds->Height = (REAL) min(height, nheight); + bounds->Width = 0.0; + bounds->Height = 0.0; + + args.bounds = bounds; + args.codepointsfitted = codepointsfitted; + args.linesfilled = linesfilled; + + gdip_format_string(graphics, string, length, font, rect, format, + measure_string_callback, &args); - GdipFree(stringdup); DeleteObject(SelectObject(graphics->hdc, oldfont)); return Ok;

1 0

Vincent Povirk : gdiplus: Add a missing NULL check to GdipMeasureString.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 32d03da99843bd43078507a077fbd772d751a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d03da99843bd43078507a07… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 30 10:34:01 2010 -0500 gdiplus: Add a missing NULL check to GdipMeasureString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c5242e4..722d7f4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3583,7 +3583,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, bounds, codepointsfitted, linesfilled); - if(!graphics || !string || !font || !rect) + if(!graphics || !string || !font || !rect || !bounds) return InvalidParameter; if(linesfilled) *linesfilled = 0;

1 0

Eric Pouech : winedbg: When filling an imagehlp frame information, also do the stack field, it's used on x86-64 platforms.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: ecbf297fbb8c7c3b88e448c1318ea519bd760cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbf297fbb8c7c3b88e448c13… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 30 21:37:08 2010 +0200 winedbg: When filling an imagehlp frame information, also do the stack field, it's used on x86-64 platforms. --- programs/winedbg/stack.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index f5769a8..4b2286c 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -84,6 +84,7 @@ static BOOL stack_get_frame(int nf, IMAGEHLP_STACK_FRAME* ihsf) memset(ihsf, 0, sizeof(*ihsf)); ihsf->InstructionOffset = dbg_curr_thread->frames[nf].linear_pc; ihsf->FrameOffset = dbg_curr_thread->frames[nf].linear_frame; + ihsf->StackOffset = dbg_curr_thread->frames[nf].linear_stack; return TRUE; }

1 0

Eric Pouech : winedbg: Store the CONTEXT in each stack frame to enable register access in the non topmost frames .
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: d29c6ead9280a174fa07ec7d5cd07293c3f7832d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29c6ead9280a174fa07ec7d5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 30 21:37:01 2010 +0200 winedbg: Store the CONTEXT in each stack frame to enable register access in the non topmost frames. --- programs/winedbg/debugger.h | 6 +++- programs/winedbg/memory.c | 11 ++------ programs/winedbg/stack.c | 53 +++++++++++++++++++++++++++++++++------ programs/winedbg/tgt_active.c | 2 +- programs/winedbg/tgt_minidump.c | 2 +- 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 373600a..9d9c1b2 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -192,6 +192,8 @@ struct dbg_thread DWORD_PTR linear_pc; DWORD_PTR linear_frame; DWORD_PTR linear_stack; + CONTEXT context; /* context we got out of stackwalk for this frame */ + BOOL is_ctx_valid; /* is the context above valid */ }* frames; int num_frames; int curr_frame; @@ -387,8 +389,8 @@ extern void stack_info(void); extern void stack_backtrace(DWORD threadID); extern BOOL stack_set_frame(int newframe); extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); -extern BOOL stack_get_register_current_frame(unsigned regno, DWORD_PTR** pval); -extern unsigned stack_fetch_frames(void); +extern BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval); +extern unsigned stack_fetch_frames(const CONTEXT* ctx); extern BOOL stack_get_current_symbol(SYMBOL_INFO* sym); /* symbol.c */ diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 2b17dab..76a103a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -694,16 +694,11 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) { if (div->val == regno) { - if (dbg_curr_thread->curr_frame != 0) + if (!stack_get_register_frame(div, value)) { - if (!stack_get_register_current_frame(regno, value)) - { - if (buffer) snprintf(buffer, len, "<register %s not in topmost frame>", div->name); - return FALSE; - } + if (buffer) snprintf(buffer, len, "<register %s not accessible in this frame>", div->name); + return FALSE; } - else - *value = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); if (buffer) lstrcpynA(buffer, div->name, len); return TRUE; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 40e6dae..f5769a8 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -119,6 +119,35 @@ BOOL stack_get_register_current_frame(unsigned regno, DWORD_PTR** pval) return TRUE; } +BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval) +{ + if (dbg_curr_thread->frames == NULL) return FALSE; + if (dbg_curr_thread->frames[dbg_curr_thread->curr_frame].is_ctx_valid) + *pval = (DWORD_PTR*)((char*)&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].context + + (DWORD_PTR)div->pval); + else + { + enum be_cpu_addr kind; + + if (!be_cpu->get_register_info(div->val, &kind)) return FALSE; + + /* reuse some known registers directly out of stackwalk details */ + switch (kind) + { + case be_cpu_addr_pc: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_pc; + break; + case be_cpu_addr_stack: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_stack; + break; + case be_cpu_addr_frame: + *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_frame; + break; + } + } + return TRUE; +} + BOOL stack_set_frame(int newframe) { ADDRESS64 addr; @@ -163,14 +192,14 @@ static BOOL CALLBACK stack_read_mem(HANDLE hProc, DWORD64 addr, * * Do a backtrace on the current thread */ -unsigned stack_fetch_frames(void) +unsigned stack_fetch_frames(const CONTEXT* _ctx) { STACKFRAME64 sf; unsigned nf = 0; /* as native stackwalk can modify the context passed to it, simply copy * it to avoid any damage */ - CONTEXT ctx = dbg_context; + CONTEXT ctx = *_ctx, prevctx = ctx; HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); dbg_curr_thread->frames = NULL; @@ -200,6 +229,15 @@ unsigned stack_fetch_frames(void) dbg_curr_thread->frames[nf].linear_frame = (DWORD_PTR)memory_to_linear_addr(&sf.AddrFrame); dbg_curr_thread->frames[nf].addr_stack = sf.AddrStack; dbg_curr_thread->frames[nf].linear_stack = (DWORD_PTR)memory_to_linear_addr(&sf.AddrStack); + dbg_curr_thread->frames[nf].context = prevctx; + /* FIXME: can this heuristic be improved: we declare first context always valid, and next ones + * if it has been modified by the call to StackWalk... + */ + dbg_curr_thread->frames[nf].is_ctx_valid = + (nf == 0 || + (dbg_curr_thread->frames[nf - 1].is_ctx_valid && + memcmp(&dbg_curr_thread->frames[nf - 1].context, &ctx, sizeof(ctx)))); + prevctx = ctx; nf++; /* we've probably gotten ourselves into an infinite loop so bail */ if (nf > 200) break; @@ -317,27 +355,26 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid) dbg_printf("Unknown thread id (%04x) in process (%04x)\n", tid, pcs->pid); else { - CONTEXT saved_ctx = dbg_context; + CONTEXT context; dbg_curr_tid = dbg_curr_thread->tid; - memset(&dbg_context, 0, sizeof(dbg_context)); - dbg_context.ContextFlags = CONTEXT_FULL; + memset(&context, 0, sizeof(context)); + context.ContextFlags = CONTEXT_FULL; if (SuspendThread(dbg_curr_thread->handle) != -1) { - if (!GetThreadContext(dbg_curr_thread->handle, &dbg_context)) + if (!GetThreadContext(dbg_curr_thread->handle, &context)) { dbg_printf("Can't get context for thread %04x in current process\n", tid); } else { - stack_fetch_frames(); + stack_fetch_frames(&context); backtrace(); } ResumeThread(dbg_curr_thread->handle); } else dbg_printf("Can't suspend thread %04x in current process\n", tid); - dbg_context = saved_ctx; } dbg_curr_thread = thread; dbg_curr_tid = thread ? thread->tid : 0; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index cbcc297..c612615 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -157,7 +157,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC * Do a quiet backtrace so that we have an idea of what the situation * is WRT the source files. */ - stack_fetch_frames(); + stack_fetch_frames(&dbg_context); if (is_debug && !is_break && break_should_continue(&addr, rec->ExceptionCode)) return FALSE; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 7826b78..a4a1af7 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -376,7 +376,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) memcpy(&dbg_context, (char*)data->mapping + mes->ThreadContext.Rva, min(sizeof(dbg_context), mes->ThreadContext.DataSize)); memory_get_current_pc(&addr); - stack_fetch_frames(); + stack_fetch_frames(&dbg_context); be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 0); stack_info(); be_cpu->print_segment_info(dbg_curr_thread->handle, &dbg_context);

1 0