wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Alexandre Julliard : winex11: Define a structure to hold coordinates information for BitBlt operations.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 39493b0660bfed2661e31a3837de06788cae5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39493b0660bfed2661e31a383… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 20:27:17 2010 +0200 winex11: Define a structure to hold coordinates information for BitBlt operations. --- dlls/winex11.drv/bitblt.c | 226 ++++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 13 ++- dlls/winex11.drv/xrender.c | 27 +++--- 3 files changed, 135 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39493b0660bfed2661e31…

1 0

Alexandre Julliard : winex11: Use repeating instead of scaling when stretching a 1x1 source bitmap.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 5842971b1535e09d9f2e8daef7d27d841bbdf288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5842971b1535e09d9f2e8daef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 13:47:28 2010 +0200 winex11: Use repeating instead of scaling when stretching a 1x1 source bitmap. --- dlls/winex11.drv/xrender.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b4f4e55..e04efcb 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -480,6 +480,14 @@ static void set_xrender_transformation(Picture src_pict, double xscale, double y #endif } +/* check if we can use repeating instead of scaling for the specified source DC */ +static BOOL use_source_repeat( X11DRV_PDEVICE *physDev ) +{ + return (physDev->bitmap && + physDev->drawable_rect.right - physDev->drawable_rect.left == 1 && + physDev->drawable_rect.bottom - physDev->drawable_rect.top == 1); +} + static struct xrender_info *get_xrender_info(X11DRV_PDEVICE *physDev) { if(!physDev->xrender) @@ -525,7 +533,7 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) return info->pict; } -static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev) +static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev, BOOL repeat) { struct xrender_info *info = get_xrender_info(physDev); if (!info) return 0; @@ -536,11 +544,13 @@ static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev) wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; + pa.repeat = repeat ? RepeatNormal : RepeatNone; info->pict_src = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, - CPSubwindowMode, &pa); + CPSubwindowMode|CPRepeat, &pa); wine_tsx11_unlock(); - TRACE("Allocing pict_src=%lx dc=%p drawable=%08lx\n", info->pict_src, physDev->hdc, physDev->drawable); + TRACE("Allocing pict_src=%lx dc=%p drawable=%08lx repeat=%u\n", + info->pict_src, physDev->hdc, physDev->drawable, pa.repeat); } return info->pict_src; @@ -2189,9 +2199,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE struct xrender_info *src_info = get_xrender_info(physDevSrc); const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; - - double xscale = widthSrc/(double)widthDst; - double yscale = heightSrc/(double)heightDst; + BOOL use_repeat; + double xscale, yscale; XRenderPictureAttributes pa; pa.subwindow_mode = IncludeInferiors; @@ -2224,6 +2233,14 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE return TRUE; } + use_repeat = use_source_repeat( physDevSrc ); + if (!use_repeat) + { + xscale = widthSrc / (double)widthDst; + yscale = heightSrc / (double)heightDst; + } + else xscale = yscale = 1; /* no scaling needed with a repeating source */ + /* mono -> color */ if(physDevSrc->depth == 1 && physDevDst->depth > 1) { @@ -2231,7 +2248,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE get_xrender_color(dst_format, physDevDst->textPixel, &col); /* We use the source drawable as a mask */ - mask_pict = get_xrender_picture_source(physDevSrc); + mask_pict = get_xrender_picture_source( physDevSrc, use_repeat ); /* Use backgroundPixel as the foreground color */ EnterCriticalSection( &xrender_cs ); @@ -2250,7 +2267,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE } else /* color -> color (can be at different depths) or mono -> mono */ { - src_pict = get_xrender_picture_source(physDevSrc); + src_pict = get_xrender_picture_source( physDevSrc, use_repeat ); wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display,

1 0

Alexandre Julliard : winex11: Add a separate helper function for Xrender mono->color blits.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: e9173e1e65e158630129a49e61b8bdf0e67a18a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9173e1e65e158630129a49e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:13:16 2010 +0200 winex11: Add a separate helper function for Xrender mono->color blits. --- dlls/winex11.drv/xrender.c | 83 +++++++++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 68a3d7c..b4f4e55 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -467,7 +467,7 @@ static const WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, } /* Set the x/y scaling and x/y offsets in the transformation matrix of the source picture */ -static void set_xrender_transformation(Picture src_pict, float xscale, float yscale, int xoffset, int yoffset) +static void set_xrender_transformation(Picture src_pict, double xscale, double yscale, int xoffset, int yoffset) { #ifdef HAVE_XRENDERSETPICTURETRANSFORM XTransform xform = {{ @@ -1878,51 +1878,62 @@ done_unlock: } /* Helper function for (stretched) blitting using xrender */ -static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, float xscale, float yscale, int width, int height) +static void xrender_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, + int x_src, int y_src, double xscale, double yscale, int width, int height ) { - /* Further down a transformation matrix is used for stretching and mirroring the source data. - * xscale/yscale contain the scaling factors for the width and height. In case of mirroring - * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. - */ - int x_offset = (xscale<0) ? -width : 0; - int y_offset = (yscale<0) ? -height : 0; - - /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict. - * The 'src_pict' data effectively acts as an alpha channel to the tile data. We need PictOpOver for correct rendering. */ - int op = mask_pict ? PictOpOver : PictOpSrc; + int x_offset, y_offset; /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ if(xscale != 1.0 || yscale != 1.0) { - if(mask_pict) - { - set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); - pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, - 0, 0, x_offset, y_offset, 0, 0, width, height); - } - else - { - set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); - pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, - x_offset, y_offset, 0, 0, 0, 0, width, height); - } + /* In case of mirroring we need a source x- and y-offset because without the pixels will be + * in the wrong quadrant of the x-y plane. + */ + x_offset = (xscale < 0) ? -width : 0; + y_offset = (yscale < 0) ? -height : 0; + set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); } else { - if(mask_pict) - { - set_xrender_transformation(mask_pict, 1, 1, 0, 0); - /* Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using mask_x / mask_y */ - pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, 0, 0, x_src, y_src, 0, 0, width, height); - } - else - { - set_xrender_transformation(src_pict, 1, 1, 0, 0); - pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); - } + x_offset = x_src; + y_offset = y_src; + set_xrender_transformation(src_pict, 1, 1, 0, 0); + } + pXRenderComposite( gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, + x_offset, y_offset, 0, 0, 0, 0, width, height ); +} + +/* Helper function for (stretched) mono->color blitting using xrender */ +static void xrender_mono_blit( Picture src_pict, Picture mask_pict, Picture dst_pict, + int x_src, int y_src, double xscale, double yscale, int width, int height ) +{ + int x_offset, y_offset; + + /* When doing a mono->color blit, 'src_pict' contains a 1x1 picture for tiling, the actual + * source data is in mask_pict. The 'src_pict' data effectively acts as an alpha channel to the + * tile data. We need PictOpOver for correct rendering. + * Note since the 'source data' is in the mask picture, we have to pass x_src / y_src using + * mask_x / mask_y + */ + if (xscale != 1.0 || yscale != 1.0) + { + /* In case of mirroring we need a source x- and y-offset because without the pixels will be + * in the wrong quadrant of the x-y plane. + */ + x_offset = (xscale < 0) ? -width : 0; + y_offset = (yscale < 0) ? -height : 0; + set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); + } + else + { + x_offset = x_src; + y_offset = y_src; + set_xrender_transformation(mask_pict, 1, 1, 0, 0); } + pXRenderComposite(gdi_display, PictOpOver, src_pict, mask_pict, dst_pict, + 0, 0, x_offset, y_offset, 0, 0, width, height); } /****************************************************************************** @@ -2231,7 +2242,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); - xrender_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); + xrender_mono_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock();

1 0

Alexandre Julliard : winex11: The source offset for mirrored Xrender blits must be scaled too.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 13f203a5f653cd5dde60dbb762565b6e43fcb406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f203a5f653cd5dde60dbb76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:04:18 2010 +0200 winex11: The source offset for mirrored Xrender blits must be scaled too. --- dlls/winex11.drv/xrender.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ea6d0a7..68a3d7c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1884,8 +1884,8 @@ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, * xscale/yscale contain the scaling factors for the width and height. In case of mirroring * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. */ - int x_offset = (xscale<0) ? width : 0; - int y_offset = (yscale<0) ? height : 0; + int x_offset = (xscale<0) ? -width : 0; + int y_offset = (yscale<0) ? -height : 0; /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict. * The 'src_pict' data effectively acts as an alpha channel to the tile data. We need PictOpOver for correct rendering. */ @@ -1897,11 +1897,17 @@ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, if(xscale != 1.0 || yscale != 1.0) { if(mask_pict) - set_xrender_transformation(mask_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); + { + set_xrender_transformation(mask_pict, xscale, yscale, x_src, y_src); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, + 0, 0, x_offset, y_offset, 0, 0, width, height); + } else - set_xrender_transformation(src_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); - - pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); + { + set_xrender_transformation(src_pict, xscale, yscale, x_src, y_src); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, + x_offset, y_offset, 0, 0, 0, 0, width, height); + } } else {

1 0

Christian Costa : d3dx9_36: Check wnd just after CreateWindow. Remove useless wnd check before calling DestroyWindow.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d862b40aeb3e154a5758679d522ae44772fe5148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d862b40aeb3e154a5758679d5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 15 08:50:17 2010 +0200 d3dx9_36: Check wnd just after CreateWindow. Remove useless wnd check before calling DestroyWindow. --- dlls/d3dx9_36/tests/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index ef04afc..43ec02b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -498,11 +498,11 @@ START_TEST(surface) HRESULT hr; wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); - d3d = Direct3DCreate9(D3D_SDK_VERSION); if (!wnd) { skip("Couldn't create application window\n"); return; } + d3d = Direct3DCreate9(D3D_SDK_VERSION); if (!d3d) { skip("Couldn't create IDirect3D9 object\n"); DestroyWindow(wnd); @@ -525,5 +525,5 @@ START_TEST(surface) check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0); - if (wnd) DestroyWindow(wnd); + DestroyWindow(wnd); }

1 0

Roderick Colenbrander : wined3d: Add BLT_OP_COLOR_FILL to blit_supported and use it in BltOverride.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: bccfd7cc061cd41e2c50fc63ba15516652a869f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bccfd7cc061cd41e2c50fc63b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 12:17:09 2010 +0200 wined3d: Add BLT_OP_COLOR_FILL to blit_supported and use it in BltOverride. --- dlls/wined3d/arb_program_shader.c | 15 +++++++------ dlls/wined3d/surface.c | 38 ++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b939213..a40b940 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6846,13 +6846,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum bli const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format_desc) { - enum complex_fixup src_fixup = get_complex_fixup(src_format_desc->color_fixup); - - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(src_format_desc->color_fixup); - } + enum complex_fixup src_fixup; if (blit_op != BLIT_OP_BLIT) { @@ -6860,6 +6854,13 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum bli return FALSE; } + src_fixup = get_complex_fixup(src_format_desc->color_fixup); + if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) + { + TRACE("Checking support for fixup:\n"); + dump_color_fixup_desc(src_format_desc->color_fixup); + } + if (!is_identity_fixup(dst_format_desc->color_fixup)) { TRACE("Destination fixups are not supported\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 667478d..309a62a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3759,16 +3759,19 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const return WINED3DERR_INVALIDCALL; } - /* This == (IWineD3DSurfaceImpl *) myDevice->render_targets[0] || dstSwapchain - must be true if we are here */ - if (This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0] && - !(This == (IWineD3DSurfaceImpl*) dstSwapchain->frontBuffer || - (dstSwapchain->backBuffer && This == (IWineD3DSurfaceImpl*) dstSwapchain->backBuffer[0]))) { - TRACE("Surface is higher back buffer, falling back to software\n"); + if (ffp_blit.blit_supported(&myDevice->adapter->gl_info, BLIT_OP_COLOR_FILL, + NULL, 0, 0, NULL, + &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) + { + return ffp_blit.color_fill(myDevice, This, &dst_rect, color); + } + else if (cpu_blit.blit_supported(&myDevice->adapter->gl_info, BLIT_OP_COLOR_FILL, + NULL, 0, 0, NULL, + &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) + { return cpu_blit.color_fill(myDevice, This, &dst_rect, color); } - - return ffp_blit.color_fill(myDevice, This, &dst_rect, color); + return WINED3DERR_INVALIDCALL; } } @@ -4801,8 +4804,20 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format_desc) { - enum complex_fixup src_fixup = get_complex_fixup(src_format_desc->color_fixup); + enum complex_fixup src_fixup; + if (blit_op == BLIT_OP_COLOR_FILL) + { + if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + { + TRACE("Color fill not supported\n"); + return FALSE; + } + + return TRUE; + } + + src_fixup = get_complex_fixup(src_format_desc->color_fixup); if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); @@ -4880,6 +4895,11 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format_desc *dst_format_desc) { + if (blit_op == BLIT_OP_COLOR_FILL) + { + return TRUE; + } + return FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00d4c48..4652be5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1171,7 +1171,8 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ enum blit_operation { - BLIT_OP_BLIT + BLIT_OP_BLIT, + BLIT_OP_COLOR_FILL }; /* Shaders for color conversions in blits */

1 0

Roderick Colenbrander : wined3d: Improve FBO support in ClearSurface.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 10f58c14bcdeba9f7ea82701b9d9ab8f2bb3414b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f58c14bcdeba9f7ea82701b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 12 12:08:06 2010 +0200 wined3d: Improve FBO support in ClearSurface. --- dlls/wined3d/device.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cd2831..91e595c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4377,6 +4377,29 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } context = context_acquire(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!surface_is_offscreen((IWineD3DSurface *)target)) + { + TRACE("Surface %p is onscreen\n", target); + + ENTER_GL(); + context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_set_draw_buffer(context, surface_get_gl_buffer((IWineD3DSurface *)target)); + LEAVE_GL(); + } + else + { + TRACE("Surface %p is offscreen\n", target); + + ENTER_GL(); + context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, (IWineD3DSurface *)target); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); + LEAVE_GL(); + } + } + if (!context->valid) { context_release(context);

1 0

Jacek Caban : jscript: Fixed String. match implementation for non-global regexps.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 6f17fa5298449114a8532778b8a6c0f8a5c505de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f17fa5298449114a8532778b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 15 12:38:38 2010 +0200 jscript: Fixed String.match implementation for non-global regexps. --- dlls/jscript/jscript.h | 1 + dlls/jscript/regexp.c | 81 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/string.c | 59 +++++------------------------- dlls/jscript/tests/regexp.js | 27 ++++++++++++++ 4 files changed, 119 insertions(+), 49 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0068827..c1c8e60 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -324,6 +324,7 @@ HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,DWORD,const WCHAR*,DWORD,con DWORD*,DWORD*,match_result_t*); HRESULT regexp_match(script_ctx_t*,DispatchEx*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*); HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*); +HRESULT regexp_string_match(script_ctx_t*,DispatchEx*,BSTR,VARIANT*,jsexcept_t*); static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) { diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index a5d607e..7861d22 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3878,6 +3878,87 @@ HRESULT create_regexp_var(script_ctx_t *ctx, VARIANT *src_arg, VARIANT *flags_ar return create_regexp(ctx, src, -1, flags, ret); } +HRESULT regexp_string_match(script_ctx_t *ctx, DispatchEx *re, BSTR str, + VARIANT *retv, jsexcept_t *ei) +{ + RegExpInstance *regexp = (RegExpInstance*)re; + match_result_t *match_result; + DWORD match_cnt, i, length; + DispatchEx *array; + VARIANT var; + HRESULT hres; + + length = SysStringLen(str); + + if(!(regexp->jsregexp->flags & JSREG_GLOB)) { + match_result_t match, *parens = NULL; + DWORD parens_cnt, parens_size = 0; + const WCHAR *cp = str; + + hres = regexp_match_next(ctx, &regexp->dispex, 0, str, length, &cp, &parens, &parens_size, &parens_cnt, &match); + if(FAILED(hres)) + return hres; + + if(retv) { + if(hres == S_OK) { + IDispatch *ret; + + hres = create_match_array(ctx, str, &match, parens, parens_cnt, ei, &ret); + if(SUCCEEDED(hres)) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = ret; + } + }else { + V_VT(retv) = VT_NULL; + } + } + + heap_free(parens); + return S_OK; + } + + hres = regexp_match(ctx, &regexp->dispex, str, length, FALSE, &match_result, &match_cnt); + if(FAILED(hres)) + return hres; + + if(!match_cnt) { + TRACE("no match\n"); + + if(retv) + V_VT(retv) = VT_NULL; + return S_OK; + } + + hres = create_array(ctx, match_cnt, &array); + if(FAILED(hres)) + return hres; + + V_VT(&var) = VT_BSTR; + + for(i=0; i < match_cnt; i++) { + V_BSTR(&var) = SysAllocStringLen(match_result[i].str, match_result[i].len); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + break; + } + + hres = jsdisp_propput_idx(array, i, &var, ei, NULL/*FIXME*/); + SysFreeString(V_BSTR(&var)); + if(FAILED(hres)) + break; + } + + heap_free(match_result); + + if(SUCCEEDED(hres) && retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array); + }else { + jsdisp_release(array); + } + return hres; +} + static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index df43fee..510dcc2 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -622,11 +622,9 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; - match_result_t *match_result; DispatchEx *regexp; - DispatchEx *array; - VARIANT var, *arg_var; - DWORD length, match_cnt, i; + VARIANT *arg_var; + DWORD length; BSTR val_str = NULL; HRESULT hres = S_OK; @@ -645,7 +643,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP case VT_DISPATCH: regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg_var)); if(regexp) { - if(regexp->builtin_info->class == JSCLASS_REGEXP) + if(is_class(regexp, JSCLASS_REGEXP)) break; jsdisp_release(regexp); } @@ -664,54 +662,17 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP } hres = get_string_val(ctx, jsthis, ei, &str, &length, &val_str); - if(SUCCEEDED(hres)) - hres = regexp_match(ctx, regexp, str, length, FALSE, &match_result, &match_cnt); - jsdisp_release(regexp); - if(FAILED(hres)) { - SysFreeString(val_str); - return hres; - } - - if(!match_cnt) { - TRACE("no match\n"); - - if(retv) - V_VT(retv) = VT_NULL; - - SysFreeString(val_str); - return S_OK; - } - - hres = create_array(ctx, match_cnt, &array); - if(FAILED(hres)) { - SysFreeString(val_str); - return hres; - } - - V_VT(&var) = VT_BSTR; - - for(i=0; i < match_cnt; i++) { - V_BSTR(&var) = SysAllocStringLen(match_result[i].str, match_result[i].len); - if(!V_BSTR(&var)) { + if(SUCCEEDED(hres)) { + if(!val_str) + val_str = SysAllocStringLen(str, length); + if(val_str) + hres = regexp_string_match(ctx, regexp, val_str, retv, ei); + else hres = E_OUTOFMEMORY; - break; - } - - hres = jsdisp_propput_idx(array, i, &var, ei, NULL/*FIXME*/); - SysFreeString(V_BSTR(&var)); - if(FAILED(hres)) - break; } - heap_free(match_result); + jsdisp_release(regexp); SysFreeString(val_str); - - if(SUCCEEDED(hres) && retv) { - V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(array); - }else { - jsdisp_release(array); - } return hres; } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 513e56e..7b74cb1 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -113,6 +113,7 @@ ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 2, "m.length is not 2"); ok(m["0"] === "ab", "m[0] is not \"ab\""); ok(m["1"] === "ab", "m[1] is not \"ab\""); +/* ok(m.input === "abcabc", "m.input = " + m.input); */ m = "abcabc".match(/Ab/g); ok(typeof(m) === "object", "typeof m is not object"); @@ -167,6 +168,32 @@ ok(m["0"] === "ab", "m[0] is not \"ab\""); m = "abcabc".match(); ok(m === null, "m is not null"); +m = "abcabc".match(/(a)(b)cabc/); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 3, "m.length is not 3"); +ok(m[0] === "abcabc", "m[0] is not \"abc\""); +ok(m[1] === "a", "m[1] is not \"a\""); +ok(m[2] === "b", "m[2] is not \"b\""); + +re = /(a)bcabc/; +re.lastIndex = -3; +m = "abcabc".match(re); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length = " + m.length + "expected 3"); +ok(m[0] === "abcabc", "m[0] is not \"abc\""); +ok(m[1] === "a", "m[1] is not \"a\""); +ok(re.lastIndex === 6, "re.lastIndex = " + re.lastIndex); + +re = /(a)bcabc/; +re.lastIndex = 2; +m = "abcabcxxx".match(re); +ok(typeof(m) === "object", "typeof m is not object"); +ok(m.length === 2, "m.length = " + m.length + "expected 3"); +ok(m[0] === "abcabc", "m[0] is not \"abc\""); +ok(m[1] === "a", "m[1] is not \"a\""); +ok(m.input === "abcabcxxx", "m.input = " + m.input); +ok(re.lastIndex === 6, "re.lastIndex = " + re.lastIndex); + r = "- [test] -".replace(re = /\[([^\[]+)\]/g, "success"); ok(r === "- success -", "r = " + r + " expected '- success -'"); ok(re.lastIndex === 8, "re.lastIndex = " + re.lastIndex);

1 0

Jacek Caban : jscript: Use special case for lastIndex< 0 only for global regexps in run_exec.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: e3ae02433a3302dfc5b1cff6477a4c563be11a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ae02433a3302dfc5b1cff64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 15 12:38:05 2010 +0200 jscript: Use special case for lastIndex<0 only for global regexps in run_exec. --- dlls/jscript/regexp.c | 26 +++++++++++++------------- dlls/jscript/tests/regexp.js | 13 +++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e895603..a5d607e 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3637,25 +3637,25 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *arg, jsexce hres = to_string(ctx, arg, ei, &string); if(FAILED(hres)) return hres; + length = SysStringLen(string); }else { - string = SysAllocStringLen(NULL, 0); - if(!string) - return E_OUTOFMEMORY; + string = NULL; + length = 0; } - if(regexp->last_index < 0) { - SysFreeString(string); - set_last_index(regexp, 0); - *ret = VARIANT_FALSE; - if(input) { - *input = NULL; + if(regexp->jsregexp->flags & JSREG_GLOB) { + if(regexp->last_index < 0) { + SysFreeString(string); + set_last_index(regexp, 0); + *ret = VARIANT_FALSE; + if(input) { + *input = NULL; + } + return S_OK; } - return S_OK; - } - length = SysStringLen(string); - if(regexp->jsregexp->flags & JSREG_GLOB) last_index = regexp->last_index; + } cp = string + last_index; hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string, length, &cp, parens, diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index fac1112..513e56e 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -410,6 +410,19 @@ m = re.exec(" "); ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex + " expected 0"); ok(m === null, "m = " + m + " expected null"); +re = /a/; +re.lastIndex = -3; +ok(re.lastIndex === -3, "re.lastIndex = " + re.lastIndex + " expected -3"); +m = re.exec(" a a "); +ok(re.lastIndex === 2, "re.lastIndex = " + re.lastIndex + " expected 0"); +ok(m.index === 1, "m = " + m + " expected 1"); + +re.lastIndex = -1; +ok(re.lastIndex === -1, "re.lastIndex = " + re.lastIndex + " expected -1"); +m = re.exec(" "); +ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex + " expected 0"); +ok(m === null, "m = " + m + " expected null"); + re = /aa/g; i = 'baacd'.search(re); ok(i === 1, "'baacd'.search(re) = " + i);

1 0

Vincent Povirk : windowscodecs: Fix uninitialized variable use in StreamOnMemory_Write.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: a924e54c94c2aa7fe749bb1b46be74d77758a5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a924e54c94c2aa7fe749bb1b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 14 12:26:12 2010 -0500 windowscodecs: Fix uninitialized variable use in StreamOnMemory_Write. --- dlls/windowscodecs/stream.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 24eaf87..bd5592b 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -125,11 +125,9 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, hr = STG_E_MEDIUMFULL; } else { - if (cb) { - memcpy(This->pbMemory + This->dwCurPos, pv, cb); - This->dwCurPos += cb; - hr = S_OK; - } + memcpy(This->pbMemory + This->dwCurPos, pv, cb); + This->dwCurPos += cb; + hr = S_OK; if (pcbWritten) *pcbWritten = cb; } LeaveCriticalSection(&This->lock);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010