September 2011 - Wine-Commits

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

Sept. 13, 2011

Module: wine Branch: master Commit: d028453f58bf86439795432e106c09ab46ad4271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028453f58bf86439795432e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:26 2011 +0200 vbscript: Added if statement tests. --- dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6335069..3b428f1 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -81,10 +81,10 @@ Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) Call ok("ab" & x = "abxx", """ab"" & x = " & ("ab"&x)) -'if(isEnglishLocale) then -' Call ok("" & true = "True", """"" & true = " & true) -' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) -'end if +if(isEnglishLocale) then + Call ok("" & true = "True", """"" & true = " & true) + Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +end if x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) @@ -99,4 +99,52 @@ Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) Call ok(2-empty = 2, "2-empty = " & (2-empty)) Call ok(2-x = -1, "2-x = " & (2-x)) +if false then + ok false, "if false called" +end if + +x = true +if x then + x = false +end if +Call ok(not x, "x is false, if not evaluated?") + +x = false +If false Then + Call ok(false, "inside if false") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not True Then + Call ok(false, "inside elseif not true") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") + x = 1 + y = 10+x +ElseIf not False Then + x = true +Else + Call ok(false, "inside else not true") +End If +Call ok(x, "elseif not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then + x = true +End If +Call ok(x, "elseif not called?") + reportSuccess()

1 0

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

Sept. 13, 2011

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

1 0

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

Sept. 13, 2011

Module: wine Branch: master Commit: 58bd62e76d3592d57cf26e17cfec12b37353702a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bd62e76d3592d57cf26e17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:38 2011 +0200 vbscript: Added if statement compiler implementation. --- dlls/vbscript/compile.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 12 ++++ dlls/vbscript/vbscript.h | 3 + 3 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9bdc31d..c50452a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -33,11 +33,25 @@ typedef struct { unsigned instr_size; vbscode_t *code; + unsigned *labels; + unsigned labels_size; + unsigned labels_cnt; + dim_decl_t *dim_decls; dynamic_var_t *global_vars; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); +static HRESULT compile_statement(compile_ctx_t*,statement_t*); + +static const struct { + instr_arg_type_t arg1_type; + instr_arg_type_t arg2_type; +} instr_info[] = { +#define X(n,a,b,c) {b,c}, +OP_LIST +#undef X +}; static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { @@ -93,6 +107,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.uint = arg; + return S_OK; +} + static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) { unsigned instr; @@ -188,6 +214,35 @@ static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR return S_OK; } +#define LABEL_FLAG 0x80000000 + +static unsigned alloc_label(compile_ctx_t *ctx) +{ + if(!ctx->labels_size) { + ctx->labels = heap_alloc(8 * sizeof(*ctx->labels)); + if(!ctx->labels) + return -1; + ctx->labels_size = 8; + }else if(ctx->labels_size == ctx->labels_cnt) { + unsigned *new_labels; + + new_labels = heap_realloc(ctx->labels, 2*ctx->labels_size*sizeof(*ctx->labels)); + if(!new_labels) + return -1; + + ctx->labels = new_labels; + ctx->labels_size *= 2; + } + + return ctx->labels_cnt++ | LABEL_FLAG; +} + +static inline void label_set_addr(compile_ctx_t *ctx, unsigned label) +{ + assert(label & LABEL_FLAG); + ctx->labels[label & ~LABEL_FLAG] = ctx->instr_cnt; +} + static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret) { unsigned arg_cnt = 0; @@ -292,6 +347,67 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) +{ + unsigned cnd_jmp, endif_label = -1; + elseif_decl_t *elseif_decl; + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + cnd_jmp = push_instr(ctx, OP_jmp_false); + if(cnd_jmp == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->if_stat); + if(FAILED(hres)) + return hres; + + if(stat->else_stat || stat->elseifs) { + endif_label = alloc_label(ctx); + if(endif_label == -1) + return E_OUTOFMEMORY; + + hres = push_instr_addr(ctx, OP_jmp, endif_label); + if(FAILED(hres)) + return hres; + } + + for(elseif_decl = stat->elseifs; elseif_decl; elseif_decl = elseif_decl->next) { + instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; + + hres = compile_expression(ctx, elseif_decl->expr); + if(FAILED(hres)) + return hres; + + cnd_jmp = push_instr(ctx, OP_jmp_false); + if(cnd_jmp == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, elseif_decl->stat); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, OP_jmp, endif_label); + if(FAILED(hres)) + return hres; + } + + instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; + + if(stat->else_stat) { + hres = compile_statement(ctx, stat->else_stat); + if(FAILED(hres)) + return hres; + } + + if(endif_label != -1) + label_set_addr(ctx, endif_label); + return S_OK; +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat) { HRESULT hres; @@ -365,6 +481,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_IF: + hres = compile_if_statement(ctx, (if_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -378,6 +497,21 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) return S_OK; } +static void resolve_labels(compile_ctx_t *ctx) +{ + instr_t *instr; + + for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + if(instr_info[instr->op].arg1_type == ARG_ADDR && (instr->arg1.uint & LABEL_FLAG)) { + assert((instr->arg1.uint & ~LABEL_FLAG) < ctx->labels_cnt); + instr->arg1.uint = ctx->labels[instr->arg1.uint & ~LABEL_FLAG]; + } + assert(instr_info[instr->op].arg2_type != ARG_ADDR); + } + + ctx->labels_cnt = 0; +} + static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *func) { HRESULT hres; @@ -391,6 +525,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + resolve_labels(ctx); + if(ctx->dim_decls) { dim_decl_t *dim_decl; dynamic_var_t *new_var; @@ -508,6 +644,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.global_vars = NULL; ctx.dim_decls = NULL; + ctx.labels = NULL; + ctx.labels_cnt = ctx.labels_size = 0; hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4877dcb..e9569fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,18 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } +static HRESULT interp_jmp(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_jmp_false(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 734ce8a..cf32705 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -93,6 +93,7 @@ typedef enum { ARG_BSTR, ARG_INT, ARG_UINT, + ARG_ADDR, ARG_DOUBLE } instr_arg_type_t; @@ -107,6 +108,8 @@ typedef enum { X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(jmp, 0, ARG_ADDR, 0) \ + X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \

1 0

Alexandre Julliard : winex11: Return a RGNDATA from add_extra_clipping_region and avoid changing the physdev region .
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

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

1 0

Jacek Caban : vbscript: Added dim statement compiler implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: d1c152756c3fd6461f4cab9d29cb993c2d0a30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c152756c3fd6461f4cab9d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:47 2011 +0200 vbscript: Added dim statement compiler implementation. --- dlls/vbscript/compile.c | 104 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 2 + dlls/vbscript/vbscript.h | 8 +++ 3 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 877780d..9bdc31d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -32,6 +32,9 @@ typedef struct { unsigned instr_cnt; unsigned instr_size; vbscode_t *code; + + dim_decl_t *dim_decls; + dynamic_var_t *global_vars; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -315,6 +318,38 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * return hres; } +static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) +{ + dim_decl_t *dim_decl; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + if(!strcmpiW(dim_decl->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) +{ + dim_decl_t *dim_decl = stat->dim_decls; + + while(1) { + if(lookup_dim_decls(ctx, dim_decl->name)) { + FIXME("dim %s name redefined\n", debugstr_w(dim_decl->name)); + return E_FAIL; + } + + if(!dim_decl->next) + break; + dim_decl = dim_decl->next; + } + + dim_decl->next = ctx->dim_decls; + ctx->dim_decls = stat->dim_decls; + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -327,6 +362,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; + case STAT_DIM: + hres = compile_dim_statement(ctx, (dim_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -353,6 +391,52 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + if(ctx->dim_decls) { + dim_decl_t *dim_decl; + dynamic_var_t *new_var; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + new_var = compiler_alloc(ctx->code, sizeof(*new_var)); + if(!new_var) + return E_OUTOFMEMORY; + + new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!new_var->name) + return E_OUTOFMEMORY; + + V_VT(&new_var->v) = VT_EMPTY; + + new_var->next = ctx->global_vars; + ctx->global_vars = new_var; + } + } + + return S_OK; +} + +static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) +{ + dynamic_var_t *var; + + for(var = script->global_vars; var; var = var->next) { + if(!strcmpiW(var->name, identifier)) + return TRUE; + } + + return FALSE; +} + +static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) +{ + dynamic_var_t *var; + + for(var = ctx->global_vars; var; var = var->next) { + if(lookup_script_identifier(script, var->name)) { + FIXME("%s: redefined\n", debugstr_w(var->name)); + return E_FAIL; + } + } + return S_OK; } @@ -422,12 +506,32 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) if(!ctx.code) return E_OUTOFMEMORY; + ctx.global_vars = NULL; + ctx.dim_decls = NULL; + hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { release_vbscode(ctx.code); return hres; } + hres = check_script_collisions(&ctx, script); + if(FAILED(hres)) { + release_vbscode(ctx.code); + return hres; + } + + if(ctx.global_vars) { + dynamic_var_t *var; + + for(var = ctx.global_vars; var->next; var = var->next); + + var->next = script->global_vars; + script->global_vars = ctx.global_vars; + } + + parser_release(&ctx.parser); + list_add_tail(&script->code_list, &ctx.code->entry); *ret = ctx.code; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2e81643..94dc3eb 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,6 +18,8 @@ Option Explicit +dim x, y + call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 226f0d2..734ce8a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,12 @@ HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; +} dynamic_var_t; + struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -73,6 +79,8 @@ struct _script_ctx_t { vbdisp_t *script_obj; + dynamic_var_t *global_vars; + struct list code_list; struct list named_items; };

1 0

Piotr Caban : msvcp90: Added basic_string::_Pdif implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 8ed4f6e07b76c3c5afb021a1f48b2ae648b0cb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed4f6e07b76c3c5afb021a1f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:31:27 2011 +0200 msvcp90: Added basic_string::_Pdif implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 515e05f..51a2ea1 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2676,12 +2676,12 @@ @ stub -arch=win64 ?_Osfx@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXXZ @ stub -arch=win32 ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXXZ @ stub -arch=win64 ?_Osfx@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ -@ stub -arch=win32 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z -@ stub -arch=win64 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z +@ cdecl -arch=win32 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_char_Pdif +@ cdecl -arch=win64 ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr) MSVCP_basic_string_char_Pdif @ stub -arch=win32 ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@KAIV?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z @ stub -arch=win64 ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@KA_KV?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z -@ stub -arch=win32 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z -@ stub -arch=win64 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z +@ cdecl -arch=win32 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_wchar_Pdif +@ cdecl -arch=win64 ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr) MSVCP_basic_string_wchar_Pdif @ thiscall -arch=win32 ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ(ptr) basic_streambuf_char__Pnavail @ cdecl -arch=win64 ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEBA_JXZ(ptr) basic_streambuf_char__Pnavail @ stub -arch=win32 ?_Pnavail@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IBEHXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 47c0c03..300c8bd 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1505,6 +1505,20 @@ String_reverse_iterator_char __thiscall MSVCP_basic_string_char_rend(basic_strin return ret; } +/* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KAIV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +/* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@KA_KV?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z */ +MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, String_iterator_char i2) +{ + TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); + + if((!i1.bstr && i1.pos) || i1.bstr!=i2.bstr) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + return !i1.pos ? 0 : i1.pos-i2.pos; +} + /* basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>> */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2IB */ /* ?npos@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@2_KB */ @@ -2492,3 +2506,17 @@ String_reverse_iterator_wchar __thiscall MSVCP_basic_string_wchar_rend(basic_str ret.pos = basic_string_wchar_const_ptr(this); return ret; } + +/* ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KAIV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +/* ?_Pdif@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@KA_KV?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z */ +MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, String_iterator_wchar i2) +{ + TRACE("(%p %p) (%p %p)\n", i1.bstr, i1.pos, i2.bstr, i2.pos); + + if((!i1.bstr && i1.pos) || i1.bstr!=i2.bstr) { + _invalid_parameter(NULL, NULL, NULL, 0, 0); + return 0; + } + + return !i1.pos ? 0 : i1.pos-i2.pos; +}

1 0

Piotr Caban : msvcrt: Improve operator new implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 45dc6c0e22204bef77ce942f09b43b7c9443bcf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dc6c0e22204bef77ce942f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:17 2011 +0200 msvcrt: Improve operator new implementation. --- dlls/msvcrt/heap.c | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 548dd82..4557c1a 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ~(alignment - 1)) - offset)) -typedef void (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); +typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; @@ -54,14 +54,28 @@ static MSVCRT_size_t MSVCRT_sbh_threshold = 0; */ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) { - void *retval = HeapAlloc(GetProcessHeap(), 0, size); - TRACE("(%ld) returning %p\n", size, retval); - if(retval) return retval; - LOCK_HEAP; - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - UNLOCK_HEAP; - return retval; + void *retval; + int freed; + + do + { + retval = HeapAlloc(GetProcessHeap(), 0, size); + if(retval) + { + TRACE("(%ld) returning %p\n", size, retval); + return retval; + } + + LOCK_HEAP; + if(MSVCRT_new_handler) + freed = (*MSVCRT_new_handler)(size); + else + freed = 0; + UNLOCK_HEAP; + } while(freed); + + TRACE("(%ld) out of memory\n", size); + return NULL; }

1 0

Francois Gouget : gdiplus: Use Liberation Mono as a fallback for Courier New for the monospace family .
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 4c13e84a7c5a69f1040fe6a347d3f819fbbf1146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c13e84a7c5a69f1040fe6a34… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 01:47:27 2011 +0200 gdiplus: Use Liberation Mono as a fallback for Courier New for the monospace family. --- dlls/gdiplus/font.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 3624391..169e28f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -816,10 +816,20 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamily) { static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; + static const WCHAR LiberationMono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o','\0'}; + GpStatus stat; if (nativeFamily == NULL) return InvalidParameter; - return GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(CourierNew, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + stat = GdipCreateFontFamilyFromName(LiberationMono, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + ERR("Missing 'Courier New' font\n"); + + return stat; } /*****************************************************************************

1 0

Piotr Caban : msvcp90: Added basic_string::_Chassign implementation.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 97ebf771840d886343c5af6b1dcac92d8723eeb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ebf771840d886343c5af6b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 13 10:30:58 2011 +0200 msvcp90: Added basic_string::_Chassign implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4654d2c..d0c29d0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2114,12 +2114,12 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ stub -arch=win32 ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ -@ stub -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z -@ stub -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z +@ thiscall -arch=win32 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign +@ cdecl -arch=win64 ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z(ptr long long long) MSVCP_basic_string_char_Chassign @ stub -arch=win32 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IAEXIIG(a)Z @ stub -arch=win64 ?_Chassign@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@IEAAX_K0G(a)Z -@ stub -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z -@ stub -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z +@ thiscall -arch=win32 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign +@ cdecl -arch=win64 ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z(ptr long long long) MSVCP_basic_string_wchar_Chassign @ stub -arch=win32 ?_Cin_func(a)std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ @ stub -arch=win64 ?_Cin_func(a)std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)XZ # extern -arch=win64 ?_Cl@?5???$log(a)M@std@@YA?AV?$complex(a)M@1(a)AEBV21@@Z(a)4MB diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6d66677..5664e87 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -731,6 +731,16 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr( MSVCP_char_traits_char_length(str)); } +/* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAEXIID(a)Z */ +/* ?_Chassign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAAX_K0D(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_Chassign, 16) +void __thiscall MSVCP_basic_string_char_Chassign(basic_string_char *this, + MSVCP_size_t off, MSVCP_size_t count, char ch) +{ + TRACE("%p %lu %lu %c\n", this, off, count, ch); + MSVCP_char_traits_char_assignn(basic_string_char_ptr(this)+off, count, ch); +} + /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ @@ -1690,6 +1700,16 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr( MSVCP_char_traits_wchar_length(str)); } +/* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAEXII_W(a)Z */ +/* ?_Chassign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IEAAX_K0_W(a)Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_Chassign, 16) +void __thiscall MSVCP_basic_string_wchar_Chassign(basic_string_wchar *this, + MSVCP_size_t off, MSVCP_size_t count, wchar_t ch) +{ + TRACE("%p %lu %lu %c\n", this, off, count, ch); + MSVCP_char_traits_wchar_assignn(basic_string_wchar_ptr(this)+off, count, ch); +} + /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */ /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ */ /* ?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */

1 0

Jacek Caban : vbscript: Added object member assignment tests.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 29ccac7966d41e84cc93eaab592b04cc368393b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ccac7966d41e84cc93eaab5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:07 2011 +0200 vbscript: Added object member assignment tests. --- dlls/vbscript/tests/run.c | 113 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 101 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index e9beab9..aa2e3f1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(testobj_propput_d); +DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -67,6 +69,9 @@ DEFINE_EXPECT(global_vbvar_i); #define DISPID_GLOBAL_GETVT 1003 #define DISPID_GLOBAL_ISENGLOC 1004 #define DISPID_GLOBAL_VBVAR 1005 +#define DISPID_GLOBAL_TESTOBJ 1006 + +#define DISPID_TESTOBJ_PROPPUT 2001 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -226,6 +231,64 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!strcmp_wa(bstrName, "propput")) { + CHECK_EXPECT(testobj_propput_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_TESTOBJ_PROPPUT; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + switch(id) { + case DISPID_TESTOBJ_PROPPUT: + CHECK_EXPECT(testobj_propput_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 1, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + return S_OK; + } + + ok(0, "unexpected call %d\n", id); + return E_FAIL; +} + +static IDispatchExVtbl testObjVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + testObj_GetDispID, + testObj_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { @@ -255,6 +318,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLOC; return S_OK; } + if(!strcmp_wa(bstrName, "testObj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "vbvar")) { CHECK_EXPECT(global_vbvar_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -328,18 +396,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_GETVT: - ok(pdp != NULL, "pdp == NULL\n"); - ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); - ok(pei != NULL, "pei == NULL\n"); - - V_VT(pvarRes) = VT_BSTR; - V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); - return S_OK; + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + 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); @@ -376,6 +444,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_TESTOBJ: + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "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_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testObj; + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -690,6 +773,12 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(testobj_propput_d); + SET_EXPECT(testobj_propput_i); + parse_script_a("testObj.propput = 1"); + CHECK_CALLED(testobj_propput_d); + CHECK_CALLED(testobj_propput_i); + run_from_res("lang.vbs"); }

1 0