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

Jacek Caban : wininet: Fixed typo in tests and accompanying implementation.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 07e5b87feb9f6160eed536a20d17fc81b9f8d284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e5b87feb9f6160eed536a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 10:41:31 2012 +0200 wininet: Fixed typo in tests and accompanying implementation. --- dlls/wininet/http.c | 5 ++++- dlls/wininet/tests/http.c | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 90cb286..a0b4a62 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3424,7 +3424,10 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, case HTTP_QUERY_STATUS_CODE: { DWORD res = ERROR_SUCCESS; - if(request_only || requested_index) + if(request_only) + return ERROR_HTTP_INVALID_QUERY_REQUEST; + + if(requested_index) break; if(dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6be48a3..a5c7afe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -209,15 +209,15 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) code = 0xdeadbeef; index = 1; size = sizeof(code); - res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, - "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + "[invalid 1] HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); code = 0xdeadbeef; size = sizeof(code); - res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); - ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, - "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_INVALID_QUERY_REQUEST, + "[invalid 2] HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); } static int close_handle_cnt;

1 0

Jacek Caban : widl: Added support for nameless structs and unions.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 76693d52c7b2d199df9d1f0e6051b2ffa333b8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76693d52c7b2d199df9d1f0e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:13:57 2012 +0200 widl: Added support for nameless structs and unions. --- include/winnt.h | 59 +++++++++++++++++++++++++++++++++++++------ tools/widl/header.c | 68 ++++++++++++++++++++++++++++++++++++++++++-------- tools/widl/parser.y | 4 +++ 3 files changed, 111 insertions(+), 20 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index ecac448..9bde031 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -245,26 +245,67 @@ extern "C" { #define DUMMYUNIONNAME8 u8 #endif /* !defined(NONAMELESSUNION) */ -#ifndef __C89_NAMELESS -# if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) -# ifdef __GNUC__ - /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */ -# if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) -# define __C89_NAMELESS __extension__ -# endif -# elif defined(_MSC_VER) -# define __C89_NAMELESS +#undef __C89_NAMELESS +#undef __C89_NAMELESSSTRUCTNAME +#undef __C89_NAMELESSSTRUCTNAME1 +#undef __C89_NAMELESSSTRUCTNAME2 +#undef __C89_NAMELESSSTRUCTNAME3 +#undef __C89_NAMELESSSTRUCTNAME4 +#undef __C89_NAMELESSSTRUCTNAME5 +#undef __C89_NAMELESSUNIONNAME +#undef __C89_NAMELESSUNIONNAME1 +#undef __C89_NAMELESSUNIONNAME2 +#undef __C89_NAMELESSUNIONNAME3 +#undef __C89_NAMELESSUNIONNAME4 +#undef __C89_NAMELESSUNIONNAME5 +#undef __C89_NAMELESSUNIONNAME6 +#undef __C89_NAMELESSUNIONNAME7 +#undef __C89_NAMELESSUNIONNAME8 + +#if !defined(__WINESRC__) && !defined(WINE_NO_NAMELESS_EXTENSION) +# ifdef __GNUC__ + /* Anonymous structs support starts with gcc 2.96/g++ 2.95 */ +# if (__GNUC__ > 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ > 95) || ((__GNUC_MINOR__ == 95) && defined(__cplusplus)))) +# define __C89_NAMELESS __extension__ # endif +# elif defined(_MSC_VER) +# define __C89_NAMELESS # endif #endif #ifdef __C89_NAMELESS # define __C89_NAMELESSSTRUCTNAME +# define __C89_NAMELESSSTRUCTNAME1 +# define __C89_NAMELESSSTRUCTNAME2 +# define __C89_NAMELESSSTRUCTNAME3 +# define __C89_NAMELESSSTRUCTNAME4 +# define __C89_NAMELESSSTRUCTNAME5 # define __C89_NAMELESSUNIONNAME +# define __C89_NAMELESSUNIONNAME1 +# define __C89_NAMELESSUNIONNAME2 +# define __C89_NAMELESSUNIONNAME3 +# define __C89_NAMELESSUNIONNAME4 +# define __C89_NAMELESSUNIONNAME5 +# define __C89_NAMELESSUNIONNAME6 +# define __C89_NAMELESSUNIONNAME7 +# define __C89_NAMELESSUNIONNAME8 #else # define __C89_NAMELESS # define __C89_NAMELESSSTRUCTNAME DUMMYSTRUCTNAME +# define __C89_NAMELESSSTRUCTNAME1 DUMMYSTRUCTNAME1 +# define __C89_NAMELESSSTRUCTNAME2 DUMMYSTRUCTNAME2 +# define __C89_NAMELESSSTRUCTNAME3 DUMMYSTRUCTNAME3 +# define __C89_NAMELESSSTRUCTNAME4 DUMMYSTRUCTNAME4 +# define __C89_NAMELESSSTRUCTNAME5 DUMMYSTRUCTNAME5 # define __C89_NAMELESSUNIONNAME DUMMYUNIONNAME +# define __C89_NAMELESSUNIONNAME1 DUMMYUNIONNAME1 +# define __C89_NAMELESSUNIONNAME2 DUMMYUNIONNAME2 +# define __C89_NAMELESSUNIONNAME3 DUMMYUNIONNAME3 +# define __C89_NAMELESSUNIONNAME4 DUMMYUNIONNAME4 +# define __C89_NAMELESSUNIONNAME5 DUMMYUNIONNAME5 +# define __C89_NAMELESSUNIONNAME6 DUMMYUNIONNAME6 +# define __C89_NAMELESSUNIONNAME7 DUMMYUNIONNAME7 +# define __C89_NAMELESSUNIONNAME8 DUMMYUNIONNAME8 #endif /* C99 restrict support */ diff --git a/tools/widl/header.c b/tools/widl/header.c index 06c6f1e..0b2b9d5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -167,21 +167,67 @@ const char *get_name(const var_t *v) return buffer; } -static void write_field(FILE *h, var_t *v) -{ - if (!v) return; - if (v->type) { - indent(h, 0); - write_type_def_or_decl(h, v->type, TRUE, v->name); - fprintf(h, ";\n"); - } -} - static void write_fields(FILE *h, var_list_t *fields) { + unsigned nameless_struct_cnt = 0, nameless_struct_i = 0, nameless_union_cnt = 0, nameless_union_i = 0; + const char *name; + char buf[32]; var_t *v; + if (!fields) return; - LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) write_field(h, v); + + LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { + if (!v || !v->type) continue; + + switch(type_get_type_detect_alias(v->type)) { + case TYPE_STRUCT: + case TYPE_ENCAPSULATED_UNION: + nameless_struct_cnt++; + break; + case TYPE_UNION: + nameless_union_cnt++; + break; + default: + ; + } + } + + LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { + if (!v || !v->type) continue; + + indent(h, 0); + name = v->name; + + switch(type_get_type_detect_alias(v->type)) { + case TYPE_STRUCT: + case TYPE_ENCAPSULATED_UNION: + if(!v->name) { + fprintf(h, "__C89_NAMELESS "); + if(nameless_struct_cnt == 1) { + name = "__C89_NAMELESSSTRUCTNAME"; + }else if(nameless_struct_i < 5 /* # of supporting macros */) { + sprintf(buf, "__C89_NAMELESSSTRUCTNAME%d", ++nameless_struct_i); + name = buf; + } + } + break; + case TYPE_UNION: + if(!v->name) { + fprintf(h, "__C89_NAMELESS "); + if(nameless_union_cnt == 1) { + name = "__C89_NAMELESSUNIONNAME"; + }else if(nameless_union_i < 8 /* # of supporting macros */ ) { + sprintf(buf, "__C89_NAMELESSUNIONNAME%d", ++nameless_union_i); + name = buf; + } + } + break; + default: + ; + } + write_type_def_or_decl(h, v->type, TRUE, name); + fprintf(h, ";\n"); + } } static void write_enums(FILE *h, var_list_t *enums) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index cd947e8..55b2df9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -740,6 +740,10 @@ s_field: m_attributes decl_spec declarator { $$ = declare_var(check_field_attrs $2, $3, FALSE); free($3); } + | m_attributes structdef { var_t *v = make_var(NULL); + v->type = $2; v->attrs = $1; + $$ = v; + } ; funcdef: declaration { $$ = $1;

1 0

Jacek Caban : include: Use widl to take care of nameless structs and unions .
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 942f2ce79261a69b87cb61336f885bb29d167e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942f2ce79261a69b87cb61336… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:14:07 2012 +0200 include: Use widl to take care of nameless structs and unions. --- dlls/devenum/createdevenum.c | 34 ++++++++++++------------ dlls/dxdiagn/provider.c | 8 +++--- dlls/quartz/filtermapper.c | 60 +++++++++++++++++++++--------------------- dlls/quartz/regsvr.c | 4 +- dlls/strmbase/dllfunc.c | 4 +- include/amvideo.idl | 2 +- include/axextend.idl | 6 ++-- include/d3d10.idl | 6 ++-- include/devicetopology.idl | 6 ++-- include/imnxport.idl | 4 +- include/propidl.idl | 2 +- 11 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=942f2ce79261a69b87cb6…

1 0

Jacek Caban : jscript: Added get_op_bstr helper.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 9a496ce10bf546fd56d3a2b38597953b95ba60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a496ce10bf546fd56d3a2b38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:01 2012 +0200 jscript: Added get_op_bstr helper. --- dlls/jscript/engine.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e15ef52..ccd07f7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -554,10 +554,14 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } +static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.bstr : ctx->code->instrs[ctx->ip].arg1.bstr; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { - const BSTR name = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR name = get_op_bstr(ctx, 0); VARIANT *v; HRESULT hres; @@ -730,7 +734,7 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) static HRESULT interp_push_except(exec_ctx_t *ctx) { const unsigned arg1 = ctx->code->instrs[ctx->ip].arg1.uint; - const BSTR arg2 = ctx->code->instrs[ctx->ip].arg2.bstr; + const BSTR arg2 = get_op_bstr(ctx, 1); except_frame_t *except; unsigned stack_top; @@ -863,7 +867,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_member(exec_ctx_t *ctx) { - const BSTR arg = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR arg = get_op_bstr(ctx, 0); IDispatch *obj; VARIANT v; DISPID id; @@ -1072,7 +1076,7 @@ static HRESULT interp_this(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_ident(exec_ctx_t *ctx) { - const BSTR arg = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR arg = get_op_bstr(ctx, 0); exprval_t exprval; VARIANT v; HRESULT hres; @@ -1097,7 +1101,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_identid(exec_ctx_t *ctx) { - const BSTR arg = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR arg = get_op_bstr(ctx, 0); const unsigned flags = ctx->code->instrs[ctx->ip].arg2.uint; exprval_t exprval; HRESULT hres; @@ -1259,7 +1263,7 @@ static HRESULT interp_new_obj(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.5 */ static HRESULT interp_obj_prop(exec_ctx_t *ctx) { - const BSTR name = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR name = get_op_bstr(ctx, 0); jsdisp_t *obj; VARIANT *v; HRESULT hres; @@ -1687,7 +1691,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.2 */ static HRESULT interp_delete_ident(exec_ctx_t *ctx) { - const BSTR arg = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR arg = get_op_bstr(ctx, 0); IDispatchEx *dispex; exprval_t exprval; BOOL ret = FALSE; @@ -1805,7 +1809,7 @@ static HRESULT interp_typeofid(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.3 */ static HRESULT interp_typeofident(exec_ctx_t *ctx) { - const BSTR arg = ctx->code->instrs[ctx->ip].arg1.bstr; + const BSTR arg = get_op_bstr(ctx, 0); exprval_t exprval; const WCHAR *ret; VARIANT v;

1 0

Jacek Caban : jscript: Added get_op_uint helper.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: bad9afb3a0805931f1630b9e5001eeee3396a2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad9afb3a0805931f1630b9e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:10 2012 +0200 jscript: Added get_op_uint helper. --- dlls/jscript/engine.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ccd07f7..40b1384 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -558,6 +558,10 @@ static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.bstr : ctx->code->instrs[ctx->ip].arg1.bstr; } +static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.uint : ctx->code->instrs[ctx->ip].arg1.uint; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -576,7 +580,7 @@ static HRESULT interp_var_set(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { - const HRESULT arg = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT arg = get_op_uint(ctx, 0); IDispatch *var_obj, *obj = NULL; IDispatchEx *dispex; DISPID id, var_id; @@ -680,7 +684,7 @@ static HRESULT interp_pop_scope(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_case(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT *v; BOOL b; HRESULT hres; @@ -713,7 +717,7 @@ static HRESULT interp_throw(exec_ctx_t *ctx) static HRESULT interp_throw_ref(exec_ctx_t *ctx) { - const HRESULT arg = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT arg = get_op_uint(ctx, 0); TRACE("%08x\n", arg); @@ -722,7 +726,7 @@ static HRESULT interp_throw_ref(exec_ctx_t *ctx) static HRESULT interp_throw_type(exec_ctx_t *ctx) { - const HRESULT hres = ctx->code->instrs[ctx->ip].arg1.uint; + const HRESULT hres = get_op_uint(ctx, 0); const WCHAR *str = ctx->code->instrs[ctx->ip].arg2.str; TRACE("%08x %s\n", hres, debugstr_w(str)); @@ -733,7 +737,7 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_push_except(exec_ctx_t *ctx) { - const unsigned arg1 = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg1 = get_op_uint(ctx, 0); const BSTR arg2 = get_op_bstr(ctx, 1); except_frame_t *except; unsigned stack_top; @@ -807,7 +811,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 13 */ static HRESULT interp_func(exec_ctx_t *ctx) { - unsigned func_idx = ctx->code->instrs[ctx->ip].arg1.uint; + unsigned func_idx = get_op_uint(ctx, 0); jsdisp_t *dispex; VARIANT v; HRESULT hres; @@ -1010,7 +1014,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.3 */ static HRESULT interp_call(exec_ctx_t *ctx) { - const unsigned argn = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned argn = get_op_uint(ctx, 0); const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; VARIANT v, *objv; DISPPARAMS dp; @@ -1036,7 +1040,7 @@ static HRESULT interp_call(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.3 */ static HRESULT interp_call_member(exec_ctx_t *ctx) { - const unsigned argn = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned argn = get_op_uint(ctx, 0); const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; IDispatch *obj; DISPPARAMS dp; @@ -1102,7 +1106,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) static HRESULT interp_identid(exec_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); - const unsigned flags = ctx->code->instrs[ctx->ip].arg2.uint; + const unsigned flags = get_op_uint(ctx, 1); exprval_t exprval; HRESULT hres; @@ -1216,7 +1220,7 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.4 */ static HRESULT interp_carray(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); jsdisp_t *array; VARIANT *v, r; unsigned i; @@ -1283,7 +1287,7 @@ static HRESULT interp_obj_prop(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.11 */ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; HRESULT hres; @@ -1305,7 +1309,7 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.11 */ static HRESULT interp_cnd_z(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; HRESULT hres; @@ -2387,7 +2391,7 @@ static HRESULT interp_assign(exec_ctx_t *ctx) /* JScript extension */ static HRESULT interp_assign_call(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); DISPID propput_dispid = DISPID_PROPERTYPUT; IDispatch *disp; DISPPARAMS dp; @@ -2425,9 +2429,9 @@ static HRESULT interp_undefined(exec_ctx_t *ctx) static HRESULT interp_jmp(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); - TRACE("\n"); + TRACE("%u\n", arg); ctx->ip = arg; return S_OK; @@ -2435,7 +2439,7 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_z(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.uint; + const unsigned arg = get_op_uint(ctx, 0); VARIANT_BOOL b; VARIANT *v; HRESULT hres;

1 0

Jacek Caban : jscript: Added get_op_int helper.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: efe744a8ba54dcd62111b09158dfd64b5347e68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe744a8ba54dcd62111b0915… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:20 2012 +0200 jscript: Added get_op_int helper. --- dlls/jscript/engine.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 40b1384..983787b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -562,6 +562,10 @@ static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.uint : ctx->code->instrs[ctx->ip].arg1.uint; } +static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.lng : ctx->code->instrs[ctx->ip].arg1.lng; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -901,7 +905,7 @@ static HRESULT interp_member(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_memberid(exec_ctx_t *ctx) { - const unsigned arg = ctx->code->instrs[ctx->ip].arg1.lng; + const unsigned arg = get_op_uint(ctx, 0); VARIANT *objv, *namev; IDispatch *obj; BSTR name; @@ -983,7 +987,7 @@ static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) /* ECMA-262 3rd Edition 11.2.2 */ static HRESULT interp_new(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const LONG arg = get_op_int(ctx, 0); VARIANT *constr, v; DISPPARAMS dp; HRESULT hres; @@ -1015,7 +1019,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_call(exec_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); - const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; + const int do_ret = get_op_int(ctx, 1); VARIANT v, *objv; DISPPARAMS dp; HRESULT hres; @@ -1041,7 +1045,7 @@ static HRESULT interp_call(exec_ctx_t *ctx) static HRESULT interp_call_member(exec_ctx_t *ctx) { const unsigned argn = get_op_uint(ctx, 0); - const int do_ret = ctx->code->instrs[ctx->ip].arg2.lng; + const int do_ret = get_op_int(ctx, 1); IDispatch *obj; DISPPARAMS dp; VARIANT v; @@ -1149,7 +1153,7 @@ static HRESULT interp_null(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.2 */ static HRESULT interp_bool(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); TRACE("%s\n", arg ? "true" : "false"); @@ -1159,7 +1163,7 @@ static HRESULT interp_bool(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.3 */ static HRESULT interp_int(exec_ctx_t *ctx) { - const LONG arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); VARIANT v; TRACE("%d\n", arg); @@ -1202,7 +1206,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; - const LONG flags = ctx->code->instrs[ctx->ip].arg2.lng; + const LONG flags = get_op_int(ctx, 1); jsdisp_t *regexp; VARIANT v; HRESULT hres; @@ -1898,7 +1902,7 @@ static HRESULT interp_tonum(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.3.1 */ static HRESULT interp_postinc(exec_ctx_t *ctx) { - const int arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); IDispatch *obj; DISPID id; VARIANT v; @@ -1933,7 +1937,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.4, 11.4.5 */ static HRESULT interp_preinc(exec_ctx_t *ctx) { - const int arg = ctx->code->instrs[ctx->ip].arg1.lng; + const int arg = get_op_int(ctx, 0); IDispatch *obj; DISPID id; VARIANT v;

1 0

Jacek Caban : jscipt: Make arg_cnt parameter of OP_new unsigned.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 0d5defafd413905866f80323be5340e0040fc539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5defafd413905866f80323b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:31 2012 +0200 jscipt: Make arg_cnt parameter of OP_new unsigned. --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index df3acb4..f965948 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -518,7 +518,7 @@ static HRESULT compile_new_expression(compiler_ctx_t *ctx, call_expression_t *ex arg_cnt++; } - return push_instr_int(ctx, OP_new, arg_cnt); + return push_instr_uint(ctx, OP_new, arg_cnt); } static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *expr, BOOL *no_ret) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 983787b..7d9b37a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -987,7 +987,7 @@ static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) /* ECMA-262 3rd Edition 11.2.2 */ static HRESULT interp_new(exec_ctx_t *ctx) { - const LONG arg = get_op_int(ctx, 0); + const unsigned arg = get_op_uint(ctx, 0); VARIANT *constr, v; DISPPARAMS dp; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a842a35..8c70783 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -78,7 +78,7 @@ typedef struct { X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ X(neq2, 1, 0,0) \ - X(new, 1, ARG_INT, 0) \ + X(new, 1, ARG_UINT, 0) \ X(new_obj, 1, 0,0) \ X(null, 1, 0,0) \ X(obj_prop, 1, ARG_BSTR, 0) \

1 0

Jacek Caban : jscript: Make flags parameter of OP_regexp unsigned.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: e273636d4d362986878c399886c8013952c471fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e273636d4d362986878c39988… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:44 2012 +0200 jscript: Make flags parameter of OP_regexp unsigned. --- dlls/jscript/compile.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f965948..bd11621 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -733,7 +733,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.str = str; - instr_ptr(ctx, instr)->arg2.lng = literal->u.regexp.flags; + instr_ptr(ctx, instr)->arg2.uint = literal->u.regexp.flags; return S_OK; } default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7d9b37a..bb42899 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1206,7 +1206,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) static HRESULT interp_regexp(exec_ctx_t *ctx) { const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; - const LONG flags = get_op_int(ctx, 1); + const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; VARIANT v; HRESULT hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8c70783..4a2c89e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -90,7 +90,7 @@ typedef struct { X(preinc, 1, ARG_INT, 0) \ X(push_except,1, ARG_ADDR, ARG_BSTR) \ X(push_scope, 1, 0,0) \ - X(regexp, 1, ARG_STR, ARG_INT) \ + X(regexp, 1, ARG_STR, ARG_UINT) \ X(rshift, 1, 0,0) \ X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \

1 0

Jacek Caban : jscript: Added get_op_str and get_op_double helpers.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 1acb30a52297e500244f2afd4698f817cf2ca854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acb30a52297e500244f2afd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:21:56 2012 +0200 jscript: Added get_op_str and get_op_double helpers. --- dlls/jscript/engine.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bb42899..fb5c39b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -566,6 +566,14 @@ static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ return i ? ctx->code->instrs[ctx->ip].arg2.lng : ctx->code->instrs[ctx->ip].arg1.lng; } +static inline const WCHAR *get_op_str(exec_ctx_t *ctx, int i){ + return i ? ctx->code->instrs[ctx->ip].arg2.str : ctx->code->instrs[ctx->ip].arg1.str; +} + +static inline double get_op_double(exec_ctx_t *ctx){ + return *ctx->code->instrs[ctx->ip].arg1.dbl; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -731,7 +739,7 @@ static HRESULT interp_throw_ref(exec_ctx_t *ctx) static HRESULT interp_throw_type(exec_ctx_t *ctx) { const HRESULT hres = get_op_uint(ctx, 0); - const WCHAR *str = ctx->code->instrs[ctx->ip].arg2.str; + const WCHAR *str = get_op_str(ctx, 1); TRACE("%08x %s\n", hres, debugstr_w(str)); @@ -1176,7 +1184,7 @@ static HRESULT interp_int(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.3 */ static HRESULT interp_double(exec_ctx_t *ctx) { - const double arg = *ctx->code->instrs[ctx->ip].arg1.dbl; + const double arg = get_op_double(ctx); VARIANT v; TRACE("%lf\n", arg); @@ -1189,7 +1197,7 @@ static HRESULT interp_double(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.4 */ static HRESULT interp_str(exec_ctx_t *ctx) { - const WCHAR *str = ctx->code->instrs[ctx->ip].arg1.str; + const WCHAR *str = get_op_str(ctx, 0); VARIANT v; TRACE("%s\n", debugstr_w(str)); @@ -1205,7 +1213,7 @@ static HRESULT interp_str(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8 */ static HRESULT interp_regexp(exec_ctx_t *ctx) { - const WCHAR *source = ctx->code->instrs[ctx->ip].arg1.str; + const WCHAR *source = get_op_str(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; VARIANT v;

1 0

Jacek Caban : jscript: Store double op arg directly instead of by pointer.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 35e663425dff635d3a0baf71ba9c6285cd25b78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e663425dff635d3a0baf71b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 12 16:22:37 2012 +0200 jscript: Store double op arg directly instead of by pointer. --- dlls/jscript/compile.c | 80 ++++++++++++++++++++++++------------------------ dlls/jscript/engine.c | 10 +++--- dlls/jscript/engine.h | 7 ++-- 3 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35e663425dff635d3a0ba…

1 0