December 2011 - Wine-commits

Henri Verbeet : wined3d: Read the PBO back into the DIB section if we have one in surface_remove_pbo ().
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 56e3e05e573f8952f2da1d3db3325ec5b29d22fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e3e05e573f8952f2da1d3db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 7 22:08:55 2011 +0100 wined3d: Read the PBO back into the DIB section if we have one in surface_remove_pbo(). --- dlls/wined3d/surface.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c49c0fb..e7ae65b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1767,7 +1767,11 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (!surface->resource.heapMemory) + if (surface->flags & SFLAG_DIBSECTION) + { + surface->resource.allocatedMemory = surface->dib.bitmap_data; + } + else if (!surface->resource.heapMemory) { surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), 0, surface->resource.size + RESOURCE_ALIGNMENT); surface->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)surface->resource.heapMemory

1 0

Henri Verbeet : wined3d: Properly check if a surface has a DIB section in gdi_surface_map().
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 2d1a941b7dc76d754b15c3f6807fb5e371e367a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1a941b7dc76d754b15c3f68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 7 22:08:56 2011 +0100 wined3d: Properly check if a surface has a DIB section in gdi_surface_map(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e7ae65b..b7a120e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1983,7 +1983,7 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - if (!surface->resource.allocatedMemory) + if (!(surface->flags & SFLAG_DIBSECTION)) { /* This happens on gdi surfaces if the application set a user pointer * and resets it. Recreate the DIB section. */

1 0

Henri Verbeet : wined3d: Avoid clearing the current wined3d context in WineD3D_CreateFakeGLContext( ).
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: ada8ad76b97e7bd2d85d6b943216bc7bc2f58d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada8ad76b97e7bd2d85d6b943… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 7 22:08:57 2011 +0100 wined3d: Avoid clearing the current wined3d context in WineD3D_CreateFakeGLContext(). There should be no need to clear the thread's current wined3d context as long as we properly restore the corresponding GL stuff. This avoids hitting the context restore code in context_enter() when we have e.g. two d3d9 devices, one of which is inactive, because now we can see that the GL context that's active belongs to another wined3d context, and we don't need to bother saving and restoring it. --- dlls/wined3d/directx.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ece3b16..c2d5c2f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -341,11 +341,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) } /* Make it the current GL context. */ - if (!context_set_current(NULL)) - { - ERR_(d3d_caps)("Failed to clear current D3D context.\n"); - } - if (!pwglMakeCurrent(ctx->dc, ctx->gl_ctx)) { ERR_(d3d_caps)("Failed to make fake GL context current.\n");

1 0

Henri Verbeet : wined3d: Get rid of the WineDirect3DVertexStridedData typedef.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 52231bc4672f2038e97b848947c88a90997894d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52231bc4672f2038e97b84894… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 7 22:08:58 2011 +0100 wined3d: Get rid of the WineDirect3DVertexStridedData typedef. --- dlls/ddraw/device.c | 131 +++++++++++++++++++++------------------- dlls/wined3d/device.c | 10 ++-- dlls/wined3d/drawprim.c | 8 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 10 ++-- 5 files changed, 84 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52231bc4672f2038e97b8…

1 0

Henri Verbeet : wined3d: Get rid of the WINEDDCOLORKEY typedef.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 3dd03f642dc16d5eca6895a85d6a281f2321b0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd03f642dc16d5eca6895a85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 7 22:08:59 2011 +0100 wined3d: Get rid of the WINEDDCOLORKEY typedef. --- dlls/ddraw/surface.c | 16 +++++----- dlls/wined3d/device.c | 8 ++-- dlls/wined3d/surface.c | 68 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 10 +++--- include/wine/wined3d.h | 20 +++++------ 5 files changed, 60 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd03f642dc16d5eca689…

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for IXSLTemplate.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: f88ea3d2a76af998b2118ec823852af19f13aaf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88ea3d2a76af998b2118ec82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 00:06:31 2011 +0300 msxml3: Added IDispatchEx support for IXSLTemplate. --- dlls/msxml3/stylesheet.c | 77 +++++++++++++++++-------------------------- dlls/msxml3/tests/domdoc.c | 12 +++++++ 2 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5a21d65..43607f5 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xsltemplate { + DispatchEx dispex; IXSLTemplate IXSLTemplate_iface; LONG ref; @@ -95,6 +96,10 @@ static HRESULT WINAPI xsltemplate_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); @@ -121,6 +126,7 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) if ( ref == 0 ) { if (This->node) IXMLDOMNode_Release( This->node ); + release_dispex(&This->dispex); heap_free( This ); } @@ -130,11 +136,7 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) static HRESULT WINAPI xsltemplate_GetTypeInfoCount( IXSLTemplate *iface, UINT* pctinfo ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI xsltemplate_GetTypeInfo( @@ -143,10 +145,8 @@ static HRESULT WINAPI xsltemplate_GetTypeInfo( ITypeInfo** ppTInfo ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IXSLTemplate_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI xsltemplate_GetIDsOfNames( @@ -155,23 +155,8 @@ static HRESULT WINAPI xsltemplate_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXSLTemplate_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI xsltemplate_Invoke( @@ -181,21 +166,8 @@ static HRESULT WINAPI xsltemplate_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXSLTemplate_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXSLTemplate_iface, dispIdMember, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI xsltemplate_putref_stylesheet( IXSLTemplate *iface, @@ -238,7 +210,7 @@ static HRESULT WINAPI xsltemplate_createProcessor( IXSLTemplate *iface, return XSLProcessor_create(This, processor); } -static const struct IXSLTemplateVtbl xsltemplate_vtbl = +static const struct IXSLTemplateVtbl XSLTemplateVtbl = { xsltemplate_QueryInterface, xsltemplate_AddRef, @@ -253,21 +225,34 @@ static const struct IXSLTemplateVtbl xsltemplate_vtbl = xsltemplate_createProcessor }; -HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj) +static const tid_t xsltemplate_iface_tids[] = { + IXSLTemplate_tid, + 0 +}; + +static dispex_static_data_t xsltemplate_dispex = { + NULL, + IXSLTemplate_tid, + NULL, + xsltemplate_iface_tids +}; + +HRESULT XSLTemplate_create(IUnknown *outer, void **ppObj) { xsltemplate *This; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p, %p)\n", outer, ppObj); - if(pUnkOuter) FIXME("support aggregation, outer\n"); + if(outer) FIXME("support aggregation, outer\n"); This = heap_alloc( sizeof (*This) ); if(!This) return E_OUTOFMEMORY; - This->IXSLTemplate_iface.lpVtbl = &xsltemplate_vtbl; + This->IXSLTemplate_iface.lpVtbl = &XSLTemplateVtbl; This->ref = 1; This->node = NULL; + init_dispex(&This->dispex, (IUnknown*)&This->IXSLTemplate_iface, &xsltemplate_dispex); *ppObj = &This->IXSLTemplate_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b2a229b..6357814 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10672,6 +10672,7 @@ static void test_dispex(void) IXMLDOMNodeList *node_list; IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; + IXSLTemplate *template; IXMLDOMDocument *doc; IXMLHTTPRequest *req; IXMLDOMElement *elem; @@ -10816,6 +10817,17 @@ static void test_dispex(void) IXMLHTTPRequest_Release(req); } + /* IXSLTemplate */ + template = create_xsltemplate(&IID_IXSLTemplate); + hr = IXSLTemplate_QueryInterface(template, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + hr = IDispatchEx_QueryInterface(dispex, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_domobj_dispex(unk); + IUnknown_Release(unk); + IDispatchEx_Release(dispex); + IXSLTemplate_Release(template); + free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Added IDispatchEx for IXSLProcessor.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: e18d99da74a18d3e3a1d3e420d5c318da7d068a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18d99da74a18d3e3a1d3e420… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 00:22:34 2011 +0300 msxml3: Added IDispatchEx for IXSLProcessor. --- dlls/msxml3/stylesheet.c | 71 +++++++++++++++++-------------------------- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++ 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 43607f5..716ebba 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -53,6 +53,7 @@ typedef struct _xsltemplate typedef struct _xslprocessor { + DispatchEx dispex; IXSLProcessor IXSLProcessor_iface; LONG ref; @@ -276,6 +277,10 @@ static HRESULT WINAPI xslprocessor_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); @@ -305,6 +310,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) if (This->output) IStream_Release(This->output); SysFreeString(This->outstr); IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); + release_dispex(&This->dispex); heap_free( This ); } @@ -314,11 +320,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) static HRESULT WINAPI xslprocessor_GetTypeInfoCount( IXSLProcessor *iface, UINT* pctinfo ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI xslprocessor_GetTypeInfo( @@ -327,10 +329,8 @@ static HRESULT WINAPI xslprocessor_GetTypeInfo( ITypeInfo** ppTInfo ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IXSLProcessor_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI xslprocessor_GetIDsOfNames( @@ -339,23 +339,8 @@ static HRESULT WINAPI xslprocessor_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXSLProcessor_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI xslprocessor_Invoke( @@ -365,21 +350,8 @@ static HRESULT WINAPI xslprocessor_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXSLProcessor_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXSLProcessor_iface, dispIdMember, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI xslprocessor_put_input( IXSLProcessor *iface, VARIANT input ) @@ -610,7 +582,7 @@ static HRESULT WINAPI xslprocessor_get_stylesheet( return E_NOTIMPL; } -static const struct IXSLProcessorVtbl xslprocessor_vtbl = +static const struct IXSLProcessorVtbl XSLProcessorVtbl = { xslprocessor_QueryInterface, xslprocessor_AddRef, @@ -636,6 +608,18 @@ static const struct IXSLProcessorVtbl xslprocessor_vtbl = xslprocessor_get_stylesheet }; +static const tid_t xslprocessor_iface_tids[] = { + IXSLProcessor_tid, + 0 +}; + +static dispex_static_data_t xslprocessor_dispex = { + NULL, + IXSLProcessor_tid, + NULL, + xslprocessor_iface_tids +}; + HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) { xslprocessor *This; @@ -646,13 +630,14 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) if(!This) return E_OUTOFMEMORY; - This->IXSLProcessor_iface.lpVtbl = &xslprocessor_vtbl; + This->IXSLProcessor_iface.lpVtbl = &XSLProcessorVtbl; This->ref = 1; This->input = NULL; This->output = NULL; This->outstr = NULL; This->stylesheet = template; IXSLTemplate_AddRef(&template->IXSLTemplate_iface); + init_dispex(&This->dispex, (IUnknown*)&This->IXSLProcessor_iface, &xslprocessor_dispex); *ppObj = &This->IXSLProcessor_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6357814..ba32411 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10672,6 +10672,7 @@ static void test_dispex(void) IXMLDOMNodeList *node_list; IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; + IXSLProcessor *processor; IXSLTemplate *template; IXMLDOMDocument *doc; IXMLHTTPRequest *req; @@ -10826,6 +10827,30 @@ static void test_dispex(void) test_domobj_dispex(unk); IUnknown_Release(unk); IDispatchEx_Release(dispex); + + /* IXSLProcessor */ + hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + EXPECT_HR(hr, S_OK); + b = VARIANT_FALSE; + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szTransformSSXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + EXPECT_HR(hr, S_OK); + IXMLDOMDocument_Release(doc); + + hr = IXSLTemplate_createProcessor(template, &processor); + EXPECT_HR(hr, S_OK); + hr = IXSLProcessor_QueryInterface(processor, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + hr = IDispatchEx_QueryInterface(dispex, &IID_IUnknown, (void**)&unk); + EXPECT_HR(hr, S_OK); + test_domobj_dispex(unk); + IUnknown_Release(unk); + IDispatchEx_Release(dispex); + + IXSLProcessor_Release(processor); IXSLTemplate_Release(template); free_bstrs();

1 0

Alexandre Julliard : gdi32: Add missing check for empty visible rects in the non-stretching case.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 72fae39ce0385112fd4f4eb720e19912252103a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fae39ce0385112fd4f4eb72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 10:32:26 2011 +0100 gdi32: Add missing check for empty visible rects in the non-stretching case. --- dlls/gdi32/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index bfb56a6..abd4dfc 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -56,7 +56,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ { offset_rect( &src->visrect, dst->x - src->x, dst->y - src->y ); - intersect_rect( &rect, &src->visrect, &dst->visrect ); + if (!intersect_rect( &rect, &src->visrect, &dst->visrect )) return FALSE; src->visrect = dst->visrect = rect; offset_rect( &src->visrect, src->x - dst->x, src->y - dst->y ); }

1 0

Alexandre Julliard : winex11: Add some sanity checks on bitmap formats before creating a pixmap.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 2453b6a896a9bd86221422658d0f4944f37b1547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2453b6a896a9bd86221422658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 10:32:51 2011 +0100 winex11: Add some sanity checks on bitmap formats before creating a pixmap. --- dlls/winex11.drv/bitmap.c | 30 ++++++++++-------------------- dlls/winex11.drv/xrender.c | 1 - 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 09da565..2232c49 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -130,6 +130,16 @@ BOOL X11DRV_create_phys_bitmap( HBITMAP hbitmap, const BITMAP *bitmap, int depth { X_PHYSBITMAP *physBitmap; + if (bitmap->bmWidth > 65535 || bitmap->bmHeight > 65535 || bitmap->bmPlanes != 1 || + (bitmap->bmBitsPixel != 1 && bitmap->bmBitsPixel != screen_bpp)) + { + WARN( "Trying to create invalid pixmap %dx%d planes %d bpp %d\n", + bitmap->bmWidth, bitmap->bmHeight, bitmap->bmPlanes, bitmap->bmBitsPixel ); + return FALSE; + } + + TRACE( "(%p) %dx%d %d bpp\n", hbitmap, bitmap->bmWidth, bitmap->bmHeight, bitmap->bmBitsPixel ); + if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return FALSE; physBitmap->depth = depth; @@ -170,28 +180,8 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; - /* Check parameters */ - if (bitmap.bmPlanes != 1) return FALSE; - - /* check if bpp is compatible with screen depth */ - if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_bpp))) - { - WARN("Trying to make bitmap with planes=%d, bpp=%d\n", - bitmap.bmPlanes, bitmap.bmBitsPixel); - return FALSE; - } - - TRACE("(%p) %dx%d %d bpp\n", hbitmap, bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); - if (bitmap.bmBitsPixel == 1) - { - if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - { - ERR( "called for stock bitmap, please report\n" ); - return FALSE; - } return X11DRV_create_phys_bitmap( hbitmap, &bitmap, 1, FALSE, NULL ); - } return X11DRV_create_phys_bitmap( hbitmap, &bitmap, screen_depth, (visual->class == TrueColor || visual->class == DirectColor), diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 21c1280..02625eb 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1303,7 +1303,6 @@ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; - if (bitmap.bmPlanes != 1) return FALSE; format = get_bitmap_format( bitmap.bmBitsPixel ); if (pict_formats[format])

1 0

Jacek Caban : jscript: Use bytecode for pre-increment expression implementation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 667cc2e68ad8a2519e3f732b488615c20f6d677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=667cc2e68ad8a2519e3f732b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 12:02:08 2011 +0100 jscript: Use bytecode for pre-increment expression implementation. --- dlls/jscript/compile.c | 10 ++++++---- dlls/jscript/engine.c | 39 +++++++++++++++++++-------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0ed6f29..c3e845e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -292,7 +292,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex return hres; } -static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expression_t *expr, int n) +static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expression_t *expr, jsop_t op, int n) { HRESULT hres; @@ -308,7 +308,7 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio if(FAILED(hres)) return hres; - return push_instr_int(ctx, OP_postinc, n); + return push_instr_int(ctx, op, n); } /* ECMA-262 3rd Edition 11.14 */ @@ -648,9 +648,11 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); case EXPR_POSTDEC: - return compile_increment_expression(ctx, (unary_expression_t*)expr, -1); + return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, -1); case EXPR_POSTINC: - return compile_increment_expression(ctx, (unary_expression_t*)expr, 1); + return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, 1); + case EXPR_PREINC: + return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 102c305..d2c07f1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2736,37 +2736,36 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.4 */ -HRESULT pre_increment_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_preinc(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - VARIANT val, num; - exprval_t exprval; + const int arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; + IDispatch *obj; + DISPID id; + VARIANT v; HRESULT hres; - TRACE("\n"); + TRACE("%d\n", arg); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; + obj = stack_pop_objid(ctx, &id); + if(!obj) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_OBJECT_EXPECTED, NULL); - hres = exprval_value(ctx, &exprval, ei, &val); + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); if(SUCCEEDED(hres)) { - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); - } + VARIANT n; - if(SUCCEEDED(hres)) { - num_set_val(&val, num_val(&num)+1.0); - hres = put_value(ctx, &exprval, &val, ei); + hres = to_number(ctx->parser->script, &v, &ctx->ei, &n); + VariantClear(&v); + if(SUCCEEDED(hres)) { + num_set_val(&v, num_val(&n)+(double)arg); + hres = disp_propput(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); + } } - - exprval_release(&exprval); + IDispatch_Release(obj); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = val; - return S_OK; + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.4.5 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7359d06..e3672a4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -78,6 +78,7 @@ typedef struct _func_stack { X(or, 1, 0,0) \ X(pop, 1, 0,0) \ X(postinc, 1, ARG_INT, 0) \ + X(preinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ @@ -563,7 +564,6 @@ HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 07414ce..1b053a0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1324,7 +1324,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - pre_increment_expression_eval, + compiled_expression_eval, pre_decrement_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0