August 2016 - Wine-Commits - list.winehq.org

Piotr Caban : ucrtbase: Add __std_type_info_name implementation.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 2487168b758a8133b15dea5aab4801f2d1f381db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2487168b758a8133b15dea5aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:38 2016 +0200 ucrtbase: Add __std_type_info_name implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 49 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 1e16e5f..d8f4c52 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -47,7 +47,7 @@ @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 8e44969..ee27fc7 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1511,6 +1511,24 @@ typedef struct char mangled[1]; } type_info140; +typedef struct +{ + SLIST_ENTRY entry; + char name[1]; +} type_info_entry; + +static void* CDECL type_info_entry_malloc(MSVCRT_size_t size) +{ + type_info_entry *ret = MSVCRT_malloc(FIELD_OFFSET(type_info_entry, name) + size); + return ret->name; +} + +static void CDECL type_info_entry_free(void *ptr) +{ + ptr = (char*)ptr - FIELD_OFFSET(type_info_entry, name); + MSVCRT_free(ptr); +} + /****************************************************************** * __std_type_info_compare (UCRTBASE.@) */ @@ -1523,4 +1541,35 @@ int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r) TRACE("(%p %p) returning %d\n", l, r, ret); return ret; } + +/****************************************************************** + * __std_type_info_name (UCRTBASE.@) + */ +const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *header) +{ + if (!ti->name) + { + char* name = __unDName(0, ti->mangled + 1, 0, + type_info_entry_malloc, type_info_entry_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE); + if (name) + { + unsigned int len = strlen(name); + + while (len && name[--len] == ' ') + name[len] = '\0'; + + if (InterlockedCompareExchangePointer((void**)&ti->name, name, NULL)) + { + type_info_entry_free(name); + } + else + { + type_info_entry *entry = (type_info_entry*)(name-FIELD_OFFSET(type_info_entry, name)); + InterlockedPushEntrySList(header, &entry->entry); + } + } + } + TRACE("(%p) returning %s\n", ti, ti->name); + return ti->name; +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 95fcc05..d1c1553 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -145,7 +145,7 @@ @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p @ stub __stdio_common_vfprintf_s diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index a8dc379..525a998 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -42,7 +42,7 @@ @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash -@ stub __std_type_info_name +@ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __telemetry_main_invoke_trigger(ptr) @ cdecl __telemetry_main_return_trigger(ptr) @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName

1 0

Jacek Caban : jscript: Store local functions in locals map.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 713051d027cd554cdc3a3ead077245b1ac3ca514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=713051d027cd554cdc3a3ead0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:46 2016 +0200 jscript: Store local functions in locals map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 74 +++++++++++++++++++++++++++--------------------- dlls/jscript/engine.c | 15 ++++++++-- dlls/jscript/engine.h | 8 +++++- dlls/jscript/function.c | 2 +- dlls/jscript/tests/run.c | 2 ++ 5 files changed, 64 insertions(+), 37 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4dea4c7..e911373 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1825,10 +1825,12 @@ static BOOL alloc_variable(compiler_ctx_t *ctx, const WCHAR *name) return alloc_local(ctx, ident, ctx->func->var_cnt++); } -static void visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +static BOOL visit_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) { expr->func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); + + return !expr->identifier || expr->event_target || alloc_variable(ctx, expr->identifier); } static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) @@ -2234,6 +2236,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(func_expr) { parameter_t *param_iter; + if(func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + + if(func_expr->event_target) { + func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); + if(!func->event_target) + return E_OUTOFMEMORY; + } + func->source = func_expr->src_str; func->source_len = func_expr->src_len; @@ -2260,36 +2274,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - off = ctx->code_off; - hres = compile_block_statement(ctx, source->statement); - if(FAILED(hres)) - return hres; - - resolve_labels(ctx, off); - - hres = push_instr_uint(ctx, OP_ret, !from_eval); - if(FAILED(hres)) - return hres; - - if(TRACE_ON(jscript_disas)) - dump_code(ctx, off); - - func->instr_off = off; - - if(func_expr) { - if(func_expr->identifier) { - func->name = compiler_alloc_bstr(ctx, func_expr->identifier); - if(!func->name) - return E_OUTOFMEMORY; - } - - if(func_expr->event_target) { - func->event_target = compiler_alloc_bstr(ctx, func_expr->event_target); - if(!func->event_target) - return E_OUTOFMEMORY; - } - } - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); if(!func->locals) return E_OUTOFMEMORY; @@ -2303,7 +2287,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, for(i = 0, j = 0; i < func->locals_cnt; i++) { if(func->locals[i].ref < 0) continue; /* skip arguments */ - func->variables[func->locals[i].ref] = func->locals[i].name; + func->variables[func->locals[i].ref].name = func->locals[i].name; + func->variables[func->locals[i].ref].func_id = -1; j++; } @@ -2314,10 +2299,35 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; memset(func->funcs, 0, func->func_cnt * sizeof(*func->funcs)); + off = ctx->code_off; + hres = compile_block_statement(ctx, source->statement); + if(FAILED(hres)) + return hres; + + resolve_labels(ctx, off); + + hres = push_instr_uint(ctx, OP_ret, !from_eval); + if(FAILED(hres)) + return hres; + + if(TRACE_ON(jscript_disas)) + dump_code(ctx, off); + + func->instr_off = off; + for(iter = ctx->func_head, i=0; iter; iter = iter->next, i++) { hres = compile_function(ctx, iter->source_elements, iter, FALSE, func->funcs+i); if(FAILED(hres)) return hres; + + TRACE("[%d] func %s\n", i, debugstr_w(func->funcs[i].name)); + if(func->funcs[i].name && !func->funcs[i].event_target) { + local_ref_t *local_ref = lookup_local(func, func->funcs[i].name); + func->funcs[i].local_ref = local_ref->ref; + TRACE("found ref %s %d for %s\n", debugstr_w(local_ref->name), local_ref->ref, debugstr_w(func->funcs[i].name)); + if(local_ref->ref >= 0) + func->variables[local_ref->ref].func_id = i; + } } assert(i == func->func_cnt); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7861b77..bc8eb5b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -600,6 +600,11 @@ static int local_ref_cmp(const void *key, const void *ref) return strcmpW((const WCHAR*)key, ((const local_ref_t*)ref)->name); } +local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) +{ + return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) { @@ -614,7 +619,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { function_code_t *func = scope->frame->function; - local_ref_t *ref = bsearch(identifier, func->locals, func->locals_cnt, sizeof(*func->locals), local_ref_cmp); + local_ref_t *ref = lookup_local(func, identifier); static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; if(ref && ref->ref < 0) { @@ -2779,10 +2784,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } for(i=0; i < function->var_cnt; i++) { - if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i], NULL)) { + TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); + if(function->variables[i].func_id != -1) + continue; + + if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { DISPID id = 0; - hres = jsdisp_get_id(variable_obj, function->variables[i], fdexNameEnsure, &id); + hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 81be179..0434ff1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -133,6 +133,7 @@ typedef struct { typedef struct _function_code_t { BSTR name; + int local_ref; BSTR event_target; unsigned instr_off; @@ -143,7 +144,10 @@ typedef struct _function_code_t { struct _function_code_t *funcs; unsigned var_cnt; - BSTR *variables; + struct { + BSTR name; + int func_id; /* -1 if not a function */ + } *variables; unsigned param_cnt; BSTR *params; @@ -152,6 +156,8 @@ typedef struct _function_code_t { local_ref_t *locals; } function_code_t; +local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; + typedef struct _bytecode_t { LONG ref; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2475908..704d2ef 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -813,7 +813,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg if(FAILED(hres)) return hres; - if(code->global_code.func_cnt != 1 || code->global_code.var_cnt) { + if(code->global_code.func_cnt != 1 || code->global_code.var_cnt != 1) { ERR("Invalid parser result!\n"); release_bytecode(code); return E_UNEXPECTED; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 0101f15..ff6edce 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2530,6 +2530,8 @@ static BOOL run_tests(void) parse_script_a("eval('var testPropGet;');"); CHECK_CALLED(global_propget_d); + parse_script_a("var testPropGet; function testPropGet() {}"); + SET_EXPECT(global_notexists_d); parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d);

1 0

Jacek Caban : jscript: Use locals map for local variables.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 2e06686ef9f9c95caacd3119abc06c6c211fd776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e06686ef9f9c95caacd3119a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:39:36 2016 +0200 jscript: Use locals map for local variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 395 +++++++++++++++++++++++++++++++++++++++++++++---- dlls/jscript/engine.c | 2 +- dlls/jscript/parser.h | 1 + 3 files changed, 366 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e06686ef9f9c95caacd3…

1 0

Sebastian Lackner : xaudio2_7: Only declare debug channel when needed.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 2fc672098850d22fd08d61e0340e4f9ef2504ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc672098850d22fd08d61e03… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 31 20:01:04 2016 +0200 xaudio2_7: Only declare debug channel when needed. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 2 ++ dlls/xaudio2_7/x3daudio.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 516d6c2..b9e720f 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -101,7 +101,9 @@ #include "wine/debug.h" +#if XAUDIO2_VER <= 7 WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index a182852..58f7062 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -23,7 +23,9 @@ #include "wine/debug.h" +#if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif #ifdef X3DAUDIO1_VER BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_swapchain_rotate().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 42b90efdfd8d2f019d9e85f9829d6bc2097359cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b90efdfd8d2f019d9e85f98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:57 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_swapchain_rotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0543d77..13106bf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -460,7 +460,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct sub_resource = &texture->sub_resources[0]; if (!(sub_resource->locations & supported_locations)) - surface_load_location(sub_resource->u.surface, context, texture->resource.draw_binding); + wined3d_texture_load_location(texture, 0, context, texture->resource.draw_binding); texture_prev->texture_rgb = texture->texture_rgb; texture_prev->rb_multisample = texture->rb_multisample;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in swapchain_blit().
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 3e6494321e4c9b6a0f4000077f23da7299025ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6494321e4c9b6a0f4000077… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 12:06:56 2016 +0200 wined3d: Use wined3d_texture_load_location() in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e3d6259..0543d77 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -330,7 +330,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, if (texture->resource.multisample_type) { location = WINED3D_LOCATION_RB_RESOLVED; - surface_load_location(back_buffer, context, location); + wined3d_texture_load_location(texture, 0, context, location); } context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, back_buffer, NULL, location);

1 0

Jacek Caban : jscript: Replaced OP_ident with static binding when possible.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 983bbab5315b55d15dd3473e3ecd1db9d8dca8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=983bbab5315b55d15dd3473e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:44 2016 +0200 jscript: Replaced OP_ident with static binding when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 10 +++++++++- dlls/jscript/engine.c | 51 +++++++++++++++++++++++++++++++++++++------------- dlls/jscript/engine.h | 1 + 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index d894b98..a1b2207 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -434,6 +434,14 @@ static HRESULT emit_identifier_ref(compiler_ctx_t *ctx, const WCHAR *identifier, return push_instr_bstr_uint(ctx, OP_identid, identifier, flags); } +static HRESULT emit_identifier(compiler_ctx_t *ctx, const WCHAR *identifier) +{ + int local_ref; + if(bind_local(ctx, identifier, &local_ref)) + return push_instr_int(ctx, OP_local, local_ref); + return push_instr_bstr(ctx, OP_ident, identifier); +} + static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *expr, unsigned flags) { HRESULT hres = S_OK; @@ -994,7 +1002,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); break; case EXPR_IDENT: - hres = push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); + hres = emit_identifier(ctx, ((identifier_expression_t*)expr)->identifier); break; case EXPR_IN: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2f74d8a..afa2b4b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1225,6 +1225,26 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return stack_push_exprval(ctx, &exprval); } +static HRESULT identifier_value(script_ctx_t *ctx, BSTR identifier) +{ + exprval_t exprval; + jsval_t v; + HRESULT hres; + + hres = identifier_eval(ctx, identifier, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type == EXPRVAL_INVALID) + return throw_type_error(ctx, exprval.u.hres, identifier); + + hres = exprval_to_value(ctx, &exprval, &v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, v); +} + static HRESULT interp_local_ref(script_ctx_t *ctx) { const int arg = get_op_int(ctx, 0); @@ -1242,28 +1262,33 @@ static HRESULT interp_local_ref(script_ctx_t *ctx) return stack_push_exprval(ctx, &ref); } -/* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT interp_ident(script_ctx_t *ctx) +static HRESULT interp_local(script_ctx_t *ctx) { - const BSTR arg = get_op_bstr(ctx, 0); - exprval_t exprval; - jsval_t v; + const int arg = get_op_int(ctx, 0); + call_frame_t *frame = ctx->call_ctx; + jsval_t copy; HRESULT hres; - TRACE("%s\n", debugstr_w(arg)); + TRACE("%d\n", arg); - hres = identifier_eval(ctx, arg, &exprval); + if(!frame->base_scope || !frame->base_scope->frame) + return identifier_value(ctx, local_name(frame, arg)); + + hres = jsval_copy(ctx->stack[local_off(frame, arg)], &copy); if(FAILED(hres)) return hres; - if(exprval.type == EXPRVAL_INVALID) - return throw_type_error(ctx, exprval.u.hres, arg); + return stack_push(ctx, copy); +} - hres = exprval_to_value(ctx, &exprval, &v); - if(FAILED(hres)) - return hres; +/* ECMA-262 3rd Edition 10.1.4 */ +static HRESULT interp_ident(script_ctx_t *ctx) +{ + const BSTR arg = get_op_bstr(ctx, 0); - return stack_push(ctx, v); + TRACE("%s\n", debugstr_w(arg)); + + return identifier_value(ctx, arg); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f515bef..3ac8169 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -48,6 +48,7 @@ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(local, 1, ARG_INT, 0) \ X(local_ref, 1, ARG_INT, ARG_UINT) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \

1 0

Jacek Caban : jscript: Replaced OP_identid with static binding when possible.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 04617ddf2182d863cda62bb5834675bf84ebf907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04617ddf2182d863cda62bb58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:37 2016 +0200 jscript: Replaced OP_identid with static binding when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 32 ++++++++++++++++-- dlls/jscript/engine.c | 88 +++++++++++++++++++++++++++++++++----------------- dlls/jscript/engine.h | 1 + 3 files changed, 88 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0087459..d894b98 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -408,6 +408,32 @@ static inline BOOL is_memberid_expr(expression_type_t type) return type == EXPR_IDENT || type == EXPR_MEMBER || type == EXPR_ARRAY; } +static BOOL bind_local(compiler_ctx_t *ctx, const WCHAR *identifier, int *ret_ref) +{ + statement_ctx_t *iter; + local_ref_t *ref; + + for(iter = ctx->stat_ctx; iter; iter = iter->next) { + if(iter->using_scope) + return FALSE; + } + + ref = lookup_local(ctx->func, identifier); + if(!ref) + return FALSE; + + *ret_ref = ref->ref; + return TRUE; +} + +static HRESULT emit_identifier_ref(compiler_ctx_t *ctx, const WCHAR *identifier, unsigned flags) +{ + int local_ref; + if(bind_local(ctx, identifier, &local_ref)) + return push_instr_int(ctx, OP_local_ref, local_ref); + return push_instr_bstr_uint(ctx, OP_identid, identifier, flags); +} + static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *expr, unsigned flags) { HRESULT hres = S_OK; @@ -416,7 +442,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex case EXPR_IDENT: { identifier_expression_t *ident_expr = (identifier_expression_t*)expr; - hres = push_instr_bstr_uint(ctx, OP_identid, ident_expr->identifier, flags); + hres = emit_identifier_ref(ctx, ident_expr->identifier, flags); break; } case EXPR_ARRAY: { @@ -1095,7 +1121,7 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; - hres = push_instr_bstr_uint(ctx, OP_identid, iter->identifier, 0); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; @@ -1304,7 +1330,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return hres; if(stat->variable) { - hres = push_instr_bstr_uint(ctx, OP_identid, stat->variable->identifier, fdexNameEnsure); + hres = emit_identifier_ref(ctx, stat->variable->identifier, fdexNameEnsure); if(FAILED(hres)) return hres; }else if(is_memberid_expr(stat->expr->type)) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 642705a..2f74d8a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -175,6 +175,18 @@ static inline HRESULT stack_pop_uint(script_ctx_t *ctx, DWORD *r) return to_uint32(ctx, stack_pop(ctx), r); } +static inline unsigned local_off(call_frame_t *frame, int ref) +{ + return ref < 0 + ? frame->arguments_off - ref-1 + : frame->variables_off + ref; +} + +static inline BSTR local_name(call_frame_t *frame, int ref) +{ + return ref < 0 ? frame->function->params[-ref-1] : frame->function->variables[ref].name; +} + /* Steals input reference even on failure. */ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) { @@ -546,13 +558,6 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) return S_OK; } -static inline unsigned local_off(call_frame_t *frame, int ref) -{ - return ref < 0 - ? frame->arguments_off - ref-1 - : frame->variables_off + ref; -} - /* * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. @@ -1192,6 +1197,51 @@ static HRESULT interp_this(script_ctx_t *ctx) return stack_push(ctx, jsval_disp(frame->this_obj)); } +static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigned flags) +{ + exprval_t exprval; + HRESULT hres; + + hres = identifier_eval(ctx, identifier, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + DISPID id; + + hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + + exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + } + + if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { + WARN("invalid ref\n"); + exprval_release(&exprval); + exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED); + } + + return stack_push_exprval(ctx, &exprval); +} + +static HRESULT interp_local_ref(script_ctx_t *ctx) +{ + const int arg = get_op_int(ctx, 0); + const unsigned flags = get_op_uint(ctx, 1); + call_frame_t *frame = ctx->call_ctx; + exprval_t ref; + + TRACE("%d\n", arg); + + if(!frame->base_scope || !frame->base_scope->frame) + return interp_identifier_ref(ctx, local_name(frame, arg), flags); + + ref.type = EXPRVAL_STACK_REF; + ref.u.off = local_off(frame, arg); + return stack_push_exprval(ctx, &ref); +} + /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_ident(script_ctx_t *ctx) { @@ -1221,32 +1271,10 @@ static HRESULT interp_identid(script_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); - exprval_t exprval; - HRESULT hres; TRACE("%s %x\n", debugstr_w(arg), flags); - hres = identifier_eval(ctx, arg, &exprval); - if(FAILED(hres)) - return hres; - - if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { - DISPID id; - - hres = jsdisp_get_id(ctx->global, arg, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; - - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); - } - - if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { - WARN("invalid ref\n"); - exprval_release(&exprval); - exprval_set_exception(&exprval, JS_E_OBJECT_EXPECTED); - } - - return stack_push_exprval(ctx, &exprval); + return interp_identifier_ref(ctx, arg, flags); } /* ECMA-262 3rd Edition 7.8.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b18b775..f515bef 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -48,6 +48,7 @@ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(local_ref, 1, ARG_INT, ARG_UINT) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \

1 0

Jacek Caban : jscript: Store variables on the stack if possible.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 765a52e86a65a1c0604b9ef985772195dbe5f67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=765a52e86a65a1c0604b9ef98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 4 13:40:11 2016 +0200 jscript: Store variables on the stack if possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 114 +++++++++++++++++++++++++++++++++++++------------- dlls/jscript/engine.h | 2 + 2 files changed, 86 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2305998..642705a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -217,11 +217,16 @@ static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) if(!frame->base_scope->frame && off >= frame->arguments_off) { DISPID id; + BSTR name; HRESULT hres; /* Got stack reference in deoptimized code. Need to convert it back to variable object reference. */ - hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, frame->function->params[off - frame->arguments_off], 0, &id); + assert(off < frame->variables_off + frame->function->var_cnt); + name = off >= frame->variables_off + ? frame->function->variables[off - frame->variables_off].name + : frame->function->params[off - frame->arguments_off]; + hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, name, 0, &id); if(FAILED(hres)) { r->type = EXPRVAL_INVALID; r->u.hres = hres; @@ -541,6 +546,13 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) return S_OK; } +static inline unsigned local_off(call_frame_t *frame, int ref) +{ + return ref < 0 + ? frame->arguments_off - ref-1 + : frame->variables_off + ref; +} + /* * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. @@ -566,8 +578,9 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->param_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->params[i], ctx->stack[frame->arguments_off+i]); + for(i = 0; i < frame->function->locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, + ctx->stack[local_off(frame, frame->function->locals[i].ref)]); if(FAILED(hres)) return hres; } @@ -622,9 +635,10 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re local_ref_t *ref = lookup_local(func, identifier); static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; - if(ref && ref->ref < 0) { + if(ref) { ret->type = EXPRVAL_STACK_REF; - ret->u.off = scope->frame->arguments_off - ref->ref - 1; + ret->u.off = local_off(scope->frame, ref->ref); + TRACE("returning ref %d for %d\n", ret->u.off, ref->ref); return S_OK; } @@ -2532,20 +2546,24 @@ static void pop_call_frame(script_ctx_t *ctx) { call_frame_t *frame = ctx->call_ctx; + frame->stack_base -= frame->pop_locals + frame->pop_variables; + + assert(frame->scope == frame->base_scope); + + /* If current scope will be kept alive, we need to transfer local variables to its variable object. */ + if(frame->scope && frame->scope->ref > 1) { + HRESULT hres = detach_variable_object(ctx, frame); + if(FAILED(hres)) + ERR("Failed to detach variable object: %08x\n", hres); + } + if(frame->arguments_obj) detach_arguments_object(frame->arguments_obj); - - if(frame->scope) { - /* If current scope will be kept alive, we need to transfer local variables to its variable object. */ - if(frame->scope->ref > 1) { - HRESULT hres = detach_variable_object(ctx, frame); - if(FAILED(hres)) - ERR("Failed to detach variable object: %08x\n", hres); - } + if(frame->scope) scope_release(frame->scope); - } - frame->stack_base -= frame->pop_locals; + if(frame->pop_variables) + stack_popn(ctx, frame->pop_variables); stack_popn(ctx, frame->pop_locals); ctx->call_ctx = frame->prev_frame; @@ -2738,6 +2756,36 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc } frame->pop_locals = ctx->stack_top - orig_stack; + + frame->variables_off = ctx->stack_top; + + for(i = 0; i < frame->function->var_cnt; i++) { + hres = stack_push(ctx, jsval_undefined()); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + } + + frame->pop_variables = i; + + for(i = 0; i < frame->function->func_cnt; i++) { + if(frame->function->funcs[i].name && !frame->function->funcs[i].event_target) { + jsdisp_t *func_obj; + unsigned off; + + hres = create_source_function(ctx, frame->bytecode, frame->function->funcs+i, frame->base_scope, &func_obj); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + + off = local_off(frame, frame->function->funcs[i].local_ref); + jsval_release(ctx->stack[off]); + ctx->stack[off] = jsval_obj(func_obj); + } + } + frame->base_scope->frame = frame; return S_OK; } @@ -2752,33 +2800,38 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi for(i = 0; i < function->func_cnt; i++) { jsdisp_t *func_obj; - if(!function->funcs[i].name) + if(!function->funcs[i].event_target) continue; hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); if(FAILED(hres)) return hres; - if(function->funcs[i].event_target) - hres = bind_event_target(ctx, function->funcs+i, func_obj); - else - hres = jsdisp_propput_name(variable_obj, function->funcs[i].name, jsval_obj(func_obj)); + hres = bind_event_target(ctx, function->funcs+i, func_obj); jsdisp_release(func_obj); if(FAILED(hres)) return hres; } - for(i=0; i < function->var_cnt; i++) { - TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); - if(function->variables[i].func_id != -1) - continue; + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + for(i=0; i < function->var_cnt; i++) { + TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); + if(function->variables[i].func_id != -1) { + jsdisp_t *func_obj; - if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { - DISPID id = 0; + hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); + if(FAILED(hres)) + return hres; - hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); - if(FAILED(hres)) - return hres; + hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); + jsdisp_release(func_obj); + }else if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { + DISPID id = 0; + + hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + } } } @@ -2807,6 +2860,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function = function; frame->ret = jsval_undefined(); frame->argc = argc; + frame->bytecode = bytecode_addref(bytecode); if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -2814,13 +2868,13 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { hres = setup_scope(ctx, frame, argc, argv); if(FAILED(hres)) { + release_bytecode(frame->bytecode); heap_free(frame); return hres; } } } - frame->bytecode = bytecode_addref(bytecode); frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; if(this_obj) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2aaf831..b18b775 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -225,6 +225,8 @@ typedef struct _call_frame_t { unsigned argc; unsigned pop_locals; unsigned arguments_off; + unsigned variables_off; + unsigned pop_variables; bytecode_t *bytecode; function_code_t *function;

1 0

Bernhard Übelacker : wininet/tests: Fix pathLen given to InternetCrackUrlA.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 0fcecad8d84a6fbe0c16b786a9b639c3530cf272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fcecad8d84a6fbe0c16b786a… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Aug 2 23:29:20 2016 +0200 wininet/tests: Fix pathLen given to InternetCrackUrlA. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/url.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 7b1fd72..0af5835 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -534,26 +534,26 @@ static void InternetCrackUrl_test(void) * The last two (path and extrainfo) are the same for all versions * of the wininet.dll. */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); firstret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); firstGLE = GetLastError(); - copy_compsA(&urlSrc, &urlComponents, 32, 0, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 0, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", ret, GLE, firstret); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 0, 1024, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); ok(ret==firstret && (GLE==firstGLE), "InternetCrackUrl returned %d with GLE=%d (expected to return %d)\n", ret, GLE, firstret); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 0, 1024, 1024); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); @@ -569,7 +569,7 @@ static void InternetCrackUrl_test(void) "InternetCrackUrl returned %d with GLE=%d (expected to return 0 and ERROR_INVALID_HANDLE or ERROR_INSUFFICIENT_BUFFER)\n", ret, GLE); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 0); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 0); SetLastError(0xdeadbeef); ret = InternetCrackUrlA(TEST_URL3, 0, ICU_DECODE, &urlComponents); GLE = GetLastError(); @@ -586,7 +586,7 @@ static void InternetCrackUrl_test(void) "InternetCrackUrl returned %d with GLE=%d (expected to return 0 and ERROR_INVALID_PARAMETER)\n", ret, GLE); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA("about://host/blank", 0,0,&urlComponents); ok(ret, "InternetCrackUrl failed with %d\n", GetLastError()); ok(!strcmp(urlComponents.lpszScheme, "about"), "lpszScheme was \"%s\" instead of \"about\"\n", urlComponents.lpszScheme); @@ -595,7 +595,7 @@ static void InternetCrackUrl_test(void) /* try a NULL lpszUrl */ SetLastError(0xdeadbeef); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA(NULL, 0, 0, &urlComponents); GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); @@ -605,7 +605,7 @@ static void InternetCrackUrl_test(void) * we just need to fail and not return success */ SetLastError(0xdeadbeef); - copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); ret = InternetCrackUrlA("", 0, 0, &urlComponents); GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); @@ -613,7 +613,7 @@ static void InternetCrackUrl_test(void) /* Invalid Call: must set size of components structure (Windows only * enforces this on the InternetCrackUrlA version of the call) */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); urlComponents.dwStructSize = 0; ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); @@ -624,7 +624,7 @@ static void InternetCrackUrl_test(void) /* Invalid Call: size of dwStructSize must be one of the "standard" sizes * of the URL_COMPONENTS structure (Windows only enforces this on the * InternetCrackUrlA version of the call) */ - copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 1024, 1024); SetLastError(0xdeadbeef); urlComponents.dwStructSize = sizeof(urlComponents) + 1; ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents);

1 0