January 2012 - Wine-Commits

Nikolay Sivov : shell32: Use shared IUnknown implementation for both vtables.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 82c72f2fae591c98e3364adb74dc1fbed8477169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c72f2fae591c98e3364adb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 03:58:33 2012 +0300 shell32: Use shared IUnknown implementation for both vtables. --- dlls/shell32/shlview_cmenu.c | 74 +++++------------------------------------ 1 files changed, 9 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3c3f369..1e1b3b0 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -66,7 +66,7 @@ static inline ContextMenu *impl_from_IContextMenu2(IContextMenu2 *iface) return CONTAINING_RECORD(iface, ContextMenu, IContextMenu2_iface); } -static HRESULT WINAPI ItemMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { ContextMenu *This = impl_from_IContextMenu2(iface); @@ -95,7 +95,7 @@ static HRESULT WINAPI ItemMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI ItemMenu_AddRef(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_AddRef(IContextMenu2 *iface) { ContextMenu *This = impl_from_IContextMenu2(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -103,7 +103,7 @@ static ULONG WINAPI ItemMenu_AddRef(IContextMenu2 *iface) return ref; } -static ULONG WINAPI ItemMenu_Release(IContextMenu2 *iface) +static ULONG WINAPI ContextMenu_Release(IContextMenu2 *iface) { ContextMenu *This = impl_from_IContextMenu2(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -553,9 +553,9 @@ static HRESULT WINAPI ItemMenu_HandleMenuMsg( static const IContextMenu2Vtbl ItemContextMenuVtbl = { - ItemMenu_QueryInterface, - ItemMenu_AddRef, - ItemMenu_Release, + ContextMenu_QueryInterface, + ContextMenu_AddRef, + ContextMenu_Release, ItemMenu_QueryContextMenu, ItemMenu_InvokeCommand, ItemMenu_GetCommandString, @@ -590,62 +590,6 @@ IContextMenu2 *ItemMenu_Constructor(IShellFolder *parent, LPCITEMIDLIST pidl, co } /* Background menu implementation */ -static HRESULT WINAPI BackgroundMenu_QueryInterface(IContextMenu2 *iface, REFIID riid, void **ppvObj) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); - - *ppvObj = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IContextMenu) || - IsEqualIID(riid, &IID_IContextMenu2)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/ - { - FIXME("-- LPSHELLEXTINIT pointer requested\n"); - } - - if(*ppvObj) - { - IContextMenu2_AddRef(iface); - TRACE("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); - return S_OK; - } - - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -static ULONG WINAPI BackgroundMenu_AddRef(IContextMenu2 *iface) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; -} - -static ULONG WINAPI BackgroundMenu_Release(IContextMenu2 *iface) -{ - ContextMenu *This = impl_from_IContextMenu2(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(%u)\n", This, ref); - - if (!ref) - { - if (This->parent) - IShellFolder_Release(This->parent); - - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - static HRESULT WINAPI BackgroundMenu_QueryContextMenu( IContextMenu2 *iface, HMENU hMenu, @@ -927,9 +871,9 @@ static HRESULT WINAPI BackgroundMenu_HandleMenuMsg( static const IContextMenu2Vtbl BackgroundContextMenuVtbl = { - BackgroundMenu_QueryInterface, - BackgroundMenu_AddRef, - BackgroundMenu_Release, + ContextMenu_QueryInterface, + ContextMenu_AddRef, + ContextMenu_Release, BackgroundMenu_QueryContextMenu, BackgroundMenu_InvokeCommand, BackgroundMenu_GetCommandString,

1 0

Austin English : wine.inf: Add Tcpip/Winsock/Winsock2 service registry keys .
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: a2219b9c841a7002d1528c613a7bc4439f14a509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2219b9c841a7002d1528c613… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 10 19:51:25 2012 -0800 wine.inf: Add Tcpip/Winsock/Winsock2 service registry keys. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index bc7d673..3ea3025 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3048,6 +3048,9 @@ ErrorControl=1 [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters" +HKLM,"System\CurrentControlSet\Services\Winsock\Parameters" +HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

André Hentschel : ntdll: No need for WINE_ prefixed debug output macro.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 37ba5eb2a2231e270c038376b6f32ed83d2f4429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ba5eb2a2231e270c038376b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 10 22:29:26 2012 +0100 ntdll: No need for WINE_ prefixed debug output macro. --- dlls/ntdll/signal_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 6f9b9bf..7514b4d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -577,7 +577,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default: - WINE_ERR( "Got unexpected trap %ld\n", TRAP_sig(context) ); + ERR("Got unexpected trap %ld\n", TRAP_sig(context)); rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; }

1 0

Alexandre Julliard : winex11: Avoid some references to the X11 device from XRender.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 3e85a7c2a73ac5fdb578424679905846dfe783b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e85a7c2a73ac5fdb57842467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:26:26 2012 +0100 winex11: Avoid some references to the X11 device from XRender. --- dlls/winex11.drv/xrender.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5f73865..27b69ae 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -158,6 +158,7 @@ struct xrender_physdev { struct gdi_physdev dev; X11DRV_PDEVICE *x11dev; + HRGN region; enum wxr_format format; int cache_index; BOOL update_clip; @@ -622,29 +623,29 @@ static Picture get_xrender_picture( struct xrender_physdev *dev, HRGN clip_rgn, wine_tsx11_unlock(); TRACE( "Allocing pict=%lx dc=%p drawable=%08lx\n", dev->pict, dev->dev.hdc, dev->x11dev->drawable ); - dev->update_clip = (dev->x11dev->region != 0); + dev->update_clip = (dev->region != 0); } if (clip_rect) { HRGN rgn = CreateRectRgnIndirect( clip_rect ); if (clip_rgn) CombineRgn( rgn, rgn, clip_rgn, RGN_AND ); - if (dev->x11dev->region) CombineRgn( rgn, rgn, dev->x11dev->region, RGN_AND ); + if (dev->region) CombineRgn( rgn, rgn, dev->region, RGN_AND ); update_xrender_clipping( dev, rgn ); DeleteObject( rgn ); } else if (clip_rgn) { - if (dev->x11dev->region) + if (dev->region) { HRGN rgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( rgn, clip_rgn, dev->x11dev->region, RGN_AND ); + CombineRgn( rgn, clip_rgn, dev->region, RGN_AND ); update_xrender_clipping( dev, rgn ); DeleteObject( rgn ); } else update_xrender_clipping( dev, clip_rgn ); } - else if (dev->update_clip) update_xrender_clipping( dev, dev->x11dev->region ); + else if (dev->update_clip) update_xrender_clipping( dev, dev->region ); dev->update_clip = (clip_rect || clip_rgn); /* have to update again if we are using a custom region */ return dev->pict; @@ -1361,6 +1362,7 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); + physdev->region = rgn; physdev->update_clip = TRUE; dev = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); @@ -2033,7 +2035,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else /* color -> color (can be at different depths) or mono -> mono */ { - if (physdev_dst->x11dev->depth == 32 && physdev_src->x11dev->depth < 32) + if (physdev_dst->pict_format->depth == 32 && physdev_src->pict_format->depth < 32) mask_pict = get_no_alpha_mask(); xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, @@ -2148,7 +2150,7 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); XSetGraphicsExposures( gdi_display, tmpGC, False ); tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, - tmp.visrect.bottom - tmp.visrect.top, physdev_dst->x11dev->depth ); + tmp.visrect.bottom - tmp.visrect.top, physdev_dst->pict_format->depth ); wine_tsx11_unlock(); xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, &tmp ); @@ -2244,8 +2246,10 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA gc = XCreateGC( gdi_display, physdev->x11dev->drawable, 0, NULL ); XSetSubwindowMode( gdi_display, gc, IncludeInferiors ); XSetGraphicsExposures( gdi_display, gc, False ); - tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, - tmp.visrect.bottom - tmp.visrect.top, physdev->x11dev->depth ); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, + tmp.visrect.right - tmp.visrect.left, + tmp.visrect.bottom - tmp.visrect.top, + physdev->pict_format->depth ); wine_tsx11_unlock(); xrender_put_image( src_pixmap, src_pict, mask_pict, NULL, physdev->pict_format,

1 0

Alexandre Julliard : winex11: Remove the global XRender installed flag.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: a680644da62cc7d213183cbae7b2c707d9d38e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a680644da62cc7d213183cbae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:49:39 2012 +0100 winex11: Remove the global XRender installed flag. --- dlls/winex11.drv/xrender.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index eec1525..fb567de 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrender); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static BOOL X11DRV_XRender_Installed = FALSE; - #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> @@ -364,6 +362,7 @@ static int load_xrender_formats(void) const struct gdi_dc_funcs *X11DRV_XRender_Init(void) { int event_base, i; + BOOL ok; using_client_side_fonts = client_side_with_render || client_side_with_core; @@ -395,9 +394,9 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) #undef LOAD_FUNCPTR wine_tsx11_lock(); - X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); + ok = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); wine_tsx11_unlock(); - if (!X11DRV_XRender_Installed) return NULL; + if (!ok) return NULL; 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 */ @@ -405,14 +404,12 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) 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; } @@ -897,7 +894,7 @@ static AA_Type get_antialias_type( HDC hdc, BOOL subpixel, BOOL hinter ) WORD flags; UINT font_smoothing_type, font_smoothing_orientation; - if (X11DRV_XRender_Installed && subpixel && + if (subpixel && SystemParametersInfoW( SPI_GETFONTSMOOTHINGTYPE, 0, &font_smoothing_type, 0) && font_smoothing_type == FE_FONTSMOOTHINGCLEARTYPE) { @@ -1072,9 +1069,6 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) } if (!font_smoothing) entry->aa_default = AA_None; - - /* we can't support subpixel without xrender */ - if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; } else entry->aa_default = AA_None; @@ -1699,7 +1693,7 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, int render_op = PictOpOver; XRenderColor col; - if (!X11DRV_XRender_Installed || !physdev->x11dev->has_gdi_font) + if (!physdev->x11dev->has_gdi_font) { dev = GET_NEXT_PHYSDEV( dev, pExtTextOut ); return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); @@ -2133,8 +2127,6 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); } - if (!X11DRV_XRender_Installed) goto x11drv_fallback; - /* XRender is of no use for color -> mono */ if (physdev_dst->format == WXR_FORMAT_MONO && physdev_src->format != WXR_FORMAT_MONO) goto x11drv_fallback; @@ -2197,8 +2189,6 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA Picture src_pict, mask_pict = 0; BOOL use_repeat; - if (!X11DRV_XRender_Installed) goto x11drv_fallback; - if (hbitmap) { if (!(bitmap = X11DRV_get_phys_bitmap( hbitmap ))) return ERROR_INVALID_HANDLE; @@ -2310,12 +2300,6 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct Pixmap src_pixmap; BOOL use_repeat; - if (!X11DRV_XRender_Installed) - { - dev = GET_NEXT_PHYSDEV( dev, pBlendImage ); - return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); - } - format = get_xrender_format_from_bitmapinfo( info ); if (!(func.AlphaFormat & AC_SRC_ALPHA)) format = get_format_without_alpha( format ); @@ -2385,7 +2369,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, double xscale, yscale; BOOL use_repeat; - if (!X11DRV_XRender_Installed || src_dev->funcs != dst_dev->funcs) + if (src_dev->funcs != dst_dev->funcs) { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); @@ -2484,7 +2468,6 @@ static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG n const GRADIENT_RECT *rect = grad_array; POINT pt[2]; - if (!X11DRV_XRender_Installed) goto fallback; if (!pXRenderCreateLinearGradient) goto fallback; /* <= 16-bpp uses dithering */ @@ -2582,7 +2565,6 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct b Picture src_pict, dst_pict; XRenderPictureAttributes pa; - if (!X11DRV_XRender_Installed) goto x11drv_fallback; if (!pattern) goto x11drv_fallback; if (physdev->format == WXR_FORMAT_MONO) goto x11drv_fallback;

1 0

Alexandre Julliard : winex11: Create XRender colors from the original COLORREF and add support for PALETTEINDEX colors .
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 7d447d7b9a8b27448a68dd335fd7b5e7d9576e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d447d7b9a8b27448a68dd335… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:54:40 2012 +0100 winex11: Create XRender colors from the original COLORREF and add support for PALETTEINDEX colors. --- dlls/winex11.drv/xrender.c | 83 +++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index fb567de..5f73865 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -453,24 +453,32 @@ sym_not_found: } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */ -static void get_xrender_color( XRenderPictFormat *pf, int src_color, XRenderColor *dst_color ) +static void get_xrender_color( struct xrender_physdev *physdev, COLORREF src_color, XRenderColor *dst_color ) { - if(pf->direct.redMask) - dst_color->red = ((src_color >> pf->direct.red) & pf->direct.redMask) * 65535/pf->direct.redMask; - else - dst_color->red = 0; + if (src_color & (1 << 24)) /* PALETTEINDEX */ + { + HPALETTE pal = GetCurrentObject( physdev->dev.hdc, OBJ_PAL ); + PALETTEENTRY pal_ent; - if(pf->direct.greenMask) - dst_color->green = ((src_color >> pf->direct.green) & pf->direct.greenMask) * 65535/pf->direct.greenMask; + if (!GetPaletteEntries( pal, LOWORD(src_color), 1, &pal_ent )) + GetPaletteEntries( pal, 0, 1, &pal_ent ); + dst_color->red = pal_ent.peRed * 257; + dst_color->green = pal_ent.peGreen * 257; + dst_color->blue = pal_ent.peBlue * 257; + } else - dst_color->green = 0; + { + if (src_color >> 16 == 0x10ff) src_color = 0; /* DIBINDEX */ - if(pf->direct.blueMask) - dst_color->blue = ((src_color >> pf->direct.blue) & pf->direct.blueMask) * 65535/pf->direct.blueMask; - else - dst_color->blue = 0; + dst_color->red = GetRValue( src_color ) * 257; + dst_color->green = GetGValue( src_color ) * 257; + dst_color->blue = GetBValue( src_color ) * 257; + } - dst_color->alpha = 0xffff; + if (physdev->format == WXR_FORMAT_MONO && !dst_color->red && !dst_color->green && !dst_color->blue) + dst_color->alpha = 0; + else + dst_color->alpha = 0xffff; } static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) @@ -1681,10 +1689,8 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); - XGCValues xgcval; gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; - int textPixel, backgroundPixel; AA_Type aa_type = AA_None; unsigned int idx; Picture pict, tile_pict = 0; @@ -1699,33 +1705,26 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); } - xgcval.function = GXcopy; - xgcval.background = physdev->x11dev->backgroundPixel; - xgcval.fill_style = FillSolid; - wine_tsx11_lock(); - XChangeGC( gdi_display, physdev->x11dev->gc, GCFunction | GCBackground | GCFillStyle, &xgcval ); - wine_tsx11_unlock(); - - if(physdev->x11dev->depth == 1) { - if((physdev->x11dev->textPixel & 0xffffff) == 0) { - textPixel = 0; - backgroundPixel = 1; - } else { - textPixel = 1; - backgroundPixel = 0; - } - } else { - textPixel = physdev->x11dev->textPixel; - backgroundPixel = physdev->x11dev->backgroundPixel; - } + get_xrender_color( physdev, GetTextColor( physdev->dev.hdc ), &col ); + pict = get_xrender_picture( physdev, 0, (flags & ETO_CLIPPED) ? lprect : NULL ); if(flags & ETO_OPAQUE) { + XRenderColor bg; + + if (physdev->format == WXR_FORMAT_MONO) + /* use the inverse of the text color */ + bg.red = bg.green = bg.blue = bg.alpha = ~col.alpha; + else + get_xrender_color( physdev, GetBkColor( physdev->dev.hdc ), &bg ); + wine_tsx11_lock(); - XSetForeground( gdi_display, physdev->x11dev->gc, backgroundPixel ); - XFillRectangle( gdi_display, physdev->x11dev->drawable, physdev->x11dev->gc, - physdev->x11dev->dc_rect.left + lprect->left, physdev->x11dev->dc_rect.top + lprect->top, - lprect->right - lprect->left, lprect->bottom - lprect->top ); + set_xrender_transformation( pict, 1, 1, 0, 0 ); + pXRenderFillRectangle( gdi_display, PictOpSrc, pict, &bg, + physdev->x11dev->dc_rect.left + lprect->left, + physdev->x11dev->dc_rect.top + lprect->top, + lprect->right - lprect->left, + lprect->bottom - lprect->top ); wine_tsx11_unlock(); } @@ -1758,7 +1757,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, physdev->x11dev->dc_rect.left + x, physdev->x11dev->dc_rect.top + y); elts = HeapAlloc(GetProcessHeap(), 0, sizeof(XGlyphElt16) * count); - pict = get_xrender_picture( physdev, 0, (flags & ETO_CLIPPED) ? lprect : NULL ); /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -1769,12 +1767,11 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, offset.x = offset.y = 0; current.x = current.y = 0; - get_xrender_color(physdev->pict_format, physdev->x11dev->textPixel, &col); tile_pict = get_tile_pict(physdev->format, &col); /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. */ - if((physdev->format == WXR_FORMAT_MONO) && (textPixel == 0)) + if (physdev->format == WXR_FORMAT_MONO && col.red == 0 && col.green == 0 && col.blue == 0) render_op = PictOpOutReverse; /* This gives us 'black' text */ for(idx = 0; idx < count; idx++) @@ -2027,8 +2024,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderColor fg, bg; - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->textPixel, &fg ); - get_xrender_color( physdev_dst->pict_format, physdev_dst->x11dev->backgroundPixel, &bg ); + get_xrender_color( physdev_dst, GetTextColor( physdev_dst->dev.hdc ), &fg ); + get_xrender_color( physdev_dst, GetBkColor( physdev_dst->dev.hdc ), &bg ); fg.alpha = bg.alpha = 0; xrender_mono_blit( src_pict, dst_pict, physdev_dst->format, &fg, &bg,

1 0

Alexandre Julliard : winex11: Move the clipboard DIB creation functions to clipboard.c.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 49b73d53cfe55f69c2c8a9aff40f89658d472ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b73d53cfe55f69c2c8a9aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 17:41:03 2012 +0100 winex11: Move the clipboard DIB creation functions to clipboard.c. --- dlls/winex11.drv/clipboard.c | 202 +++++++++++++++++++++++++++++++++++---- dlls/winex11.drv/dib.c | 219 ------------------------------------------ dlls/winex11.drv/x11drv.h | 4 - 3 files changed, 184 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b73d53cfe55f69c2c8a…

1 0

Alexandre Julliard : winex11: Avoid using DIB functions to create the dithering image.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 978c42feb5efcee2a0dbf7af9ecba5284a0746e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978c42feb5efcee2a0dbf7af9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:29:47 2012 +0100 winex11: Avoid using DIB functions to create the dithering image. --- dlls/winex11.drv/brush.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index afc1e0b..216c142 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -112,17 +112,21 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) Pixmap pixmap; GC gc = get_bitmap_gc(depth); + wine_tsx11_lock(); if (!ditherImage) { - ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, depth ); - if (!ditherImage) + ditherImage = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, + NULL, MATRIX_SIZE, MATRIX_SIZE, 32, 0 ); + if (!ditherImage) { + wine_tsx11_unlock(); ERR("Could not create dither image\n"); return 0; } + ditherImage->data = HeapAlloc( GetProcessHeap(), 0, + ditherImage->height * ditherImage->bytes_per_line ); } - wine_tsx11_lock(); if (color != prevColor) { int r = GetRValue( color ) * DITHER_LEVELS;

1 0

Alexandre Julliard : winex11: Store the XRender format in the bitmap structure.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 5112699a6b55971f4e1051518c9e706033813596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5112699a6b55971f4e1051518… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 20:19:56 2012 +0100 winex11: Store the XRender format in the bitmap structure. --- dlls/winex11.drv/bitmap.c | 35 +++++++++++-------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 80 ++++++++++++++++++++------------------------ 3 files changed, 58 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5112699a6b55971f4e105…

1 0

Alexandre Julliard : winex11: Get rid of the DIB section support.
by Alexandre Julliard Jan. 11, 2012

Jan. 11, 2012

Module: wine Branch: master Commit: 5b11c96fa129953b6059e9715851be2e9ec1d7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b11c96fa129953b6059e9715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:18:05 2012 +0100 winex11: Get rid of the DIB section support. --- dlls/winex11.drv/Makefile.in | 4 - dlls/winex11.drv/bitmap.c | 5 - dlls/winex11.drv/dib.c | 3978 --------------------------------------- dlls/winex11.drv/dib_convert.c | 1428 -------------- dlls/winex11.drv/dib_dst_swap.c | 1569 --------------- dlls/winex11.drv/dib_src_swap.c | 1518 --------------- dlls/winex11.drv/x11drv.h | 160 -- dlls/winex11.drv/xrender.c | 44 - 8 files changed, 0 insertions(+), 8706 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b11c96fa129953b6059e…

1 0