December 2011 - Wine-Commits

Alexandre Julliard : ntdll: Make an error message a proper ERR.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 70f4b2d5024cbe923518510c88e9fa1aa689e117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f4b2d5024cbe923518510c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 21:25:13 2011 +0100 ntdll: Make an error message a proper ERR. --- dlls/ntdll/rtl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c430e2d..1970251 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -140,7 +140,7 @@ void WINAPI RtlDeleteResource(LPRTL_RWLOCK rwl) { RtlEnterCriticalSection( &rwl->rtlCS ); if( rwl->iNumberActive || rwl->uExclusiveWaiters || rwl->uSharedWaiters ) - MESSAGE("Deleting active MRSW lock (%p), expect failure\n", rwl ); + ERR("Deleting active MRSW lock (%p), expect failure\n", rwl ); rwl->hOwningThreadId = 0; rwl->uExclusiveWaiters = rwl->uSharedWaiters = 0; rwl->iNumberActive = 0;

1 0

Henri Verbeet : ddraw: Move clipper handling to ddraw.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: e6fb4537f00cd1e94ff11dd85b7b07b58245ec45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fb4537f00cd1e94ff11dd85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:55 2011 +0100 ddraw: Move clipper handling to ddraw. --- dlls/ddraw/clipper.c | 304 ++++++++++++++++------------------------ dlls/ddraw/ddraw.c | 18 +-- dlls/ddraw/ddraw_private.h | 15 +-- dlls/ddraw/surface.c | 14 +-- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/clipper.c | 161 --------------------- dlls/wined3d/surface.c | 23 +--- dlls/wined3d/wined3d.spec | 11 -- dlls/wined3d/wined3d_private.h | 10 -- include/wine/wined3d.h | 13 -- 10 files changed, 138 insertions(+), 432 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6fb4537f00cd1e94ff11…

1 0

Henri Verbeet : ddraw: Add support for clipped blits.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 10d2a9375ddfac47de8957c7d126a28d82f15701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d2a9375ddfac47de8957c7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:56 2011 +0100 ddraw: Add support for clipped blits. --- dlls/ddraw/surface.c | 136 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 122 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 86d02c5..d110acc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1270,6 +1270,125 @@ static HRESULT WINAPI ddraw_surface1_Flip(IDirectDrawSurface *iface, IDirectDraw dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); } +static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, const RECT *dst_rect_in, + IDirectDrawSurfaceImpl *src_surface, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) +{ + struct wined3d_surface *wined3d_src_surface = src_surface ? src_surface->wined3d_surface : NULL; + RECT src_rect, dst_rect; + float scale_x, scale_y; + const RECT *clip_rect; + UINT clip_list_size; + RGNDATA *clip_list; + HRESULT hr = DD_OK; + UINT i; + + if (!dst_surface->clipper) + { + if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = ddraw_surface_update_frontbuffer(src_surface, src_rect_in, TRUE); + if (SUCCEEDED(hr)) + hr = wined3d_surface_blt(dst_surface->wined3d_surface, dst_rect_in, + wined3d_src_surface, src_rect_in, flags, fx, filter); + if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(dst_surface, dst_rect_in, FALSE); + + return hr; + } + + if (!dst_rect_in) + { + dst_rect.left = 0; + dst_rect.top = 0; + dst_rect.right = dst_surface->surface_desc.dwWidth; + dst_rect.bottom = dst_surface->surface_desc.dwHeight; + } + else + { + dst_rect = *dst_rect_in; + } + + if (IsRectEmpty(&dst_rect)) + return DDERR_INVALIDRECT; + + if (src_surface) + { + if (!src_rect_in) + { + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = src_surface->surface_desc.dwWidth; + src_rect.bottom = src_surface->surface_desc.dwHeight; + } + else + { + src_rect = *src_rect_in; + } + + if (IsRectEmpty(&src_rect)) + return DDERR_INVALIDRECT; + } + else + { + SetRect(&src_rect, 0, 0, 0, 0); + } + + scale_x = (float)(src_rect.right - src_rect.left) / (float)(dst_rect.right - dst_rect.left); + scale_y = (float)(src_rect.bottom - src_rect.top) / (float)(dst_rect.bottom - dst_rect.top); + + if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface, + &dst_rect, NULL, &clip_list_size))) + { + WARN("Failed to get clip list size, hr %#x.\n", hr); + return hr; + } + + if (!(clip_list = HeapAlloc(GetProcessHeap(), 0, clip_list_size))) + { + WARN("Failed to allocate clip list.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface, + &dst_rect, clip_list, &clip_list_size))) + { + WARN("Failed to get clip list, hr %#x.\n", hr); + return hr; + } + + clip_rect = (RECT *)clip_list->Buffer; + for (i = 0; i < clip_list->rdh.nCount; ++i) + { + RECT src_rect_clipped = src_rect; + + if (src_surface) + { + src_rect_clipped.left += (clip_rect[i].left - dst_rect.left) * scale_x; + src_rect_clipped.top += (clip_rect[i].top - dst_rect.top) * scale_y; + src_rect_clipped.right -= (dst_rect.right - clip_rect[i].right) * scale_x; + src_rect_clipped.bottom -= (dst_rect.bottom - clip_rect[i].bottom) * scale_y; + + if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) + break; + } + } + + if (FAILED(hr = wined3d_surface_blt(dst_surface->wined3d_surface, &clip_rect[i], + wined3d_src_surface, &src_rect_clipped, flags, fx, filter))) + break; + + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) + break; + } + } + + return hr; +} + /***************************************************************************** * IDirectDrawSurface7::Blt * @@ -1322,13 +1441,8 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR * does, copy the struct, and replace the ddraw surfaces with the wined3d * surfaces. So far no blitting operations using surfaces in the bltfx * struct are supported anyway. */ - if (Src && Src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(Src, SrcRect, TRUE); - if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(This->wined3d_surface, DestRect, Src ? Src->wined3d_surface : NULL, - SrcRect, Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This, DestRect, FALSE); + hr = ddraw_surface_blt_clipped(This, DestRect, Src, SrcRect, + Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); wined3d_mutex_unlock(); switch(hr) @@ -3756,13 +3870,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d flags |= WINEDDBLT_DONOTWAIT; wined3d_mutex_lock(); - if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); - if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, - src->wined3d_surface, rsrc, flags, NULL, WINED3DTEXF_POINT); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); + hr = ddraw_surface_blt_clipped(This, &dst_rect, src, rsrc, flags, NULL, WINED3DTEXF_POINT); wined3d_mutex_unlock(); switch(hr)

1 0

Alexandre Julliard : winex11: Get rid of the GetPixel implementation, use the null driver fallback instead.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 810d215a3c53f4a2d027ab660a69a1c2d2abbdcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d215a3c53f4a2d027ab660… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 21:21:28 2011 +0100 winex11: Get rid of the GetPixel implementation, use the null driver fallback instead. --- dlls/winex11.drv/graphics.c | 52 ------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 1 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 0f72389..163afd2 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1093,58 +1093,6 @@ COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** - * X11DRV_GetPixel - */ -COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y ) -{ - static Pixmap pixmap = 0; - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - XImage * image; - int pixel; - POINT pt; - BOOL memdc = (GetObjectType(dev->hdc) == OBJ_MEMDC); - - pt.x = x; - pt.y = y; - LPtoDP( dev->hdc, &pt, 1 ); - - /* Update the pixmap from the DIB section */ - X11DRV_LockDIBSection(physDev, DIB_Status_GdiMod); - - wine_tsx11_lock(); - if (memdc) - { - image = XGetImage( gdi_display, physDev->drawable, - physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, - 1, 1, AllPlanes, ZPixmap ); - } - else - { - /* If we are reading from the screen, use a temporary copy */ - /* to avoid a BadMatch error */ - if (!pixmap) pixmap = XCreatePixmap( gdi_display, root_window, - 1, 1, physDev->depth ); - XCopyArea( gdi_display, physDev->drawable, pixmap, get_bitmap_gc(physDev->depth), - physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, 1, 1, 0, 0 ); - image = XGetImage( gdi_display, pixmap, 0, 0, 1, 1, AllPlanes, ZPixmap ); - } - pixel = XGetPixel( image, 0, 0 ); - XDestroyImage( image ); - wine_tsx11_unlock(); - - /* Update the DIBSection from the pixmap */ - X11DRV_UnlockDIBSection(physDev, FALSE); - if( physDev->depth > 1) - pixel = X11DRV_PALETTE_ToLogical(physDev, pixel); - else - /* monochrome bitmaps return black or white */ - if( pixel) pixel = 0xffffff; - return pixel; - -} - - -/*********************************************************************** * X11DRV_PaintRgn */ BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 39a57b5..b094e0a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -512,7 +512,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGetKerningPairs */ X11DRV_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ - X11DRV_GetPixel, /* pGetPixel */ + NULL, /* pGetPixel */ X11DRV_GetPixelFormat, /* pGetPixelFormat */ X11DRV_GetSystemPaletteEntries, /* pGetSystemPaletteEntries */ NULL, /* pGetTextCharsetInfo */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7c12360..922aa9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -198,7 +198,6 @@ extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) D extern DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetPixel in the null driver using GetImage.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 9f410413a6cb89fc4c4340daf917d5cfa9d1909e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f410413a6cb89fc4c4340daf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:53:50 2011 +0100 gdi32: Implement GetPixel in the null driver using GetImage. --- dlls/gdi32/bitblt.c | 29 +++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 13 +++++++++++++ dlls/gdi32/driver.c | 5 ----- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/painting.c | 8 ++------ 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 1638f46..0d7ed3c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -472,6 +472,35 @@ done: return ret; } +COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) +{ + DC *dc = get_nulldrv_dc( dev ); + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct bitblt_coords src; + struct gdi_image_bits bits; + COLORREF ret; + + src.visrect.left = x; + src.visrect.top = y; + LPtoDP( dev->hdc, (POINT *)&src.visrect, 1 ); + src.visrect.right = src.visrect.left + 1; + src.visrect.bottom = src.visrect.top + 1; + src.x = src.visrect.left; + src.y = src.visrect.top; + src.width = src.height = 1; + + if (!clip_visrect( dc, &src.visrect, &src.visrect )) return CLR_INVALID; + + dev = GET_DC_PHYSDEV( dc, pGetImage ); + if (dev->funcs->pGetImage( dev, 0, info, &bits, &src )) return CLR_INVALID; + + ret = get_pixel_bitmapinfo( info, bits.ptr, &src ); + if (bits.free) bits.free( &bits ); + return ret; +} + + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 20fcd4d..ad329be 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1372,6 +1372,19 @@ DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_a return ret; } +COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) +{ + dib_info dib; + POINT pt; + DWORD pixel; + + init_dib_info_from_bitmapinfo( &dib, info, bits, default_color_table ); + pt.x = src->x; + pt.y = src->y; + pixel = dib.funcs->get_pixel( &dib, &pt ); + return dib.funcs->pixel_to_colorref( &dib, pixel ); +} + /*********************************************************************** * dibdrv_StretchBlt */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 15481ac..9612d6f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -394,11 +394,6 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT return 0; } -static COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) -{ - return CLR_INVALID; -} - static INT nulldrv_GetPixelFormat( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a371f4e..d87dfdc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -250,6 +250,7 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD gradient_bitmapinfo( const BITMAPINFO *info, void *bits, TRIVERTEX *vert_array, ULONG nvert, void *grad_array, ULONG ngrad, ULONG mode, const POINT *dev_pts, HRGN rgn ) DECLSPEC_HIDDEN; +extern COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; @@ -356,6 +357,7 @@ extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, IN extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index d721bd1..241f9c3 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -476,13 +476,9 @@ COLORREF WINAPI GetPixel( HDC hdc, INT x, INT y ) if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixel ); update_dc( dc ); - /* FIXME: should this be in the graphics driver? */ - if (PtVisible( hdc, x, y )) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixel ); - ret = physdev->funcs->pGetPixel( physdev, x, y ); - } + ret = physdev->funcs->pGetPixel( physdev, x, y ); release_dc_ptr( dc ); } return ret;

1 0

Matteo Bruni : wined3d: Fix some flag checks.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: fdd4df446fa572e7ff7ef318f1c878b8054a5687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd4df446fa572e7ff7ef318f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 12 20:25:16 2011 +0100 wined3d: Fix some flag checks. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecb2c03..8b152d3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2134,7 +2134,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); } static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) @@ -2177,7 +2177,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; } @@ -2218,7 +2218,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; } @@ -2259,7 +2259,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; }

1 0

Alexandre Julliard : gdi32: Remove support for private color maps.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: d357392b8b2cdc434726db885f77f8d1bd6e3ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d357392b8b2cdc434726db885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:58:05 2011 +0100 gdi32: Remove support for private color maps. --- dlls/gdi32/dibdrv/dc.c | 33 +++++---------------------------- dlls/gdi32/dibdrv/dibdrv.h | 7 ++----- dlls/gdi32/dibdrv/primitives.c | 2 +- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index ed7b0f7..c4921a3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -68,7 +68,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) } static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, void *bits, enum dib_info_flags flags) + const RGBQUAD *color_table, void *bits, enum dib_info_flags flags) { dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; @@ -79,7 +79,6 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->bits.is_copy = FALSE; dib->bits.free = NULL; dib->bits.param = NULL; - dib->flags = flags; if(dib->height < 0) /* top-down */ { @@ -143,19 +142,12 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD if (color_table && bi->biClrUsed) { - if (flags & private_color_table) - { - dib->color_table = HeapAlloc(GetProcessHeap(), 0, bi->biClrUsed * sizeof(dib->color_table[0])); - if(!dib->color_table) return FALSE; - memcpy(dib->color_table, color_table, bi->biClrUsed * sizeof(color_table[0])); - } - else - dib->color_table = color_table; + dib->color_table = color_table; dib->color_table_size = bi->biClrUsed; } else if (flags & default_color_table) { - dib->color_table = (RGBQUAD *)get_default_color_table( dib->bit_count ); + dib->color_table = get_default_color_table( dib->bit_count ); dib->color_table_size = dib->color_table ? (1 << dib->bit_count) : 0; } else @@ -170,7 +162,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, - (RGBQUAD *)info->bmiColors, bits, flags ); + info->bmiColors, bits, flags ); } BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) @@ -208,9 +200,6 @@ static void clear_dib_info(dib_info *dib) */ void free_dib_info(dib_info *dib) { - if (dib->flags & private_color_table) - HeapFree(GetProcessHeap(), 0, dib->color_table); - if (dib->bits.free) dib->bits.free( &dib->bits ); clear_dib_info( dib ); } @@ -229,19 +218,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) dst->blue_shift = src->blue_shift; dst->funcs = src->funcs; dst->color_table_size = src->color_table_size; - dst->color_table = NULL; - dst->flags = src->flags; - if(dst->color_table_size) - { - int size = dst->color_table_size * sizeof(dst->color_table[0]); - if (dst->flags & private_color_table) - { - dst->color_table = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(dst->color_table, src->color_table, size); - } - else - dst->color_table = src->color_table; - } + dst->color_table = src->color_table; } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index d388f91..524032a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,8 +20,7 @@ enum dib_info_flags { - private_color_table = 1, - default_color_table = 2 + default_color_table = 1 }; typedef struct @@ -35,11 +34,9 @@ typedef struct int red_shift, green_shift, blue_shift; int red_len, green_len, blue_len; - RGBQUAD *color_table; + const RGBQUAD *color_table; DWORD color_table_size; - enum dib_info_flags flags; - const struct primitive_funcs *funcs; } dib_info; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index d0d838b..07911b2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1391,7 +1391,7 @@ static DWORD rgb_to_pixel_colortable(const dib_info *dib, BYTE r, BYTE g, BYTE b for(i = 0; i < dib->color_table_size; i++) { - RGBQUAD *cur = dib->color_table + i; + const RGBQUAD *cur = dib->color_table + i; diff = (r - cur->rgbRed) * (r - cur->rgbRed) + (g - cur->rgbGreen) * (g - cur->rgbGreen) + (b - cur->rgbBlue) * (b - cur->rgbBlue);

1 0

Alexandre Julliard : gdi32: init_dib_info() can no longer fail, and no longer requires freeing.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: cae4ef81e65a559c77ecdbbd88deb11d34be7bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae4ef81e65a559c77ecdbbd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 16:11:17 2011 +0100 gdi32: init_dib_info() can no longer fail, and no longer requires freeing. --- dlls/gdi32/dibdrv/bitblt.c | 42 ++++++++++-------------------------------- dlls/gdi32/dibdrv/dc.c | 39 +++++++++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 8 +++----- dlls/gdi32/dibdrv/graphics.c | 3 +-- dlls/gdi32/dibdrv/objects.c | 2 -- 5 files changed, 31 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cae4ef81e65a559c77ecd…

1 0

Alexandre Julliard : gdi32: Remove some color table size checks, we use full-size color tables now.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 0c194895a295ff06368e70cd8ccdd19bc31840d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c194895a295ff06368e70cd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:52:41 2011 +0100 gdi32: Remove some color table size checks, we use full-size color tables now. --- dlls/gdi32/dibdrv/bitblt.c | 5 +-- dlls/gdi32/dibdrv/primitives.c | 73 ++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c194895a295ff06368e7…

1 0

Alexandre Julliard : gdi32: Implement GetNearestColor in the DIB driver.
by Alexandre Julliard Dec. 13, 2011

Dec. 13, 2011

Module: wine Branch: master Commit: 49ae7360228348bbe6f188daa1a2b388ea327258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ae7360228348bbe6f188daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:20:06 2011 +0100 gdi32: Implement GetNearestColor in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 14 ++++++++++++++ dlls/gdi32/tests/bitmap.c | 2 ++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 66c9234..571a070 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -530,7 +530,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetICMProfile */ dibdrv_GetImage, /* pGetImage */ NULL, /* pGetKerningPairs */ - NULL, /* pGetNearestColor */ + dibdrv_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ dibdrv_GetPixel, /* pGetPixel */ NULL, /* pGetPixelFormat */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index cd96e3e..6c63c3d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -124,6 +124,7 @@ extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; 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; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 439a10f..67f1c99 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -392,6 +392,20 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } /*********************************************************************** + * dibdrv_GetNearestColor + */ +COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DWORD pixel; + + TRACE( "(%p, %08x)\n", dev, color ); + + pixel = get_pixel_color( pdev, color, FALSE ); + return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); +} + +/*********************************************************************** * dibdrv_GetPixel */ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index accfc91..6e8e1d4 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -346,6 +346,8 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ c = GetPixel(hdc, 0, 0); \ ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ + c = GetNearestColor(hdc, color); \ + ok(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ } static void test_dib_bits_access( HBITMAP hdib, void *bits )

1 0