September 2011 - Wine-Commits

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

Sept. 13, 2011

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

Alexandre Julliard : winex11: Add a SetDeviceClipping entry point to the XRender driver.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

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 : gdi32: Move coordinate checks into the common part of GdiAlphaBlend.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

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

Francois Gouget : mshtml/tests: GetUserDefaultUILanguage() is not available in NT4.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: c571be83da04c2276468805d6c92b4520e8afc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c571be83da04c2276468805d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 17:32:25 2011 +0200 mshtml/tests: GetUserDefaultUILanguage() is not available in NT4. --- dlls/mshtml/tests/dom.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ab9e8b5..107fbb5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -35,6 +35,7 @@ #include "objsafe.h" static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); +static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; @@ -4133,11 +4134,16 @@ static void test_navigator(IHTMLDocument2 *doc) test_language_string(bstr, LOCALE_SYSTEM_DEFAULT); SysFreeString(bstr); - bstr = NULL; - hres = IOmNavigator_get_browserLanguage(navigator, &bstr); - ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres); - test_language_string(bstr, GetUserDefaultUILanguage()); - SysFreeString(bstr); + if (pGetUserDefaultUILanguage) + { + bstr = NULL; + hres = IOmNavigator_get_browserLanguage(navigator, &bstr); + ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres); + test_language_string(bstr, pGetUserDefaultUILanguage()); + SysFreeString(bstr); + } + else + win_skip("GetUserDefaultUILanguage not available\n"); bstr = NULL; hres = IOmNavigator_get_userLanguage(navigator, &bstr); @@ -6155,7 +6161,9 @@ static void run_domtest(const char *str, domtest_t test) START_TEST(dom) { - pLCIDToLocaleName = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "LCIDToLocaleName"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + pLCIDToLocaleName = (void*)GetProcAddress(hkernel32, "LCIDToLocaleName"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); CoInitialize(NULL);

1 0

Francois Gouget : mshtml/tests: Some tests require that the user interface be in English.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: e931ebc704242a0c26f4b50543f8ffa226e56a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931ebc704242a0c26f4b5054… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 17:35:53 2011 +0200 mshtml/tests: Some tests require that the user interface be in English. With MUI versions of Windows checking for the default user language id is insufficient. Skip the system language id check as it is irrelevant here. --- dlls/mshtml/tests/htmldoc.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6676020..03f2539 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -285,8 +285,18 @@ static BSTR a2bstr(const char *str) static BOOL is_english(void) { - return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH - && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } #define EXPECT_UPDATEUI 1

1 0

Jacek Caban : vbscript: Added multiplicative expression parser/ compiler implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 2f3c235a44a258f4dbe99890c31f2d467bf6ba46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3c235a44a258f4dbe99890c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:39 2011 +0200 vbscript: Added multiplicative expression parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 9 ++++++++- dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 98b8abd..d14e8de 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -353,6 +353,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); + case EXPR_DIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: @@ -365,6 +367,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); + case EXPR_MUL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 925da12..4feb2a9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -690,6 +690,18 @@ static HRESULT interp_idiv(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_div(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_mul(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 3d180ce..e15a851 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -20,12 +20,14 @@ typedef enum { EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, + EXPR_DIV, EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, EXPR_IDIV, EXPR_MEMBER, EXPR_MOD, + EXPR_MUL, EXPR_NEG, EXPR_NEQUAL, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 89cc569..7d574d1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -203,6 +203,13 @@ IntdivExpression { $$ = new_binary_expression(ctx, EXPR_IDIV, $1, $3); CHECK_ERROR; } MultiplicativeExpression + : ExpExpression { $$ = $1; } + | MultiplicativeExpression '*' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_MUL, $1, $3); CHECK_ERROR; } + | MultiplicativeExpression '/' ExpExpression + { $$ = new_binary_expression(ctx, EXPR_DIV, $1, $3); CHECK_ERROR; } + +ExpExpression : UnaryExpression /* FIXME */ { $$ = $1; } UnaryExpression diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a460233..690cad3 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -103,6 +103,7 @@ typedef enum { X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ + X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ @@ -113,6 +114,7 @@ typedef enum { X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(mod, 1, 0, 0) \ + X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \

1 0

Bruno Jesus : ws2_32: SO_OOBINLINE sockets must always return TRUE to SIOCATMARK request.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

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_mul implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 8a526743a1d74348ba256277eb85d95bea67326d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a526743a1d74348ba256277e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:50 2011 +0200 vbscript: Added interp_mul implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4feb2a9..ace9c7c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -698,8 +698,26 @@ static HRESULT interp_div(exec_ctx_t *ctx) static HRESULT interp_mul(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 = VarMul(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)

1 0

Jacek Caban : vbscript: Added interp_idiv implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 80eff04037e0639b2976ed67c6b0b08181aa99f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80eff04037e0639b2976ed67c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:28 2011 +0200 vbscript: Added interp_idiv 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 602a259..925da12 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -668,8 +668,26 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_idiv(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 = VarIdiv(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 d5565bd..b6330b2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -106,6 +106,11 @@ Call ok(getVT(2 mod null) = "VT_NULL", "getVT(2 mod null) = " & getVT(2 mod null Call ok(getVT(null mod 2) = "VT_NULL", "getVT(null mod 2) = " & getVT(null mod 2)) 'FIXME: Call ok(empty mod 2 = 0, "empty mod 2 = " & (empty mod 2)) +Call ok(5 \ 2 = 2, "5 \ 2 = " & (5\2)) +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)) + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added if statement parser implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: df3adde1868f5ac1a753af6c82c51772854f2407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3adde1868f5ac1a753af6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:04 2011 +0200 vbscript: Added if statement parser implementation. --- dlls/vbscript/parse.h | 15 +++++++++++ dlls/vbscript/parser.y | 62 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index d50889d..c8ed7f0 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -80,6 +80,7 @@ typedef struct { typedef enum { STAT_ASSIGN, STAT_CALL, + STAT_IF, STAT_DIM } statement_type_t; @@ -109,6 +110,20 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _elseif_decl_t { + expression_t *expr; + statement_t *stat; + struct _elseif_decl_t *next; +} elseif_decl_t; + +typedef struct { + statement_t stat; + expression_t *expr; + statement_t *if_stat; + elseif_decl_t *elseifs; + statement_t *else_stat; +} if_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b5e740e..8efcc5a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -48,8 +48,10 @@ static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,co static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); + static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); +static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -63,6 +65,7 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + elseif_decl_t *elseif; dim_decl_t *dim_decl; LONG lng; BOOL bool; @@ -86,13 +89,14 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); %token <lng> tLong tShort %token <dbl> tDouble -%type <statement> Statement StatementNl +%type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <elseif> ElseIfs_opt ElseIfs ElseIf %type <dim_decl> DimDeclList %% @@ -108,6 +112,10 @@ SourceElements : /* empty */ | SourceElements StatementNl { source_add_statement(ctx, $2); } +StatementsNl + : StatementNl { $$ = $1; } + | StatementNl StatementsNl { $1->next = $2; $$ = $1; } + StatementNl : Statement tNL { $$ = $1; } @@ -117,6 +125,7 @@ Statement | MemberExpression Arguments_opt '=' Expression { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } + | IfStatement { $$ = $1; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -126,6 +135,27 @@ DimDeclList /* FIXME: Support arrays */ : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +IfStatement + : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF + { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } + /* FIXME: short if statement */ + +ElseIfs_opt + : /* empty */ { $$ = NULL; } + | ElseIfs { $$ = $1; } + +ElseIfs + : ElseIf { $$ = $1; } + | ElseIf ElseIfs { $1->next = $2; $$ = $1; } + +ElseIf + : tELSEIF Expression tTHEN tNL StatementsNl + { $$ = new_elseif_decl(ctx, $2, $5); } + +Else_opt + : /* empty */ { $$ = NULL; } + | tELSE tNL StatementsNl { $$ = $3; } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } @@ -376,6 +406,36 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) return &stat->stat; } +static elseif_decl_t *new_elseif_decl(parser_ctx_t *ctx, expression_t *expr, statement_t *stat) +{ + elseif_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->expr = expr; + decl->stat = stat; + decl->next = NULL; + return decl; +} + +static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, + statement_t *else_stat) +{ + if_statement_t *stat; + + stat = new_statement(ctx, STAT_IF, sizeof(*stat)); + if(!stat) + return NULL; + + stat->expr = expr; + stat->if_stat = if_stat; + stat->elseifs = elseif_decl; + stat->else_stat = else_stat; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0