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

Zebediah Figura : httpapi: Implement HttpCreateHttpHandle().
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: cf14c0bde259aea6172b07c258f32a6e484014a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf14c0bde259aea6172b07c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:14 2019 -0500 httpapi: Implement HttpCreateHttpHandle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 19 ++++++++++++++++--- dlls/httpapi/tests/httpapi.c | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 429ae1a..4536aa8 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "http.h" #include "wine/debug.h" @@ -167,10 +168,22 @@ ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID * NO_ERROR if function succeeds, or error code if function fails * */ -ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) +ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) { - FIXME( "(%p, %d): stub!\n", handle, reserved); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + + TRACE("handle %p, reserved %#x.\n", handle, reserved); + + if (!handle) + return ERROR_INVALID_PARAMETER; + + RtlInitUnicodeString(&string, device_nameW); + attr.ObjectName = &string; + return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); } /*********************************************************************** diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 6646e8e..c30c380 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -117,7 +117,7 @@ static void test_v1_server(void) memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpCreateHttpHandle(NULL, 0); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected error %u.\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected error %u.\n", ret); /* Non-zero reserved parameter is accepted on XP/2k3. */ queue = NULL;

1 0

Alexandre Julliard : inetmib1: Make bsearch() callback functions cdecl.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: ea6eea0bba9119b1361d0e5bf87c6f443ad587d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6eea0bba9119b1361d0e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:58:00 2019 +0200 inetmib1: Make bsearch() callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 96e3b1f..6345573 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -318,7 +318,7 @@ static DWORD oidToIpAddr(AsnObjectIdentifier *oid) } typedef void (*oidToKeyFunc)(AsnObjectIdentifier *oid, void *dst); -typedef int (*compareFunc)(const void *key, const void *value); +typedef int (__cdecl *compareFunc)(const void *key, const void *value); /* Finds the first value in the table that matches key. Returns its 1-based * index if found, or 0 if not found. @@ -769,7 +769,7 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int compareIpAddrRow(const void *a, const void *b) +static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *key = a, *value = b; @@ -862,7 +862,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) row->dwForwardDest = oidToIpAddr(oid); } -static int compareIpForwardRow(const void *a, const void *b) +static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *key = a, *value = b; @@ -1220,7 +1220,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) row->dwLocalPort = oid->ids[4]; } -static int compareUdpRow(const void *a, const void *b) +static int __cdecl compareUdpRow(const void *a, const void *b) { const MIB_UDPROW *key = a, *value = b; int ret;

1 0

Jacek Caban : vbscript: Fix handling null argument in CStr.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: fb5b0c64639c056d55e14011a3b4e6f2d83e7cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5b0c64639c056d55e14011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:46 2019 +0200 vbscript: Fix handling null argument in CStr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 17759b8..0797403 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -528,6 +528,9 @@ static HRESULT Global_CStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI TRACE("%s\n", debugstr_variant(arg)); + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_string(arg, &str); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index cbffcf4..93cf7f8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -129,6 +129,14 @@ TestCStr 3, "3" if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" +sub testCStrError() + on error resume next + Error.clear() + CStr(null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testCStrError() + Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120))

1 0

Jacek Caban : mshtml/tests: Add Object.defineProperties tests.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

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

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

Aug. 21, 2019

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

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

Aug. 21, 2019

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

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

Aug. 21, 2019

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

Richard Pospesel : widl: Respect wire-marshal typedefs in type libraries.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 57f697e137e099837d8ed3eb00cd2814bfc135df URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f697e137e099837d8ed3eb… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 21 11:18:10 2019 -0500 widl: Respect wire-marshal typedefs in type libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47041 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 3 ++- tools/widl/write_msft.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 4f6b4fc..79e72e0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -129,7 +129,8 @@ unsigned short get_type_vt(type_t *t) if (vt) return vt; } - if (type_is_alias(t) && is_attr(t->attrs, ATTR_PUBLIC)) + if (type_is_alias(t) && + (is_attr(t->attrs, ATTR_PUBLIC) || is_attr(t->attrs, ATTR_WIREMARSHAL))) return VT_USERDEFINED; switch (type_get_type(t)) { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index e972a26..0e6ef08 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -967,9 +967,22 @@ static int encode_type( } else { - /* typedef'd types without public attribute aren't included in the typelib */ - while (type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type_alias_get_aliasee_type(type); + /* Typedefs without the [public] attribute aren't included in the + * typelib, unless the aliasee is an anonymous UDT or the typedef + * is wire-marshalled. In the latter case the wire-marshal type, + * which may be a non-public alias, is used instead. */ + while (type_is_alias(type)) + { + if (is_attr(type->attrs, ATTR_WIREMARSHAL)) + { + type = get_attrp(type->attrs, ATTR_WIREMARSHAL); + break; + } + else if (!is_attr(type->attrs, ATTR_PUBLIC)) + type = type_alias_get_aliasee_type(type); + else + break; + } chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", type->name, type_get_type(type));

1 0

Jacek Caban : vbscript/tests: Fix tests on recent win10.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 17fb70efe6d94e8f1b4504fd32e29ab5e48280bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=17fb70efe6d94e8f1b4504fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:21:53 2019 +0200 vbscript/tests: Fix tests on recent win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 88ec994..15a8f10 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -696,7 +696,6 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Jacek Caban : vbscript: Return correct error when builtin call argument count is invalid.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 6cc7b0e8d5013bdc492ff1f31c2c2aa82351b30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc7b0e8d5013bdc492ff1f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 20:22:18 2019 +0200 vbscript: Return correct error when builtin call argument count is invalid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8ebbfb6..b252d58 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,17 @@ Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) +sub testUBoundError() + on error resume next + call Err.clear() + call UBound() + call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call UBound(arr, 1, 2) + call ok(Err.number = 450, "Err.number = " & Err.number) +end sub +call testUBoundError() + Dim newObject Set newObject = New ValClass newObject.myval = 1 @@ -494,6 +505,17 @@ TestStrComp "ABC", Empty, 1, 1 TestStrComp vbNull, vbNull, 1, 0 TestStrComp "", vbNull, 1, -1 +sub testStrCompError() + on error resume next + call Err.clear() + call StrComp() + call ok(Err.number = 450, "Err.number = " & Err.number) + call Err.clear() + call StrComp("a", "a", 0, 1) + call ok(Err.number = 450, "Err.number = " & Err.number) +end sub +call testStrCompError() + Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1)) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d781dbc..a907f40 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -232,8 +232,8 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f argn = arg_cnt(dp); if(argn < prop->min_args || argn > (prop->max_args ? prop->max_args : prop->min_args)) { - FIXME("invalid number of arguments\n"); - return E_FAIL; + WARN("invalid number of arguments\n"); + return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH); } assert(argn < ARRAY_SIZE(args));

1 0