July 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Store scheme in nsWineURI instead of nsChannel.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: cc533ecc2f06906efd48b8fcb4239fafdd021c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc533ecc2f06906efd48b8fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 12:36:02 2012 +0200 mshtml: Store scheme in nsWineURI instead of nsChannel. --- dlls/mshtml/binding.h | 1 - dlls/mshtml/nsio.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 7d70dc9..040fcf2 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -47,7 +47,6 @@ typedef struct { REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; - UINT url_scheme; } nsChannel; typedef struct BSCallbackVtbl BSCallbackVtbl; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1be94e8..d59e161 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -65,6 +65,7 @@ struct nsWineURI { IUriBuilder *uri_builder; BOOL is_doc_uri; BOOL is_mutable; + DWORD scheme; }; static BOOL ensure_uri(nsWineURI *This) @@ -321,7 +322,7 @@ static void set_uri_window(nsWineURI *This, HTMLOuterWindow *window) static inline BOOL is_http_channel(nsChannel *This) { - return This->url_scheme == URL_SCHEME_HTTP || This->url_scheme == URL_SCHEME_HTTPS; + return This->uri->scheme == URL_SCHEME_HTTP || This->uri->scheme == URL_SCHEME_HTTPS; } static http_header_t *find_http_header(struct list *headers, const WCHAR *name, int len) @@ -2814,6 +2815,7 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) { nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); + HRESULT hres; ret->nsIURL_iface.lpVtbl = &nsURLVtbl; ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; @@ -2826,6 +2828,10 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c IUri_AddRef(iuri); ret->uri = iuri; + hres = IUri_GetScheme(iuri, &ret->scheme); + if(FAILED(hres)) + ret->scheme = URL_SCHEME_UNKNOWN; + TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -2856,7 +2862,6 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, WCHAR *url, nsWineURI **ret) static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) { nsChannel *channel; - HRESULT hres; if(!ensure_uri(uri)) return NS_ERROR_UNEXPECTED; @@ -2876,10 +2881,6 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) nsIURL_AddRef(&uri->nsIURL_iface); channel->uri = uri; - hres = IUri_GetScheme(uri->uri, &channel->url_scheme); - if(FAILED(hres)) - channel->url_scheme = URL_SCHEME_UNKNOWN; - *ret = channel; return NS_OK; }

1 0

Jacek Caban : mshtml: Added nsIFileURL stub implementation.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 74451bf36a649dda2ab2e809582577c20188eff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74451bf36a649dda2ab2e8095… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 12:36:33 2012 +0200 mshtml: Added nsIFileURL stub implementation. --- dlls/mshtml/nsiface.idl | 12 ++ dlls/mshtml/nsio.c | 279 +++++++++++++++++++++++++---------------------- 2 files changed, 161 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74451bf36a649dda2ab2e…

1 0

Jacek Caban : mshtml: Added nsIFileURL::GetFile implementation.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 5e5129935fdbb486fbe3a47ffb231a13fabfcf8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5129935fdbb486fbe3a47ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 12:36:50 2012 +0200 mshtml: Added nsIFileURL::GetFile implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsio.c | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f006176..04b5b1e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -781,6 +781,7 @@ HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; void get_editor_controller(NSContainer*) DECLSPEC_HIDDEN; nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; +nsresult create_nsfile(const PRUnichar*,nsIFile**) DECLSPEC_HIDDEN; HRESULT create_pending_window(HTMLOuterWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLOuterWindow*,IMoniker*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5ae78d5..9ab0a9b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -79,7 +79,7 @@ static ATOM nscontainer_class; static WCHAR gecko_path[MAX_PATH]; static unsigned gecko_path_len; -static nsresult create_nsfile(const PRUnichar *path, nsIFile **ret) +nsresult create_nsfile(const PRUnichar *path, nsIFile **ret) { nsAString str; nsresult nsres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c0b04d1..4c07706 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2705,8 +2705,19 @@ static nsresult NSAPI nsURL_GetRelativeSpec(nsIFileURL *iface, nsIURI *aURIToCom static nsresult NSAPI nsFileURL_GetFile(nsIFileURL *iface, nsIFile **aFile) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aFile); - return NS_ERROR_NOT_IMPLEMENTED; + WCHAR path[MAX_PATH]; + DWORD size; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aFile); + + hres = CoInternetParseIUri(This->uri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); + if(FAILED(hres)) { + WARN("CoInternetParseIUri failed: %08x\n", hres); + return NS_ERROR_FAILURE; + } + + return create_nsfile(path, aFile); } static nsresult NSAPI nsFileURL_SetFile(nsIFileURL *iface, nsIFile *aFile)

1 0

Alexandre Julliard : fusion: Simplify the parsing of clr tables.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 328383d4ebd0da48b64c1d627894c785971c28bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=328383d4ebd0da48b64c1d627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 20:12:35 2012 +0200 fusion: Simplify the parsing of clr tables. --- dlls/fusion/assembly.c | 41 ++++++++++------------------------------- 1 files changed, 10 insertions(+), 31 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index d04ba73..920d8db 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -482,8 +482,9 @@ static inline ULONG get_table_size(const ASSEMBLY *assembly, DWORD index) static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) { - DWORD i, previ, offidx; + DWORD i, count; ULONG currofs; + ULONGLONG mask; currofs = offset; assembly->tableshdr = assembly_data_offset(assembly, currofs); @@ -502,44 +503,22 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) if (!assembly->numrows) return E_FAIL; - assembly->numtables = 0; - for (i = 0; i < MAX_CLR_TABLES; i++) - { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) - { - assembly->numtables++; - } - } - - currofs += assembly->numtables * sizeof(DWORD); memset(assembly->tables, -1, MAX_CLR_TABLES * sizeof(CLRTABLE)); - if (assembly->tableshdr->MaskValid.u.LowPart & 1) - assembly->tables[0].offset = currofs; - - offidx = 0; - for (i = 0; i < MAX_CLR_TABLES; i++) + for (i = count = 0, mask = 1; i < MAX_CLR_TABLES; i++, mask <<= 1) { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) - { - assembly->tables[i].rows = assembly->numrows[offidx]; - offidx++; - } + if (assembly->tableshdr->MaskValid.QuadPart & mask) + assembly->tables[i].rows = assembly->numrows[count++]; } + assembly->numtables = count; + currofs += assembly->numtables * sizeof(DWORD); - previ = 0; - offidx = 1; - for (i = 1; i < MAX_CLR_TABLES; i++) + for (i = 0, mask = 1; i < MAX_CLR_TABLES; i++, mask <<= 1) { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) + if (assembly->tableshdr->MaskValid.QuadPart & mask) { - currofs += get_table_size(assembly, previ) * assembly->numrows[offidx - 1]; assembly->tables[i].offset = currofs; - offidx++; - previ = i; + currofs += get_table_size(assembly, i) * assembly->tables[i].rows; } }

1 0

Dmitry Timoshkov : gdiplus: Set actual resolution of an image being encoded .
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 7bcfb02169dacef0b448fe74c522d11b9b9dcea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcfb02169dacef0b448fe74c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 20 19:52:36 2012 +0900 gdiplus: Set actual resolution of an image being encoded. --- dlls/gdiplus/image.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bfa0156..a5b560d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3509,8 +3509,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, hr = IWICBitmapFrameEncode_SetSize(frameencode, width, height); if (SUCCEEDED(hr)) - /* FIXME: use the resolution from the image */ - hr = IWICBitmapFrameEncode_SetResolution(frameencode, 96.0, 96.0); + hr = IWICBitmapFrameEncode_SetResolution(frameencode, image->xres, image->yres); if (SUCCEEDED(hr)) {

1 0

Jacek Caban : vbscript: Added parser support for select case statement.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 119c985cdaa72d4150e0040d4969cc747bdac87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=119c985cdaa72d4150e0040d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 16:28:32 2012 +0200 vbscript: Added parser support for select case statement. --- dlls/vbscript/compile.c | 9 +++++++ dlls/vbscript/lex.c | 4 +++ dlls/vbscript/parse.h | 13 +++++++++++ dlls/vbscript/parser.y | 54 ++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7c4b0e6..fb8076c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -752,6 +752,12 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st return S_OK; } +static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t *stat) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT compile_assignment(compile_ctx_t *ctx, member_expression_t *member_expr, expression_t *value_expr, BOOL is_set) { unsigned args_cnt; @@ -1058,6 +1064,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_ONERROR: hres = compile_onerror_statement(ctx, (onerror_statement_t*)stat); break; + case STAT_SELECT: + hres = compile_select_statement(ctx, (select_statement_t*)stat); + break; case STAT_SET: hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index fe5fbae..8e971e2 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -30,6 +30,7 @@ static const WCHAR andW[] = {'a','n','d',0}; static const WCHAR byrefW[] = {'b','y','r','e','f',0}; static const WCHAR byvalW[] = {'b','y','v','a','l',0}; static const WCHAR callW[] = {'c','a','l','l',0}; +static const WCHAR caseW[] = {'c','a','s','e',0}; static const WCHAR classW[] = {'c','l','a','s','s',0}; static const WCHAR constW[] = {'c','o','n','s','t',0}; static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; @@ -70,6 +71,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; static const WCHAR remW[] = {'r','e','m',0}; static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; +static const WCHAR selectW[] = {'s','e','l','e','c','t',0}; static const WCHAR setW[] = {'s','e','t',0}; static const WCHAR stepW[] = {'s','t','e','p',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; @@ -90,6 +92,7 @@ static const struct { {byrefW, tBYREF}, {byvalW, tBYVAL}, {callW, tCALL}, + {caseW, tCASE}, {classW, tCLASS}, {constW, tCONST}, {defaultW, tDEFAULT}, @@ -130,6 +133,7 @@ static const struct { {publicW, tPUBLIC}, {remW, tREM}, {resumeW, tRESUME}, + {selectW, tSELECT}, {setW, tSET}, {stepW, tSTEP}, {stopW, tSTOP}, diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 50151d3..df8f9b5 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -113,6 +113,7 @@ typedef enum { STAT_FUNC, STAT_IF, STAT_ONERROR, + STAT_SELECT, STAT_SET, STAT_STOP, STAT_UNTIL, @@ -233,6 +234,18 @@ typedef struct { const_decl_t *decls; } const_statement_t; +typedef struct _case_clausule_t { + expression_t *expr; + statement_t *stat; + struct _case_clausule_t *next; +} case_clausule_t; + +typedef struct { + statement_t stat; + expression_t *expr; + case_clausule_t *case_clausules; +} select_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index fca0cf1..baac315 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -58,12 +58,14 @@ static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,el static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static statement_t *new_onerror_statement(parser_ctx_t*,BOOL); static statement_t *new_const_statement(parser_ctx_t*,const_decl_t*); +static statement_t *new_select_statement(parser_ctx_t*,expression_t*,case_clausule_t*); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); static const_decl_t *new_const_decl(parser_ctx_t*,const WCHAR*,expression_t*); +static case_clausule_t *new_case_clausule(parser_ctx_t*,expression_t*,statement_t*,case_clausule_t*); static class_decl_t *new_class_decl(parser_ctx_t*); static class_decl_t *add_class_function(parser_ctx_t*,class_decl_t*,function_decl_t*); @@ -94,6 +96,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; arg_decl_t *arg_decl; class_decl_t *class_decl; const_decl_t *const_decl; + case_clausule_t *case_clausule; unsigned uint; LONG lng; BOOL bool; @@ -107,6 +110,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT %token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN +%token tSELECT tCASE %token tBYREF tBYVAL %token tOPTION tEXPLICIT %token tSTOP @@ -122,7 +126,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt ArgumentList Step_opt +%type <expression> Arguments_opt ArgumentList_opt Step_opt ExpressionList %type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -132,6 +136,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <dim_decl> DimDeclList %type <const_decl> ConstDecl ConstDeclList %type <string> Identifier +%type <case_clausule> CaseClausules %% @@ -196,6 +201,8 @@ SimpleStatement { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } + | tSELECT tCASE Expression tNL CaseClausules tEND tSELECT + { $$ = new_select_statement(ctx, $3, $5); } MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -247,22 +254,28 @@ Else_opt : /* empty */ { $$ = NULL; } | tELSE tNL StatementsNl { $$ = $3; } +CaseClausules + : /* empty */ { $$ = NULL; } + | tCASE tELSE tNL StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE ExpressionList tNL StatementsNl_opt CaseClausules + { $$ = new_case_clausule(ctx, $2, $4, $5); } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } - | '(' ArgumentList ')' { $$ = $2; } + | '(' ExpressionList ')' { $$ = $2; } ArgumentList_opt : EmptyBrackets_opt { $$ = NULL; } - | ArgumentList { $$ = $1; } - -ArgumentList - : Expression { $$ = $1; } - | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } + | ExpressionList { $$ = $1; } EmptyBrackets_opt : /* empty */ | tEMPTYBRACKETS +ExpressionList + : Expression { $$ = $1; } + | Expression ',' ExpressionList { $1->next = $3; $$ = $1; } + Expression : EqvExpression { $$ = $1; } | Expression tIMP EqvExpression { $$ = new_binary_expression(ctx, EXPR_IMP, $1, $3); CHECK_ERROR; } @@ -697,6 +710,33 @@ static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, stat return &stat->stat; } +static statement_t *new_select_statement(parser_ctx_t *ctx, expression_t *expr, case_clausule_t *case_clausules) +{ + select_statement_t *stat; + + stat = new_statement(ctx, STAT_SELECT, sizeof(*stat)); + if(!stat) + return NULL; + + stat->expr = expr; + stat->case_clausules = case_clausules; + return &stat->stat; +} + +static case_clausule_t *new_case_clausule(parser_ctx_t *ctx, expression_t *expr, statement_t *stat, case_clausule_t *next) +{ + case_clausule_t *ret; + + ret = parser_alloc(ctx, sizeof(*ret)); + if(!ret) + return NULL; + + ret->expr = expr; + ret->stat = stat; + ret->next = next; + return ret; +} + static statement_t *new_onerror_statement(parser_ctx_t *ctx, BOOL resume_next) { onerror_statement_t *stat;

1 0

Jacek Caban : vbscript: Added compiler support for select case statement.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: f17aaf8da7d169f1a48a36a288912a62eacd7de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17aaf8da7d169f1a48a36a28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 16:28:45 2012 +0200 vbscript: Added compiler support for select case statement. --- dlls/vbscript/compile.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/interp.c | 6 +++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fb8076c..12db4e0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -754,8 +754,89 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t *stat) { - FIXME("\n"); - return E_NOTIMPL; + unsigned end_label, case_cnt = 0, *case_labels = NULL, i; + case_clausule_t *case_iter; + expression_t *expr_iter; + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + if(!push_instr(ctx, OP_val)) + return E_OUTOFMEMORY; + + end_label = alloc_label(ctx); + if(!end_label) + return E_OUTOFMEMORY; + + for(case_iter = stat->case_clausules; case_iter; case_iter = case_iter->next) + case_cnt++; + + if(case_cnt) { + case_labels = heap_alloc(case_cnt*sizeof(*case_labels)); + if(!case_labels) + return E_OUTOFMEMORY; + } + + for(case_iter = stat->case_clausules, i=0; case_iter; case_iter = case_iter->next, i++) { + case_labels[i] = alloc_label(ctx); + if(!case_labels[i]) { + hres = E_OUTOFMEMORY; + break; + } + + if(!case_iter->expr) + break; + + for(expr_iter = case_iter->expr; expr_iter; expr_iter = expr_iter->next) { + hres = compile_expression(ctx, expr_iter); + if(FAILED(hres)) + break; + + hres = push_instr_addr(ctx, OP_case, case_labels[i]); + if(FAILED(hres)) + break; + } + } + + if(FAILED(hres)) { + heap_free(case_labels); + return hres; + } + + hres = push_instr_uint(ctx, OP_pop, 1); + if(FAILED(hres)) { + heap_free(case_labels); + return hres; + } + + hres = push_instr_addr(ctx, OP_jmp, case_iter ? case_labels[i] : end_label); + if(FAILED(hres)) { + heap_free(case_labels); + return hres; + } + + for(case_iter = stat->case_clausules, i=0; case_iter; case_iter = case_iter->next, i++) { + label_set_addr(ctx, case_labels[i]); + hres = compile_statement(ctx, NULL, case_iter->stat); + if(FAILED(hres)) + break; + + if(!case_iter->next) + break; + + hres = push_instr_addr(ctx, OP_jmp, end_label); + if(FAILED(hres)) + return hres; + } + + heap_free(case_labels); + if(FAILED(hres)) + return hres; + + label_set_addr(ctx, end_label); + return S_OK; } static HRESULT compile_assignment(compile_ctx_t *ctx, member_expression_t *member_expr, expression_t *value_expr, BOOL is_set) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3a6fb38..c908716 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1422,6 +1422,12 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_case(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, VARIANT_BOOL *ret) { IObjectIdentity *identity; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a4ae64c..3f1e887 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -189,6 +189,7 @@ typedef enum { X(assign_ident, 1, ARG_BSTR, ARG_UINT) \ X(assign_member, 1, ARG_BSTR, ARG_UINT) \ X(bool, 1, ARG_INT, 0) \ + X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ X(div, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_case implementation.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 374280aa047100106a02548e79851b3387ab14ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=374280aa047100106a02548e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 16:29:00 2012 +0200 vbscript: Added interp_case implementation. --- dlls/vbscript/interp.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c908716..28c1b14 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1302,6 +1302,20 @@ static HRESULT interp_imp(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT var_cmp(exec_ctx_t *ctx, VARIANT *l, VARIANT *r) +{ + TRACE("%s %s\n", debugstr_variant(l), debugstr_variant(r)); + + if(V_VT(l) == VT_NULL || V_VT(r) == VT_NULL) { + FIXME("comparing nulls is not implemented\n"); + return E_NOTIMPL; + } + + /* FIXME: Fix comparing string to number */ + + return VarCmp(l, r, ctx->script->lcid, 0); + } + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; @@ -1313,16 +1327,11 @@ static HRESULT cmp_oper(exec_ctx_t *ctx) hres = stack_pop_val(ctx, &l); if(SUCCEEDED(hres)) { - if(V_VT(l.v) == VT_NULL || V_VT(r.v) == VT_NULL) { - FIXME("comparing nulls is not implemented\n"); - hres = E_NOTIMPL; - }else { - hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); - } + hres = var_cmp(ctx, l.v, r.v); + release_val(&l); } release_val(&r); - release_val(&l); return hres; } @@ -1424,8 +1433,29 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) static HRESULT interp_case(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg = ctx->instr->arg1.uint; + variant_val_t v; + HRESULT hres; + + TRACE("%d\n", arg); + + hres = stack_pop_val(ctx, &v); + if(FAILED(hres)) + return hres; + + hres = var_cmp(ctx, stack_top(ctx, 0), v.v); + release_val(&v); + if(FAILED(hres)) + return hres; + + if(hres == VARCMP_EQ) { + stack_popn(ctx, 1); + instr_jmp(ctx, arg); + }else { + ctx->instr++; + } + + return S_OK; } static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, VARIANT_BOOL *ret)

1 0

Jacek Caban : vbscript: Added select case statement tests.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: 74f67ba82e1237dc8b9b4882304ee449508280ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f67ba82e1237dc8b9b48823… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 16:29:34 2012 +0200 vbscript: Added select case statement tests. --- dlls/vbscript/tests/lang.vbs | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9389462..2ba3e5a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -440,6 +440,62 @@ next Call ok(y = 1, "y = " & y) Call ok(x = 2, "x = " & x) +x = false +select case 3 + case 2 + Call ok(false, "unexpected case") + case 2 + Call ok(false, "unexpected case") + case 4 + Call ok(false, "unexpected case") + case "test" + case "another case" + Call ok(false, "unexpected case") + case 0, false, 2+1, 10 + x = true + case ok(false, "unexpected case") + Call ok(false, "unexpected case") + case else + Call ok(false, "unexpected case") +end select +Call ok(x, "wrong case") + +x = false +select case 3 + case 3 + x = true +end select +Call ok(x, "wrong case") + +x = false +select case 2+2 + case 3 + Call ok(false, "unexpected case") + case else + x = true +end select +Call ok(x, "wrong case") + +y = "3" +x = false +select case y + case "3" + x = true + case 3 + Call ok(false, "unexpected case") +end select +Call ok(x, "wrong case") + +select case 0 + case 1 + Call ok(false, "unexpected case") + case "2" + Call ok(false, "unexpected case") +end select + +select case 0 +end select + if false then Sub testsub x = true

1 0

Matteo Bruni : d3dcompiler: Parse some postfix operators.
by Alexandre Julliard 20 Jul '12

20 Jul '12

Module: wine Branch: master Commit: e851bf211ece772db0263a0e311744f6d4291c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e851bf211ece772db0263a0e3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 20 16:37:37 2012 +0200 d3dcompiler: Parse some postfix operators. --- dlls/d3dcompiler_43/hlsl.y | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 8dd2e70..c84736b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -920,6 +920,26 @@ postfix_expr: primary_expr { $$ = $1; } + | postfix_expr OP_INC + { + struct hlsl_ir_node *operands[3]; + struct source_location loc; + + operands[0] = $1; + operands[1] = operands[2] = NULL; + set_location(&loc, &@2); + $$ = &new_expr(HLSL_IR_BINOP_POSTINC, operands, &loc)->node; + } + | postfix_expr OP_DEC + { + struct hlsl_ir_node *operands[3]; + struct source_location loc; + + operands[0] = $1; + operands[1] = operands[2] = NULL; + set_location(&loc, &@2); + $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ | var_modifiers type '(' initializer_expr_list ')'

1 0