November 2011 - Wine-Commits

Alexandre Julliard : comctl32: Avoid accessing imagelist internals.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: d0b1b4c7b0c4efc22cd35e03697818bad2a608d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b1b4c7b0c4efc22cd35e036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 11:43:06 2011 +0100 comctl32: Avoid accessing imagelist internals. --- dlls/comctl32/header.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 17b55be..ce95d58 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -39,7 +39,6 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" -#include "imagelist.h" #include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" @@ -384,6 +383,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU /* cnt,txt,img,bmp */ UINT cx, tx, ix, bx, cw, tw, iw, bw; + INT img_cx, img_cy; BITMAP bmp; HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE); @@ -400,8 +400,8 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; } - if ((phdi->fmt & HDF_IMAGE) && (infoPtr->himl)) { - iw = infoPtr->himl->cx + 2 * infoPtr->iMargin; + if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) { + iw = img_cx + 2 * infoPtr->iMargin; x = &ix; w = &iw; } @@ -474,8 +474,8 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (iw) { ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, - ix, r.top + ((INT)rh - infoPtr->himl->cy) / 2, - infoPtr->himl->cx, infoPtr->himl->cy, CLR_DEFAULT, CLR_DEFAULT, 0); + ix, r.top + ((INT)rh - img_cy) / 2, + img_cx, img_cy, CLR_DEFAULT, CLR_DEFAULT, 0); } DeleteObject(hClipRgn);

1 0

Michael Stefaniuc : user32/tests: Drop superfluous function pointer casts.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 8cd1d5839f21c87cdb04a97f56d0c73c14cc8af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd1d5839f21c87cdb04a97f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 11:05:34 2011 +0100 user32/tests: Drop superfluous function pointer casts. --- dlls/user32/tests/dialog.c | 2 +- dlls/user32/tests/edit.c | 102 ++++++++++++++++++++++---------------------- dlls/user32/tests/msg.c | 2 +- 3 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cd1d5839f21c87cdb04a…

1 0

Alexandre Julliard : comctl32: Merge imagelist definitions into the C file.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: e6cf9fbcc2751e8a8a418b531f8e98980b304933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cf9fbcc2751e8a8a418b531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 11:47:24 2011 +0100 comctl32: Merge imagelist definitions into the C file. --- dlls/comctl32/imagelist.c | 52 ++++++++++++++++++++++++++++- dlls/comctl32/imagelist.h | 80 --------------------------------------------- 2 files changed, 50 insertions(+), 82 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ca6579f..db59104 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -52,15 +52,63 @@ #include "commctrl.h" #include "comctl32.h" #include "commoncontrols.h" -#include "imagelist.h" #include "wine/debug.h" #include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(imagelist); - #define MAX_OVERLAYIMAGE 15 +struct _IMAGELIST +{ + const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */ + + INT cCurImage; /* 04: ImageCount */ + INT cMaxImage; /* 08: maximages */ + INT cGrow; /* 0C: cGrow */ + INT cx; /* 10: cx */ + INT cy; /* 14: cy */ + DWORD x4; + UINT flags; /* 1C: flags */ + COLORREF clrFg; /* 20: foreground color */ + COLORREF clrBk; /* 24: background color */ + + + HBITMAP hbmImage; /* 28: images Bitmap */ + HBITMAP hbmMask; /* 2C: masks Bitmap */ + HDC hdcImage; /* 30: images MemDC */ + HDC hdcMask; /* 34: masks MemDC */ + INT nOvlIdx[MAX_OVERLAYIMAGE]; /* 38: overlay images index */ + + /* not yet found out */ + HBRUSH hbrBlend25; + HBRUSH hbrBlend50; + INT cInitial; + UINT uBitsPixel; + char *has_alpha; + + LONG ref; /* reference count */ +}; + +#define IMAGELIST_MAGIC 0x53414D58 + +/* Header used by ImageList_Read() and ImageList_Write() */ +#include "pshpack2.h" +typedef struct _ILHEAD +{ + USHORT usMagic; + USHORT usVersion; + WORD cCurImage; + WORD cMaxImage; + WORD cGrow; + WORD cx; + WORD cy; + COLORREF bkcolor; + WORD flags; + SHORT ovls[4]; +} ILHEAD; +#include "poppack.h" + /* internal image list data used for Drag & Drop operations */ typedef struct { diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h deleted file mode 100644 index f6f1d1b..0000000 --- a/dlls/comctl32/imagelist.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * ImageList definitions - * - * Copyright 1998 Eric Kohl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_IMAGELIST_H -#define __WINE_IMAGELIST_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" - -struct _IMAGELIST -{ - const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */ - - INT cCurImage; /* 04: ImageCount */ - INT cMaxImage; /* 08: maximages */ - INT cGrow; /* 0C: cGrow */ - INT cx; /* 10: cx */ - INT cy; /* 14: cy */ - DWORD x4; - UINT flags; /* 1C: flags */ - COLORREF clrFg; /* 20: foreground color */ - COLORREF clrBk; /* 24: background color */ - - - HBITMAP hbmImage; /* 28: images Bitmap */ - HBITMAP hbmMask; /* 2C: masks Bitmap */ - HDC hdcImage; /* 30: images MemDC */ - HDC hdcMask; /* 34: masks MemDC */ - INT nOvlIdx[15]; /* 38: overlay images index */ - - /* not yet found out */ - HBRUSH hbrBlend25; - HBRUSH hbrBlend50; - INT cInitial; - UINT uBitsPixel; - char *has_alpha; - - LONG ref; /* reference count */ -}; - -#define IMAGELIST_MAGIC 0x53414D58 - -/* Header used by ImageList_Read() and ImageList_Write() */ -#include "pshpack2.h" -typedef struct _ILHEAD -{ - USHORT usMagic; - USHORT usVersion; - WORD cCurImage; - WORD cMaxImage; - WORD cGrow; - WORD cx; - WORD cy; - COLORREF bkcolor; - WORD flags; - SHORT ovls[4]; -} ILHEAD; -#include "poppack.h" - -#endif /* __WINE_IMAGELIST_H */

1 0

Huw Davies : gdi32: Add solid_line primitives.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 04396063c89785787b4a40b9d663d5f01c47ce50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04396063c89785787b4a40b9d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 21 10:12:52 2011 +0000 gdi32: Add solid_line primitives. --- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/objects.c | 15 +--- dlls/gdi32/dibdrv/primitives.c | 230 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04396063c89785787b4a4…

1 0

Alexandre Julliard : comctl32: Take the total bitmap size into account when reading a bottom-up image list .
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: ee462a7801ae64cb57e890b62ed848c77d124154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee462a7801ae64cb57e890b62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 11:42:48 2011 +0100 comctl32: Take the total bitmap size into account when reading a bottom-up image list. --- dlls/comctl32/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c32cb0b..ca6579f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2216,8 +2216,8 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ { - ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride; - mask_ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride / 8; + ptr += image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride; + mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 8; stride = -stride; image_info->bmiHeader.biHeight = himl->cy; }

1 0

Huw Davies : gdi32: Simplify the Bresenham line drawing.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: f168f838f1f6deb530251a0d6115d12b6bf8df2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f168f838f1f6deb530251a0d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 21 10:12:51 2011 +0000 gdi32: Simplify the Bresenham line drawing. --- dlls/gdi32/dibdrv/dibdrv.h | 8 +++ dlls/gdi32/dibdrv/objects.c | 147 ++++++++++++++++++++++++++----------------- 2 files changed, 97 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index ee8e1a0..e38000e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -147,6 +147,14 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } +struct line_params +{ + int err_start, err_add_1, err_add_2, bias; + unsigned int length; + int x_inc, y_inc; + BOOL x_major; +}; + struct stretch_params { int err_start, err_add_1, err_add_2; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c0dd7d2..9fbb3c9 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -545,44 +545,39 @@ int clip_line(const POINT *start, const POINT *end, const RECT *clip, } } -static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, const bres_params *params, INT err, - BOOL last_pt, void (* callback)(dibdrv_physdev*,INT,INT), dibdrv_physdev *pdev) +static void bres_line_with_bias(const POINT *start, const struct line_params *params, + void (* callback)(dibdrv_physdev*,INT,INT), dibdrv_physdev *pdev) { - const int xadd = is_x_increasing(params->octant) ? 1 : -1; - const int yadd = is_y_increasing(params->octant) ? 1 : -1; - INT erradd; + POINT pt = *start; + int len = params->length, err = params->err_start; - if (is_xmajor(params->octant)) /* line is "more horizontal" */ + if (params->x_major) { - erradd = 2*params->dy - 2*params->dx; - while(x1 != x2) + while(len--) { - callback(pdev, x1, y1); + callback(pdev, pt.x, pt.y); if (err + params->bias > 0) { - y1 += yadd; - err += erradd; + pt.y += params->y_inc; + err += params->err_add_1; } - else err += 2*params->dy; - x1 += xadd; + else err += params->err_add_2; + pt.x += params->x_inc; } - if(last_pt) callback(pdev, x1, y1); } - else /* line is "more vertical" */ + else { - erradd = 2*params->dx - 2*params->dy; - while(y1 != y2) + while(len--) { - callback(pdev, x1, y1); + callback(pdev, pt.x, pt.y); if (err + params->bias > 0) { - x1 += xadd; - err += erradd; + pt.x += params->x_inc; + err += params->err_add_1; } - else err += 2*params->dx; - y1 += yadd; + else err += params->err_add_2; + pt.y += params->y_inc; } - if(last_pt) callback(pdev, x1, y1); } } @@ -651,38 +646,58 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) } else { - bres_params params; - INT dx = end->x - start->x; - INT dy = end->y - start->y; + bres_params clip_params; + struct line_params line_params; + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); INT i; - params.dx = abs(dx); - params.dy = abs(dy); - params.octant = get_octant_mask(dx, dy); - params.bias = get_bias(params.octant); + clip_params.dx = abs_dx; + clip_params.dy = abs_dy; + clip_params.octant = get_octant_mask(dx, dy); + clip_params.bias = get_bias( clip_params.octant ); + + line_params.bias = clip_params.bias; + line_params.x_major = is_xmajor( clip_params.octant ); + line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; + line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; + + if (line_params.x_major) + { + line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; + line_params.err_add_2 = 2 * abs_dy; + } + else + { + line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; + line_params.err_add_2 = 2 * abs_dx; + } for(i = 0; i < clip->numRects; i++) { POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clip->rects + i, &params, &clipped_start, &clipped_end); + clip_status = clip_line(start, end, clip->rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { int m = abs(clipped_start.x - start->x); int n = abs(clipped_start.y - start->y); - int err; - BOOL last_pt = FALSE; - if(is_xmajor(params.octant)) - err = 2 * params.dy - params.dx + m * 2 * params.dy - n * 2 * params.dx; + if (line_params.x_major) + { + line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; + } else - err = 2 * params.dx - params.dy + n * 2 * params.dx - m * 2 * params.dy; + { + line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; + } - if(clip_status == 1 && (end->x != clipped_end.x || end->y != clipped_end.y)) last_pt = TRUE; + if (clipped_end.x == end->x && clipped_end.y == end->y) line_params.length--; - bres_line_with_bias(clipped_start.x, clipped_start.y, clipped_end.x, clipped_end.y, &params, - err, last_pt, solid_pen_line_callback, pdev); + bres_line_with_bias( &clipped_start, &line_params, solid_pen_line_callback, pdev ); if(clip_status == 2) break; /* completely unclipped, so we can finish */ } @@ -923,54 +938,70 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) } else { - bres_params params; - INT dx = end->x - start->x; - INT dy = end->y - start->y; + bres_params clip_params; + struct line_params line_params; + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); INT i; - params.dx = abs(dx); - params.dy = abs(dy); - params.octant = get_octant_mask(dx, dy); - params.bias = get_bias(params.octant); + clip_params.dx = abs_dx; + clip_params.dy = abs_dy; + clip_params.octant = get_octant_mask(dx, dy); + clip_params.bias = get_bias( clip_params.octant ); + + line_params.bias = clip_params.bias; + line_params.x_major = is_xmajor( clip_params.octant ); + line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; + line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; + + if (line_params.x_major) + { + line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; + line_params.err_add_2 = 2 * abs_dy; + } + else + { + line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; + line_params.err_add_2 = 2 * abs_dx; + } for(i = 0; i < clip->numRects; i++) { POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clip->rects + i, &params, &clipped_start, &clipped_end); + clip_status = clip_line(start, end, clip->rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { int m = abs(clipped_start.x - start->x); int n = abs(clipped_start.y - start->y); - int err; - BOOL last_pt = FALSE; pdev->dash_pos = start_pos; - if(is_xmajor(params.octant)) + if (line_params.x_major) { - err = 2 * params.dy - params.dx + m * 2 * params.dy - n * 2 * params.dx; + line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; skip_dash(pdev, m); } else { - err = 2 * params.dx - params.dy + n * 2 * params.dx - m * 2 * params.dy; + line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; skip_dash(pdev, n); } - if(clip_status == 1 && (end->x != clipped_end.x || end->y != clipped_end.y)) last_pt = TRUE; + if (clipped_end.x == end->x && clipped_end.y == end->y) line_params.length--; - bres_line_with_bias(clipped_start.x, clipped_start.y, clipped_end.x, clipped_end.y, &params, - err, last_pt, dashed_pen_line_callback, pdev); + bres_line_with_bias( &clipped_start, &line_params, dashed_pen_line_callback, pdev ); if(clip_status == 2) break; /* completely unclipped, so we can finish */ } } pdev->dash_pos = start_pos; - if(is_xmajor(params.octant)) - skip_dash(pdev, params.dx); + if(line_params.x_major) + skip_dash(pdev, abs_dx); else - skip_dash(pdev, params.dy); + skip_dash(pdev, abs_dy); } release_wine_region(pdev->clip);

1 0

Alexandre Julliard : winex11: Don' t allocate the glyph cache without Xrender, and cleanup initialization.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 9efb9d480d9b720a7a34353b9ecc2e17e5c646fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efb9d480d9b720a7a34353b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 20:44:26 2011 +0100 winex11: Don't allocate the glyph cache without Xrender, and cleanup initialization. --- dlls/winex11.drv/x11drv_main.c | 3 +- dlls/winex11.drv/xrender.c | 118 ++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 66 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8e2082d..ca03083 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -632,8 +632,7 @@ static void process_detach(void) /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup(); #endif - if(using_client_side_fonts) - X11DRV_XRender_Finalize(); + X11DRV_XRender_Finalize(); /* cleanup GDI */ X11DRV_GDI_Finalize(); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a1b0581..f6b19ba 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -44,6 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrender); #ifdef SONAME_LIBXRENDER +WINE_DECLARE_DEBUG_CHANNEL(winediag); + static BOOL X11DRV_XRender_Installed = FALSE; #include <X11/Xlib.h> @@ -359,51 +361,51 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) { int event_base, i; - if (client_side_with_render && - (xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) - { - -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found; -LOAD_FUNCPTR(XRenderAddGlyphs) -LOAD_FUNCPTR(XRenderComposite) -LOAD_FUNCPTR(XRenderCompositeText16) -LOAD_FUNCPTR(XRenderCreateGlyphSet) -LOAD_FUNCPTR(XRenderCreatePicture) -LOAD_FUNCPTR(XRenderFillRectangle) -LOAD_FUNCPTR(XRenderFindFormat) -LOAD_FUNCPTR(XRenderFindVisualFormat) -LOAD_FUNCPTR(XRenderFreeGlyphSet) -LOAD_FUNCPTR(XRenderFreePicture) -LOAD_FUNCPTR(XRenderSetPictureClipRectangles) -LOAD_FUNCPTR(XRenderQueryExtension) + using_client_side_fonts = client_side_with_render || client_side_with_core; + + if (!client_side_with_render) return NULL; + if (!(xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) return NULL; + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) return NULL + LOAD_FUNCPTR(XRenderAddGlyphs); + LOAD_FUNCPTR(XRenderComposite); + LOAD_FUNCPTR(XRenderCompositeText16); + LOAD_FUNCPTR(XRenderCreateGlyphSet); + LOAD_FUNCPTR(XRenderCreatePicture); + LOAD_FUNCPTR(XRenderFillRectangle); + LOAD_FUNCPTR(XRenderFindFormat); + LOAD_FUNCPTR(XRenderFindVisualFormat); + LOAD_FUNCPTR(XRenderFreeGlyphSet); + LOAD_FUNCPTR(XRenderFreePicture); + LOAD_FUNCPTR(XRenderSetPictureClipRectangles); + LOAD_FUNCPTR(XRenderQueryExtension); #undef LOAD_FUNCPTR #ifdef HAVE_XRENDERSETPICTURETRANSFORM -#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0); -LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) +#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) + LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform); #undef LOAD_OPTIONAL_FUNCPTR #endif - wine_tsx11_lock(); - X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); - wine_tsx11_unlock(); - if(X11DRV_XRender_Installed) { - TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); - if(!load_xrender_formats()) /* This fails in buggy versions of libXrender.so */ - { - wine_tsx11_unlock(); - WINE_MESSAGE( - "Wine has detected that you probably have a buggy version\n" - "of libXrender.so . Because of this client side font rendering\n" - "will be disabled. Please upgrade this library.\n"); - X11DRV_XRender_Installed = FALSE; - return NULL; - } + wine_tsx11_lock(); + X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); + wine_tsx11_unlock(); + if (!X11DRV_XRender_Installed) return NULL; - if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) { - WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); - X11DRV_XRender_Installed = FALSE; - } - } + TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); + if(!load_xrender_formats()) /* This fails in buggy versions of libXrender.so */ + { + ERR_(winediag)("Wine has detected that you probably have a buggy version " + "of libXrender. Because of this client side font rendering " + "will be disabled. Please upgrade this library.\n"); + X11DRV_XRender_Installed = FALSE; + return NULL; + } + + if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) + { + WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); + X11DRV_XRender_Installed = FALSE; + return NULL; } #ifdef SONAME_LIBFONTCONFIG @@ -428,32 +430,20 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) #endif sym_not_found: - if(X11DRV_XRender_Installed || client_side_with_core) - { - glyphsetCache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*glyphsetCache) * INIT_CACHE_SIZE); - - glyphsetCacheSize = INIT_CACHE_SIZE; - lastfree = 0; - for(i = 0; i < INIT_CACHE_SIZE; i++) { - glyphsetCache[i].next = i + 1; - glyphsetCache[i].count = -1; - } - glyphsetCache[i-1].next = -1; - using_client_side_fonts = 1; + glyphsetCache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*glyphsetCache) * INIT_CACHE_SIZE); - if(!X11DRV_XRender_Installed) { - TRACE("Xrender is not available on your XServer, client side rendering with the core protocol instead.\n"); - if(screen_depth <= 8 || !client_side_antialias_with_core) - antialias = 0; - } else { - if(screen_depth <= 8 || !client_side_antialias_with_render) - antialias = 0; - } - return &xrender_funcs; + glyphsetCacheSize = INIT_CACHE_SIZE; + lastfree = 0; + for(i = 0; i < INIT_CACHE_SIZE; i++) { + glyphsetCache[i].next = i + 1; + glyphsetCache[i].count = -1; } - TRACE("Using X11 core fonts\n"); - return NULL; + glyphsetCache[i-1].next = -1; + + if(screen_depth <= 8 || !client_side_antialias_with_render) antialias = 0; + + return &xrender_funcs; } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */

1 0

Alexandre Julliard : gdi32: Add a null driver fallback implementation for non-antialiased text output.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 5282ffadaddbfe858d50f57d6363d11a8dae8ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5282ffadaddbfe858d50f57d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 11:57:53 2011 +0100 gdi32: Add a null driver fallback implementation for non-antialiased text output. --- dlls/gdi32/driver.c | 6 -- dlls/gdi32/font.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + 3 files changed, 152 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 9b951d0..0610347 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -301,12 +301,6 @@ static BOOL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UIN return TRUE; } -static BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, - LPCWSTR str, UINT count, const INT *dx ) -{ - return TRUE; -} - static BOOL nulldrv_FontIsLinked( PHYSDEV dev ) { return FALSE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 97cc2b6..ee824f0 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1607,6 +1607,156 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, } +/* helper for nulldrv_ExtTextOut */ +static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, + GLYPHMETRICS *metrics, struct gdi_image_bits *image ) +{ + UINT ggo_flags = aa_flags | GGO_GLYPH_INDEX; + static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; + UINT indices[3] = {0, 0, 0x20}; + int i; + DWORD ret, size; + int stride; + + indices[0] = index; + + for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i]) + { + ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, 0, NULL, &identity ); + if (ret != GDI_ERROR) break; + } + + if (ret == GDI_ERROR) return ERROR_NOT_FOUND; + if (!image) return ERROR_SUCCESS; + + image->ptr = NULL; + image->free = NULL; + if (!ret) return ERROR_SUCCESS; /* empty glyph */ + + stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); + size = metrics->gmBlackBoxY * stride; + + if (!(image->ptr = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + image->is_copy = TRUE; + image->free = free_heap_bits; + + ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, size, image->ptr, &identity ); + if (ret == GDI_ERROR) + { + HeapFree( GetProcessHeap(), 0, image->ptr ); + return ERROR_NOT_FOUND; + } + return ERROR_SUCCESS; +} + +/* helper for nulldrv_ExtTextOut */ +static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS *metrics, + const struct gdi_image_bits *image, const RECT *clip ) +{ + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; + UINT x, y, i, count; + BYTE *ptr = image->ptr; + int stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); + POINT *pts; + RECT rect, clipped_rect; + + rect.left = origin_x + metrics->gmptGlyphOrigin.x; + rect.top = origin_y - metrics->gmptGlyphOrigin.y; + rect.right = rect.left + metrics->gmBlackBoxX; + rect.bottom = rect.top + metrics->gmBlackBoxY; + if (!clip) clipped_rect = rect; + else if (!intersect_rect( &clipped_rect, &rect, clip )) return; + + pts = HeapAlloc( GetProcessHeap(), 0, + max(2,metrics->gmBlackBoxX) * metrics->gmBlackBoxY * sizeof(*pts) ); + if (!pts) return; + + count = 0; + ptr += (clipped_rect.top - rect.top) * stride; + for (y = clipped_rect.top; y < clipped_rect.bottom; y++, ptr += stride) + { + for (x = clipped_rect.left - rect.left; x < clipped_rect.right - rect.left; x++) + { + while (x < clipped_rect.right - rect.left && !(ptr[x / 8] & masks[x % 8])) x++; + pts[count].x = rect.left + x; + while (x < clipped_rect.right - rect.left && (ptr[x / 8] & masks[x % 8])) x++; + pts[count + 1].x = rect.left + x; + if (pts[count + 1].x > pts[count].x) + { + pts[count].y = pts[count + 1].y = y; + count += 2; + } + } + } + DPtoLP( hdc, pts, count ); + for (i = 0; i < count; i += 2) Polyline( hdc, pts + i, 2 ); + HeapFree( GetProcessHeap(), 0, pts ); +} + +/*********************************************************************** + * nulldrv_ExtTextOut + */ +BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) +{ + UINT i; + DWORD err; + HGDIOBJ orig; + HPEN pen; + + if (flags & ETO_OPAQUE) + { + RECT rc = *rect; + HBRUSH brush = CreateSolidBrush( GetNearestColor( dev->hdc, GetBkColor(dev->hdc) )); + + if (brush) + { + orig = SelectObject( dev->hdc, brush ); + DPtoLP( dev->hdc, (POINT *)&rc, 2 ); + PatBlt( dev->hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + SelectObject( dev->hdc, orig ); + DeleteObject( brush ); + } + } + + if (!count) return TRUE; + + pen = CreatePen( PS_SOLID, 1, GetTextColor(dev->hdc) ); + orig = SelectObject( dev->hdc, pen ); + + for (i = 0; i < count; i++) + { + GLYPHMETRICS metrics; + struct gdi_image_bits image; + + err = get_glyph_bitmap( dev->hdc, (UINT)str[i], GGO_BITMAP, &metrics, &image ); + if (err) continue; + + if (image.ptr) draw_glyph( dev->hdc, x, y, &metrics, &image, (flags & ETO_CLIPPED) ? rect : NULL ); + if (image.free) image.free( &image ); + + if (dx) + { + if (flags & ETO_PDY) + { + x += dx[ i * 2 ]; + y += dx[ i * 2 + 1]; + } + else x += dx[ i ]; + } + else + { + x += metrics.gmCellIncX; + y += metrics.gmCellIncY; + } + } + + SelectObject( dev->hdc, orig ); + DeleteObject( pen ); + return TRUE; +} + + /*********************************************************************** * ExtTextOutA (GDI32.@) * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c23a5cc..d8a793f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -358,6 +358,8 @@ extern BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a helper function to determine anti-aliasing flags.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 1b63d5a6101ee9d8fb27726c0cabc4d15e81cf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b63d5a6101ee9d8fb27726c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 12:01:58 2011 +0100 gdi32: Add a helper function to determine anti-aliasing flags. --- dlls/gdi32/dibdrv/graphics.c | 22 +++++----------------- dlls/gdi32/font.c | 19 +++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 +++ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 0e55af1..3a9880d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -157,19 +157,6 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME release_wine_region( pdev->clip ); } -static inline UINT get_aa_flags( dibdrv_physdev *pdev ) -{ - LOGFONTW lf; - - if (pdev->dib.bit_count <= 8) return GGO_BITMAP; - - GetObjectW( GetCurrentObject( pdev->dev.hdc, OBJ_FONT ), sizeof(lf), &lf ); - if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - - /* FIXME, check gasp and user prefs */ - return GGO_GRAY4_BITMAP; -} - static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static const int padding[4] = {0, 3, 2, 1}; @@ -181,10 +168,10 @@ static const int padding[4] = {0, 3, 2, 1}; * For non-antialiased bitmaps convert them to the 17-level format * using only values 0 or 16. */ -static DWORD get_glyph_bitmap( dibdrv_physdev *pdev, UINT index, GLYPHMETRICS *metrics, +static DWORD get_glyph_bitmap( dibdrv_physdev *pdev, UINT index, UINT aa_flags, GLYPHMETRICS *metrics, struct gdi_image_bits *image ) { - UINT aa_flags = get_aa_flags( pdev ), ggo_flags = aa_flags | GGO_GLYPH_INDEX; + UINT ggo_flags = aa_flags | GGO_GLYPH_INDEX; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; UINT indices[3] = {0, 0, 0x20}; int i, x, y; @@ -253,7 +240,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); - UINT i; + UINT aa_flags, i; POINT origin; DWORD err; HRGN saved_clip = NULL; @@ -274,6 +261,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, DeleteObject( clip ); } + aa_flags = get_font_aa_flags( dev->hdc ); origin.x = x; origin.y = y; for (i = 0; i < count; i++) @@ -281,7 +269,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, GLYPHMETRICS metrics; struct gdi_image_bits image; - err = get_glyph_bitmap( pdev, (UINT)str[i], &metrics, &image ); + err = get_glyph_bitmap( pdev, (UINT)str[i], aa_flags, &metrics, &image ); if (err) continue; if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ee824f0..60e04c5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -258,6 +258,25 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC } +UINT get_font_aa_flags( HDC hdc ) +{ + LOGFONTW lf; + + if (GetObjectType( hdc ) == OBJ_MEMDC) + { + BITMAP bm; + GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bm), &bm ); + if (bm.bmBitsPixel <= 8) return GGO_BITMAP; + } + else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; + + GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); + if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; + + /* FIXME, check gasp and user prefs */ + return GGO_GRAY4_BITMAP; +} + /*********************************************************************** * GdiGetCodePage (GDI32.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d8a793f..70dc521 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,6 +278,9 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; +/* font.c */ +extern UINT get_font_aa_flags( HDC hdc ) DECLSPEC_HIDDEN; + /* freetype.c */ /* Undocumented structure filled in by GdiRealizationInfo */

1 0

Alexandre Julliard : winex11: Get rid of the non-Xrender client-side font rendering.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: b61a534853ab5a20ce050b9285842363dc10c2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61a534853ab5a20ce050b928… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 20:26:23 2011 +0100 winex11: Get rid of the non-Xrender client-side font rendering. --- dlls/winex11.drv/xrender.c | 561 +++++--------------------------------------- 1 files changed, 62 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b61a534853ab5a20ce050…

1 0