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

Henri Verbeet : wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_device_uninit_3d().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 4e0394d7853245d9b8baac3d5494df4bc6d23f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0394d7853245d9b8baac3d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:02 2016 +0200 wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_device_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74a07ec..2215af8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1185,7 +1185,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } wine_rb_clear(&device->samplers, device_free_sampler, NULL);

1 0

Michael Stefaniuc : oleaut32/tests: Use todo_wine_if() instead of ifdef constructs.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 9d74567ad30d741073461904479c08579ad8e196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74567ad30d7410734619044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 00:06:16 2016 +0200 oleaut32/tests: Use todo_wine_if() instead of ifdef constructs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 90 ++++++++----------------------------------- 1 file changed, 15 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d74567ad30d741073461…

1 0

Michael Stefaniuc : dinput/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: a516c0aa382a322c40d07d425575e5239d88fd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a516c0aa382a322c40d07d425… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 15:59:27 2016 +0200 dinput/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 5ac55cf..a5f7c0c 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -123,12 +123,7 @@ static void test_preinitialization(void) enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags); - if (enum_devices_tests[i].todo) - { - todo_wine - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); - } - else + todo_wine_if(enum_devices_tests[i].todo) ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput_EnumDevice returned 0x%08x\n", i, hr); }

1 0

Michael Stefaniuc : dinput8/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 12f8274539f8674f83b65232afd6668a257ae4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f8274539f8674f83b65232a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 15:59:55 2016 +0200 dinput8/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/dinput.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index c3f80c6..0984767 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -99,12 +99,7 @@ static void test_preinitialization(void) enum_devices_tests[i].lpCallback, NULL, enum_devices_tests[i].dwFlags); - if (enum_devices_tests[i].todo) - { - todo_wine - ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr); - } - else + todo_wine_if(enum_devices_tests[i].todo) ok(hr == enum_devices_tests[i].expected_hr, "[%d] IDirectInput8_EnumDevice returned 0x%08x\n", i, hr); }

1 0

Michael Stefaniuc : gdi32/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 68f1df237a73559a4fdd6babae16706873f1dc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f1df237a73559a4fdd6baba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 5 16:00:51 2016 +0200 gdi32/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 373d2a1..96c4623 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2952,13 +2952,8 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(!efd.total, "no fonts should be enumerated for empty font_name\n"); for (i = 0; i < efd.total; i++) { -/* FIXME: remove completely once Wine is fixed */ -if (efd.lf[i].lfCharSet != font_charset) -{ -todo_wine - ok(efd.lf[i].lfCharSet == font_charset, "%d: got charset %d\n", i, efd.lf[i].lfCharSet); -} -else + /* FIXME: remove completely once Wine is fixed */ + todo_wine_if(efd.lf[i].lfCharSet != font_charset) ok(efd.lf[i].lfCharSet == font_charset, "%d: got charset %d\n", i, efd.lf[i].lfCharSet); ok(!strcmp(efd.lf[i].lfFaceName, font_name), "expected %s, got %s\n", font_name, efd.lf[i].lfFaceName);

1 0

Jacek Caban : jscript: Create scope in setup_scope.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 403fb41cd136d02f304dc3fc570f23f7cf2a953e URL: http://source.winehq.org/git/wine.git/?a=commit;h=403fb41cd136d02f304dc3fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:15:06 2016 +0200 jscript: Create scope in setup_scope. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 33 ++++++++++++++++++++------------- dlls/jscript/function.c | 12 +++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index afa2b4b..871017c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2775,9 +2775,10 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc, jsval_t *argv) +static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t *scope_chain, jsdisp_t *variable_object, unsigned argc, jsval_t *argv) { const unsigned orig_stack = ctx->stack_top; + scope_chain_t *scope; unsigned i; jsval_t v; HRESULT hres; @@ -2822,14 +2823,21 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc frame->pop_variables = i; + hres = scope_push(scope_chain, variable_object, to_disp(variable_object), &scope); + if(FAILED(hres)) { + stack_popn(ctx, ctx->stack_top - orig_stack); + return hres; + } + 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); + hres = create_source_function(ctx, frame->bytecode, frame->function->funcs+i, scope, &func_obj); if(FAILED(hres)) { stack_popn(ctx, ctx->stack_top - orig_stack); + scope_release(scope); return hres; } @@ -2839,7 +2847,8 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, unsigned argc } } - frame->base_scope->frame = frame; + scope->frame = frame; + frame->base_scope = frame->scope = scope; return S_OK; } @@ -2915,17 +2924,15 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->argc = argc; frame->bytecode = bytecode_addref(bytecode); - if(scope) { - frame->base_scope = frame->scope = scope_addref(scope); - - 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; - } + if(!(flags & (EXEC_GLOBAL|EXEC_EVAL))) { + hres = setup_scope(ctx, frame, scope, variable_obj, argc, argv); + if(FAILED(hres)) { + release_bytecode(frame->bytecode); + heap_free(frame); + return hres; } + }else if(scope) { + frame->base_scope = frame->scope = scope_addref(scope); } frame->ip = function->instr_off; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 704d2ef..03d5cad 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -233,7 +233,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis BOOL is_constructor, BOOL caller_execs_source, jsval_t *r) { jsdisp_t *var_disp; - scope_chain_t *scope; DWORD exec_flags = 0; HRESULT hres; @@ -251,19 +250,14 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis if(FAILED(hres)) return hres; - hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); - jsdisp_release(var_disp); - if(FAILED(hres)) - return hres; - if(caller_execs_source) exec_flags |= EXEC_RETURN_TO_INTERP; if(is_constructor) exec_flags |= EXEC_CONSTRUCTOR; - hres = exec_source(ctx, exec_flags, function->code, function->func_code, scope, this_obj, - &function->dispex, scope->jsobj, argc, argv, r); + hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, + &function->dispex, var_disp, argc, argv, r); - scope_release(scope); + jsdisp_release(var_disp); return hres; }

1 0

Jacek Caban : jscript: Don' t create arguments object in pop_call_frame if it wasn't already created.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 5088828f2a83c9f99719bea68ce3c14214cdc0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5088828f2a83c9f99719bea68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:15:13 2016 +0200 jscript: Don't create arguments object in pop_call_frame if it wasn't already created. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 871017c..f958204 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -562,7 +562,7 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) * Transfers local variables from stack to variable object. * It's slow, so we want to avoid it as much as possible. */ -static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) +static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BOOL from_release) { unsigned i; HRESULT hres; @@ -575,7 +575,7 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame) assert(frame == frame->base_scope->frame); assert(frame->variable_obj == frame->base_scope->jsobj); - if(!frame->arguments_obj) { + if(!from_release && !frame->arguments_obj) { hres = setup_arguments_object(ctx, frame); if(FAILED(hres)) return hres; @@ -648,7 +648,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } if(!strcmpW(identifier, argumentsW)) { - hres = detach_variable_object(ctx, scope->frame); + hres = detach_variable_object(ctx, scope->frame, FALSE); if(FAILED(hres)) return hres; } @@ -2605,7 +2605,7 @@ static void pop_call_frame(script_ctx_t *ctx) /* 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); + HRESULT hres = detach_variable_object(ctx, frame, TRUE); if(FAILED(hres)) ERR("Failed to detach variable object: %08x\n", hres); } @@ -2910,7 +2910,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } if(ctx->call_ctx && (flags & EXEC_EVAL)) { - hres = detach_variable_object(ctx, ctx->call_ctx); + hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) return hres; }

1 0

Jacek Caban : jscript/tests: Added more tests.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: afc63fd570e889594a331ff2d8eeafd758b9f17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc63fd570e889594a331ff2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 17:15:20 2016 +0200 jscript/tests: Added more tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4990826..c179265 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -269,6 +269,24 @@ testNoRes(); testRes() && testRes(); testNoRes(), testNoRes(); +(function() { + eval("var x=1;"); + ok(x === 1, "x = " + x); +})(); + +(function() { + var e = eval; + var r = e(1); + ok(r === 1, "r = " + r); + (function(x, a) { x(a); })(eval, "2"); +})(); + +(function(r) { + r = eval("1"); + ok(r === 1, "r = " + r); + (function(x, a) { x(a); })(eval, "2"); +})(); + tmp = (function(){ return testNoRes(), testRes();})(); var f1, f2; @@ -384,6 +402,20 @@ ok(typeof(obj2) === "object", "typeof(obj2) = " + typeof(obj2)); var obj3 = new Object; ok(typeof(obj3) === "object", "typeof(obj3) is not object"); +(function() { + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + function func() {} + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + func = 0; + ok(typeof(func) === "number", "typeof(func) = " + typeof(func)); +})(); + +(function(f) { + ok(typeof(f) === "function", "typeof(f) = " + typeof(f)); + function f() {}; + ok(typeof(f) === "function", "typeof(f) = " + typeof(f)); +})(1); + for(var iter in "test") ok(false, "unexpected forin call, test = " + iter); @@ -1286,6 +1318,38 @@ try { ok(false, "deleteTest not throwed exception?"); }catch(ex) {} +(function() { + var to_delete = 2; + var r = delete to_delete; + ok(r === false, "delete 1 returned " + r); + if(r) + return; + ok(to_delete === 2, "to_delete = " + to_delete); + + to_delete = new Object(); + r = delete to_delete; + ok(r === false, "delete 2 returned " + r); + ok(typeof(to_delete) === "object", "typeof(to_delete) = " + typeof(to_delete)); +})(); + +(function(to_delete) { + var r = delete to_delete; + ok(r === false, "delete 3 returned " + r); + ok(to_delete === 2, "to_delete = " + to_delete); + + to_delete = new Object(); + r = delete to_delete; + ok(r === false, "delete 4 returned " + r); + ok(typeof(to_delete) === "object", "typeof(to_delete) = " + typeof(to_delete)); +})(2); + +(function() { + with({to_delete: new Object()}) { + var r = delete to_delete; + ok(r === true, "delete returned " + r); + } +})(); + if (false) if (true) ok(false, "if evaluated"); @@ -1533,6 +1597,24 @@ tmp = (function() { })(); ok(tmp, "tmp = " + tmp); +(function() { + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); + with(new Object()) { + var x = false && function func() {}; + } + ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); +})(); + +(function() { + ok(x === undefined, "x = " + x); // x is declared, but never initialized + with({x: 1}) { + ok(x === 1, "x = " + x); + var x = 2; + ok(x === 2, "x = " + x); + } + ok(x === undefined, "x = " + x); +})(); + /* NoNewline rule parser tests */ while(true) { if(true) break

1 0

Matteo Bruni : d3dx11: Use debugstr_a() to trace a user-supplied string.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 285981e3efaaaa5e61e590657c4424e5184f709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=285981e3efaaaa5e61e590657… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:31 2016 +0200 d3dx11: Use debugstr_a() to trace a user-supplied string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index b5a6ded..2c17ffb 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -32,7 +32,7 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); if (pump)

1 0

Matteo Bruni : d3dx10: Use debugstr_a() to trace a user-supplied string.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: f110a82dd0dc29edb3ba1db25fd15c1da3f17945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f110a82dd0dc29edb3ba1db25… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:32 2016 +0200 d3dx10: Use debugstr_a() to trace a user-supplied string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 879e420..f70b0c1 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -34,7 +34,7 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); if (pump)

1 0