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

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 4b97c4b1ef8c83f3cc51c7b8396b99839a10a87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b97c4b1ef8c83f3cc51c7b83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:42:09 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 292 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 228 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 260 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 284 +++++++++++++++++++++--------------------- 4 files changed, 532 insertions(+), 532 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b97c4b1ef8c83f3cc51c…

1 0

Alexandre Julliard : Release 1.5.7.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: d35cb8164a7635201c2ccdf73de2a78cebf6cb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35cb8164a7635201c2ccdf73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 22 20:16:32 2012 +0200 Release 1.5.7. --- ANNOUNCE | 913 ++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 527 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d35cb8164a7635201c2cc…

1 0

Henri Verbeet : wined3d: Implement mode setting in the adapter instead of the device.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 0f0fe49240522cc3cf67d2211c875fb38c140396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0fe49240522cc3cf67d2211… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:27 2012 +0200 wined3d: Implement mode setting in the adapter instead of the device. --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 80 +++----------------------------------------- dlls/wined3d/directx.c | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 8 +++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 +- 6 files changed, 87 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f0fe49240522cc3cf67d…

1 0

Henri Verbeet : wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 70008999486651b62bef641196a31f6c7002d0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70008999486651b62bef64119… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:28 2012 +0200 wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain. --- dlls/wined3d/device.c | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54eea3f..08b9b63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3723,31 +3723,10 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic TRACE("device %p, swapchain_idx %u, mode %p.\n", device, swapchain_idx, mode); - if (swapchain_idx) + if (SUCCEEDED(hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain))) { - hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain); - if (SUCCEEDED(hr)) - { - hr = wined3d_swapchain_get_display_mode(swapchain, mode); - wined3d_swapchain_decref(swapchain); - } - } - else - { - const struct wined3d_adapter *adapter = device->adapter; - - /* Don't read the real display mode, but return the stored mode - * instead. X11 can't change the color depth, and some apps are - * pretty angry if they SetDisplayMode from 24 to 16 bpp and find out - * that GetDisplayMode still returns 24 bpp. - * - * Also don't relay to the swapchain because with ddraw it's possible - * that there isn't a swapchain at all. */ - mode->width = adapter->screen_size.cx; - mode->height = adapter->screen_size.cy; - mode->format_id = adapter->screen_format; - mode->refresh_rate = 0; - hr = WINED3D_OK; + hr = wined3d_swapchain_get_display_mode(swapchain, mode); + wined3d_swapchain_decref(swapchain); } return hr;

1 0

Henri Verbeet : wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties ().
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: c2c0743ccfd4a945df3b88231d62731e14da3324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c0743ccfd4a945df3b88231… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:29 2012 +0200 wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties(). --- dlls/wined3d/device.c | 15 ++++++++++----- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08b9b63..49b1efb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4800,7 +4800,9 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device if (cursor_image) { + struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; + HRESULT hr; /* MSDN: Cursor must be A8R8G8B8 */ if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) @@ -4809,13 +4811,18 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > device->adapter->screen_size.cx - || cursor_image->resource.height > device->adapter->screen_size.cy) + if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) { WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", cursor_image, cursor_image->resource.width, cursor_image->resource.height, - device->adapter->screen_size.cx, device->adapter->screen_size.cy); + mode.width, mode.height); return WINED3DERR_INVALIDCALL; } @@ -5694,8 +5701,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - adapter->screen_size.cx = mode.width; - adapter->screen_size.cy = mode.height; adapter->screen_format = mode.format_id; /* Save the creation parameters. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fe3109..2685504 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3136,8 +3136,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Store the new values. */ - adapter->screen_size.cx = mode->width; - adapter->screen_size.cy = mode->height; adapter->screen_format = mode->format_id; /* And finally clip mouse to our screen. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9aa4be3..5d07091 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1543,7 +1543,6 @@ struct wined3d_adapter BOOL opengl; POINT monitorPoint; - SIZE screen_size; enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info;

1 0

Henri Verbeet : wined3d: Only store a different screen format if it' s explicitly changed through wined3d.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: b6c7b825a10f6661763cf0e196004d21f600a12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7b825a10f6661763cf0e19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:30 2012 +0200 wined3d: Only store a different screen format if it's explicitly changed through wined3d. --- dlls/wined3d/device.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49b1efb..4c3282c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5678,7 +5678,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct fragment_pipeline *fragment_pipeline; - struct wined3d_display_mode mode; struct shader_caps shader_caps; struct fragment_caps ffp_caps; unsigned int i; @@ -5693,16 +5692,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, list_init(&device->shaders); device->surface_alignment = surface_alignment; - /* Get the initial screen setup for ddraw. */ - hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode); - if (FAILED(hr)) - { - ERR("Failed to get the adapter's display mode, hr %#x.\n", hr); - wined3d_decref(device->wined3d); - return hr; - } - adapter->screen_format = mode.format_id; - /* Save the creation parameters. */ device->create_parms.adapter_idx = adapter_idx; device->create_parms.device_type = device_type;

1 0

Henri Verbeet : wined3d: Get rid of the d3d_caps debug channel.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: c11c2e2dbbce3f9b59d2a976281a0fcb60549fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11c2e2dbbce3f9b59d2a9762… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:31 2012 +0200 wined3d: Get rid of the d3d_caps debug channel. --- dlls/wined3d/arb_program_shader.c | 13 +- dlls/wined3d/directx.c | 425 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 7 +- 3 files changed, 215 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c11c2e2dbbce3f9b59d2a…

1 0

Vincent Povirk : gdiplus: Scale all points in GdipAddPathString instead of the font.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: cae52d078a871f184653da7ff171b337b2848e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae52d078a871f184653da7ff… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 21 15:31:27 2012 -0500 gdiplus: Scale all points in GdipAddPathString instead of the font. --- dlls/gdiplus/graphicspath.c | 46 +++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index f61d588..3095c08 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -840,7 +840,8 @@ static float fromfixedpoint(const FIXED v) struct format_string_args { GpPath *path; - UINT maxY; + float maxY; + float scale; }; static GpStatus format_string_callback(HDC dc, @@ -853,8 +854,8 @@ static GpStatus format_string_callback(HDC dc, struct format_string_args *args = priv; GpPath *path = args->path; GpStatus status = Ok; - float x = bounds->X; - float y = bounds->Y; + float x = rect->X + (bounds->X - rect->X) * args->scale; + float y = rect->Y + (bounds->Y - rect->Y) * args->scale; int i; if (underlined_index_count) @@ -866,7 +867,7 @@ static GpStatus format_string_callback(HDC dc, TTPOLYGONHEADER *ph = NULL; char *start; DWORD len, ofs = 0; - UINT bb_end; + float bb_end; len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); if (len == GDI_ERROR) { @@ -881,7 +882,7 @@ static GpStatus format_string_callback(HDC dc, break; } GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity); - bb_end = gm.gmBlackBoxY + gm.gmptGlyphOrigin.y; + bb_end = (gm.gmBlackBoxY + gm.gmptGlyphOrigin.y) * args->scale; if (bb_end + y > args->maxY) args->maxY = bb_end + y; @@ -891,8 +892,8 @@ static GpStatus format_string_callback(HDC dc, DWORD ofs_start = ofs; ph = (TTPOLYGONHEADER*)&start[ofs]; path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart; - path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x); - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(ph->pfxStart.y); + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(ph->pfxStart.y) * args->scale; TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y); ofs += sizeof(*ph); while (ofs - ofs_start < ph->cb) @@ -907,16 +908,16 @@ static GpStatus format_string_callback(HDC dc, for (j = 0; j < curve->cpfx; ++j) { path->pathdata.Types[path->pathdata.Count] = PathPointTypeLine; - path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x); - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y); + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; } break; case TT_PRIM_CSPLINE: for (j = 0; j < curve->cpfx; ++j) { path->pathdata.Types[path->pathdata.Count] = PathPointTypeBezier; - path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x); - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y); + path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; } break; default: @@ -927,8 +928,8 @@ static GpStatus format_string_callback(HDC dc, path->pathdata.Types[path->pathdata.Count - 1] |= PathPointTypeCloseSubpath; } path->newfigure = TRUE; - x += gm.gmCellIncX; - y += gm.gmCellIncY; + x += gm.gmCellIncX * args->scale; + y += gm.gmCellIncY * args->scale; GdipFree(ph); if (status != Ok) @@ -948,12 +949,24 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT GpPath *backup; struct format_string_args args; int i; + UINT16 native_height; + RectF scaled_layout_rect; + TEXTMETRICW textmetric; FIXME("(%p, %s, %d, %p, %d, %f, %p, %p): stub\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format); if (!path || !string || !family || !emSize || !layoutRect || !format) return InvalidParameter; - status = GdipCreateFont(family, emSize, style, UnitPixel, &font); + status = GdipGetEmHeight(family, style, &native_height); + if (status != Ok) + return status; + + scaled_layout_rect.X = layoutRect->X; + scaled_layout_rect.Y = layoutRect->Y; + scaled_layout_rect.Width = layoutRect->Width * native_height / emSize; + scaled_layout_rect.Height = layoutRect->Height * native_height / emSize; + + status = GdipCreateFont(family, native_height, style, UnitPixel, &font); if (status != Ok) return status; @@ -974,9 +987,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT dc = CreateCompatibleDC(0); SelectObject(dc, hfont); + GetTextMetricsW(dc, &textmetric); + args.path = path; args.maxY = 0; - status = gdip_format_string(dc, string, length, NULL, layoutRect, format, format_string_callback, &args); + args.scale = emSize / native_height; + status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont);

1 0

Vincent Povirk : gdiplus: Don' t position characters by glyph metrics in GdipAddPathString.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 3cde67e1444e794d220f6344f04774ff88f5e23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cde67e1444e794d220f6344f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 21 15:49:39 2012 -0500 gdiplus: Don't position characters by glyph metrics in GdipAddPathString. --- dlls/gdiplus/graphicspath.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3095c08..df9613d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -842,6 +842,7 @@ struct format_string_args GpPath *path; float maxY; float scale; + float ascent; }; static GpStatus format_string_callback(HDC dc, @@ -861,13 +862,15 @@ static GpStatus format_string_callback(HDC dc, if (underlined_index_count) FIXME("hotkey underlines not drawn yet\n"); + if (y + bounds->Height * args->scale > args->maxY) + args->maxY = y + bounds->Height * args->scale; + for (i = index; i < length; ++i) { GLYPHMETRICS gm; TTPOLYGONHEADER *ph = NULL; char *start; DWORD len, ofs = 0; - float bb_end; len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); if (len == GDI_ERROR) { @@ -882,9 +885,6 @@ static GpStatus format_string_callback(HDC dc, break; } GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, len, start, &identity); - bb_end = (gm.gmBlackBoxY + gm.gmptGlyphOrigin.y) * args->scale; - if (bb_end + y > args->maxY) - args->maxY = bb_end + y; ofs = 0; while (ofs < len) @@ -893,7 +893,7 @@ static GpStatus format_string_callback(HDC dc, ph = (TTPOLYGONHEADER*)&start[ofs]; path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x) * args->scale; - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(ph->pfxStart.y) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(ph->pfxStart.y) * args->scale; TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y); ofs += sizeof(*ph); while (ofs - ofs_start < ph->cb) @@ -909,7 +909,7 @@ static GpStatus format_string_callback(HDC dc, { path->pathdata.Types[path->pathdata.Count] = PathPointTypeLine; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(curve->apfx[j].y) * args->scale; } break; case TT_PRIM_CSPLINE: @@ -917,7 +917,7 @@ static GpStatus format_string_callback(HDC dc, { path->pathdata.Types[path->pathdata.Count] = PathPointTypeBezier; path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(curve->apfx[j].x) * args->scale; - path->pathdata.Points[path->pathdata.Count++].Y = y + bb_end - fromfixedpoint(curve->apfx[j].y) * args->scale; + path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(curve->apfx[j].y) * args->scale; } break; default: @@ -992,6 +992,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.path = path; args.maxY = 0; args.scale = emSize / native_height; + args.ascent = textmetric.tmAscent * args.scale; status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); DeleteDC(dc);

1 0

Vincent Povirk : gdiplus: Fix vertical alignment calculation in GdipAddPathString.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: fe000c773ce89961a4dcfbf6eee75c5833911539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe000c773ce89961a4dcfbf6e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 21 15:51:37 2012 -0500 gdiplus: Fix vertical alignment calculation in GdipAddPathString. --- dlls/gdiplus/graphicspath.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index df9613d..471f915 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1008,12 +1008,12 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT } if (format && format->vertalign == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) { - float inc = layoutRect->Height - args.maxY - layoutRect->Y; + float inc = layoutRect->Height + layoutRect->Y - args.maxY; inc /= 2; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; } else if (format && format->vertalign == StringAlignmentFar) { - float inc = layoutRect->Height - args.maxY - layoutRect->Y; + float inc = layoutRect->Height + layoutRect->Y - args.maxY; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; }

1 0