wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

André Hentschel : dbghelp: Only declare deltapc for i386.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 3a183a42df95c915254ae1ca6f2d51e505082b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a183a42df95c915254ae1ca6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 28 23:11:02 2011 +0200 dbghelp: Only declare deltapc for i386. --- dlls/dbghelp/cpu_i386.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 8fe5eac..70ee9e6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -157,8 +157,8 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val16; DWORD val32; BOOL do_switch; - unsigned deltapc; #ifdef __i386__ + unsigned deltapc; CONTEXT _context; #endif @@ -174,6 +174,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); +#ifdef __i386__ /* if we're at first call (which doesn't actually unwind, it just computes ReturnPC, * or if we're doing the first real unwind (count == 1), then we can directly use * eip. otherwise, eip is *after* the insn that actually made the call to @@ -184,7 +185,6 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO */ deltapc = curr_count <= 1 ? 0 : 1; -#ifdef __i386__ if (!context) { /* setup a pseudo context for the rest of the code (esp. unwinding) */

1 0

Vincent Povirk : gdiplus: Use DrawDriverString to draw the text in DrawString.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: d59c3d45e34817e08e68305d3e5f632e3c8523a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59c3d45e34817e08e68305d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 27 14:40:59 2011 -0500 gdiplus: Use DrawDriverString to draw the text in DrawString. --- dlls/gdiplus/graphics.c | 77 +++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d756c0b..be25653 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4608,9 +4608,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, } struct draw_string_args { - POINT drawbase; - UINT drawflags; - REAL ang_cos, ang_sin; + GpGraphics *graphics; + GDIPCONST GpBrush *brush; + REAL x, y, rel_width, rel_height, ascent; }; static GpStatus draw_string_callback(HDC hdc, @@ -4619,14 +4619,14 @@ static GpStatus draw_string_callback(HDC hdc, INT lineno, const RectF *bounds, void *user_data) { struct draw_string_args *args = user_data; - RECT drawcoord; + PointF position; - drawcoord.left = drawcoord.right = args->drawbase.x + roundr(args->ang_sin * bounds->Y); - drawcoord.top = drawcoord.bottom = args->drawbase.y + roundr(args->ang_cos * bounds->Y); + position.X = args->x + bounds->X / args->rel_width; + position.Y = args->y + bounds->Y / args->rel_height + args->ascent; - DrawTextW(hdc, string + index, length, &drawcoord, args->drawflags); - - return Ok; + return GdipDrawDriverString(args->graphics, &string[index], length, font, + args->brush, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); } GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, @@ -4637,10 +4637,12 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string HFONT gdifont; GpPointF pt[3], rectcpy[4]; POINT corners[4]; - REAL angle, rel_width, rel_height; + REAL rel_width, rel_height; INT offsety = 0, save_state; struct draw_string_args args; RectF scaled_rect; + HDC hdc, temp_hdc=NULL; + TEXTMETRICW textmetric; TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, brush); @@ -4648,15 +4650,13 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; - if((brush->bt != BrushTypeSolidColor)){ - FIXME("not implemented for given parameters\n"); - return NotImplemented; + if(graphics->hdc) + { + hdc = graphics->hdc; } - - if(!graphics->hdc) + else { - FIXME("graphics object has no HDC\n"); - return Ok; + hdc = temp_hdc = CreateCompatibleDC(0); } if(format){ @@ -4675,9 +4675,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } - save_state = SaveDC(graphics->hdc); - SetBkMode(graphics->hdc, TRANSPARENT); - SetTextColor(graphics->hdc, brush->lb.lbColor); + save_state = SaveDC(hdc); pt[0].X = 0.0; pt[0].Y = 0.0; @@ -4686,9 +4684,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string pt[2].X = 0.0; pt[2].Y = 1.0; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - args.ang_cos = cos(angle); - args.ang_sin = sin(angle); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -4709,38 +4704,30 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); - SelectClipRgn(graphics->hdc, rgn); + SelectClipRgn(hdc, rgn); } get_font_hfont(graphics, font, &gdifont); - SelectObject(graphics->hdc, gdifont); + SelectObject(hdc, gdifont); - if (!format || format->align == StringAlignmentNear) - { - args.drawbase.x = corners[0].x; - args.drawbase.y = corners[0].y; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS; - } - else if (format->align == StringAlignmentCenter) - { - args.drawbase.x = (corners[0].x + corners[1].x)/2; - args.drawbase.y = (corners[0].y + corners[1].y)/2; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_CENTER; - } - else /* (format->align == StringAlignmentFar) */ - { - args.drawbase.x = corners[1].x; - args.drawbase.y = corners[1].y; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; - } + args.graphics = graphics; + args.brush = brush; - gdip_format_string(graphics->hdc, string, length, font, &scaled_rect, format, + args.rel_width = rel_width; + args.rel_height = rel_height; + + GetTextMetricsW(hdc, &textmetric); + args.ascent = textmetric.tmAscent / rel_height; + + gdip_format_string(hdc, string, length, font, &scaled_rect, format, draw_string_callback, &args); DeleteObject(rgn); DeleteObject(gdifont); - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); + + DeleteDC(temp_hdc); return Ok; }

1 0

Rico Schüller : d3dx9: Fix ID3DXEffect:: SetStateManager().
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 32bba812dfcdf373a82c882b5d46d599c48068ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bba812dfcdf373a82c882b5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jun 28 22:49:44 2011 +0200 d3dx9: Fix ID3DXEffect::SetStateManager(). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 756163a..4253863 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2944,8 +2944,8 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX TRACE("iface %p, manager %p\n", This, manager); - if (This->manager) IUnknown_Release(This->manager); if (manager) IUnknown_AddRef(manager); + if (This->manager) IUnknown_Release(This->manager); This->manager = manager;

1 0

Vincent Povirk : gdiplus: Implement GdipMeasureDriverString.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 6cc7e7f7c4b353257e18cd6356c58df2d00e2923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc7e7f7c4b353257e18cd635… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 27 13:24:39 2011 -0500 gdiplus: Implement GdipMeasureDriverString. --- dlls/gdiplus/graphics.c | 108 ++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 34 ++++++------ 2 files changed, 123 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8c6a042..d756c0b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5624,8 +5624,112 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT GDIPCONST GpFont *font, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox) { - FIXME("(%p %p %d %p %p %d %p %p): stub\n", graphics, text, length, font, positions, flags, matrix, boundingBox); - return NotImplemented; + static const INT unsupported_flags = ~(DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance); + HFONT hfont; + HDC hdc; + REAL min_x, min_y, max_x, max_y, x, y; + int i; + TEXTMETRICW textmetric; + const WORD *glyph_indices; + WORD *dynamic_glyph_indices=NULL; + REAL rel_width, rel_height, ascent, descent; + GpPointF pt[3]; + + TRACE("(%p %p %d %p %p %d %p %p)\n", graphics, text, length, font, positions, flags, matrix, boundingBox); + + if (!graphics || !text || !font || !positions || !boundingBox) + return InvalidParameter; + + if (length == -1) + length = strlenW(text); + + if (length == 0) + { + boundingBox->X = 0.0; + boundingBox->Y = 0.0; + boundingBox->Width = 0.0; + boundingBox->Height = 0.0; + } + + if (flags & unsupported_flags) + FIXME("Ignoring flags %x\n", flags & unsupported_flags); + + if (matrix) + FIXME("Ignoring matrix\n"); + + get_font_hfont(graphics, font, &hfont); + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + GetTextMetricsW(hdc, &textmetric); + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + if (flags & DriverStringOptionsCmapLookup) + { + glyph_indices = dynamic_glyph_indices = GdipAlloc(sizeof(WORD) * length); + if (!glyph_indices) + { + DeleteDC(hdc); + DeleteObject(hfont); + return OutOfMemory; + } + + GetGlyphIndicesW(hdc, text, length, dynamic_glyph_indices, 0); + } + else + glyph_indices = text; + + min_x = max_x = x = positions[0].X; + min_y = max_y = y = positions[0].Y; + + ascent = textmetric.tmAscent / rel_height; + descent = textmetric.tmDescent / rel_height; + + for (i=0; i<length; i++) + { + int char_width; + ABC abc; + + if (!(flags & DriverStringOptionsRealizedAdvance)) + { + x = positions[i].X; + y = positions[i].Y; + } + + GetCharABCWidthsW(hdc, glyph_indices[i], glyph_indices[i], &abc); + char_width = abc.abcA + abc.abcB + abc.abcB; + + if (min_y > y - ascent) min_y = y - ascent; + if (max_y < y + descent) max_y = y + descent; + if (min_x > x) min_x = x; + + x += char_width / rel_width; + + if (max_x < x) max_x = x; + } + + GdipFree(dynamic_glyph_indices); + DeleteDC(hdc); + DeleteObject(hfont); + + boundingBox->X = min_x; + boundingBox->Y = min_y; + boundingBox->Width = max_x - min_x; + boundingBox->Height = max_y - min_y; + + return Ok; } static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0ab570d..bbca69f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3048,36 +3048,36 @@ static void test_string_functions(void) status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, NULL, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, 0x100, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, NULL); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); rc.X = 0; rc.Y = 0; @@ -3086,12 +3086,12 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(0.0, rc.X); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); - todo_wine ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); + ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); char_width = rc.Width; char_height = rc.Height; @@ -3103,11 +3103,11 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(0.0, rc.X); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); expectf(char_height, rc.Height); rc.X = 0; @@ -3117,11 +3117,11 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(rc.X, 0.0); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); expectf(rc.Height, char_height); GdipDeleteMatrix(identity);

1 0

Vincent Povirk : gdiplus: Test MeasureDriverString with a character that has an underhang.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 640c7b5e4ffcdad40efc2dde2496484c609edc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640c7b5e4ffcdad40efc2dde2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 28 13:57:23 2011 -0500 gdiplus: Test MeasureDriverString with a character that has an underhang. --- dlls/gdiplus/tests/graphics.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 64472f4..0ab570d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2827,6 +2827,7 @@ static void test_string_functions(void) HDC hdc = GetDC( hwnd ); const WCHAR fontname[] = {'T','a','h','o','m','a',0}; const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; + const WCHAR teststring2[] = {'j',0}; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3109,6 +3110,20 @@ static void test_string_functions(void) todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); expectf(char_height, rc.Height); + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(Ok, status); + + expectf(rc.X, 0.0); + todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + todo_wine ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); + expectf(rc.Height, char_height); + GdipDeleteMatrix(identity); GdipDeleteStringFormat(format); GdipDeleteBrush(brush);

1 0

Vincent Povirk : gdiplus: Fix the order of arguments to expectf in test_string_functions.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 0ec9d398a57351b65806b6975dab2cd79523d328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec9d398a57351b65806b6975… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 28 13:53:41 2011 -0500 gdiplus: Fix the order of arguments to expectf in test_string_functions. --- dlls/gdiplus/tests/graphics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 49f6815..64472f4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3087,7 +3087,7 @@ static void test_string_functions(void) identity, &rc); todo_wine expect(Ok, status); - expectf(rc.X, 0.0); + expectf(0.0, rc.X); todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); todo_wine ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); todo_wine ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); @@ -3104,10 +3104,10 @@ static void test_string_functions(void) identity, &rc); todo_wine expect(Ok, status); - expectf(rc.X, 0.0); + expectf(0.0, rc.X); todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); - expectf(rc.Height, char_height); + expectf(char_height, rc.Height); GdipDeleteMatrix(identity); GdipDeleteStringFormat(format);

1 0

Marcus Meissner : explorer: Remove useless array NULL check (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 436ec812401b87a1b0e2f4567d5fe24de0d303d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436ec812401b87a1b0e2f4567… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 08:31:31 2011 +0200 explorer: Remove useless array NULL check (Coverity). --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index d04457b..0dc82cf 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -167,7 +167,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) HRESULT hres; SHGetDesktopFolder(&desktop); - if(!params->root || (strlenW(params->root)==0)) + if (!params->root[0]) { return desktop; }

1 0

Dylan Smith : ddraw: Partially revert a struct copy change to fix a regression.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: ced4c383241a1069eca094408d288fbc3784c094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced4c383241a1069eca094408… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 28 12:41:21 2011 -0400 ddraw: Partially revert a struct copy change to fix a regression. Commit 3871329872afe3976e0b2b85330e3a7c47301658 caused the regression. --- dlls/ddraw/ddraw_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c73743a..0f3864a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -585,10 +585,11 @@ typedef struct #define DD_STRUCT_COPY_BYSIZE_(to,from,from_size) \ do { \ DWORD __size = (to)->dwSize; \ - DWORD __copysize = min(__size, from_size); \ + DWORD __resetsize = min(__size, sizeof(*to)); \ + DWORD __copysize = min(__resetsize, from_size); \ assert(to != from); \ memcpy(to, from, __copysize); \ - memset((char*)(to) + __copysize, 0, __size - __copysize); \ + memset((char*)(to) + __copysize, 0, __resetsize - __copysize); \ (to)->dwSize = __size; /* restore size */ \ } while (0)

1 0

André Hentschel : tools: Preserve ordinal when updating specfiles.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: ed3a2765915e5bead74585285532ff880e5bb147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3a2765915e5bead74585285… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 23 00:02:30 2011 +0200 tools: Preserve ordinal when updating specfiles. --- tools/make_specfiles | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 9e9b8e8..ff21ca8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -214,7 +214,7 @@ sub update_spec_file($) { my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack - $_ = sprintf "@ %s %s%s", $callconv, $flags, $func; + $_ = sprintf "$descr{ordinal} %s %s%s", $callconv, $flags, $func; if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible { @@ -227,7 +227,7 @@ sub update_spec_file($) } else { - $_ = sprintf "@ stub %s%s", $flags, $func; + $_ = sprintf "$descr{ordinal} stub %s%s", $flags, $func; } $_ .= $descr{comment} || "";

1 0

André Hentschel : shdocvw: Add ITaskbarList2 Interface .
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 84d68639be45080429a184da85cb94744c924b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d68639be45080429a184da8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 22:01:51 2011 +0200 shdocvw: Add ITaskbarList2 Interface. --- dlls/shdocvw/taskbarlist.c | 52 +++++++++++++++++++++++++++---------------- include/shobjidl.idl | 15 ++++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index d853506..a053cff 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -27,23 +27,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct taskbar_list { - ITaskbarList ITaskbarList_iface; + ITaskbarList2 ITaskbarList2_iface; LONG refcount; }; -static inline struct taskbar_list *impl_from_ITaskbarList(ITaskbarList *iface) +static inline struct taskbar_list *impl_from_ITaskbarList2(ITaskbarList2 *iface) { - return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList_iface); + return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList2_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList2 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ITaskbarList) - || IsEqualGUID(riid, &IID_IUnknown)) + if (IsEqualGUID(riid, &IID_ITaskbarList) || + IsEqualGUID(riid, &IID_ITaskbarList2) || + IsEqualGUID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); *object = iface; @@ -56,9 +57,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) +static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList2 *iface) { - struct taskbar_list *This = impl_from_ITaskbarList(iface); + struct taskbar_list *This = impl_from_ITaskbarList2(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -66,9 +67,9 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) return refcount; } -static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) +static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList2 *iface) { - struct taskbar_list *This = impl_from_ITaskbarList(iface); + struct taskbar_list *This = impl_from_ITaskbarList2(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -84,42 +85,53 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) /* ITaskbarList methods */ -static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList *iface) +static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList2 *iface) { TRACE("iface %p\n", iface); return S_OK; } -static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE taskbar_list_SetActiveAlt(ITaskbarList *iface, HWND hwnd) +static HRESULT STDMETHODCALLTYPE taskbar_list_SetActiveAlt(ITaskbarList2 *iface, HWND hwnd) { FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); return E_NOTIMPL; } -static const struct ITaskbarListVtbl taskbar_list_vtbl = +/* ITaskbarList2 method */ + +static HRESULT STDMETHODCALLTYPE taskbar_list_MarkFullscreenWindow(ITaskbarList2 *iface, + HWND hwnd, + BOOL fullscreen) +{ + FIXME("iface %p, hwnd %p, fullscreen %s stub!\n", iface, hwnd, (fullscreen)?"true":"false"); + + return E_NOTIMPL; +} + +static const struct ITaskbarList2Vtbl taskbar_list_vtbl = { /* IUnknown methods */ taskbar_list_QueryInterface, @@ -131,6 +143,8 @@ static const struct ITaskbarListVtbl taskbar_list_vtbl = taskbar_list_DeleteTab, taskbar_list_ActivateTab, taskbar_list_SetActiveAlt, + /* ITaskbarList2 method */ + taskbar_list_MarkFullscreenWindow, }; HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) @@ -155,12 +169,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) return E_OUTOFMEMORY; } - object->ITaskbarList_iface.lpVtbl = &taskbar_list_vtbl; + object->ITaskbarList2_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 0; - TRACE("Created ITaskbarList %p\n", object); + TRACE("Created ITaskbarList2 %p\n", object); - hr = ITaskbarList_QueryInterface(&object->ITaskbarList_iface, riid, taskbar_list); + hr = ITaskbarList2_QueryInterface(&object->ITaskbarList2_iface, riid, taskbar_list); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, object); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 53afd68..8dd9926 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1857,6 +1857,21 @@ interface ITaskbarList : IUnknown cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") /***************************************************************************** + * ITaskbarList2 interface + */ +[ + object, + uuid(602D4995-B13A-429B-A66E-1935E44F4317), + pointer_default(unique) +] +interface ITaskbarList2 : ITaskbarList +{ + HRESULT MarkFullscreenWindow( + [in] HWND hwnd, + [in] BOOL fullscreen); +} + +/***************************************************************************** * IAutoCompleteDropDown interface */ [

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011