wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zebediah Figura : widl: Handle encapsulated unions in type libraries.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 4f4763ab6b81effe05705eb65c9761814a1402bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4763ab6b81effe05705eb6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 11:18:07 2019 -0500 widl: Handle encapsulated unions in type libraries. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 420404a..5d5fd89 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -976,6 +976,7 @@ static int encode_type( switch (type_get_type(type)) { case TYPE_STRUCT: + case TYPE_ENCAPSULATED_UNION: add_structure_typeinfo(typelib, type); break; case TYPE_INTERFACE: @@ -2119,6 +2120,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure) { + var_list_t *fields; int idx = 0; var_t *cur; msft_typeinfo_t *msft_typeinfo; @@ -2130,9 +2132,16 @@ static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure) msft_typeinfo = create_msft_typeinfo(typelib, TKIND_RECORD, structure->name, structure->attrs); msft_typeinfo->typeinfo->size = 0; - if (type_struct_get_fields(structure)) - LIST_FOR_EACH_ENTRY( cur, type_struct_get_fields(structure), var_t, entry ) + if (type_get_type(structure) == TYPE_STRUCT) + fields = type_struct_get_fields(structure); + else + fields = type_encapsulated_union_get_fields(structure); + + if (fields) + { + LIST_FOR_EACH_ENTRY( cur, fields, var_t, entry ) add_var_desc(msft_typeinfo, idx++, cur); + } } static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) @@ -2320,6 +2329,7 @@ static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) add_interface_typeinfo(typelib, type); break; case TYPE_STRUCT: + case TYPE_ENCAPSULATED_UNION: add_structure_typeinfo(typelib, type); break; case TYPE_ENUM:

1 0

Zebediah Figura : widl: Generate a name for the encapsulated union type.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 732f67ed38a45911d726df8da5a68710d175ba1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=732f67ed38a45911d726df8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 11:18:06 2019 -0500 widl: Generate a name for the encapsulated union type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 3 +-- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 072e138..8496109 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -82,7 +82,6 @@ static var_t *reg_const(var_t *var); static void push_namespace(const char *name); static void pop_namespace(const char *name); -static char *gen_name(void); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); @@ -2033,7 +2032,7 @@ var_t *find_const(const char *name, int f) return cur->var; } -static char *gen_name(void) +char *gen_name(void) { static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 524d005..e9afc6f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -366,7 +366,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio { if (!union_field) union_field = make_var(xstrdup("tagged_union")); - union_field->declspec.type = type_new_nonencapsulated_union(NULL, TRUE, cases); + union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), TRUE, cases); t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = append_var(NULL, switch_field); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index f025f25..e288c57 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -51,6 +51,7 @@ void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); +char *gen_name(void); /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname);

1 0

Nikolay Sivov : gdiplus: Add GdipRecordMetafileStreamI().
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 88207f0c117cc28ae60190954e6ad110efa0e5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88207f0c117cc28ae6019095… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 20 22:48:35 2019 +0300 gdiplus: Add GdipRecordMetafileStreamI(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 5 +++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ed9d50c..ee28b0e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -451,7 +451,7 @@ 451 stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) 452 stdcall GdipRecordMetafileI(long long ptr long wstr ptr) 453 stdcall GdipRecordMetafileStream(ptr long long ptr long wstr ptr) -454 stub GdipRecordMetafileStreamI +454 stdcall GdipRecordMetafileStreamI(ptr long long ptr long wstr ptr) 455 stdcall GdipReleaseDC(ptr ptr) 456 stdcall GdipRemovePropertyItem(ptr long) 457 stdcall GdipResetClip(ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 47d5ac5..a292483 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -859,6 +859,27 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return GdipRecordMetafile(hdc, type, pFrameRectF, frameUnit, desc, metafile); } +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + GpRectF frameRectF, *pFrameRectF; + + TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + + if (frameRect) + { + frameRectF.X = frameRect->X; + frameRectF.Y = frameRect->Y; + frameRectF.Width = frameRect->Width; + frameRectF.Height = frameRect->Height; + pFrameRectF = &frameRectF; + } + else + pFrameRectF = NULL; + + return GdipRecordMetafileStream(stream, hdc, type, pFrameRectF, frameUnit, desc, metafile); +} + GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 57fa6c6..1e26c0a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -284,8 +284,6 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); -GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*, - MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); @@ -549,6 +547,9 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream*,HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream*,HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); /* MetafileHeader */ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);

1 0

Isira Seneviratne : jscript: Replace '%pure-parser' with '%define api.pure '.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: e0e57b140a02c4a665510cba7fc8c32084c00f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e57b140a02c4a665510cba… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Aug 18 16:47:06 2019 +0530 jscript: Replace '%pure-parser' with '%define api.pure'. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 18c1cb1..4bc6260 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start CCExpr %union { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 138b6f3..ca83b6f 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -141,7 +141,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {

1 0

Rémi Bernon : msctf/tests: Add multi-threaded apartment test for ITfSource_AdviseSink.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: b9b834b6ba768891c8d6a90c44ff9438e48af012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9b834b6ba768891c8d6a90c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 20 17:46:56 2019 +0200 msctf/tests: Add multi-threaded apartment test for ITfSource_AdviseSink. We expect it to fail because the ITfUIElementSink interface is flagged as "local" and cannot be marshalled, and because ITfThreadMgr is flagged with "threading(apartment)" and cannot be instanciated in the MTA. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d73a3f9..1222085 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2511,6 +2511,53 @@ static void test_profile_mgr(void) ITfInputProcessorProfileMgr_Release(ipp_mgr); } +static DWORD WINAPI test_MultiThreadApartment_Thread(void *param) { + ITfThreadMgrEx *thmgr; + ITfSource *source; + DWORD cookie; + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(SUCCEEDED(hr), "Failed to initialize multi-threaded apartment\n"); + + hr = CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfThreadMgrEx, (LPVOID *)&thmgr); + ok(SUCCEEDED(hr), "Failed to create ITfThreadMgrEx instance\n"); + + hr = ITfThreadMgrEx_QueryInterface(thmgr, &IID_ITfSource, (LPVOID *)&source); + ok(SUCCEEDED(hr), "Failed to query ITfSource interface\n"); + + hr = ITfSource_AdviseSink(source, &IID_ITfUIElementSink, (IUnknown*)&TfUIElementSink, &cookie); + ok(hr == REGDB_E_IIDNOTREG /* native */ || hr == E_NOINTERFACE /* wine */, + "Advise ITfUIElementSink should return marshalling failure: %08x\n", hr); + + hr = ITfSource_Release(source); + ok(SUCCEEDED(hr), "Failed to Release source\n"); + + hr = ITfThreadMgrEx_Release(thmgr); + ok(SUCCEEDED(hr), "Failed to Release thread manager\n"); + + CoUninitialize(); + + return 0xdeadcafe; +} + +static void test_MultiThreadApartment(void) +{ + DWORD ret; + HANDLE thread; + + thread = CreateThread(0, 0, test_MultiThreadApartment_Thread, 0, 0, 0); + ok(thread != NULL, "Failed to create test thread\n"); + + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread completion\n"); + + GetExitCodeThread(thread, &ret); + ok(ret == 0xdeadcafe, "Thread terminated in an unexpected way\n"); + + CloseHandle(thread); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -2540,6 +2587,7 @@ START_TEST(inputprocessor) test_UnregisterCategory(); test_Unregister(); test_profile_mgr(); + test_MultiThreadApartment(); ITextStoreACPSink_Release(ACPSink); ITfDocumentMgr_Release(g_dm);

1 0

Jacek Caban : jscript: Fix Object.defineProperty return value.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 7dab372271f8423e4ff2f6612179eaf5d4572610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dab372271f8423e4ff2f661… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:32:01 2019 +0200 jscript: Fix Object.defineProperty return value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 2 ++ dlls/mshtml/tests/es5.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 123541e..58db45b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -500,6 +500,8 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl hres = jsdisp_define_property(obj, name, &prop_desc); release_property_descriptor(&prop_desc); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(jsdisp_addref(obj)); return hres; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 11b68e5..7ee8cc1 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -311,8 +311,9 @@ function test_defineProperty() { ok(false, "expected exception"); } - var obj = new Object(); - Object.defineProperty(obj, "test", {}); + var obj = new Object(), defined; + defined = Object.defineProperty(obj, "test", {}); + ok(defined === obj, "defined != obj"); ok("test" in obj, "test is not in obj"); test_own_data_prop_desc(obj, "test", false, false, false); ok(obj.test === undefined, "obj.test = " + obj.test);

1 0

Jacek Caban : mshtml/tests: Add Object.defineProperties tests.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 98cf6a6ac79dd0da64450b48c638eba0c7f4d57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=98cf6a6ac79dd0da64450b48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:44 2019 +0200 mshtml/tests: Add Object.defineProperties tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 85a6899..11b68e5 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -507,6 +507,48 @@ function test_defineProperty() { next_test(); } +function test_defineProperties() { + var o, defined, descs; + + descs = { + acc_prop: { get: function() { return 1; } }, + prop: { value: 2 }, + e: { enumerable: true } + }; + + o = new Object(); + defined = Object.defineProperties(o, descs); + ok(defined === o, "defined != o"); + ok(o.acc_prop === 1, "o.acc_prop = " + o.acc_prop); + ok(o.prop === 2, "o.prop = " + o.prop); + ok(o.e === undefined, "o.e = " + o.e); + ok("e" in o, "e is not in o"); + test_own_data_prop_desc(o, "prop", false, false, false); + test_own_data_prop_desc(o, "e", false, true, false); + for(var p in o) ok(p === "e", "p = " + p); + + o = new Object(); + Object.defineProperties(o, 1); + for(var p in o) ok(false, "o has property " + p); + + o = Object.create(null, descs); + ok(o.acc_prop === 1, "o.acc_prop = " + o.acc_prop); + ok(o.prop === 2, "o.prop = " + o.prop); + ok(o.e === undefined, "o.e = " + o.e); + ok("e" in o, "e is not in o"); + test_own_data_prop_desc(o, "prop", false, false, false); + test_own_data_prop_desc(o, "e", false, true, false); + for(var p in o) ok(p === "e", "p = " + p); + + var desc_proto = new Object(); + desc_proto.proto_prop = { value: true, enumerable: true }; + descs = Object.create(desc_proto); + o = Object.create(null, descs); + ok(!("proto_prop" in o), "proto_prop is in o"); + + next_test(); +} + function test_property_definitions() { var obj, val, i, arr; @@ -811,6 +853,7 @@ var tests = [ test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty, + test_defineProperties, test_property_definitions, test_string_trim, test_global_properties,

1 0

Jacek Caban : jscript: Support properties argument in Object.create.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: e458e706360f8556367202174953a716cab5e0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e458e706360f855636720217… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:33 2019 +0200 jscript: Support properties argument in Object.create. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 7794f1d..123541e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -598,11 +598,6 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, TRACE("(%s)\n", debugstr_jsval(argv[0])); - if(argc > 1) { - FIXME("Unsupported properties argument %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; - } - if(argc && is_object_instance(argv[0])) { if(get_object(argv[0])) proto = to_jsdisp(get_object(argv[0])); @@ -615,13 +610,18 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return E_INVALIDARG; } - if(r) { - hres = create_dispex(ctx, NULL, proto, &obj); - if(FAILED(hres)) - return hres; + hres = create_dispex(ctx, NULL, proto, &obj); + if(FAILED(hres)) + return hres; + + if(argc >= 2 && !is_undefined(argv[1])) + hres = jsdisp_define_properties(ctx, obj, argv[1]); + + if(SUCCEEDED(hres) && r) *r = jsval_obj(obj); - } - return S_OK; + else + jsdisp_release(obj); + return hres; } static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0

Jacek Caban : jscript: Add Object.defineProperties implementation.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 34d4a9c75188093675b97bc142f2ff6e6489a268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d4a9c75188093675b97bc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:18 2019 +0200 jscript: Add Object.defineProperties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 619356b..7794f1d 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -409,6 +409,57 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } +static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_t list_val) +{ + DISPID id = DISPID_STARTENUM; + property_desc_t prop_desc; + IDispatch *list_disp; + jsdisp_t *list_obj, *desc_obj; + jsval_t desc_val; + BSTR name; + HRESULT hres; + + hres = to_object(ctx, list_val, &list_disp); + if(FAILED(hres)) + return hres; + + if(!(list_obj = to_jsdisp(list_disp))) { + FIXME("non-JS list obj\n"); + IDispatch_Release(list_disp); + return E_NOTIMPL; + } + + while(1) { + hres = jsdisp_next_prop(list_obj, id, TRUE, &id); + if(hres != S_OK) + break; + + hres = jsdisp_propget(list_obj, id, &desc_val); + if(FAILED(hres)) + break; + + if(!is_object_instance(desc_val) || !get_object(desc_val) || !(desc_obj = to_jsdisp(get_object(desc_val)))) { + jsval_release(desc_val); + break; + } + + hres = to_property_descriptor(ctx, desc_obj, &prop_desc); + jsdisp_release(desc_obj); + if(FAILED(hres)) + break; + + hres = IDispatchEx_GetMemberName(&list_obj->IDispatchEx_iface, id, &name); + if(SUCCEEDED(hres)) + hres = jsdisp_define_property(obj, name, &prop_desc); + release_property_descriptor(&prop_desc); + if(FAILED(hres)) + break; + } + + jsdisp_release(list_obj); + return FAILED(hres) ? hres : S_OK; +} + static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -455,8 +506,20 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *obj; + HRESULT hres; + + if(argc < 1 || !is_object_instance(argv[0]) || !get_object(argv[0]) || !(obj = to_jsdisp(get_object(argv[0])))) { + FIXME("not an object\n"); + return E_NOTIMPL; + } + + TRACE("%p\n", obj); + + hres = jsdisp_define_properties(ctx, obj, argc >= 2 ? argv[1] : jsval_undefined()); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(jsdisp_addref(obj)); + return hres; } static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0

Jacek Caban : jscript: Support enumerating own properties.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 9b4267b04d4f84042931c0cfb7c848fd22a6dbc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b4267b04d4f84042931c0cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:08 2019 +0200 jscript: Support enumerating own properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/jscript/jscript.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b1f2914..da23d18 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -870,34 +870,14 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { jsdisp_t *This = impl_from_IDispatchEx(iface); - dispex_prop_t *iter; HRESULT hres; TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - if(id == DISPID_STARTENUM) { - hres = fill_protrefs(This); - if(FAILED(hres)) - return hres; - } - - if(id+1>=0 && id+1<This->prop_cnt) { - iter = &This->props[id+1]; - }else { + hres = jsdisp_next_prop(This, id, FALSE, pid); + if(hres == S_FALSE) *pid = DISPID_STARTENUM; - return S_FALSE; - } - - while(iter < This->props + This->prop_cnt) { - if(iter->name && (get_flags(This, iter) & PROPF_ENUMERABLE) && iter->type!=PROP_DELETED) { - *pid = prop_to_id(This, iter); - return S_OK; - } - iter++; - } - - *pid = DISPID_STARTENUM; - return S_FALSE; + return hres; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) @@ -1563,6 +1543,34 @@ 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) +{ + dispex_prop_t *iter; + HRESULT hres; + + if(id == DISPID_STARTENUM && !own_only) { + hres = fill_protrefs(obj); + if(FAILED(hres)) + return hres; + } + + if(id + 1 < 0 || id+1 >= obj->prop_cnt) + return S_FALSE; + + 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) + continue; + if(!(get_flags(obj, iter) & PROPF_ENUMERABLE)) + continue; + *ret = prop_to_id(obj, iter); + return S_OK; + } + + return S_FALSE; +} + HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) { IDispatchEx *dispex; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1fbd957..2dd73d6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -297,6 +297,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 create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2019