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

Anton Baskanov : amstream/tests: Test that streams call IMediaStreamFilter::Flush in IPin::BeginFlush.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 35fc7319e2f94674b0b94f44c7e5f5caad2fb80a URL: https://source.winehq.org/git/wine.git/?a=commit;h=35fc7319e2f94674b0b94f44… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 20 00:22:54 2021 +0700 amstream/tests: Test that streams call IMediaStreamFilter::Flush in IPin::BeginFlush. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 249 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 228 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35fc7319e2f94674b0b9…

1 0

Anton Baskanov : amstream: Call IMediaStreamFilter::Flush in IPin::BeginFlush.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 1917fe0e0734df60911739872efcdcbf2c665a68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1917fe0e0734df6091173987… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 20 00:22:55 2021 +0700 amstream: Call IMediaStreamFilter::Flush in IPin::BeginFlush. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 8 ++++++++ dlls/amstream/ddrawstream.c | 8 ++++++++ dlls/amstream/tests/amstream.c | 12 ++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index a07e62a4672..77ed4072ccf 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -1168,17 +1168,25 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface) static HRESULT WINAPI audio_sink_BeginFlush(IPin *iface) { struct audio_stream *stream = impl_from_IPin(iface); + BOOL cancel_eos; TRACE("stream %p.\n", stream); EnterCriticalSection(&stream->cs); + cancel_eos = stream->eos; + stream->flushing = TRUE; stream->eos = FALSE; flush_receive_queue(stream); LeaveCriticalSection(&stream->cs); + /* Calling IMediaStreamFilter::Flush() inside the critical section would + * invert the locking order, so we must leave it first to avoid the + * application thread deadlocking on the filter's critical section. */ + IMediaStreamFilter_Flush(stream->filter, cancel_eos); + return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index e04e3a1c56f..b1ef12cb524 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -1188,17 +1188,25 @@ static HRESULT WINAPI ddraw_sink_EndOfStream(IPin *iface) static HRESULT WINAPI ddraw_sink_BeginFlush(IPin *iface) { struct ddraw_stream *stream = impl_from_IPin(iface); + BOOL cancel_eos; TRACE("stream %p.\n", stream); EnterCriticalSection(&stream->cs); + cancel_eos = stream->eos; + stream->flushing = TRUE; stream->eos = FALSE; WakeConditionVariable(&stream->update_queued_cv); LeaveCriticalSection(&stream->cs); + /* Calling IMediaStreamFilter::Flush() inside the critical section would + * invert the locking order, so we must leave it first to avoid the + * application thread deadlocking on the filter's critical section. */ + IMediaStreamFilter_Flush(stream->filter, cancel_eos); + return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index eaa1073532d..182fb06a082 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4214,7 +4214,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IPin_EndOfStream(pin2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4248,8 +4248,8 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IPin_EndOfStream(pin2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); - todo_wine ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5808,7 +5808,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IPin_EndOfStream(pin2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5842,8 +5842,8 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IPin_EndOfStream(pin2); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); - todo_wine ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); + ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + ok(graph.event_code == EC_COMPLETE, "Got event code %d.\n", graph.event_code); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Jacek Caban : jscript: Use enum to pass enumeration type to jsdisp_next_prop.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: c4948c428a58bcbd12e11054af6f72e8c024d4d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4948c428a58bcbd12e11054… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 20 19:11:56 2021 +0200 jscript: Use enum to pass enumeration type to jsdisp_next_prop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++---- dlls/jscript/jscript.h | 7 ++++++- dlls/jscript/object.c | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 67b7cfad005..61f4df48c86 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1700,7 +1700,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - hres = jsdisp_next_prop(This, id, FALSE, pid); + hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid); if(hres == S_FALSE) *pid = DISPID_STARTENUM; return hres; @@ -2366,12 +2366,12 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } -HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, BOOL own_only, DISPID *ret) +HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_type, DISPID *ret) { dispex_prop_t *iter; HRESULT hres; - if(id == DISPID_STARTENUM && !own_only) { + if(id == DISPID_STARTENUM && enum_type == JSDISP_ENUM_ALL) { hres = fill_protrefs(obj); if(FAILED(hres)) return hres; @@ -2383,7 +2383,7 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, BOOL own_only, DISPID *ret) for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) { if(!iter->name || iter->type == PROP_DELETED) continue; - if(own_only && iter->type == PROP_PROTREF) + if(enum_type != JSDISP_ENUM_ALL && iter->type == PROP_PROTREF) continue; if(!(get_flags(obj, iter) & PROPF_ENUMERABLE)) continue; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3c870a68a54..ec2c6583682 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -290,6 +290,11 @@ void jsdisp_release(jsdisp_t*) DECLSPEC_HIDDEN; #endif +enum jsdisp_enum_type { + JSDISP_ENUM_ALL, + JSDISP_ENUM_OWN_ENUMERABLE +}; + HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; @@ -315,7 +320,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) DECLSPEC_HIDDEN; +HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,enum jsdisp_enum_type,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); void jsdisp_freeze(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; BOOL jsdisp_is_frozen(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index b957ea58bdf..a47516c7710 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -404,7 +404,7 @@ static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_ } while(1) { - hres = jsdisp_next_prop(list_obj, id, TRUE, &id); + hres = jsdisp_next_prop(list_obj, id, JSDISP_ENUM_OWN_ENUMERABLE, &id); if(hres != S_OK) break; @@ -652,7 +652,7 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; do { - hres = jsdisp_next_prop(obj, id, TRUE, &id); + hres = jsdisp_next_prop(obj, id, JSDISP_ENUM_OWN_ENUMERABLE, &id); if(hres != S_OK) break;

1 0

Jacek Caban : jscript: Add Object.getOwnPropertyNames implementation.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9885de45af87a65f49c743788bf8c64b72c26d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9885de45af87a65f49c74378… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 20 19:12:07 2021 +0200 jscript: Add Object.getOwnPropertyNames implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 34 ++++++++++++++++++++++++++-------- dlls/mshtml/tests/es5.js | 31 +++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 61f4df48c86..3955ed34cd2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2385,7 +2385,7 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty continue; if(enum_type != JSDISP_ENUM_ALL && iter->type == PROP_PROTREF) continue; - if(!(get_flags(obj, iter) & PROPF_ENUMERABLE)) + if(enum_type != JSDISP_ENUM_OWN && !(get_flags(obj, iter) & PROPF_ENUMERABLE)) continue; *ret = prop_to_id(obj, iter); return S_OK; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ec2c6583682..02420349d8d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -292,6 +292,7 @@ void jsdisp_release(jsdisp_t*) DECLSPEC_HIDDEN; enum jsdisp_enum_type { JSDISP_ENUM_ALL, + JSDISP_ENUM_OWN, JSDISP_ENUM_OWN_ENUMERABLE }; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index a47516c7710..fd5c67833d8 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -625,8 +625,7 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } -static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - unsigned argc, jsval_t *argv, jsval_t *r) +static HRESULT object_keys(script_ctx_t *ctx, jsval_t arg, enum jsdisp_enum_type enum_type, jsval_t *r) { DISPID id = DISPID_STARTENUM; jsdisp_t *obj, *array; @@ -634,14 +633,12 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, jsstr_t *key; HRESULT hres; - if(!argc || !is_object_instance(argv[0])) { - FIXME("invalid arguments %s\n", debugstr_jsval(argv[0])); + if(!is_object_instance(arg) || !get_object(arg)) { + FIXME("invalid arguments %s\n", debugstr_jsval(arg)); return E_NOTIMPL; } - TRACE("(%s)\n", debugstr_jsval(argv[0])); - - obj = to_jsdisp(get_object(argv[0])); + obj = to_jsdisp(get_object(arg)); if(!obj) { FIXME("Non-JS object\n"); return E_NOTIMPL; @@ -652,7 +649,7 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; do { - hres = jsdisp_next_prop(obj, id, JSDISP_ENUM_OWN_ENUMERABLE, &id); + hres = jsdisp_next_prop(obj, id, enum_type, &id); if(hres != S_OK) break; @@ -671,6 +668,26 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } +static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsval_t arg = argc ? argv[0] : jsval_undefined(); + + TRACE("(%s)\n", debugstr_jsval(arg)); + + return object_keys(ctx, arg, JSDISP_ENUM_OWN_ENUMERABLE, r); +} + +static HRESULT Object_getOwnPropertyNames(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsval_t arg = argc ? argv[0] : jsval_undefined(); + + TRACE("(%s)\n", debugstr_jsval(arg)); + + return object_keys(ctx, arg, JSDISP_ENUM_OWN, r); +} + static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { jsdisp_t *obj; @@ -810,6 +827,7 @@ static const builtin_prop_t ObjectConstr_props[] = { {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"freeze", Object_freeze, PROPF_ES5|PROPF_METHOD|1}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, + {L"getOwnPropertyNames", Object_getOwnPropertyNames, PROPF_ES5|PROPF_METHOD|1}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, {L"isExtensible", Object_isExtensible, PROPF_ES5|PROPF_METHOD|1}, {L"isFrozen", Object_isFrozen, PROPF_ES5|PROPF_METHOD|1}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 474c09d3bd7..7e46848d40e 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -892,9 +892,40 @@ sync_test("keys", function() { keys = Object.keys(o).sort().join(); ok(keys === "test", "keys = " + keys); + Object.defineProperty(o, "defined", { value: 3, enumerable: false }); + keys = Object.keys(o).sort().join(); + ok(keys === "test", "keys = " + keys); + + keys = Object.keys([]).sort().join(); + ok(keys === "", "keys([]) = " + keys); + ok(Object.keys.length === 1, "Object.keys.length = " + Object.keys.length); }); +sync_test("getOwnPropertyNames", function() { + var o = { a: 1, b: 2, c: 3 }; + var names = Object.getOwnPropertyNames(o).sort().join(); + ok(names === "a,b,c", "names = " + names); + + o = Object.create(o); + names = Object.getOwnPropertyNames(o).sort().join(); + ok(names === "", "names = " + names); + + o.test = 1; + names = Object.getOwnPropertyNames(o).sort().join(); + ok(names === "test", "names = " + names); + + Object.defineProperty(o, "defined", { value: 3, enumerable: false }); + names = Object.getOwnPropertyNames(o).sort().join(); + ok(names === "defined,test", "names = " + names); + + names = Object.getOwnPropertyNames([]).sort().join(); + todo_wine. + ok(names === "length", "names = " + names); + + ok(Object.getOwnPropertyNames.length === 1, "Object.getOwnPropertyNames.length = " + Object.getOwnPropertyNames.length); +}); + sync_test("reduce", function() { var r, array;

1 0

Jacek Caban : jscript: Pass container object and property name to stringify.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 6a58d990e788247db63edec89b8f270c4678e844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a58d990e788247db63edec8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 20 19:12:14 2021 +0200 jscript: Pass container object and property name to stringify. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 8f16ba22885..f3b523d63d8 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -490,13 +490,13 @@ static inline BOOL is_callable(jsdisp_t *obj) return is_class(obj, JSCLASS_FUNCTION); } -static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val); +static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *name); /* ECMA-262 5.1 Edition 15.12.3 (abstract operation JA) */ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) { unsigned length, i, j; - jsval_t val; + WCHAR name[16]; HRESULT hres; if(is_on_stack(ctx, obj)) { @@ -526,19 +526,12 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) } } - hres = jsdisp_get_idx(obj, i, &val); - if(SUCCEEDED(hres)) { - hres = stringify(ctx, val); - if(FAILED(hres)) - return hres; - if(hres == S_FALSE && !append_string(ctx, L"null")) - return E_OUTOFMEMORY; - }else if(hres == DISP_E_UNKNOWNNAME) { - if(!append_string(ctx, L"null")) - return E_OUTOFMEMORY; - }else { + _itow(i, name, ARRAY_SIZE(name)); + hres = stringify(ctx, obj, name); + if(FAILED(hres)) return hres; - } + if(hres == S_FALSE && !append_string(ctx, L"null")) + return E_OUTOFMEMORY; } if((length && *ctx->gap && !append_char(ctx, '\n')) || !append_char(ctx, ']')) @@ -552,7 +545,6 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) { DISPID dispid = DISPID_STARTENUM; - jsval_t val = jsval_undefined(); unsigned prop_cnt = 0, i; size_t stepback; BSTR prop_name; @@ -570,14 +562,6 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) return E_OUTOFMEMORY; while((hres = IDispatchEx_GetNextDispID(&obj->IDispatchEx_iface, fdexEnumDefault, dispid, &dispid)) == S_OK) { - jsval_release(val); - hres = jsdisp_propget(obj, dispid, &val); - if(FAILED(hres)) - return hres; - - if(is_undefined(val)) - continue; - stepback = ctx->buf_len; if(prop_cnt && !append_char(ctx, ',')) { @@ -601,21 +585,23 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) hres = IDispatchEx_GetMemberName(&obj->IDispatchEx_iface, dispid, &prop_name); if(FAILED(hres)) - break; + return hres; hres = json_quote(ctx, prop_name, SysStringLen(prop_name)); - SysFreeString(prop_name); - if(FAILED(hres)) - break; + if(FAILED(hres)) { + SysFreeString(prop_name); + return hres; + } if(!append_char(ctx, ':') || (*ctx->gap && !append_char(ctx, ' '))) { - hres = E_OUTOFMEMORY; - break; + SysFreeString(prop_name); + return E_OUTOFMEMORY; } - hres = stringify(ctx, val); + hres = stringify(ctx, obj, prop_name); + SysFreeString(prop_name); if(FAILED(hres)) - break; + return hres; if(hres == S_FALSE) { ctx->buf_len = stepback; @@ -624,9 +610,6 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) prop_cnt++; } - jsval_release(val); - if(FAILED(hres)) - return hres; if(prop_cnt && *ctx->gap) { if(!append_char(ctx, '\n')) @@ -648,18 +631,24 @@ static HRESULT stringify_object(stringify_ctx_t *ctx, jsdisp_t *obj) } /* ECMA-262 5.1 Edition 15.12.3 (abstract operation Str) */ -static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) +static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *name) { - jsval_t value; + jsval_t value, v; HRESULT hres; - if(is_object_instance(val) && get_object(val)) { + hres = jsdisp_propget_name(object, name, &value); + if(FAILED(hres)) + return hres == DISP_E_UNKNOWNNAME ? S_FALSE : hres; + + if(is_object_instance(value) && get_object(value)) { jsdisp_t *obj; DISPID id; - obj = iface_to_jsdisp(get_object(val)); - if(!obj) + obj = iface_to_jsdisp(get_object(value)); + if(!obj) { + jsval_release(value); return S_FALSE; + } hres = jsdisp_get_id(obj, L"toJSON", 0, &id); jsdisp_release(obj); @@ -669,7 +658,9 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) /* FIXME: Support replacer replacer. */ - hres = maybe_to_primitive(ctx->ctx, val, &value); + v = value; + hres = maybe_to_primitive(ctx->ctx, v, &value); + jsval_release(v); if(FAILED(hres)) return hres; @@ -746,6 +737,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { stringify_ctx_t stringify_ctx = {ctx, NULL,0,0, NULL,0,0, {0}}; + jsdisp_t *obj; HRESULT hres; TRACE("\n"); @@ -790,7 +782,12 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un jsval_release(space_val); } - hres = stringify(&stringify_ctx, argv[0]); + if(FAILED(hres = create_object(ctx, NULL, &obj))) + goto fail; + if(FAILED(hres = jsdisp_propput_name(obj, L"", argv[0]))) + goto fail; + + hres = stringify(&stringify_ctx, obj, L""); if(SUCCEEDED(hres) && r) { assert(!stringify_ctx.stack_top); @@ -805,6 +802,9 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } } +fail: + if(obj) + jsdisp_release(obj); heap_free(stringify_ctx.buf); heap_free(stringify_ctx.stack); return hres;

1 0

Jacek Caban : jscript: Support replacer argument in JSON.stringify.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 34a9c343805f0cd526e1b1665d4f59005b421523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a9c343805f0cd526e1b166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 20 19:12:25 2021 +0200 jscript: Support replacer argument in JSON.stringify. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 38 +++++++++++++++++++++++++++++++------- dlls/jscript/tests/api.js | 21 ++++++++++++++++++++- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index f3b523d63d8..a8014f95b4f 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -320,6 +320,8 @@ typedef struct { size_t stack_size; WCHAR gap[11]; /* according to the spec, it's no longer than 10 chars */ + + jsdisp_t *replacer; } stringify_ctx_t; static BOOL stringify_push_obj(stringify_ctx_t *ctx, jsdisp_t *obj) @@ -656,7 +658,22 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na FIXME("Use toJSON.\n"); } - /* FIXME: Support replacer replacer. */ + if(ctx->replacer) { + jsstr_t *name_str; + jsval_t args[2]; + if(!(name_str = jsstr_alloc(name))) { + jsval_release(value); + return E_OUTOFMEMORY; + } + args[0] = jsval_string(name_str); + args[1] = value; + hres = jsdisp_call_value(ctx->replacer, to_disp(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + jsstr_release(name_str); + jsval_release(value); + if(FAILED(hres)) + return hres; + value = v; + } v = value; hres = maybe_to_primitive(ctx->ctx, v, &value); @@ -736,8 +753,8 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na /* ECMA-262 5.1 Edition 15.12.3 */ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - stringify_ctx_t stringify_ctx = {ctx, NULL,0,0, NULL,0,0, {0}}; - jsdisp_t *obj; + stringify_ctx_t stringify_ctx = { ctx }; + jsdisp_t *obj = NULL, *replacer; HRESULT hres; TRACE("\n"); @@ -748,9 +765,14 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return S_OK; } - if(argc >= 2 && is_object_instance(argv[1])) { - FIXME("Replacer %s not yet supported\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; + if(argc >= 2 && is_object_instance(argv[1]) && get_object(argv[1]) && + (replacer = to_jsdisp(get_object(argv[1])))) { + if(is_callable(replacer)) { + stringify_ctx.replacer = jsdisp_addref(replacer); + }else if(is_class(replacer, JSCLASS_ARRAY)) { + FIXME("Array replacer not yet supported\n"); + return E_NOTIMPL; + } } if(argc >= 3) { @@ -758,7 +780,7 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un hres = maybe_to_primitive(ctx, argv[2], &space_val); if(FAILED(hres)) - return hres; + goto fail; if(is_number(space_val)) { double n = get_number(space_val); @@ -805,6 +827,8 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un fail: if(obj) jsdisp_release(obj); + if(stringify_ctx.replacer) + jsdisp_release(stringify_ctx.replacer); heap_free(stringify_ctx.buf); heap_free(stringify_ctx.stack); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 564dfc16f30..d5d8e7d34b9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1923,7 +1923,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); [[NaN], "null"], [[Infinity], "null"], [[-Infinity], "null"], - [[{prop1: true, prop2: "string"}], "{\"prop1\":true,\"prop2\":\"string\"}"], + [[{prop1: true, prop2: "string", func1: function() {}}], "{\"prop1\":true,\"prop2\":\"string\"}"], [[{prop1: true, prop2: testObj, prop3: undefined}], "{\"prop1\":true}"], [[{prop1: true, prop2: {prop: "string"}},undefined," "], "{\n \"prop1\": true,\n \"prop2\": {\n \"prop\": \"string\"\n }\n}"], @@ -1951,6 +1951,25 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); ok(s === undefined || s === "undefined" /* broken on some old versions */, "stringify(undefined) returned " + s + " expected undefined"); + s = JSON.stringify(1, function(name, value) { + ok(name === "", "name = " + name); + ok(value === 1, "value = " + value); + ok(this[name] === value, "this[" + name + "] = " + this[name] + " expected " + value); + return 2; + }); + ok(s == "2", "s = " + s); + + var o = { prop: 1 }; + s = JSON.stringify(1, function(name, value) { + ok(name === "" || name === "prop", "name = " + name); + ok(value === 1 || value === true, "value = " + value); + ok(this[name] === value, "this[" + name + "] = " + this[name] + " expected " + value); + if(name === "") return o; + ok(this === o, "this != o"); + return value; + }); + ok(s == "{\"prop\":1}", "s = " + s); + var parse_tests = [ ["true", true], [" \nnull ", null],

1 0

Liam Middlebrook : winevulkan: Ignore Zircon handle type.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: de87cc6d5b2a4258a25c456532e74af531209750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de87cc6d5b2a4258a25c4565… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 19 12:45:37 2021 -0700 winevulkan: Ignore Zircon handle type. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 100d233bc51..e6c23f2bda3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1476,8 +1476,8 @@ class VkParam(object): self.format_conv = "wine_dbgstr_longlong({0})" elif self.type == "HANDLE": self.format_str = "%p" - elif self.type in ["VisualID", "xcb_visualid_t", "RROutput"]: - # Don't care about Linux specific types. + elif self.type in ["VisualID", "xcb_visualid_t", "RROutput", "zx_handle_t"]: + # Don't care about specific types for non-Windows platforms. self.format_str = "" else: LOGGER.warn("Unhandled type: {0}".format(self.type_info))

1 0

Liam Middlebrook : winevulkan: Explicitly define VK_NULL_HANDLE.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 108e093f0119fcd9cd30975826116f810c22c636 URL: https://source.winehq.org/git/wine.git/?a=commit;h=108e093f0119fcd9cd309758… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 19 12:45:38 2021 -0700 winevulkan: Explicitly define VK_NULL_HANDLE. This fixes a mismatch that occurred when the default type of VK_NULL_HANDLE and VK_DEFINE_NON_DISPATCHABLE_HANDLE had changed in the upstream XML. Because WineVulkan overrides the definition of VK_DEFINE_NON_DISPATCHABLE_HANDLE we must do the same for VK_NULL_HANDLE so that the types match. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e6c23f2bda3..3d64d65cad4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -317,8 +317,6 @@ class VkDefine(object): if name_elem is None: # <type category="define" name="some_name">some_value</type> - # At the time of writing there is only 1 define of this category - # 'VK_DEFINE_NON_DISPATCHABLE_HANDLE'. name = define.attrib.get("name") # We override behavior of VK_DEFINE_NON_DISPATCHABLE handle as the default @@ -326,6 +324,10 @@ class VkDefine(object): # This complicates TRACEs in the thunks, so just use uint64_t. if name == "VK_DEFINE_NON_DISPATCHABLE_HANDLE": value = "#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;" + # As VK_DEFINE_NON_DISPATCHABLE handle is overriden above, we must also override + # VK_NULL_HANDLE so that its type will match. + elif name == "VK_NULL_HANDLE": + value = "#define VK_NULL_HANDLE 0ULL" else: value = define.text return VkDefine(name, value)

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.176.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9c1d52dff463109cd91d5f1d0048bb9eb54efbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c1d52dff463109cd91d5f1d… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 19 12:45:39 2021 -0700 winevulkan: Update to VK spec version 1.2.176. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 42 + dlls/winevulkan/loader_thunks.h | 7 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 136 ++ dlls/winevulkan/vulkan_thunks.h | 14 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2798 +++++++++++++++++++++------------------ 7 files changed, 1677 insertions(+), 1324 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c1d52dff463109cd91d…

1 0

Zhiyi Zhang : include: Add META_SETLAYOUT definition.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 91c9393b7f1c81bbec9c63272348d97116cdba04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c9393b7f1c81bbec9c6327… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 19 15:17:39 2021 +0800 include: Add META_SETLAYOUT definition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/wingdi.h b/include/wingdi.h index d989fb6f71b..c10d7518337 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2125,6 +2125,7 @@ typedef struct #define META_ENDPAGE 0x0050 #define META_ABORTDOC 0x0052 #define META_ENDDOC 0x005E +#define META_SETLAYOUT 0x0149 #define META_DELETEOBJECT 0x01F0 #define META_CREATEPALETTE 0x00F7 #define META_CREATEBRUSH 0x00F8

1 0