September 2011 - Wine-commits

Alexandre Julliard : winex11: Add an AlphaBlend entry point in the XRender driver.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b174bde4d2e94c3fdfaadaf3e2c1af4491bb404b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b174bde4d2e94c3fdfaadaf3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:20:01 2011 +0200 winex11: Add an AlphaBlend entry point in the XRender driver. --- dlls/winex11.drv/bitblt.c | 22 --------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 6 ---- dlls/winex11.drv/xrender.c | 62 ++++++++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b174bde4d2e94c3fdfaad…

1 0

Alexandre Julliard : winex11: Pass an HDC to the size mapping functions.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 84f549b6832e234361510fd502fa43c289cf9aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f549b6832e234361510fd50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 13:27:31 2011 +0200 winex11: Pass an HDC to the size mapping functions. --- dlls/winex11.drv/graphics.c | 8 ++++---- dlls/winex11.drv/pen.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xfont.c | 4 ++-- dlls/winex11.drv/xrender.c | 28 ++++++++++++++-------------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7c4e0d5..c93001f 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -473,7 +473,7 @@ BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ) * * Performs a world-to-viewport transformation on the specified width. */ -INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ) +INT X11DRV_XWStoDS( HDC hdc, INT width ) { POINT pt[2]; @@ -481,7 +481,7 @@ INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ) pt[0].y = 0; pt[1].x = width; pt[1].y = 0; - LPtoDP( physDev->dev.hdc, pt, 2 ); + LPtoDP( hdc, pt, 2 ); return pt[1].x - pt[0].x; } @@ -490,7 +490,7 @@ INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ) * * Performs a world-to-viewport transformation on the specified height. */ -INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ) +INT X11DRV_YWStoDS( HDC hdc, INT height ) { POINT pt[2]; @@ -498,7 +498,7 @@ INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ) pt[0].y = 0; pt[1].x = 0; pt[1].y = height; - LPtoDP( physDev->dev.hdc, pt, 2 ); + LPtoDP( hdc, pt, 2 ); return pt[1].y - pt[0].y; } diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 54883b2..45a1f6f 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -74,7 +74,7 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) physDev->pen.width = logpen.lopnWidth.x; if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width >= 1)) { - physDev->pen.width = X11DRV_XWStoDS( physDev, physDev->pen.width ); + physDev->pen.width = X11DRV_XWStoDS( dev->hdc, physDev->pen.width ); if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c128da7..fb190b2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -286,8 +286,8 @@ extern void restore_clipping_region( X11DRV_PDEVICE *dev, HRGN rgn ) DECLSPEC_HI extern BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; -extern INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ) DECLSPEC_HIDDEN; -extern INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ) DECLSPEC_HIDDEN; +extern INT X11DRV_XWStoDS( HDC hdc, INT width ) DECLSPEC_HIDDEN; +extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; extern const int X11DRV_XROPfunction[]; diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 35d23d6..9d837a4 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3254,14 +3254,14 @@ HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) /* FIXME - check that the other drivers do this correctly */ if (lf.lfWidth) { - INT width = X11DRV_XWStoDS( physDev, lf.lfWidth ); + INT width = X11DRV_XWStoDS( dev->hdc, lf.lfWidth ); lf.lfWidth = (lf.lfWidth < 0) ? -abs(width) : abs(width); if (lf.lfWidth == 0) lf.lfWidth = 1; /* Minimum width */ } if (lf.lfHeight) { - INT height = X11DRV_YWStoDS( physDev, lf.lfHeight ); + INT height = X11DRV_YWStoDS( dev->hdc, lf.lfHeight ); lf.lfHeight = (lf.lfHeight < 0) ? -abs(height) : abs(height); if (lf.lfHeight == 0) lf.lfHeight = MIN_FONT_SIZE; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 62db5b0..e7a1062 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -828,7 +828,7 @@ static int AllocEntry(void) return mru; } -static BOOL get_gasp_flags(struct xrender_physdev *physDev, WORD *flags) +static BOOL get_gasp_flags(HDC hdc, WORD *flags) { DWORD size; WORD *gasp, *buffer; @@ -838,15 +838,15 @@ static BOOL get_gasp_flags(struct xrender_physdev *physDev, WORD *flags) *flags = 0; - size = GetFontData(physDev->dev.hdc, MS_GASP_TAG, 0, NULL, 0); + size = GetFontData(hdc, MS_GASP_TAG, 0, NULL, 0); if(size == GDI_ERROR) return FALSE; gasp = buffer = HeapAlloc(GetProcessHeap(), 0, size); - GetFontData(physDev->dev.hdc, MS_GASP_TAG, 0, gasp, size); + GetFontData(hdc, MS_GASP_TAG, 0, gasp, size); - GetTextMetricsW(physDev->dev.hdc, &tm); - ppem = abs(X11DRV_YWStoDS(physDev->x11dev, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading)); + GetTextMetricsW(hdc, &tm); + ppem = abs(X11DRV_YWStoDS(hdc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading)); gasp++; num_recs = get_be_word(*gasp); @@ -864,7 +864,7 @@ static BOOL get_gasp_flags(struct xrender_physdev *physDev, WORD *flags) return TRUE; } -static AA_Type get_antialias_type( struct xrender_physdev *physDev, BOOL subpixel, BOOL hinter) +static AA_Type get_antialias_type( HDC hdc, BOOL subpixel, BOOL hinter ) { AA_Type ret; WORD flags; @@ -887,7 +887,7 @@ static AA_Type get_antialias_type( struct xrender_physdev *physDev, BOOL subpixe But, Wine's subpixel rendering can support the portrait mode. */ } - else if (!hinter || !get_gasp_flags(physDev, &flags) || flags & GASP_DOGRAY) + else if (!hinter || !get_gasp_flags(hdc, &flags) || flags & GASP_DOGRAY) ret = AA_Grey; else ret = AA_None; @@ -895,7 +895,7 @@ static AA_Type get_antialias_type( struct xrender_physdev *physDev, BOOL subpixe return ret; } -static int GetCacheEntry(struct xrender_physdev *physDev, LFANDSIZE *plfsz) +static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) { int ret; int format; @@ -926,11 +926,11 @@ static int GetCacheEntry(struct xrender_physdev *physDev, LFANDSIZE *plfsz) switch (plfsz->lf.lfQuality) { case ANTIALIASED_QUALITY: - entry->aa_default = get_antialias_type( physDev, FALSE, hinter ); + entry->aa_default = get_antialias_type( hdc, FALSE, hinter ); return ret; /* ignore further configuration */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: - entry->aa_default = get_antialias_type( physDev, subpixel, hinter ); + entry->aa_default = get_antialias_type( hdc, subpixel, hinter ); break; case DEFAULT_QUALITY: case DRAFT_QUALITY: @@ -939,7 +939,7 @@ static int GetCacheEntry(struct xrender_physdev *physDev, LFANDSIZE *plfsz) if ( SystemParametersInfoW( SPI_GETFONTSMOOTHING, 0, &font_smoothing, 0) && font_smoothing) { - entry->aa_default = get_antialias_type( physDev, subpixel, hinter ); + entry->aa_default = get_antialias_type( hdc, subpixel, hinter ); } else entry->aa_default = AA_None; @@ -1111,8 +1111,8 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth ); - lfsz.devsize.cx = X11DRV_XWStoDS( physdev->x11dev, lfsz.lf.lfWidth ); - lfsz.devsize.cy = X11DRV_YWStoDS( physdev->x11dev, lfsz.lf.lfHeight ); + lfsz.devsize.cx = X11DRV_XWStoDS( dev->hdc, lfsz.lf.lfWidth ); + lfsz.devsize.cy = X11DRV_YWStoDS( dev->hdc, lfsz.lf.lfHeight ); GetTransform( dev->hdc, 0x204, &lfsz.xform ); TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12, @@ -1126,7 +1126,7 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) EnterCriticalSection(&xrender_cs); if (physdev->info.cache_index != -1) dec_ref_cache( physdev->info.cache_index ); - physdev->info.cache_index = GetCacheEntry( physdev, &lfsz ); + physdev->info.cache_index = GetCacheEntry( dev->hdc, &lfsz ); LeaveCriticalSection(&xrender_cs); physdev->x11dev->has_gdi_font = TRUE; return 0;

1 0

Jacek Caban : vbscript: Added lexer support for remaining equality expressions.
by Alexandre Julliard 12 Sep '11

12 Sep '11

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: Make vbscode_t own the memory it uses.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 5b8cde66f120717e063ac6a45e0690332c8b5219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8cde66f120717e063ac6a45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:29:14 2011 +0200 vbscript: Make vbscode_t own the memory it uses. --- dlls/vbscript/compile.c | 33 ++++++++++++++-- dlls/vbscript/vbscript.h | 13 ++++++ dlls/vbscript/vbscript_main.c | 83 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 181f6c1..450fa18 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -36,6 +36,23 @@ typedef struct { static HRESULT compile_expression(compile_ctx_t*,expression_t*); +static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) +{ + return vbsheap_alloc(&vbscode->heap, size); +} + +static WCHAR *compiler_alloc_string(vbscode_t *vbscode, const WCHAR *str) +{ + size_t size; + WCHAR *ret; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = compiler_alloc(vbscode, size); + if(ret) + memcpy(ret, str, size); + return ret; +} + static inline instr_t *instr_ptr(compile_ctx_t *ctx, unsigned id) { assert(id < ctx->instr_cnt); @@ -75,13 +92,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) { - unsigned ret; + unsigned instr; + WCHAR *str; - ret = push_instr(ctx, op); - if(ret == -1) + str = compiler_alloc_string(ctx->code, arg); + if(!str) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) return E_OUTOFMEMORY; - instr_ptr(ctx, ret)->arg1.str = arg; + instr_ptr(ctx, instr)->arg1.str = str; return S_OK; } @@ -263,6 +285,8 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); + vbsheap_free(&code->heap); + heap_free(code->bstr_pool); heap_free(code->source); heap_free(code->instrs); @@ -291,6 +315,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 0; ctx->instr_size = 32; + vbsheap_init(&ret->heap); ret->option_explicit = ctx->parser.option_explicit; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 199ca70..9c047d1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -31,6 +31,18 @@ #include "wine/list.h" #include "wine/unicode.h" +typedef struct { + void **blocks; + DWORD block_cnt; + DWORD last_block; + DWORD offset; + struct list custom_blocks; +} vbsheap_t; + +void vbsheap_init(vbsheap_t*) DECLSPEC_HIDDEN; +void *vbsheap_alloc(vbsheap_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; +void vbsheap_free(vbsheap_t*) DECLSPEC_HIDDEN; + typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; typedef struct _script_ctx_t script_ctx_t; @@ -122,6 +134,7 @@ struct _vbscode_t { BSTR *bstr_pool; unsigned bstr_pool_size; unsigned bstr_cnt; + vbsheap_t heap; struct list entry; }; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 9d74026..1527281 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -31,6 +31,89 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +#define MIN_BLOCK_SIZE 128 + +static inline DWORD block_size(DWORD block) +{ + return MIN_BLOCK_SIZE << block; +} + +void vbsheap_init(vbsheap_t *heap) +{ + memset(heap, 0, sizeof(*heap)); + list_init(&heap->custom_blocks); +} + +void *vbsheap_alloc(vbsheap_t *heap, size_t size) +{ + struct list *list; + void *tmp; + + size = (size+3)&~3; + + if(!heap->block_cnt) { + if(!heap->blocks) { + heap->blocks = heap_alloc(sizeof(void*)); + if(!heap->blocks) + return NULL; + } + + tmp = heap_alloc(block_size(0)); + if(!tmp) + return NULL; + + heap->blocks[0] = tmp; + heap->block_cnt = 1; + } + + if(heap->offset + size <= block_size(heap->last_block)) { + tmp = ((BYTE*)heap->blocks[heap->last_block])+heap->offset; + heap->offset += size; + return tmp; + } + + if(size <= block_size(heap->last_block+1)) { + if(heap->last_block+1 == heap->block_cnt) { + tmp = heap_realloc(heap->blocks, (heap->block_cnt+1)*sizeof(void*)); + if(!tmp) + return NULL; + + heap->blocks = tmp; + heap->blocks[heap->block_cnt] = heap_alloc(block_size(heap->block_cnt)); + if(!heap->blocks[heap->block_cnt]) + return NULL; + + heap->block_cnt++; + } + + heap->last_block++; + heap->offset = size; + return heap->blocks[heap->last_block]; + } + + list = heap_alloc(size + sizeof(struct list)); + if(!list) + return NULL; + + list_add_head(&heap->custom_blocks, list); + return list+1; +} + +void vbsheap_free(vbsheap_t *heap) +{ + struct list *iter; + DWORD i; + + while((iter = list_next(&heap->custom_blocks, &heap->custom_blocks))) { + list_remove(iter); + heap_free(iter); + } + + for(i=0; i < heap->block_cnt; i++) + heap_free(heap->blocks[i]); + heap_free(heap->blocks); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL;

1 0

Jacek Caban : vbscript: Don't leak memory in parser.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: bb80eaa492c0eda28d24e039e543c41a1c200a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80eaa492c0eda28d24e039e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:29:31 2011 +0200 vbscript: Don't leak memory in parser. --- dlls/vbscript/parse.h | 3 +++ dlls/vbscript/parser.y | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 56b3e1b..0e69921 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -87,8 +87,11 @@ typedef struct { statement_t *stats; statement_t *stats_tail; + + vbsheap_t heap; } parser_ctx_t; HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN; +void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c1c7e61..607fcb6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -280,8 +280,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; - /* FIXME: leaks! */ - ret = heap_alloc(size); + ret = vbsheap_alloc(&ctx->heap, size); if(!ret) ctx->hres = E_OUTOFMEMORY; return ret; @@ -292,6 +291,8 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); + vbsheap_init(&ctx->heap); + ctx->parse_complete = FALSE; ctx->hres = S_OK; @@ -311,3 +312,8 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) return S_OK; } + +void parser_release(parser_ctx_t *ctx) +{ + vbsheap_free(&ctx->heap); +}

1 0

Jacek Caban : vbscript: Added lexer support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 1e224b4e09e25192d8c80d90c9208497c7a694fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e224b4e09e25192d8c80d90c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:29:43 2011 +0200 vbscript: Added lexer support for numeric literals. --- dlls/vbscript/lex.c | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/parser.y | 2 ++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 4c78b42..ddafee9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -240,6 +240,33 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) +{ + double n = 0; + + if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') + return *ctx->ptr++; + + do { + n = n*10 + *ctx->ptr++ - '0'; + }while('0' <= *ctx->ptr && *ctx->ptr <= '9'); + + if(*ctx->ptr != '.') { + if((LONG)n == n) { + LONG l = n; + *(LONG*)ret = l; + return (short)l == l ? tShort : tLong; + } + }else { + double e = 1.0; + while('0' <= *++ctx->ptr && *ctx->ptr <= '9') + n += (e /= 10.0)*(*ctx->ptr-'0'); + } + + *(double*)ret = n; + return tDouble; +} + static void skip_spaces(parser_ctx_t *ctx) { while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') @@ -256,6 +283,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) c = *ctx->ptr; + if('0' <= c && c <= '9') + return parse_numeric_literal(ctx, lval); + if(isalphaW(c)) { int ret = check_keywords(ctx); if(!ret) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 607fcb6..a5fff60 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -74,6 +74,8 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME %token tERROR tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString +%token <lng> tLong tShort +%token <dbl> tDouble %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression

1 0

Jacek Caban : vbscript: Added parser support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

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 12 Sep '11

12 Sep '11

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

Jacek Caban : vbscript: Added interpreter support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 66d3dd4b7e30a0a4baffb9ff3926934f3c061c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d3dd4b7e30a0a4baffb9ff3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:21 2011 +0200 vbscript: Added interpreter support for numeric literals. --- dlls/vbscript/interp.c | 30 ++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e7e3ab3..1661700 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,20 +253,38 @@ static HRESULT interp_string(exec_ctx_t *ctx) static HRESULT interp_long(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const LONG arg = ctx->instr->arg1.lng; + VARIANT v; + + TRACE("%d\n", arg); + + V_VT(&v) = VT_I4; + V_I4(&v) = arg; + return stack_push(ctx, &v); } static HRESULT interp_short(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const LONG arg = ctx->instr->arg1.lng; + VARIANT v; + + TRACE("%d\n", arg); + + V_VT(&v) = VT_I2; + V_I2(&v) = arg; + return stack_push(ctx, &v); } static HRESULT interp_double(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const DOUBLE *arg = ctx->instr->arg1.dbl; + VARIANT v; + + TRACE("%lf\n", *arg); + + V_VT(&v) = VT_R8; + V_R8(&v) = *arg; + return stack_push(ctx, &v); } static HRESULT interp_empty(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a5a9c5..91da4fe 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -38,5 +38,11 @@ Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") +Call ok(getVT(0) = "VT_I2", "getVT(0) is not VT_I2") +Call ok(getVT(1) = "VT_I2", "getVT(1) is not VT_I2") +Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") +Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") +Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") +Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8") reportSuccess()

1 0

Jacek Caban : vbscript: Added hex literal implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e5d25a170a27b781bdd62240cfb57d1e328a081e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d25a170a27b781bdd62240c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:34 2011 +0200 vbscript: Added hex literal implementation. --- dlls/vbscript/lex.c | 33 +++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index ddafee9..394a24d 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -267,6 +267,35 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) return tDouble; } +static int hex_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') + return c-'0'; + if('a' <= c && c <= 'f') + return c+10-'a'; + if('A' <= c && c <= 'F') + return c+10-'A'; + return -1; +} + +static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) +{ + const WCHAR *begin = ctx->ptr; + LONG l = 0, d; + + while((d = hex_to_int(*++ctx->ptr)) != -1) + l = l*16 + d; + + if(begin + 9 /* max digits+1 */ < ctx->ptr || *ctx->ptr != '&') { + FIXME("invalid literal\n"); + return 0; + } + + ctx->ptr++; + *ret = l; + return (short)l == l ? tShort : tLong; +} + static void skip_spaces(parser_ctx_t *ctx) { while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') @@ -329,6 +358,10 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return '('; case '"': return parse_string_literal(ctx, lval); + case '&': + if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') + return parse_hex_literal(ctx, lval); + return '&'; case '<': switch(*++ctx->ptr) { case '>': diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 91da4fe..dba5c9a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -31,6 +31,10 @@ Call ok(not (true = false), "true = false is true") Call ok("x" = "x", """x"" = ""x"" is false") Call ok(empty = empty, "empty = empty is false") Call ok(empty = "", "empty = """" is false") +Call ok(0 = 0.0, "0 <> 0.0") +Call ok(16 = &h10&, "16 <> &h10&") +Call ok(010 = 10, "010 <> 10") +Call ok(10. = 10, "10. <> 10") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -44,5 +48,9 @@ Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8") +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") reportSuccess()

1 0