wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : mshtml/tests: When a test fails, print the bad value.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 3b7fb23ca7ea3eba28d21fe18db9e1cc773c5e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7fb23ca7ea3eba28d21fe18… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 17:32:18 2011 +0200 mshtml/tests: When a test fails, print the bad value. --- dlls/mshtml/tests/htmldoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7791b73..6676020 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1620,7 +1620,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, if(expect_InPlaceUIWindow_SetActiveObject_active) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); if(pActiveObject && is_english()) - ok(!lstrcmpW(wszHTML_Document, pszObjName), "pszObjName != \"HTML Document\"\n"); + ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); } else { ok(pActiveObject == NULL, "pActiveObject=%p, expected NULL\n", pActiveObject); @@ -1640,7 +1640,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT2(SetActiveObject); if(pActiveObject && is_english()) - ok(!lstrcmpW(wszHTML_Document, pszObjName), "pszObjName != \"HTML Document\"\n"); + ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); }else { CHECK_EXPECT(SetActiveObject_null);

1 0

Frédéric Delanoy : cmd/tests: Segment mkdir tests for an easier read.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8fff969ce6ba55568e8002ce48896b2c0a333402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fff969ce6ba55568e8002ce4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 12 20:28:03 2011 +0200 cmd/tests: Segment mkdir tests for an easier read. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++------ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 046e6e4..7551e57 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -881,14 +881,14 @@ rmdir "foo bar" echo ----------- Testing mkdir ----------- call :setError 0 -rem md and mkdir are synonymous +echo ... md and mkdir are synonymous ... mkdir foobar echo %ErrorLevel% rmdir foobar md foobar echo %ErrorLevel% rmdir foobar -rem Creating an already existing directory/file must fail +echo ... creating an already existing directory/file must fail ... mkdir foobar md foobar echo %ErrorLevel% @@ -897,7 +897,7 @@ echo > foobar mkdir foobar echo %ErrorLevel% del foobar -rem Multi-level path creation +echo ... multilevel path creation ... mkdir foo echo %ErrorLevel% mkdir foo\bar\baz @@ -922,13 +922,13 @@ rmdir bar cd .. rmdir foo echo %ErrorLevel% -rem Trailing backslashes +echo ... trailing backslashes ... mkdir foo\\\\ echo %ErrorLevel% if exist foo (rmdir foo & echo dir created ) else ( echo dir not created ) echo %ErrorLevel% -rem Invalid chars +echo ... invalid chars ... mkdir ? echo mkdir ? gives errorlevel %ErrorLevel% call :setError 0 @@ -954,7 +954,7 @@ if not exist foo ( cd .. rmdir foo ) -rem multiples directories at once +echo ... multiple directories at once ... mkdir foobaz & cd foobaz mkdir foo bar\baz foobar if exist foo (echo foo created) else echo foo not created! diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1e2e3df..733e1d5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -595,10 +595,13 @@ del /q * succeeded on file1 del /q * succeeded on file2.dat ------------ Testing del /s -------------- ----------- Testing mkdir ----------- +... md and mkdir are synonymous ... 0 0 +... creating an already existing directory/file must fail ... 1 1 +... multilevel path creation ... 0 0 0 @@ -607,15 +610,18 @@ del /q * succeeded on file2.dat 1 0 0 +... trailing backslashes ... 0 dir created 0 +... invalid chars ... mkdir ? gives errorlevel 1 mkdir ?\foo gives errorlevel 1 mkdir foo\? gives errorlevel 1 ok, foo created mkdir foo\bar\? gives errorlevel 1 ok, foo\bar created +... multiple directories at once ... foo created bar created foobar created

1 0

Nikolay Sivov : shell32/tests: Make test explicit about return pointer.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: c03f813c872d790a7c77d81810aa0cac425f4abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03f813c872d790a7c77d8181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 11 20:19:35 2011 +0400 shell32/tests: Make test explicit about return pointer. --- dlls/shell32/tests/shelldispatch.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index a2b649a..2ccc364 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -84,10 +84,12 @@ static void test_namespace(void) V_VT(&var) = VT_I4; V_I4(&var) = -1; + folder = (void*)0xdeadbeef; r = IShellDispatch_NameSpace(sd, var, &folder); - todo_wine + todo_wine { ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); - + ok(folder == NULL, "got %p\n", folder); +} V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES; r = IShellDispatch_NameSpace(sd, var, &folder);

1 0

Alexandre Julliard : gdi32: Move coordinate checks into the common part of GdiAlphaBlend.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 497c3982b647fa6e16b960ee59efa16e9d86f324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497c3982b647fa6e16b960ee5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 17:10:37 2011 +0200 gdi32: Move coordinate checks into the common part of GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 18 +++++++++++++++++- dlls/winex11.drv/xrender.c | 13 ++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e8e2c88..9f37ab0 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -669,7 +669,23 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.BlendOp, blendFunction.BlendFlags, blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat ); - if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); + if (src.x < 0 || src.y < 0 || src.width < 0 || src.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))) + { + WARN( "Invalid src coords: (%d,%d), size %dx%d\n", src.x, src.y, src.width, src.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } + else if (dst.width < 0 || dst.height < 0) + { + WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", dst.x, dst.y, dst.width, dst.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } + else if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); + release_dc_ptr( dcDst ); } release_dc_ptr( dcSrc ); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 62fba77..2e7aca3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2396,22 +2396,13 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, double xscale, yscale; BOOL use_repeat; - if (src->x < 0 || src->y < 0 || src->width < 0 || src->height < 0 || - src->width > physdev_src->x11dev->drawable_rect.right - physdev_src->x11dev->drawable_rect.left - src->x || - src->height > physdev_src->x11dev->drawable_rect.bottom - physdev_src->x11dev->drawable_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 ); - return FALSE; - } - if (!X11DRV_XRender_Installed || src_dev->funcs != dst_dev->funcs) { dst_dev = GET_NEXT_PHYSDEV( dst_dev, pAlphaBlend ); return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } - if (physdev_src->x11dev != physdev_dst->x11dev) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + if (physdev_src != physdev_dst) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); dst_pict = get_xrender_picture( physdev_dst->x11dev ); @@ -2460,7 +2451,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); - if (physdev_src->x11dev != physdev_dst->x11dev) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); + if (physdev_src != physdev_dst) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); return TRUE; }

1 0

Alexandre Julliard : winex11: Add a SetDeviceClipping entry point to the XRender driver.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 271530b3ddf4183265fc30a8541206d565dbea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=271530b3ddf4183265fc30a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 15:47:19 2011 +0200 winex11: Add a SetDeviceClipping entry point to the XRender driver. --- dlls/winex11.drv/graphics.c | 6 ++- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 91 +++++++++++++++++++++++++++++++----------- 3 files changed, 73 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index eb25764..7c84c8b 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -185,7 +185,10 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) } -static void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) +/*********************************************************************** + * update_x11_clipping + */ +void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) { wine_tsx11_lock(); XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, @@ -193,6 +196,7 @@ static void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) wine_tsx11_unlock(); } + /*********************************************************************** * add_extra_clipping_region * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 02dc34b..4cc0522 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -280,6 +280,7 @@ extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; +extern void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) DECLSPEC_HIDDEN; extern RGNDATA *add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) DECLSPEC_HIDDEN; @@ -300,7 +301,6 @@ extern int client_side_antialias_with_render DECLSPEC_HIDDEN; extern int using_client_side_fonts DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; -extern void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) DECLSPEC_HIDDEN; extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) DECLSPEC_HIDDEN; extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) DECLSPEC_HIDDEN; BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ab1cade..62fba77 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1132,21 +1132,45 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) return 0; } -/*********************************************************************** -* X11DRV_XRender_SetDeviceClipping -*/ -void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) +static void update_xrender_clipping( struct xrender_physdev *dev, const RGNDATA *data ) { - if (physDev->xrender->pict) + if (dev->info.pict) { wine_tsx11_lock(); - pXRenderSetPictureClipRectangles( gdi_display, physDev->xrender->pict, - physDev->dc_rect.left, physDev->dc_rect.top, + pXRenderSetPictureClipRectangles( gdi_display, dev->info.pict, + dev->x11dev->dc_rect.left, dev->x11dev->dc_rect.top, (XRectangle *)data->Buffer, data->rdh.nCount ); wine_tsx11_unlock(); } } +static RGNDATA *add_xrender_clipping_region( struct xrender_physdev *dev, HRGN rgn ) +{ + RGNDATA *ret, *data; + HRGN clip; + + if (!(ret = X11DRV_GetRegionData( dev->x11dev->region, 0 ))) return NULL; + if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + CombineRgn( clip, dev->x11dev->region, rgn, RGN_AND ); + if ((data = X11DRV_GetRegionData( clip, 0 ))) + { + update_xrender_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); + } + DeleteObject( clip ); + return ret; +} + +static void restore_xrender_clipping_region( struct xrender_physdev *dev, RGNDATA *data ) +{ + if (!data) return; + update_xrender_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); +} static BOOL create_xrender_dc( PHYSDEV *pdev ) { @@ -1280,6 +1304,23 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA return dev->funcs->pPutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); } +/*********************************************************************** + * xrenderdrv_SetDeviceClipping + */ +static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + RGNDATA *data; + + CombineRgn( physdev->x11dev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + + if (!(data = X11DRV_GetRegionData( physdev->x11dev->region, 0 ))) return; + update_x11_clipping( physdev->x11dev, data ); + update_xrender_clipping( physdev, data ); + HeapFree( GetProcessHeap(), 0, data ); +} + + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -2004,13 +2045,6 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, goto done_unlock; } - if (flags & ETO_CLIPPED) - { - HRGN clip_region = CreateRectRgnIndirect( lprect ); - saved_region = add_extra_clipping_region( physdev->x11dev, clip_region ); - DeleteObject( clip_region ); - } - EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->info.cache_index; @@ -2091,6 +2125,14 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, desired.y = physdev->x11dev->dc_rect.top + y + offset.y; } } + + if (flags & ETO_CLIPPED) + { + HRGN clip_region = CreateRectRgnIndirect( lprect ); + saved_region = add_xrender_clipping_region( physdev, clip_region ); + DeleteObject( clip_region ); + } + wine_tsx11_lock(); /* Make sure we don't have any transforms set from a previous call */ set_xrender_transformation(pict, 1, 1, 0, 0); @@ -2101,8 +2143,17 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, elts); + restore_xrender_clipping_region( physdev, saved_region ); } else { POINT offset = {0, 0}; + + if (flags & ETO_CLIPPED) + { + HRGN clip_region = CreateRectRgnIndirect( lprect ); + saved_region = add_extra_clipping_region( physdev->x11dev, clip_region ); + DeleteObject( clip_region ); + } + wine_tsx11_lock(); XSetForeground( gdi_display, physdev->x11dev->gc, textPixel ); @@ -2263,11 +2314,9 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } no_image: wine_tsx11_unlock(); + restore_clipping_region( physdev->x11dev, saved_region ); } LeaveCriticalSection(&xrender_cs); - - restore_clipping_region( physdev->x11dev, saved_region ); - retv = TRUE; done_unlock: @@ -2640,7 +2689,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ + xrenderdrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ @@ -2684,12 +2733,6 @@ void X11DRV_XRender_Finalize(void) { } -void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) -{ - assert(0); - return; -} - void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) { wine_tsx11_lock();

1 0

Alexandre Julliard : winex11: Return a RGNDATA from add_extra_clipping_region and avoid changing the physdev region .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: c582edbc5a77c858159d422ec9da75cd08122de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c582edbc5a77c858159d422ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 15:40:57 2011 +0200 winex11: Return a RGNDATA from add_extra_clipping_region and avoid changing the physdev region. --- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/graphics.c | 43 ++++++++++++++++++++++++------------------- dlls/winex11.drv/text.c | 24 ++++++++++++------------ dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrender.c | 6 +++--- 5 files changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index bcdb996..09e99e6 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1902,7 +1902,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info } else { - HRGN saved_region = 0; + RGNDATA *saved_region = NULL; if (clip) saved_region = add_extra_clipping_region( physdev, clip ); X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); @@ -1939,7 +1939,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info } X11DRV_UnlockDIBSection( physdev, !ret ); - if (saved_region) restore_clipping_region( physdev, saved_region ); + restore_clipping_region( physdev, saved_region ); } image->data = NULL; } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index c93001f..eb25764 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -185,18 +185,12 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) } -static void update_x11_clipping( X11DRV_PDEVICE *physDev ) +static void update_x11_clipping( X11DRV_PDEVICE *physDev, const RGNDATA *data ) { - RGNDATA *data; - - if (!(data = X11DRV_GetRegionData( physDev->region, 0 ))) return; wine_tsx11_lock(); XSetClipRectangles( gdi_display, physDev->gc, physDev->dc_rect.left, physDev->dc_rect.top, (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); wine_tsx11_unlock(); - - if (physDev->xrender) X11DRV_XRender_SetDeviceClipping(physDev, data); - HeapFree( GetProcessHeap(), 0, data ); } /*********************************************************************** @@ -205,15 +199,24 @@ static void update_x11_clipping( X11DRV_PDEVICE *physDev ) * Temporarily add a region to the current clipping region. * The returned region must be restored with restore_clipping_region. */ -HRGN add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) +RGNDATA *add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) { - HRGN ret, clip; + RGNDATA *ret, *data; + HRGN clip; - if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) return 0; + if (!(ret = X11DRV_GetRegionData( dev->region, 0 ))) return NULL; + if (!(clip = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } CombineRgn( clip, dev->region, rgn, RGN_AND ); - ret = dev->region; - dev->region = clip; - update_x11_clipping( dev ); + if ((data = X11DRV_GetRegionData( clip, 0 ))) + { + update_x11_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); + } + DeleteObject( clip ); return ret; } @@ -221,12 +224,11 @@ HRGN add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) /*********************************************************************** * restore_clipping_region */ -void restore_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) +void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) { - if (!rgn) return; - DeleteObject( dev->region ); - dev->region = rgn; - update_x11_clipping( dev ); + if (!data) return; + update_x11_clipping( dev, data ); + HeapFree( GetProcessHeap(), 0, data ); } @@ -235,10 +237,13 @@ void restore_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) */ void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { + RGNDATA *data; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - update_x11_clipping( physDev ); + + if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) update_x11_clipping( physDev, data ); + HeapFree( GetProcessHeap(), 0, data ); } diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index bbc57a8..bce0af9 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -41,6 +41,7 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); + RGNDATA *saved_region = NULL; unsigned int i; fontObject* pfo; XFontStruct* font; @@ -48,7 +49,6 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, XChar2b *str2b = NULL; BOOL dibUpdateFlag = FALSE; BOOL result = TRUE; - HRGN saved_region = 0; if (!X11DRV_SetupGCForText( physDev )) return TRUE; @@ -98,7 +98,10 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, /* Draw the text (count > 0 verified) */ if (!(str2b = X11DRV_cptable[pfo->fi->cptable].punicode_to_char2b( pfo, wstr, count ))) - goto FAIL; + { + result = FALSE; + goto END; + } wine_tsx11_lock(); XSetForeground( gdi_display, physDev->gc, physDev->textPixel ); @@ -116,8 +119,11 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, XTextItem16 *items; items = HeapAlloc( GetProcessHeap(), 0, count * sizeof(XTextItem16) ); - if(items == NULL) goto FAIL; - + if(items == NULL) + { + result = FALSE; + goto END; + } items[0].chars = str2b; items[0].delta = 0; items[0].nchars = 1; @@ -167,17 +173,11 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } } } - HeapFree( GetProcessHeap(), 0, str2b ); - - if (saved_region) restore_clipping_region( physDev, saved_region ); - goto END; - -FAIL: - HeapFree( GetProcessHeap(), 0, str2b ); - result = FALSE; END: + HeapFree( GetProcessHeap(), 0, str2b ); if (dibUpdateFlag) X11DRV_UnlockDIBSection( physDev, TRUE ); + restore_clipping_region( physDev, saved_region ); return result; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fb190b2..02dc34b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -280,8 +280,8 @@ extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; -extern HRGN add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN; -extern void restore_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN; +extern RGNDATA *add_extra_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HIDDEN; +extern void restore_clipping_region( X11DRV_PDEVICE *dev, RGNDATA *data ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e7a1062..ab1cade 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1948,7 +1948,7 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, gsCacheEntryFormat *formatEntry; BOOL retv = FALSE; int textPixel, backgroundPixel; - HRGN saved_region = 0; + RGNDATA *saved_region = NULL; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; unsigned int idx; @@ -1957,7 +1957,7 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (!physdev->x11dev->has_gdi_font) { dev = GET_NEXT_PHYSDEV( dev, pExtTextOut ); - dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); + return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); } if(is_dib_with_colortable( physdev->x11dev )) @@ -2266,7 +2266,7 @@ BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } LeaveCriticalSection(&xrender_cs); - if (saved_region) restore_clipping_region( physdev->x11dev, saved_region ); + restore_clipping_region( physdev->x11dev, saved_region ); retv = TRUE;

1 0

Bruno Jesus : ws2_32: SO_OOBINLINE sockets must always return TRUE to SIOCATMARK request.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: fd7b94bcd2b5d8ee48f329ec3705da9ef3fcf5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7b94bcd2b5d8ee48f329ec3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 13 08:07:00 2011 -0400 ws2_32: SO_OOBINLINE sockets must always return TRUE to SIOCATMARK request. --- dlls/ws2_32/socket.c | 21 +++++++++++++++++++-- dlls/ws2_32/tests/sock.c | 23 ++++++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfe34ce..b6d17ff 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3099,17 +3099,34 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; case WS_FIONREAD: + { + if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + if (ioctl(fd, FIONREAD, out_buff ) == -1) + status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + release_sock_fd( s, fd ); + break; + } + case WS_SIOCATMARK: { - int cmd = code == WS_FIONREAD ? FIONREAD : SIOCATMARK; + unsigned int oob = 0, oobsize = sizeof(int), atmark = 0; if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; - if (ioctl(fd, cmd, out_buff ) == -1) + /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ + if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) + || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + else + (*(WS_u_long *) out_buff) = oob | atmark; release_sock_fd( s, fd ); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3766186..326b77d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2939,7 +2939,7 @@ static void test_ioctlsocket(void) { SOCKET sock; struct tcp_keepalive kalive; - int ret; + int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; UINT i; u_long arg = 0; @@ -2965,8 +2965,25 @@ static void test_ioctlsocket(void) * that normal(not urgent) data returns a non-zero value for SIOCATMARK. */ ret = ioctlsocket(sock, SIOCATMARK, &arg); - if(ret != SOCKET_ERROR) - todo_wine ok(arg, "expected a non-zero value\n"); + ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n"); + todo_wine ok(arg, "SIOCATMARK expected a non-zero value\n"); + + /* when SO_OOBINLINE is set SIOCATMARK must always return TRUE */ + optval = 1; + ret = setsockopt(sock, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval)); + ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); + arg = 0; + ret = ioctlsocket(sock, SIOCATMARK, &arg); + ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n"); + ok(arg, "SIOCATMARK expected a non-zero value\n"); + + /* disable SO_OOBINLINE and get the same old bahavior */ + optval = 0; + ret = setsockopt(sock, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval)); + ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); + arg = 0; + ret = ioctlsocket(sock, SIOCATMARK, &arg); + todo_wine ok(arg, "SIOCATMARK expected a non-zero value\n"); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");

1 0

Jacek Caban : vbscript: Added interp_exp implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 143a488508753c73cb036f50ee0adc6e6b4978e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143a488508753c73cb036f50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:41:34 2011 +0200 vbscript: Added interp_exp implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6cf50b9..593c83e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -740,8 +740,26 @@ static HRESULT interp_mul(exec_ctx_t *ctx) static HRESULT interp_exp(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarPow(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 661e2c9..12bdaf5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -116,6 +116,11 @@ Call ok(3/2 = 1.5, "3/2 = " & (3/2)) Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) +Call ok(2^3 = 8, "2^3 = " & (2^3)) +Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2)) +Call ok(-3^2 = 9, "-3^2 = " & (-3^2)) +Call ok(2*3^2 = 18, "2*3^2 = " & (2*3^2)) + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added exp expression parser/compiler implementation .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: b5d8554f1ef1bc186033a7d1ef783cc66675dee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d8554f1ef1bc186033a7d1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:41:15 2011 +0200 vbscript: Added exp expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 3 ++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d14e8de..d39b94e 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -361,6 +361,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_EXP: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_exp); case EXPR_IDIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); case EXPR_MEMBER: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7a5be72..6cf50b9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -738,6 +738,12 @@ static HRESULT interp_mul(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_exp(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index e15a851..cfeb8c0 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -24,6 +24,7 @@ typedef enum { EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, + EXPR_EXP, EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7d574d1..c9f9c76 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -210,7 +210,8 @@ MultiplicativeExpression { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } ExpExpression - : UnaryExpression /* FIXME */ { $$ = $1; } + : UnaryExpression { $$ = $1; } + | ExpExpression '^' UnaryExpression { $$ = new_binary_expression(ctx, EXPR_EXP, $1, $3); CHECK_ERROR; } UnaryExpression : LiteralExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 690cad3..afa9d83 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -107,6 +107,7 @@ typedef enum { X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ + X(exp, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_div implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 9db2d7c352de98a99adee48158e5cddd861afaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db2d7c352de98a99adee4815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:41:03 2011 +0200 vbscript: Added interp_div implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ace9c7c..7a5be72 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -692,8 +692,26 @@ static HRESULT interp_idiv(exec_ctx_t *ctx) static HRESULT interp_div(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarDiv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_mul(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index b6330b2..661e2c9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -111,6 +111,11 @@ Call ok(4.6 \ 1.5 = 2, "4.6 \ 1.5 = " & (4.6\1.5)) Call ok(4.6 \ 1.49 = 5, "4.6 \ 1.49 = " & (4.6\1.49)) Call ok(2+3\4 = 2, "2+3\4 = " & (2+3\4)) +Call ok(2*3 = 6, "2*3 = " & (2*3)) +Call ok(3/2 = 1.5, "3/2 = " & (3/2)) +Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) +Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) + if false then ok false, "if false called" end if

1 0

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 September 2011