September 2011 - Wine-commits

Alexandre Julliard : winex11: Get rid of the WineXRenderFormat structure.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 5efaa2082367e41118ba9c7d4f8ab6806473c8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efaa2082367e41118ba9c7d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 15:26:44 2011 +0200 winex11: Get rid of the WineXRenderFormat structure. --- dlls/winex11.drv/xrender.c | 111 +++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5efaa2082367e41118ba9…

1 0

Alexandre Julliard : winex11: Remove a redundant field in the XRender format templates.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 1525273bb83318d7cdb7ce86c3becceabbb92e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1525273bb83318d7cdb7ce86c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 15:33:59 2011 +0200 winex11: Remove a redundant field in the XRender format templates. --- dlls/winex11.drv/xrender.c | 64 ++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e1139e2..db46eae 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -75,7 +75,6 @@ typedef enum wxr_format typedef struct wine_xrender_format_template { - WXRFormat wxr_format; unsigned int depth; unsigned int alpha; unsigned int alphaMask; @@ -90,18 +89,18 @@ typedef struct wine_xrender_format_template static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = { /* Format depth alpha mask red mask green mask blue mask*/ - {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, - {WXR_FORMAT_GRAY, 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, - {WXR_FORMAT_X1R5G5B5, 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, - {WXR_FORMAT_X1B5G5R5, 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, - {WXR_FORMAT_R5G6B5, 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, - {WXR_FORMAT_B5G6R5, 16, 0, 0, 0, 0x1f, 5, 0x3f, 11, 0x1f }, - {WXR_FORMAT_R8G8B8, 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8, 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, - {WXR_FORMAT_A8R8G8B8, 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8A8, 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, - {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8X8, 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, +/* WXR_FORMAT_MONO */ { 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, +/* WXR_FORMAT_GRAY */ { 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, +/* WXR_FORMAT_X1R5G5B5 */ { 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, +/* WXR_FORMAT_X1B5G5R5 */ { 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, +/* WXR_FORMAT_R5G6B5 */ { 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, +/* WXR_FORMAT_B5G6R5 */ { 16, 0, 0, 0, 0x1f, 5, 0x3f, 11, 0x1f }, +/* WXR_FORMAT_R8G8B8 */ { 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8 */ { 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, +/* WXR_FORMAT_A8R8G8B8 */ { 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8A8 */ { 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, +/* WXR_FORMAT_X8R8G8B8 */ { 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; static enum wxr_format default_format; @@ -287,15 +286,15 @@ static int load_xrender_formats(void) int count = 0; unsigned int i; - for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + for (i = 0; i < WXR_NB_FORMATS; i++) { - XRenderPictFormat templ, *pict_format; + XRenderPictFormat templ; if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i])) { wine_tsx11_lock(); - pict_format = pXRenderFindVisualFormat(gdi_display, visual); - if(!pict_format) + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, visual); + if (!pict_formats[i]) { /* Xrender doesn't like DirectColor visuals, try to find a TrueColor one instead */ if (visual->class == DirectColor) @@ -304,20 +303,13 @@ static int load_xrender_formats(void) if (XMatchVisualInfo( gdi_display, DefaultScreen(gdi_display), screen_depth, TrueColor, &info )) { - pict_format = pXRenderFindVisualFormat(gdi_display, info.visual); - if (pict_format) visual = info.visual; + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, info.visual); + if (pict_formats[i]) visual = info.visual; } } } wine_tsx11_unlock(); - - if(pict_format) - { - pict_formats[wxr_formats_template[i].wxr_format] = pict_format; - default_format = wxr_formats_template[i].wxr_format; - count++; - TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_format->id, wxr_formats_template[i].wxr_format); - } + if (pict_formats[i]) default_format = i; } else { @@ -325,15 +317,13 @@ static int load_xrender_formats(void) get_xrender_template(&wxr_formats_template[i], &templ, &mask); wine_tsx11_lock(); - pict_format = pXRenderFindFormat(gdi_display, mask, &templ, 0); + pict_formats[i] = pXRenderFindFormat(gdi_display, mask, &templ, 0); wine_tsx11_unlock(); - - if(pict_format) - { - pict_formats[wxr_formats_template[i].wxr_format] = pict_format; - count++; - TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_format->id, wxr_formats_template[i].wxr_format); - } + } + if (pict_formats[i]) + { + count++; + TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_formats[i]->id, i); } } return count; @@ -485,13 +475,13 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif blueMask = shifts->physicalBlue.max << shifts->physicalBlue.shift; /* Try to locate a format which matches the specification of the dibsection. */ - for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + for(i = 0; i < WXR_NB_FORMATS; i++) { if( depth == wxr_formats_template[i].depth && redMask == (wxr_formats_template[i].redMask << wxr_formats_template[i].red) && greenMask == (wxr_formats_template[i].greenMask << wxr_formats_template[i].green) && blueMask == (wxr_formats_template[i].blueMask << wxr_formats_template[i].blue) ) - return wxr_formats_template[i].wxr_format; + return i; } /* This should not happen because when we reach 'shifts' must have been set and we only allows shifts which are backed by X */

1 0

Alexandre Julliard : winex11: Get rid of the WXRFormat typedef.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 84ec1acced6a174410af36f8ed692bbf4774fb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ec1acced6a174410af36f8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 15:35:32 2011 +0200 winex11: Get rid of the WXRFormat typedef. --- dlls/winex11.drv/xrender.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index db46eae..34a7bb5 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -55,7 +55,7 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -typedef enum wxr_format +enum wxr_format { WXR_FORMAT_MONO, WXR_FORMAT_GRAY, @@ -71,7 +71,7 @@ typedef enum wxr_format WXR_FORMAT_B8G8R8X8, WXR_NB_FORMATS, WXR_INVALID_FORMAT = WXR_NB_FORMATS -} WXRFormat; +}; typedef struct wine_xrender_format_template { @@ -233,7 +233,7 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif -static WXRFormat get_format_without_alpha( WXRFormat format ) +static enum wxr_format get_format_without_alpha( enum wxr_format format ) { switch (format) { @@ -1331,7 +1331,7 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form gsCacheEntry *entry = glyphsetCache + physDev->cache_index; gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; - WXRFormat wxr_format; + enum wxr_format wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };

1 0

Jacek Caban : vbscript: Added class parser implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 80ad3a23fa095b420f4aed23a5f9dc9a79c13688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ad3a23fa095b420f4aed23a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:16:47 2011 +0200 vbscript: Added class parser implementation. --- dlls/vbscript/parse.h | 6 ++++++ dlls/vbscript/parser.y | 32 +++++++++++++++++++++++++++++++- dlls/vbscript/tests/lang.vbs | 3 +++ 3 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 7e1124c..67fa221 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -142,6 +142,11 @@ typedef struct _function_statement_t { function_decl_t *func_decl; } function_statement_t; +typedef struct _class_decl_t { + const WCHAR *name; + struct _class_decl_t *next; +} class_decl_t; + typedef struct _elseif_decl_t { expression_t *expr; statement_t *stat; @@ -170,6 +175,7 @@ typedef struct { statement_t *stats; statement_t *stats_tail; + class_decl_t *class_decls; vbsheap_t heap; } parser_ctx_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a6281d6..6d8a674 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -34,6 +34,7 @@ static int parser_error(const char*); static void parse_complete(parser_ctx_t*,BOOL); static void source_add_statement(parser_ctx_t*,statement_t*); +static void source_add_class(parser_ctx_t*,class_decl_t*); static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); @@ -56,6 +57,7 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); +static class_decl_t *new_class_decl(parser_ctx_t*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -73,6 +75,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); dim_decl_t *dim_decl; function_decl_t *func_decl; arg_decl_t *arg_decl; + class_decl_t *class_decl; LONG lng; BOOL bool; double dbl; @@ -105,6 +108,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf +%type <class_decl> ClassDeclaration ClassBody %type <dim_decl> DimDeclList %% @@ -118,7 +122,8 @@ OptionExplicit_opt SourceElements : /* empty */ - | SourceElements StatementNl { source_add_statement(ctx, $2); } + | SourceElements StatementNl { source_add_statement(ctx, $2); } + | SourceElements ClassDeclaration { source_add_class(ctx, $2); } StatementsNl_opt : /* empty */ { $$ = NULL; } @@ -268,6 +273,12 @@ LiteralExpression PrimaryExpression : '(' Expression ')' { $$ = $2; } +ClassDeclaration + : tCLASS tIdentifier tNL ClassBody tEND tCLASS tNL { $4->name = $2; $$ = $4; } + +ClassBody + : /* empty */ { $$ = new_class_decl(ctx); } + FunctionDecl : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } @@ -304,6 +315,12 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) } } +static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) +{ + class_decl->next = ctx->class_decls; + ctx->class_decls = class_decl; +} + static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) { ctx->parse_complete = TRUE; @@ -545,6 +562,18 @@ static statement_t *new_function_statement(parser_ctx_t *ctx, function_decl_t *d return &stat->stat; } +static class_decl_t *new_class_decl(parser_ctx_t *ctx) +{ + class_decl_t *class_decl; + + class_decl = parser_alloc(ctx, sizeof(*class_decl)); + if(!class_decl) + return NULL; + + class_decl->next = NULL; + return class_decl; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; @@ -568,6 +597,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; + ctx->class_decls = NULL; ctx->option_explicit = FALSE; parser_parse(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index b9b5c57..a338e76 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -355,4 +355,7 @@ x = false ok SetVal(x, true), "SetVal returned false?" Call ok(x, "x is not set to true by SetVal?") +Class EmptyClass +End Class + reportSuccess()

1 0

Jacek Caban : vbscript: Added class compiler implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: e8797c29b57d36515253fd87f01e42bd8ba15edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8797c29b57d36515253fd87f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:17:17 2011 +0200 vbscript: Added class compiler implementation. --- dlls/vbscript/compile.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 7 ++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index f74f5fe..21c8588 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -47,6 +47,8 @@ typedef struct { function_t *func; function_t *funcs; function_decl_t *func_decls; + + class_desc_t *classes; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -779,8 +781,44 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi return S_OK; } +static BOOL lookup_class_name(compile_ctx_t *ctx, const WCHAR *name) +{ + class_desc_t *iter; + + for(iter = ctx->classes; iter; iter = iter->next) { + if(!strcmpiW(iter->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) +{ + class_desc_t *class_desc; + + if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) + || lookup_class_name(ctx, class_decl->name)) { + FIXME("%s: redefinition\n", debugstr_w(class_decl->name)); + return E_FAIL; + } + + class_desc = compiler_alloc(ctx->code, sizeof(*class_desc)); + if(!class_desc) + return E_OUTOFMEMORY; + + class_desc->name = compiler_alloc_string(ctx->code, class_decl->name); + if(!class_desc->name) + return E_OUTOFMEMORY; + + class_desc->next = ctx->classes; + ctx->classes = class_desc; + return S_OK; +} + static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { + class_desc_t *class; dynamic_var_t *var; function_t *func; @@ -794,11 +832,17 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi return TRUE; } + for(class = script->classes; class; class = class->next) { + if(!strcmpiW(class->name, identifier)) + return TRUE; + } + return FALSE; } static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { + class_desc_t *class; dynamic_var_t *var; function_t *func; @@ -816,6 +860,13 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) } } + for(class = ctx->classes; class; class = class->next) { + if(lookup_script_identifier(script, class->name)) { + FIXME("%s: redefined\n", debugstr_w(class->name)); + return E_FAIL; + } + } + return S_OK; } @@ -891,6 +942,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) { function_t *new_func; function_decl_t *func_decl; + class_decl_t *class_decl; compile_ctx_t ctx; vbscode_t *code; HRESULT hres; @@ -907,6 +959,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.func_decls = NULL; ctx.global_vars = NULL; ctx.dim_decls = NULL; + ctx.classes = NULL; ctx.labels = NULL; ctx.labels_cnt = ctx.labels_size = 0; @@ -927,6 +980,14 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.funcs = new_func; } + for(class_decl = ctx.parser.class_decls; class_decl; class_decl = class_decl->next) { + hres = compile_class(&ctx, class_decl); + if(FAILED(hres)) { + release_compiler(&ctx); + return hres; + } + } + hres = check_script_collisions(&ctx, script); if(FAILED(hres)) { release_compiler(&ctx); @@ -949,6 +1010,20 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) script->global_funcs = ctx.funcs; } + if(ctx.classes) { + class_desc_t *class = ctx.classes; + + while(1) { + class->ctx = script; + if(!class->next) + break; + class = class->next; + } + + class->next = script->classes; + script->classes = ctx.classes; + } + if(TRACE_ON(vbscript_disas)) dump_code(&ctx); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5f1d6ce..9ad3bb6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -55,6 +55,12 @@ typedef struct named_item_t { struct list entry; } named_item_t; +typedef struct _class_desc_t { + const WCHAR *name; + script_ctx_t *ctx; + struct _class_desc_t *next; +} class_desc_t; + typedef struct { IDispatchEx IDispatchEx_iface; @@ -98,6 +104,7 @@ struct _script_ctx_t { dynamic_var_t *global_vars; function_t *global_funcs; + class_desc_t *classes; struct list code_list; struct list named_items;

1 0

Jacek Caban : vbscript: Added set statement parser/compiler implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: b3a6217ed3105ab69eec4a571b9012052f2c3e13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a6217ed3105ab69eec4a571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:17:38 2011 +0200 vbscript: Added set statement parser/compiler implementation. --- dlls/vbscript/compile.c | 11 +++++++---- dlls/vbscript/interp.c | 14 ++++++++++++++ dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 16 ++++++++++++++++ dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 21c8588..d1720cf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -475,7 +475,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return S_OK; } -static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat) +static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -493,9 +493,9 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * if(FAILED(hres)) return hres; - hres = push_instr_bstr(ctx, OP_assign_member, stat->member_expr->identifier); + hres = push_instr_bstr(ctx, is_set ? OP_set_member : OP_assign_member, stat->member_expr->identifier); }else { - hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); + hres = push_instr_bstr(ctx, is_set ? OP_set_ident : OP_assign_ident, stat->member_expr->identifier); } return hres; @@ -585,7 +585,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) while(stat) { switch(stat->type) { case STAT_ASSIGN: - hres = compile_assign_statement(ctx, (assign_statement_t*)stat); + hres = compile_assign_statement(ctx, (assign_statement_t*)stat, FALSE); break; case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); @@ -605,6 +605,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_IF: hres = compile_if_statement(ctx, (if_statement_t*)stat); break; + case STAT_SET: + hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2a50667..e61ed7a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -385,6 +385,13 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return assign_ident(ctx, arg, v.v, v.owned); } +static HRESULT interp_set_ident(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(arg)); + return E_NOTIMPL; +} + static HRESULT interp_assign_member(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; @@ -419,6 +426,13 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } +static HRESULT interp_set_member(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(identifier)); + return E_NOTIMPL; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 67fa221..76f8775 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -94,7 +94,8 @@ typedef enum { STAT_EXITFUNC, STAT_EXITSUB, STAT_FUNC, - STAT_IF + STAT_IF, + STAT_SET } statement_type_t; typedef struct _statement_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 6d8a674..2e0140e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -49,6 +49,7 @@ static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,co static void *new_statement(parser_ctx_t*,statement_type_t,size_t); static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); +static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); @@ -146,6 +147,8 @@ Statement | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } + | tSET MemberExpression Arguments_opt '=' Expression + { $2->args = $3; $$ = new_set_statement(ctx, $2, $5); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -465,6 +468,19 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t return &stat->stat; } +static statement_t *new_set_statement(parser_ctx_t *ctx, member_expression_t *left, expression_t *right) +{ + assign_statement_t *stat; + + stat = new_statement(ctx, STAT_SET, sizeof(*stat)); + if(!stat) + return NULL; + + stat->member_expr = left; + stat->value_expr = right; + return &stat->stat; +} + static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) { dim_decl_t *decl; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9ad3bb6..9655978 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -150,6 +150,8 @@ typedef enum { X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ X(ret, 0, 0, 0) \ + X(set_ident, 1, ARG_BSTR, 0) \ + X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_set_ident implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: f683832ac1603aa904256f3eca730e45d35601fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f683832ac1603aa904256f3ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:17:51 2011 +0200 vbscript: Added interp_set_ident implementation. --- dlls/vbscript/interp.c | 15 +++++++++++++-- dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e61ed7a..705992c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -388,8 +388,19 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_set_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; - FIXME("%s\n", debugstr_w(arg)); - return E_NOTIMPL; + IDispatch *disp; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = stack_pop_disp(ctx, &disp); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = disp; + return assign_ident(ctx, ctx->instr->arg1.bstr, &v, TRUE); } static HRESULT interp_assign_member(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a338e76..01c7072 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -355,6 +355,9 @@ x = false ok SetVal(x, true), "SetVal returned false?" Call ok(x, "x is not set to true by SetVal?") +set x = testObj +Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) + Class EmptyClass End Class

1 0

Jacek Caban : vbscript: Added new expression parser/compiler implemetation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 408a1bf6820cd43b5929a0ee93755103bdcdf095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408a1bf6820cd43b5929a0ee9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:18:12 2011 +0200 vbscript: Added new expression parser/compiler implemetation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 7 +++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 14 ++++++++++++++ dlls/vbscript/vbscript.h | 1 + 5 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d1720cf..b9e05bd9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -390,6 +390,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_nequal); + case EXPR_NEW: + return push_instr_str(ctx, OP_new, ((string_expression_t*)expr)->value); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 705992c..dd4f4ff 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -444,6 +444,13 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_NOTIMPL; } +static HRESULT interp_new(exec_ctx_t *ctx) +{ + const WCHAR *arg = ctx->instr->arg1.bstr; + FIXME("%s\n", debugstr_w(arg)); + return E_NOTIMPL; +} + static HRESULT interp_jmp(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 76f8775..21f0d60 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -34,6 +34,7 @@ typedef enum { EXPR_MUL, EXPR_NEG, EXPR_NEQUAL, + EXPR_NEW, EXPR_NOT, EXPR_NULL, EXPR_OR, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2e0140e..48a5ab4 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -43,6 +43,7 @@ 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*); +static expression_t *new_new_expression(parser_ctx_t*,const WCHAR*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -256,6 +257,7 @@ ExpExpression UnaryExpression : LiteralExpression { $$ = $1; } | CallExpression { $$ = $1; } + | tNEW tIdentifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } CallExpression @@ -430,6 +432,18 @@ static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_ return expr; } +static expression_t *new_new_expression(parser_ctx_t *ctx, const WCHAR *identifier) +{ + string_expression_t *expr; + + expr = new_expression(ctx, EXPR_NEW, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = identifier; + return &expr->expr; +} + static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size) { statement_t *stat; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9655978..3e3af5b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -146,6 +146,7 @@ typedef enum { X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ + X(new, 1, ARG_STR, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(or, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_new implementation.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: fb57bc21b8471d47764793a4b06cd32592b25f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb57bc21b8471d47764793a4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:18:29 2011 +0200 vbscript: Added interp_new implementation. --- dlls/vbscript/interp.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 + 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index dd4f4ff..04ed81d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -447,8 +447,29 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) static HRESULT interp_new(exec_ctx_t *ctx) { const WCHAR *arg = ctx->instr->arg1.bstr; - FIXME("%s\n", debugstr_w(arg)); - return E_NOTIMPL; + class_desc_t *class_desc; + vbdisp_t *obj; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { + if(!strcmpiW(class_desc->name, arg)) + break; + } + if(!class_desc) { + FIXME("Class %s not found\n", debugstr_w(arg)); + return E_FAIL; + } + + hres = create_vbdisp(&obj); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&obj->IDispatchEx_iface; + return stack_push(ctx, &v); } static HRESULT interp_jmp(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 01c7072..c89009b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -358,6 +358,10 @@ Call ok(x, "x is not set to true by SetVal?") set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) +Dim obj +Set obj = New EmptyClass +Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj)) + Class EmptyClass End Class diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9cfdab2..73006be 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -184,7 +184,7 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -static HRESULT create_vbdisp(vbdisp_t **ret) +HRESULT create_vbdisp(vbdisp_t **ret) { vbdisp_t *vbdisp; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3e3af5b..9e77714 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -74,6 +74,7 @@ typedef enum { VBDISP_ANY } vbdisp_invoke_type_t; +HRESULT create_vbdisp(vbdisp_t**); 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*);

1 0

Jacek Caban : vbscript: Store class_desc_t in vbdisp_t.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: efc59d1b19cff5b5e5ab184b7717defcf968c9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc59d1b19cff5b5e5ab184b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:18:43 2011 +0200 vbscript: Store class_desc_t in vbdisp_t. --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbdisp.c | 6 ++++-- dlls/vbscript/vbscript.h | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 04ed81d..b413243 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -463,7 +463,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) return E_FAIL; } - hres = create_vbdisp(&obj); + hres = create_vbdisp(class_desc, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 73006be..f1a323d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -184,7 +184,7 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -HRESULT create_vbdisp(vbdisp_t **ret) +HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) { vbdisp_t *vbdisp; @@ -194,6 +194,7 @@ HRESULT create_vbdisp(vbdisp_t **ret) vbdisp->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; vbdisp->ref = 1; + vbdisp->desc = desc; *ret = vbdisp; return S_OK; @@ -201,7 +202,8 @@ HRESULT create_vbdisp(vbdisp_t **ret) HRESULT init_global(script_ctx_t *ctx) { - return create_vbdisp(&ctx->script_obj); + ctx->script_desc.ctx = ctx; + return create_vbdisp(&ctx->script_desc, &ctx->script_obj); } HRESULT disp_get_id(IDispatch *disp, BSTR name, DISPID *id) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9e77714..dabf52b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,8 @@ typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + + const class_desc_t *desc; } vbdisp_t; typedef enum { @@ -74,7 +76,7 @@ typedef enum { VBDISP_ANY } vbdisp_invoke_type_t; -HRESULT create_vbdisp(vbdisp_t**); +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); 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*); @@ -101,6 +103,7 @@ struct _script_ctx_t { IDispatch *host_global; + class_desc_t script_desc; vbdisp_t *script_obj; dynamic_var_t *global_vars;

1 0