May 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi32: Always pass the actual coordinates to the get_pixel_ptr functions.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 025b58870ee9747d0f8473f0fe777d06f6038a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025b58870ee9747d0f8473f0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 14:24:43 2012 +0200 gdi32: Always pass the actual coordinates to the get_pixel_ptr functions. --- dlls/gdi32/dibdrv/primitives.c | 226 ++++++++++++++++++++-------------------- 1 files changed, 113 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=025b58870ee9747d0f847…

1 0

Hans Leidekker : msi: Add the Session object as a global member to custom action scripts.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: c3e3c81bfb661e02f497667d91bfa9867683e491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e3c81bfb661e02f497667d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:38:52 2012 +0200 msi: Add the Session object as a global member to custom action scripts. --- dlls/msi/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index e157c6d..236b60b 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -136,7 +136,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function if (FAILED(hr)) goto done; /* Add the session object */ - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_ISVISIBLE); + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); if (FAILED(hr)) goto done; /* Pass the script to the engine */

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_AddVisual.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: acfb249af6f1bc38d8d46f13b3f7d5e113e1b92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfb249af6f1bc38d8d46f13b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 30 17:10:27 2012 +0200 d3drm: Implement IDirect3DRMFrameX_AddVisual. --- dlls/d3drm/frame.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 55fa08b..2e98059 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -37,6 +37,9 @@ typedef struct { ULONG nb_children; ULONG children_capacity; IDirect3DRMFrame3** children; + ULONG nb_visuals; + ULONG visuals_capacity; + IDirect3DRMVisual** visuals; } IDirect3DRMFrameImpl; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) @@ -279,9 +282,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddVisual(IDirect3DRMFrame2* iface, { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - return E_NOTIMPL; + return IDirect3DRMFrame3_AddVisual(&This->IDirect3DRMFrame3_iface, (LPUNKNOWN)vis); } static HRESULT WINAPI IDirect3DRMFrame2Impl_GetChildren(IDirect3DRMFrame2* iface, @@ -1169,10 +1172,45 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddRotation(IDirect3DRMFrame3* iface static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3* iface, LPUNKNOWN vis) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); + ULONG i; + IDirect3DRMVisual** visuals; - FIXME("(%p/%p)->(%p): stub\n", iface, This, vis); + TRACE("(%p/%p)->(%p)\n", iface, This, vis); - return E_NOTIMPL; + if (!vis) + return D3DRMERR_BADOBJECT; + + /* Check if already existing and return gracefully without increasing ref count */ + for (i = 0; i < This->nb_visuals; i++) + if (This->visuals[i] == (IDirect3DRMVisual*)vis) + return D3DRM_OK; + + if ((This->nb_visuals + 1) > This->visuals_capacity) + { + ULONG new_capacity; + + if (!This->visuals_capacity) + { + new_capacity = 16; + visuals = HeapAlloc(GetProcessHeap(), 0, new_capacity * sizeof(IDirect3DRMVisual*)); + } + else + { + new_capacity = This->visuals_capacity * 2; + visuals = HeapReAlloc(GetProcessHeap(), 0, This->visuals, new_capacity * sizeof(IDirect3DRMVisual*)); + } + + if (!visuals) + return E_OUTOFMEMORY; + + This->visuals_capacity = new_capacity; + This->visuals = visuals; + } + + This->visuals[This->nb_visuals++] = (IDirect3DRMVisual*)vis; + IDirect3DRMVisual_AddRef(vis); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMFrame3Impl_GetChildren(IDirect3DRMFrame3* iface,

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_UnlockRect().
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: c85f6c9419ca9ac9ea2c3e165c4f2d348c79f014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85f6c9419ca9ac9ea2c3e165… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 30 21:30:18 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_UnlockRect(). --- dlls/d3d9/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index bbe7808..bc39ed2 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -373,6 +373,7 @@ static HRESULT WINAPI d3d9_texture_2d_UnlockRect(IDirect3DTexture9 *iface, UINT { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -381,7 +382,10 @@ static HRESULT WINAPI d3d9_texture_2d_UnlockRect(IDirect3DTexture9 *iface, UINT if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); + } wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : gdi32: Support drawing to a visible rectangle smaller than the whole bitmap in the DIB engine .
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 6a19d9f2520ae3805f43a7f2577bafb44699e6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a19d9f2520ae3805f43a7f25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 14:44:53 2012 +0200 gdi32: Support drawing to a visible rectangle smaller than the whole bitmap in the DIB engine. --- dlls/gdi32/dibdrv/bitblt.c | 20 ++- dlls/gdi32/dibdrv/dc.c | 10 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 42 +++-- dlls/gdi32/dibdrv/objects.c | 17 ++- dlls/gdi32/dibdrv/primitives.c | 329 ++++++++++++++++++++-------------------- 6 files changed, 228 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a19d9f2520ae3805f43a…

1 0

Józef Kucia : d3dx9: Implement conversion from DDS pixel format to D3DFORMAT.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: d3068976e5c9199f76aaec8f07a213457e448035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3068976e5c9199f76aaec8f0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Apr 29 21:43:10 2012 +0200 d3dx9: Implement conversion from DDS pixel format to D3DFORMAT. --- dlls/d3dx9_36/surface.c | 112 ++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/surface.c | 149 +++++++++++++++++++++-------------------- 2 files changed, 186 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3068976e5c9199f76aae…

1 0

Alexandre Julliard : gdi32: Add support for clipping source coordinates to the DC device rectangle.
by Alexandre Julliard May 1, 2012

May 1, 2012

Module: wine Branch: master Commit: 41e5bc06d8928d6d9b56b8910164683cf66b4cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e5bc06d8928d6d9b56b8910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 21:17:00 2012 +0200 gdi32: Add support for clipping source coordinates to the DC device rectangle. --- dlls/gdi32/bitblt.c | 14 +++-------- dlls/gdi32/bitmap.c | 1 + dlls/gdi32/clipping.c | 55 +++++++++++++++++++++++++++------------------ dlls/gdi32/dc.c | 1 + dlls/gdi32/dib.c | 1 + dlls/gdi32/gdi_private.h | 2 + 6 files changed, 42 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a97231c..6b99e43 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -146,13 +146,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); - /* source is not clipped */ - if (dc_src->header.type == OBJ_MEMDC) - intersect_rect( &src->visrect, &rect, &dc_src->vis_rect ); - else - src->visrect = rect; /* FIXME: clip to device size */ - - if (is_rect_empty( &src->visrect )) return FALSE; + if (!clip_device_rect( dc_src, &src->visrect, &rect )) return FALSE; if (is_rect_empty( &dst->visrect )) return FALSE; return intersect_vis_rectangles( dst, src ); @@ -932,9 +926,9 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || src.log_width < 0 || src.log_height < 0 || - (dcSrc->header.type == OBJ_MEMDC && - (src.width > dcSrc->vis_rect.right - dcSrc->vis_rect.left - src.x || - src.height > dcSrc->vis_rect.bottom - dcSrc->vis_rect.top - src.y))) + (!is_rect_empty( &dcSrc->device_rect ) && + (src.width > dcSrc->device_rect.right - dcSrc->vis_rect.left - src.x || + src.height > dcSrc->device_rect.bottom - dcSrc->vis_rect.top - src.y))) { WARN( "Invalid src coords: (%d,%d), size %dx%d\n", src.x, src.y, src.width, src.height ); SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cee9204..68e9c9a 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -609,6 +609,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; + dc->device_rect = dc->vis_rect; GDI_ReleaseObj( handle ); DC_InitDC( dc ); GDI_dec_ref_count( ret ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index c413e1a..1cb420c 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -29,15 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); -/* return the DC visible rectangle if not empty */ -static inline BOOL get_dc_visrect( DC *dc, RECT *rect ) +/* return the DC device rectangle if not empty */ +static inline BOOL get_dc_device_rect( DC *dc, RECT *rect ) { - if (dc->header.type != OBJ_MEMDC) return FALSE; - rect->left = 0; - rect->top = 0; - rect->right = dc->vis_rect.right - dc->vis_rect.left; - rect->bottom = dc->vis_rect.bottom - dc->vis_rect.top; - return TRUE; + *rect = dc->device_rect; + offset_rect( rect, -dc->vis_rect.left, -dc->vis_rect.top ); + return !is_rect_empty( rect ); } /*********************************************************************** @@ -64,6 +61,20 @@ static inline RECT get_clip_rect( DC * dc, int left, int top, int right, int bot } /*********************************************************************** + * clip_device_rect + * + * Clip a rectangle to the whole DC surface. + */ +BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) +{ + RECT clip; + + if (get_dc_device_rect( dc, &clip )) return intersect_rect( dst, src, &clip ); + *dst = *src; + return TRUE; +} + +/*********************************************************************** * clip_visrect * * Clip a rectangle to the DC visible rect. @@ -72,11 +83,9 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) { RECT clip; - if (get_dc_visrect( dc, &clip )) intersect_rect( dst, src, &clip ); - else *dst = *src; - - if (GetRgnBox( get_dc_region(dc), &clip )) intersect_rect( dst, dst, &clip ); - return !is_rect_empty( dst ); + if (!clip_device_rect( dc, dst, src )) return FALSE; + if (GetRgnBox( get_dc_region(dc), &clip )) return intersect_rect( dst, dst, &clip ); + return TRUE; } /*********************************************************************** @@ -117,7 +126,7 @@ static inline void create_default_clip_region( DC * dc ) { RECT rect; - if (!get_dc_visrect( dc, &rect )) + if (!get_dc_device_rect( dc, &rect )) { rect.left = 0; rect.top = 0; @@ -361,7 +370,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = (!get_dc_visrect( dc, &visrect ) || + ret = (!get_dc_device_rect( dc, &visrect ) || (pt.x >= visrect.left && pt.x < visrect.right && pt.y >= visrect.top && pt.y < visrect.bottom)); if (ret && get_dc_region( dc )) ret = PtInRegion( get_dc_region( dc ), pt.x, pt.y ); @@ -385,7 +394,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - ret = (!get_dc_visrect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); + ret = (!get_dc_device_rect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); if (ret && get_dc_region( dc )) ret = RectInRegion( get_dc_region( dc ), &tmpRect ); release_dc_ptr( dc ); return ret; @@ -406,7 +415,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (get_dc_region( dc )) { ret = GetRgnBox( get_dc_region( dc ), rect ); - if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) + if (get_dc_device_rect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) ret = NULLREGION; } else @@ -492,7 +501,6 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) { INT ret = 1; - RECT visrect; DC *dc = get_dc_ptr( hDC ); if (!dc) return -1; @@ -516,13 +524,16 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) case SYSRGN: /* == 4 */ update_dc( dc ); if (dc->hVisRgn) + { CombineRgn( hRgn, dc->hVisRgn, 0, RGN_COPY ); - else if (get_dc_visrect( dc, &visrect )) - SetRectRgn( hRgn, visrect.left, visrect.top, visrect.right, visrect.bottom ); + /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ + if (!(GetVersion() & 0x80000000)) OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); + } + else if (!is_rect_empty( &dc->device_rect )) + SetRectRgn( hRgn, dc->device_rect.left, dc->device_rect.top, + dc->device_rect.right, dc->device_rect.bottom ); else ret = 0; - /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ - if (ret && !(GetVersion() & 0x80000000)) OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); break; default: WARN("Unknown code %d\n", iCode); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 33c1033..95dd3e2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -698,6 +698,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = 1; dc->vis_rect.bottom = 1; + dc->device_rect = dc->vis_rect; ret = dc->hSelf; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d8d283e..f7e08a5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1624,6 +1624,7 @@ static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = bitmap->dib.dsBm.bmWidth; dc->vis_rect.bottom = bitmap->dib.dsBm.bmHeight; + dc->device_rect = dc->vis_rect; GDI_ReleaseObj( handle ); DC_InitDC( dc ); GDI_dec_ref_count( ret ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 20b522d..2589238 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -104,6 +104,7 @@ typedef struct tagDC SIZE virtual_res; /* Initially HORZRES,VERTRES. Changed by SetVirtualResolution */ SIZE virtual_size; /* Initially HORZSIZE,VERTSIZE. Changed by SetVirtualResolution */ RECT vis_rect; /* visible rectangle in screen coords */ + RECT device_rect; /* rectangle for the whole device */ FLOAT miterLimit; int flags; @@ -217,6 +218,7 @@ extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */ +extern BOOL clip_device_rect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN;

1 0