June 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Move 'delete' syntax tests into a separate function.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 7c9f372480511cba8abd90ed04480911d96036de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9f372480511cba8abd90ed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 18 22:31:58 2021 +1000 reg/tests: Move 'delete' syntax tests into a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 22c5e867461..251a15f3371 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -19,11 +19,9 @@ #include "reg_test.h" -static void test_delete(void) +static void test_command_syntax(void) { - HKEY hkey; DWORD r; - const DWORD deadbeef = 0xdeadbeef; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); @@ -68,6 +66,16 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +static void test_delete(void) +{ + HKEY hkey; + DWORD r; + const DWORD deadbeef = 0xdeadbeef; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -142,5 +150,6 @@ START_TEST(delete) return; } + test_command_syntax(); test_delete(); }

1 0

Paul Gofman : jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 2a368c45ae928f14dc9d8a74f15aad33362359e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a368c45ae928f14dc9d8a74… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:16 2021 +0300 jscript: Factor local_ref_scopes_t structure out of function_code_t. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 14 +++++++++----- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/engine.h | 9 +++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2a17639641f..46efd53cdb5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2379,10 +2379,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); - if(!func->locals) + func->local_scope_count = 1; + func->local_scopes = compiler_alloc(ctx->code, func->local_scope_count * sizeof(*func->local_scopes)); + if(!func->local_scopes) return E_OUTOFMEMORY; - func->locals_cnt = ctx->locals_cnt; + func->local_scopes[0].locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->local_scopes[0].locals)); + if(!func->local_scopes[0].locals) + return E_OUTOFMEMORY; + func->local_scopes[0].locals_cnt = ctx->locals_cnt; func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) @@ -2390,8 +2394,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, i = 0; WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { - func->locals[i].name = local->name; - func->locals[i].ref = local->ref; + func->local_scopes[0].locals[i].name = local->name; + func->local_scopes[0].locals[i].ref = local->ref; if(local->ref >= 0) { func->variables[local->ref].name = local->name; func->variables[local->ref].func_id = -1; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e0a6e10e98b..c6ca3a9c10d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -578,13 +578,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BO frame->base_scope->frame = NULL; - 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)]); + for(i = 0; i < frame->function->local_scopes[0].locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->local_scopes[0].locals[i].name, + ctx->stack[local_off(frame, frame->function->local_scopes[0].locals[i].ref)]); if(FAILED(hres)) return hres; } - return S_OK; } @@ -630,7 +629,8 @@ static int __cdecl local_ref_cmp(const void *key, const void *ref) 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); + return bsearch(identifier, function->local_scopes[0].locals, function->local_scopes[0].locals_cnt, + sizeof(*function->local_scopes[0].locals), local_ref_cmp); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 442e7334c41..a94f1f211e4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -147,6 +147,11 @@ typedef struct { #define INVALID_LOCAL_REF 0x7fffffff +typedef struct { + unsigned locals_cnt; + local_ref_t *locals; +} local_ref_scopes_t; + typedef struct _function_code_t { BSTR name; int local_ref; @@ -168,8 +173,8 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; - unsigned locals_cnt; - local_ref_t *locals; + local_ref_scopes_t *local_scopes; + unsigned local_scope_count; bytecode_t *bytecode; } function_code_t;

1 0

Paul Gofman : jscript: Enumerate with and block scopes.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: a35901137e3f9626f0d78472977466e8f9cdc2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35901137e3f9626f0d78472… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:17 2021 +0300 jscript: Enumerate with and block scopes. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 136 ++++++++++++++++++++++++++++++++++++++++--------- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + 3 files changed, 113 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a35901137e3f9626f0d7…

1 0

Paul Gofman : jscript: Support block scope variables.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 308c8468b4326d989fe4a064740143af140336a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308c8468b4326d989fe4a064… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:18 2021 +0300 jscript: Support block scope variables. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 104 ++++++++++++++++---------- dlls/jscript/engine.c | 182 ++++++++++++++++++++++++++++++++++++++------- dlls/jscript/engine.h | 6 +- dlls/jscript/tests/lang.js | 16 ++++ dlls/mshtml/tests/es5.js | 48 +++++++++++- 5 files changed, 285 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308c8468b4326d989fe4…

1 0

Paul Gofman : jscript: Support nested scopes for functions defined inside.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: e73cf60a746ef7d79ff3feb2f201acce87849cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73cf60a746ef7d79ff3feb2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:19 2021 +0300 jscript: Support nested scopes for functions defined inside. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 39 +++++++++++++++++++++++++++++---- dlls/jscript/engine.c | 56 ++++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 1 + dlls/mshtml/tests/es5.js | 49 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 133 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e73cf60a746ef7d79ff3…

1 0

Paul Gofman : mshtml/tests: Add test for multiple JS scope instances.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: bb12dbb892ee7a616038d77ac670ddb044133195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb12dbb892ee7a616038d77a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:20 2021 +0300 mshtml/tests: Add test for multiple JS scope instances. Based on a patch by Jacek Caban. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 2fb115556e5..dd6ea76c77a 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1319,3 +1319,25 @@ sync_test("declaration_let", function() { ok(a == 3, "a != 3"); }); + +sync_test("let scope instances", function() { + var a = [], i; + for(i = 0; i < 3; i++) { + a[i] = function() { return v; }; + let v = i; + } + for(i = 0; i < 3; i++) + ok(a[i]() == i, "a[" + i + "]() = " + a[i]()); + + ok(typeof f == 'undefined', "f is defined"); + + for(i = 0; i < 3; i++) { + function f() { return v; } + a[i] = f; + let v = i; + } + for(i = 0; i < 3; i++) + ok(a[i]() == i, "a[" + i + "]() = " + a[i]()); + + ok(f() == 2, "f() = " + f()); +});

1 0

Paul Gofman : mshtml/tests: Add a test for JS functions scope.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 9c818c96e457632c54de463c458145710649717e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c818c96e457632c54de463c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:21 2021 +0300 mshtml/tests: Add a test for JS functions scope. Based on a patch by Jacek Caban. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index dd6ea76c77a..03663917177 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1341,3 +1341,86 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); + +sync_test("functions scope", function() { + function f(){ return 1; } + function f(){ return 2; } + + var f0 = f, f1, f2, f3, i, o, a = []; + ok(f0() === 2, "f0() = " + f0()); + + { + f1 = f; + function f() { return 3; } + ok(f1 === f, "f1 != f"); + ok(f0 != f1, "f0 == f1"); + } + ok(f === f1, "f != f1"); + + for(i = 0; i < 3; i++) { + a[i] = f; + function f() {} + ok(f === a[i], "f != a[i]"); + } + ok(a[0] != a[1], "a[0] == a[1]"); + ok(a[1] != a[2], "a[1] == a[2]"); + ok(f === a[2], "f != a[2]"); + + { + f2 = f; + ok(f() === 4, "f() = " + f()); + function f() { return 4; } + + { + f3 = f; + ok(f() === 5, "f() = " + f()); + function f() { return 5;} + } + ok(f() === 4, "f() = " + f()); + ok(f === f2, "f != f2"); + } + ok(f === f3, "f != f3"); + + with(o = {f: 1}) { + ok(f === 1, "f != 1"); + { + ok(f() === 6, "f() = " + f()); + function f() { return 6; } + } + ok(f === 1, "f != 1"); + delete o.f; + ok(f() === 6, "f() = " + f()); + } + + if(false) { + function f() { throw "unexpected call"; } + } + ok(f() === 6, "f() = " + f()); + + /* 'with' has no effect for function defined in a single statement context. */ + let w = 8; + with({w:10, value:11}) + function with_function() + { + var except + + ok(w == 8, "w != 8"); + except = false; + try + { + ok(value === undefined, "value is defined"); + } + catch(e) + { + except = true; + } + ok(except, "with_function: expected exception"); + + let ret = w; + w = 9; + return ret; + } + val = with_function(); + ok(val == 8, "val != 8"); + ok(w == 9, "w != 9"); +});

1 0

Florian Eder : cmd: Do not change errorlevel when setting environment variables.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 617d14bc1238b57327a8400eda1c1ab22624beb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=617d14bc1238b57327a8400e… Author: Florian Eder <others.meder(a)gmail.com> Date: Tue Jun 1 07:02:54 2021 +0000 cmd: Do not change errorlevel when setting environment variables. Changes CMD to set its errorlevel to 0 only when the value of an environment variable is set in in non-interactive / batch mode, retains the previous value otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47791 Signed-off-by: Florian Eder <others.meder(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 502694ffc46..c7df724ae00 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4218,7 +4218,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if (!status) WCMD_print_error(); - else errorlevel = 0; + else if (!interactive) errorlevel = 0; } }

1 0

Nikolay Sivov : mfplay: Create media item on player creation, when url is specified.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 352da005c18e7a34935ecc05940c9b37110c7883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352da005c18e7a34935ecc05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 18 19:28:53 2021 +0300 mfplay: Create media item on player creation, when url is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 29 +++++++++++++++++++++++++++++ dlls/mfplay/tests/mfplay.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index f6cb81de436..0bbe59f4c90 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1911,14 +1911,26 @@ static const IMFAsyncCallbackVtbl media_player_session_events_callback_vtbl = media_player_session_events_callback_Invoke, }; +/*********************************************************************** + * MFPCreateMediaPlayer (mfplay.@) + */ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND window, IMFPMediaPlayer **player) { struct media_player *object; + IMFPMediaItem *item; HRESULT hr; TRACE("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, window, player); + if (!player) + return E_POINTER; + + *player = NULL; + + if (!url && start_playback) + return E_INVALIDARG; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1950,6 +1962,23 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C 0, mfplay_instance, NULL); } + if (url) + { + if (FAILED(hr = media_player_create_item_from_url(object, url, TRUE, 0, &item))) + { + WARN("Failed to create media item, hr %#x.\n", hr); + goto failed; + } + + hr = IMFPMediaPlayer_SetMediaItem(&object->IMFPMediaPlayer_iface, item); + IMFPMediaItem_Release(item); + if (FAILED(hr)) + { + WARN("Failed to set media item, hr %#x.\n", hr); + goto failed; + } + } + *player = &object->IMFPMediaPlayer_iface; return S_OK; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f11973ef939..a2d6da54f3e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -87,6 +87,26 @@ static void test_create_player(void) HWND window; HRESULT hr; + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + player = (void *)0xdeadbeef; + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, NULL, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(!player, "Unexpected pointer %p.\n", player); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(L"doesnotexist.mp4", FALSE, 0, &callback, NULL, &player); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + + hr = MFPCreateMediaPlayer(NULL, TRUE, 0, &callback, NULL, &player); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplay: Start playback on player creation automatically, when enabled.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: d2abb6a49bd216d10f4fe66fd78cbd0cab0f4fdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2abb6a49bd216d10f4fe66f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 18 19:28:54 2021 +0300 mfplay: Start playback on player creation automatically, when enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0bbe59f4c90..c4913134901 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1977,6 +1977,9 @@ HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_C WARN("Failed to set media item, hr %#x.\n", hr); goto failed; } + + if (start_playback) + IMFPMediaPlayer_Play(&object->IMFPMediaPlayer_iface); } *player = &object->IMFPMediaPlayer_iface;

1 0