September 2011 - Wine-Commits

Jacek Caban : vbscript: Added additive expressions parser/ compiler implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 0ec93395334bdb069c2b206ad5e6d9c6053cbd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec93395334bdb069c2b206ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:58 2011 +0200 vbscript: Added additive expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 7 ++++++- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index baaa078..9e34c35 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -234,6 +234,8 @@ static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: @@ -254,6 +256,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); + case EXPR_SUB: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_USHORT: return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 67230da..fb3adfe 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,18 @@ static HRESULT interp_concat(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_add(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_sub(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 0c87209..3d6d604 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -17,6 +17,7 @@ */ typedef enum { + EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, EXPR_DOUBLE, @@ -27,6 +28,7 @@ typedef enum { EXPR_NOT, EXPR_NULL, EXPR_STRING, + EXPR_SUB, EXPR_ULONG, EXPR_USHORT } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 316957c..2f42ab6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -145,6 +145,11 @@ ConcatExpression | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } AdditiveExpression + : ModExpression { $$ = $1; } + | AdditiveExpression '+' ModExpression { $$ = new_binary_expression(ctx, EXPR_ADD, $1, $3); CHECK_ERROR; } + | AdditiveExpression '-' ModExpression { $$ = new_binary_expression(ctx, EXPR_SUB, $1, $3); CHECK_ERROR; } + +ModExpression : UnaryExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9db2692..cf90b38 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -88,6 +88,7 @@ typedef enum { } instr_arg_type_t; #define OP_LIST \ + X(add, 1, 0, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ @@ -101,7 +102,8 @@ typedef enum { X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ - X(string, 1, ARG_STR, 0) + X(string, 1, ARG_STR, 0) \ + X(sub, 1, 0, 0) typedef enum { #define X(x,n,a,b) OP_##x,

1 0

Jacek Caban : vbscript: Added interp_sub implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 324aadd2a95fa4766b0e47caf7d38c5eb68dcb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324aadd2a95fa4766b0e47caf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:18 2011 +0200 vbscript: Added interp_sub 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 f3e3f56..4585f88 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -417,8 +417,26 @@ static HRESULT interp_add(exec_ctx_t *ctx) static HRESULT interp_sub(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 = VarSub(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 06a3d07..9c37bb2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -75,4 +75,9 @@ Call ok(false + 6 + true = 5, "false + 6 + true <> 5") Call ok(getVT(2+null) = "VT_NULL", "getVT(2+null) = " & getVT(2+null)) Call ok(2+empty = 2, "2+empty = " & (2+empty)) +Call ok(5-1 = 4, "5-1 = " & (5-1)) +Call ok(3+5-true = 9, "3+5-true <> 9") +Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) +Call ok(2-empty = 2, "2-empty = " & (2-empty)) + reportSuccess()

1 0

Jacek Caban : vbscript: Added assign statement parser implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: e63c4472281872c363cc17205f4264477b360298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63c4472281872c363cc17205… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:38 2011 +0200 vbscript: Added assign statement parser implementation. --- dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 188b673..f7b9436 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -78,6 +78,7 @@ typedef struct { } member_expression_t; typedef enum { + STAT_ASSIGN, STAT_CALL } statement_type_t; @@ -92,6 +93,12 @@ typedef struct { } call_statement_t; typedef struct { + statement_t stat; + member_expression_t *member_expr; + expression_t *value_expr; +} assign_statement_t; + +typedef struct { const WCHAR *code; const WCHAR *ptr; const WCHAR *end; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ebfbbbc..0d56acd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,6 +46,7 @@ static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expre static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); 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*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -108,6 +109,8 @@ StatementNl Statement : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } + | MemberExpression Arguments_opt '=' Expression + { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -325,6 +328,19 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, member_expression_t *e return &stat->stat; } +static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t *left, expression_t *right) +{ + assign_statement_t *stat; + + stat = new_statement(ctx, STAT_ASSIGN, sizeof(*stat)); + if(!stat) + return NULL; + + stat->member_expr = left; + stat->value_expr = right; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added concatenation tests.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: a5fe24c61d03189c431d98f229ee2674e6cfb703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fe24c61d03189c431d98f22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:07 2011 +0200 vbscript: Added concatenation tests. --- dlls/vbscript/tests/lang.vbs | 11 +++++++++++ dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dba5c9a..dc64c91 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -52,5 +52,16 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") + +Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") +Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null)) +Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) +Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) + +'if(isEnglishLocale) then +' Call ok("" & true = "True", """"" & true = " & true) +' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +'end if reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 329d75a..dac8bec 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 +#define DISPID_GLOBAL_ISENGLOC 1004 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -121,6 +122,12 @@ static const char *vt2a(VARIANT *v) } } +static BOOL is_english(void) +{ + return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH + && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) { @@ -240,6 +247,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_GETVT; return S_OK; } + if(!strcmp_wa(bstrName, "isEnglishLocale")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_ISENGLOC; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -319,6 +331,25 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_BSTR; V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_ISENGLOC: + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BOOL; + if(is_english()) { + V_BOOL(pvarRes) = VARIANT_TRUE; + }else { + skip("Skipping some test in non-English locale\n"); + V_BOOL(pvarRes) = VARIANT_FALSE; + } + return S_OK; + } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added interp_concat implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: fad15f782a9b70c0c5a924e6735bf7ef30502333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad15f782a9b70c0c5a924e67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:57 2011 +0200 vbscript: Added interp_concat 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 7ee58a2..90531fb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -369,8 +369,26 @@ static HRESULT interp_equal(exec_ctx_t *ctx) static HRESULT interp_concat(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 = VarCat(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = {

1 0

Alexandre Julliard : winex11: Add bitmap entry points to the XRender driver .
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 225d8abec90fbd41c59ec95af5d65c22a564b9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225d8abec90fbd41c59ec95af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:12:15 2011 +0200 winex11: Add bitmap entry points to the XRender driver. --- dlls/winex11.drv/bitmap.c | 3 - dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrender.c | 101 +++++++++++++++++++++++++------------------ 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index af6266b..6c5eb26 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -95,9 +95,6 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; - if(physDev->xrender) - X11DRV_XRender_UpdateDrawable( physDev ); - if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) physBitmap = &BITMAP_stock_phys_bitmap; else if (!(physBitmap = X11DRV_get_phys_bitmap( hbitmap ))) return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 55b4f22..e8cda91 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -313,7 +313,6 @@ extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, const struct bitblt_coords *src, const struct bitblt_coords *dst ) DECLSPEC_HIDDEN; -extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) DECLSPEC_HIDDEN; extern BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3b931b2..e2a9858 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1222,6 +1222,60 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); } +/**************************************************************************** + * xrenderdrv_CreateBitmap + */ +static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) +{ + dev = GET_NEXT_PHYSDEV( dev, pCreateBitmap ); + return dev->funcs->pCreateBitmap( dev, hbitmap ); +} + +/**************************************************************************** + * xrenderdrv_DeleteBitmap + */ +static BOOL xrenderdrv_DeleteBitmap( HBITMAP hbitmap ) +{ + return X11DRV_DeleteBitmap( hbitmap ); +} + +/*********************************************************************** + * xrenderdrv_SelectBitmap + */ +static HBITMAP xrenderdrv_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +{ + HBITMAP ret; + struct xrender_physdev *physdev = get_xrender_dev( dev ); + + dev = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); + ret = dev->funcs->pSelectBitmap( dev, hbitmap ); + if (ret) update_xrender_drawable( physdev ); + return ret; +} + +/*********************************************************************** + * xrenderdrv_GetImage + */ +static DWORD xrenderdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + if (hbitmap) return X11DRV_GetImage( dev, hbitmap, info, bits, src ); + dev = GET_NEXT_PHYSDEV( dev, pGetImage ); + return dev->funcs->pGetImage( dev, hbitmap, info, bits, src ); +} + +/*********************************************************************** + * xrenderdrv_PutImage + */ +static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + if (hbitmap) return X11DRV_PutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); + dev = GET_NEXT_PHYSDEV( dev, pPutImage ); + return dev->funcs->pPutImage( dev, hbitmap, clip, info, bits, src, dst, rop ); +} + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -1295,37 +1349,6 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, return TRUE; } -/*********************************************************************** - * X11DRV_XRender_UpdateDrawable - * - * Deletes the pict and tile when the drawable changes. - */ -void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) -{ - struct xrender_info *info = physDev->xrender; - - if (info->pict || info->pict_src) - { - wine_tsx11_lock(); - XFlush( gdi_display ); - if (info->pict) - { - TRACE("freeing pict = %lx dc = %p\n", info->pict, physDev->dev.hdc); - pXRenderFreePicture(gdi_display, info->pict); - info->pict = 0; - } - if(info->pict_src) - { - TRACE("freeing pict = %lx dc = %p\n", info->pict_src, physDev->dev.hdc); - pXRenderFreePicture(gdi_display, info->pict_src); - info->pict_src = 0; - } - wine_tsx11_unlock(); - } - - info->format = NULL; -} - /************************************************************************ * UploadGlyph * @@ -2516,11 +2539,11 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCreateBitmap */ + xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ - NULL, /* pDeleteBitmap */ + xrenderdrv_DeleteBitmap, /* pDeleteBitmap */ xrenderdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ @@ -2546,7 +2569,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ - NULL, /* pGetImage */ + xrenderdrv_GetImage, /* pGetImage */ NULL, /* pGetNearestColor */ NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ @@ -2572,7 +2595,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pPolygon */ NULL, /* pPolyline */ NULL, /* pPolylineTo */ - NULL, /* pPutImage */ + xrenderdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ NULL, /* pRectangle */ @@ -2582,7 +2605,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pSaveDC */ NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */ - NULL, /* pSelectBitmap */ + xrenderdrv_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ @@ -2659,12 +2682,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag return FALSE; } -void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) -{ - assert(0); - return; -} - BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) {

1 0

Alexandre Julliard : winex11: Add an ExtTextOut entry point in the XRender driver.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 5a2ab8364afe9104937939f5c79b6f15a81e82a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2ab8364afe9104937939f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 11:57:22 2011 +0200 winex11: Add an ExtTextOut entry point in the XRender driver. --- dlls/winex11.drv/text.c | 3 - dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 153 +++++++++++++++++++++---------------------- 3 files changed, 75 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2ab8364afe910493793…

1 0

Jacek Caban : vbscript: Added lexer support for remaining equality expressions.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: e5eaf4d222469955655fb1a7e7e870a071b7e931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5eaf4d222469955655fb1a7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:28:55 2011 +0200 vbscript: Added lexer support for remaining equality expressions. --- dlls/vbscript/lex.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 41f76e9..4c78b42 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -299,6 +299,22 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return '('; case '"': return parse_string_literal(ctx, lval); + case '<': + switch(*++ctx->ptr) { + case '>': + ctx->ptr++; + return tNEQ; + case '=': + ctx->ptr++; + return tLTEQ; + } + return '<'; + case '>': + if(*++ctx->ptr == '=') { + ctx->ptr++; + return tGTEQ; + } + return '>'; default: FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); }

1 0

Jacek Caban : vbscript: Added parser support for numeric literals.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 7f835c969e28313d3431a04494a8d0bef21d657d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f835c969e28313d3431a0449… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:29:59 2011 +0200 vbscript: Added parser support for numeric literals. --- dlls/vbscript/parse.h | 15 ++++++++++++++- dlls/vbscript/parser.y | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0e69921..82a60a9 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,12 +18,15 @@ typedef enum { EXPR_BOOL, + EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, EXPR_NULL, - EXPR_STRING + EXPR_STRING, + EXPR_ULONG, + EXPR_USHORT } expression_type_t; typedef struct _expression_t { @@ -38,6 +41,16 @@ typedef struct { typedef struct { expression_t expr; + LONG value; +} int_expression_t; + +typedef struct { + expression_t expr; + double value; +} double_expression_t; + +typedef struct { + expression_t expr; const WCHAR *value; } string_expression_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a5fff60..ef12328 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -38,6 +38,8 @@ static void source_add_statement(parser_ctx_t*,statement_t*); static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); +static expression_t *new_long_expression(parser_ctx_t*,expression_type_t,LONG); +static expression_t *new_double_expression(parser_ctx_t*,double); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); @@ -57,7 +59,9 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + LONG lng; BOOL bool; + double dbl; } %token tEOF tNL tREM tEMPTYBRACKETS @@ -148,6 +152,10 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tShort { $$ = new_long_expression(ctx, EXPR_USHORT, $1); CHECK_ERROR; } + | '0' { $$ = new_long_expression(ctx, EXPR_USHORT, 0); CHECK_ERROR; } + | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } + | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } @@ -214,6 +222,30 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_long_expression(parser_ctx_t *ctx, expression_type_t type, LONG value) +{ + int_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + +static expression_t *new_double_expression(parser_ctx_t *ctx, double value) +{ + double_expression_t *expr; + + expr = new_expression(ctx, EXPR_DOUBLE, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *subexpr) { unary_expression_t *expr;

1 0

Jacek Caban : vbscript: Added compiler support for numeric literals.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 880d706636b2f202470744c1d5bdc3be42a0fe39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880d706636b2f202470744c1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:11 2011 +0200 vbscript: Added compiler support for numeric literals. --- dlls/vbscript/compile.c | 24 ++++++++++++++++++++++++ dlls/vbscript/interp.c | 18 ++++++++++++++++++ dlls/vbscript/vbscript.h | 7 ++++++- 3 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 450fa18..b398d85 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -107,6 +107,24 @@ static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return S_OK; } +static HRESULT push_instr_double(compile_ctx_t *ctx, vbsop_t op, double arg) +{ + unsigned instr; + double *d; + + d = compiler_alloc(ctx->code, sizeof(double)); + if(!d) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + *d = arg; + instr_ptr(ctx, instr)->arg1.dbl = d; + return S_OK; +} + static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) { if(!ctx->code->bstr_pool_size) { @@ -218,6 +236,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_DOUBLE: + return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: @@ -230,6 +250,10 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); + case EXPR_USHORT: + return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); + case EXPR_ULONG: + return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); default: FIXME("Unimplemented expression type %d\n", expr->type); return E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d02516e..e7e3ab3 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -251,6 +251,24 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_long(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_short(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_double(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_empty(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9c047d1..7835eb2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -83,18 +83,22 @@ typedef enum { ARG_STR, ARG_BSTR, ARG_INT, - ARG_UINT + ARG_UINT, + ARG_DOUBLE } instr_arg_type_t; #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(long, 1, ARG_INT, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ + X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) typedef enum { @@ -109,6 +113,7 @@ typedef union { BSTR bstr; unsigned uint; LONG lng; + double *dbl; } instr_arg_t; typedef struct {

1 0