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

Ričardas Barkauskas : ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 5c8ad267572d36ed006e63e795f314fd3f382240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ad267572d36ed006e63e79… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:08 2011 +0300 ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper. --- dlls/ddraw/ddraw.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index daea1ca..fc0dd93 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3471,10 +3471,6 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, ddraw_create_gdi_swapchain(ddraw, object); } - /* Addref the ddraw interface to keep an reference for each surface */ - IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - object->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; - /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { @@ -3523,6 +3519,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * } *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -3563,7 +3561,6 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, } *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw4_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3606,7 +3603,6 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw3_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3649,7 +3645,6 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr; @@ -3682,7 +3677,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr;

1 0

Ričardas Barkauskas : ddraw: Print IDirectDrawGammaControl interface reference count for easier debugging .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 68f3d21f0279aef932f620044751bf2f073c46af URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f3d21f0279aef932f620044… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:19 2011 +0300 ddraw: Print IDirectDrawGammaControl interface reference count for easier debugging. --- dlls/ddraw/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index f7713c5..37a125d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -752,7 +752,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, void *context) { IDirectDrawSurfaceImpl *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref7, ref4, ref3, ref2, ref1, iface_count; + ULONG ref7, ref4, ref3, ref2, ref1, gamma_count, iface_count; ref7 = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ IDirectDrawSurface4_AddRef(&Impl->IDirectDrawSurface4_iface); @@ -763,8 +763,10 @@ DestroyCallback(IDirectDrawSurface7 *surf, ref2 = IDirectDrawSurface2_Release(&Impl->IDirectDrawSurface2_iface); IDirectDrawSurface_AddRef(&Impl->IDirectDrawSurface_iface); ref1 = IDirectDrawSurface_Release(&Impl->IDirectDrawSurface_iface); - WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u\n", - Impl, ref7, ref4, ref3, ref2, ref1); + IDirectDrawGammaControl_AddRef(&Impl->IDirectDrawGammaControl_iface); + gamma_count = IDirectDrawGammaControl_Release(&Impl->IDirectDrawGammaControl_iface); + WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u gamma: %u\n", + Impl, ref7, ref4, ref3, ref2, ref1, gamma_count); /* Skip surfaces which are attached somewhere or which are * part of a complex compound. They will get released when destroying

1 0

Owen Rudge : comctl32: Fix incorrect use of border metrics.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 2d8ad31e22eaa41a15bae88030c5ef717f7cab9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8ad31e22eaa41a15bae8803… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Aug 9 16:39:09 2011 +0100 comctl32: Fix incorrect use of border metrics. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d5778e3..fba9bce 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3066,8 +3066,8 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & WS_BORDER) { - cy += 2 * GetSystemMetrics(SM_CXBORDER); - cx += 2 * GetSystemMetrics(SM_CYBORDER); + cx += 2 * GetSystemMetrics(SM_CXBORDER); + cy += 2 * GetSystemMetrics(SM_CYBORDER); } SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags);

1 0

Nikolay Sivov : oleaut32/tests: Clean result value checks.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 78ca68c85426f12dae2a0a319ec62cf8d5149473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ca68c85426f12dae2a0a319… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 17:45:49 2011 +0400 oleaut32/tests: Clean result value checks. --- dlls/oleaut32/tests/olefont.c | 203 ++++++++++++++++++++--------------------- 1 files changed, 97 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78ca68c85426f12dae2a0…

1 0

Nikolay Sivov : oleaut32: FONTDESC size field value is not important for OleCreateFontIndirect.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 08f578a6c5e415a7f937d42f93a5e245907934a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f578a6c5e415a7f937d42f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 17:53:12 2011 +0400 oleaut32: FONTDESC size field value is not important for OleCreateFontIndirect. --- dlls/oleaut32/olefont.c | 5 ----- dlls/oleaut32/tests/olefont.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index fa60da6..222e20d 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2245,11 +2245,6 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->ref = 1; - /* - * Copy the description of the font in the object. - */ - assert(fontDesc->cbSizeofstruct >= sizeof(FONTDESC)); - newObject->description.cbSizeofstruct = sizeof(FONTDESC); newObject->description.lpstrName = HeapAlloc(GetProcessHeap(), 0, diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 65589b3..6fc1520 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1104,6 +1104,42 @@ static void test_realization(void) IFont_Release(font); } +static void test_OleCreateFontIndirect(void) +{ + FONTDESC fontdesc; + IFont *font; + HRESULT hr; + + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = arial_font; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = ANSI_CHARSET; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + /* play with cbSizeofstruct value */ + fontdesc.cbSizeofstruct = sizeof(fontdesc)-1; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + fontdesc.cbSizeofstruct = sizeof(fontdesc)+1; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + fontdesc.cbSizeofstruct = 0; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); +} + START_TEST(olefont) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1126,4 +1162,5 @@ START_TEST(olefont) test_returns(); test_hfont_lifetime(); test_realization(); + test_OleCreateFontIndirect(); }

1 0

Nikolay Sivov : oleaut32: Use strdupW to duplicate strings.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 1a7d52c907c68d205957a7eab7e0e1b9eda30b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7d52c907c68d205957a7eab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 18:13:47 2011 +0400 oleaut32: Use strdupW to duplicate strings. --- dlls/oleaut32/olefont.c | 48 +++++++++++----------------------------------- 1 files changed, 12 insertions(+), 36 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 222e20d..be88f51 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -697,32 +697,18 @@ static HRESULT WINAPI OLEFontImpl_put_Name( IFont* iface, BSTR name) { - OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%p)\n", this, name); + OLEFontImpl *This = impl_from_IFont(iface); + TRACE("(%p)->(%p)\n", This, name); if (!name) return CTL_E_INVALIDPROPERTYVALUE; - if (this->description.lpstrName==0) - { - this->description.lpstrName = HeapAlloc(GetProcessHeap(), - 0, - (lstrlenW(name)+1) * sizeof(WCHAR)); - } - else - { - this->description.lpstrName = HeapReAlloc(GetProcessHeap(), - 0, - this->description.lpstrName, - (lstrlenW(name)+1) * sizeof(WCHAR)); - } - - if (this->description.lpstrName==0) - return E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, This->description.lpstrName); + This->description.lpstrName = strdupW(name); + if (!This->description.lpstrName) return E_OUTOFMEMORY; - strcpyW(this->description.lpstrName, name); - TRACE("new name %s\n", debugstr_w(this->description.lpstrName)); - OLEFont_SendNotify(this, DISPID_FONT_NAME); + TRACE("new name %s\n", debugstr_w(This->description.lpstrName)); + OLEFont_SendNotify(This, DISPID_FONT_NAME); return S_OK; } @@ -1025,15 +1011,8 @@ static HRESULT WINAPI OLEFontImpl_Clone( return E_OUTOFMEMORY; *newObject = *this; - - /* We need to alloc new memory for the string, otherwise - * we free memory twice. - */ - newObject->description.lpstrName = HeapAlloc( - GetProcessHeap(),0, - (1+strlenW(this->description.lpstrName))*2 - ); - strcpyW(newObject->description.lpstrName, this->description.lpstrName); + /* allocate separate buffer */ + newObject->description.lpstrName = strdupW(this->description.lpstrName); /* Increment internal ref in hfont item list */ if(newObject->gdiFont) inc_int_ref(newObject->gdiFont); @@ -2246,10 +2225,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->ref = 1; newObject->description.cbSizeofstruct = sizeof(FONTDESC); - newObject->description.lpstrName = HeapAlloc(GetProcessHeap(), - 0, - (lstrlenW(fontDesc->lpstrName)+1) * sizeof(WCHAR)); - strcpyW(newObject->description.lpstrName, fontDesc->lpstrName); + newObject->description.lpstrName = strdupW(fontDesc->lpstrName); newObject->description.cySize = fontDesc->cySize; newObject->description.sWeight = fontDesc->sWeight; newObject->description.sCharset = fontDesc->sCharset; @@ -2264,8 +2240,8 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->pPropertyNotifyCP = NULL; newObject->pFontEventsCP = NULL; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); - CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IFontEventsDisp, &newObject->pFontEventsCP); if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) {

1 0

Huw Davies : gdi32: Move to using a multi-line pen object-level function.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 0f40ad8a3d5a968234dc04976b55f4e62125ca67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40ad8a3d5a968234dc04976… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:18 2011 +0100 gdi32: Move to using a multi-line pen object-level function. --- dlls/gdi32/dibdrv/graphics.c | 10 ++++------ dlls/gdi32/dibdrv/objects.c | 32 ++++++++++++++++++++++++++++---- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a7a2fd8..ff83d1a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -73,7 +73,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_line(pdev, pts, pts + 1)) + if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts)) return next->funcs->pLineTo( next, x, y ); return TRUE; @@ -154,7 +154,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); - POINT pts[4]; + POINT pts[5]; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -170,11 +170,9 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; pts[2].y = pts[3].y = rect.bottom - 1; + pts[4] = pts[0]; - pdev->pen_line(pdev, pts , pts + 1); - pdev->pen_line(pdev, pts + 1, pts + 2); - pdev->pen_line(pdev, pts + 2, pts + 3); - pdev->pen_line(pdev, pts + 3, pts ); + pdev->pen_lines(pdev, 5, pts); /* FIXME: Will need updating when we support wide pens */ diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index d96f4bd..e0e37f7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -647,6 +647,18 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +{ + int i; + + assert( num >= 2 ); + for (i = 0; i < num - 1; i++) + if (!solid_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + + return TRUE; +} + void reset_dash_origin(dibdrv_physdev *pdev) { pdev->dash_pos.cur_dash = 0; @@ -920,7 +932,19 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL null_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +{ + int i; + + assert( num >= 2 ); + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + + return TRUE; +} + +static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) { return TRUE; } @@ -984,7 +1008,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; - pdev->pen_line = solid_pen_line; + pdev->pen_lines = solid_pen_lines; pdev->defer &= ~DEFER_PEN; break; @@ -994,13 +1018,13 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_DASHDOTDOT: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; - pdev->pen_line = dashed_pen_line; + pdev->pen_lines = dashed_pen_lines; pdev->pen_pattern = dash_patterns[style]; pdev->defer &= ~DEFER_PEN; break; case PS_NULL: - pdev->pen_line = null_pen_line; + pdev->pen_lines = null_pen_lines; pdev->defer &= ~DEFER_PEN; break; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f3ba2cf..40271af 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -136,7 +136,7 @@ typedef struct dibdrv_physdev DWORD pen_color, pen_and, pen_xor; dash_pattern pen_pattern; dash_pos dash_pos; - BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts); /* brush */ UINT brush_style;

1 0

Huw Davies : gdi32: Implement Polyline and PolyPolyline in the dib driver.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: c6f6c3f727556734905a5bbf4fe1b59079e37bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f6c3f727556734905a5bbf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:19 2011 +0100 gdi32: Implement Polyline and PolyPolyline in the dib driver. --- dlls/gdi32/dibdrv/dc.c | 4 +- dlls/gdi32/dibdrv/dibdrv.h | 3 ++ dlls/gdi32/dibdrv/graphics.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 64769be..03e3f65 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -773,9 +773,9 @@ const DC_FUNCTIONS dib_driver = NULL, /* pPolyBezierTo */ NULL, /* pPolyDraw */ NULL, /* pPolyPolygon */ - NULL, /* pPolyPolyline */ + dibdrv_PolyPolyline, /* pPolyPolyline */ NULL, /* pPolygon */ - NULL, /* pPolyline */ + dibdrv_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ dibdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index bab52cd..760c02e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -21,6 +21,9 @@ extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, + DWORD polylines ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ff83d1a..b2e9f2c 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -147,6 +147,61 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** + * dibdrv_PolyPolyline + */ +BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); + DWORD max_points = 0, i; + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); + + for (i = 0; i < polylines; i++) max_points = max( counts[i], max_points ); + + points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); + if (!points) return FALSE; + + for (i = 0; i < polylines; i++) + { + memcpy( points, pt, counts[i] * sizeof(*pt) ); + pt += counts[i]; + LPtoDP( dev->hdc, points, counts[i] ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, counts[i], points ); + } + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** + * dibdrv_Polyline + */ +BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyline ); + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyline( next, pt, count ); + + points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt) ); + if (!points) return FALSE; + + memcpy( points, pt, count * sizeof(*pt) ); + LPtoDP( dev->hdc, points, count ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, count, points ); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** * dibdrv_Rectangle */ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom )

1 0

Huw Davies : gdi32: Change the object-level brush function to accept a stand-alone dib and a separate clip region .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 925fa108657239ae1672a12299432f696723a072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925fa108657239ae1672a1229… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:20 2011 +0100 gdi32: Change the object-level brush function to accept a stand-alone dib and a separate clip region. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 6 +++--- dlls/gdi32/dibdrv/objects.c | 40 +++++++++++++++++++++++++++++----------- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 760c02e..6727a6b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -75,6 +75,7 @@ extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; +extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index b2e9f2c..f8b3f8a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -107,7 +107,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) update_brush_rop( pdev, rop2 ); - done = pdev->brush_rects( pdev, 1, &dst->visrect ); + done = brush_rects( pdev, 1, &dst->visrect ); update_brush_rop( pdev, GetROP2(dev->hdc) ); @@ -139,7 +139,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); - pdev->brush_rects( pdev, 1, &rect ); + brush_rects( pdev, 1, &rect ); } release_wine_region( rgn ); @@ -236,7 +236,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.right -= 1; rect.bottom -= 1; - pdev->brush_rects(pdev, 1, &rect); + brush_rects(pdev, 1, &rect); return TRUE; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e0e37f7..8575bb4 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1059,10 +1059,16 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) * Fill a number of rectangles with the solid brush * FIXME: Should we insist l < r && t < b? Currently we assume this. */ -static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { int i, j; - const WINEREGION *clip = get_wine_region(pdev->clip); + const WINEREGION *clip = get_wine_region( region ); + + if (!clip) + { + dib->funcs->solid_rects( dib, num, rects, pdev->brush_and, pdev->brush_xor ); + return TRUE; + } for(i = 0; i < num; i++) { @@ -1074,7 +1080,7 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) { - pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); break; } @@ -1088,11 +1094,11 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) rect.right = min(rect.right, clip->rects[j].right); rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); } } } - release_wine_region(pdev->clip); + release_wine_region( region ); return TRUE; } @@ -1205,7 +1211,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) * Fill a number of rectangles with the pattern brush * FIXME: Should we insist l < r && t < b? Currently we assume this. */ -static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { int i, j; const WINEREGION *clip; @@ -1233,7 +1239,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) GetBrushOrgEx(pdev->dev.hdc, &origin); - clip = get_wine_region(pdev->clip); + clip = get_wine_region( region ); + + if (!clip) + { + dib->funcs->pattern_rects( dib, num, rects, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); + return TRUE; + } + for(i = 0; i < num; i++) { for(j = 0; j < clip->numRects; j++) @@ -1244,7 +1257,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) { - pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + dib->funcs->pattern_rects( dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); break; } @@ -1258,15 +1271,15 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) rect.right = min(rect.right, clip->rects[j].right); rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + dib->funcs->pattern_rects( dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); } } } - release_wine_region(pdev->clip); + release_wine_region( region ); return TRUE; } -static BOOL null_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL null_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { return TRUE; } @@ -1392,3 +1405,8 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCBrushColor( next, color ); } + +BOOL brush_rects(dibdrv_physdev *pdev, int num, const RECT *rects) +{ + return pdev->brush_rects( pdev, &pdev->dib, num, rects, pdev->clip ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 40271af..2189040 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -146,7 +146,7 @@ typedef struct dibdrv_physdev DWORD brush_color, brush_and, brush_xor; dib_info brush_dib; void *brush_and_bits, *brush_xor_bits; - BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); + BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ DWORD bkgnd_color, bkgnd_and, bkgnd_xor;

1 0

Nikolay Sivov : oleaut32: Remove some useless comments and initializers.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 92054ef01ca0f2b74427473ce1b6ccf253d7202c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92054ef01ca0f2b74427473ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 12:16:28 2011 +0400 oleaut32: Remove some useless comments and initializers. --- dlls/oleaut32/olefont.c | 221 +++++++---------------------------------------- 1 files changed, 30 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92054ef01ca0f2b744274…

1 0