October 2020 - Wine-devel - list.winehq.org

[PATCH] opcservices: Use wide-char string literals.
by Michael Stefaniuc 12 Oct '20

12 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opcservices/factory.c | 3 +-- dlls/opcservices/package.c | 54 +++++++++++++------------------------- dlls/opcservices/uri.c | 7 +++-- 3 files changed, 22 insertions(+), 42 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index ee155b3e714..7ee66676c9d 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -320,7 +320,6 @@ static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcU static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, IOpcPartUri **out) { - static const WCHAR rootW[] = {'/',0}; IUri *part_uri, *root_uri, *combined; HRESULT hr; @@ -337,7 +336,7 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, return hr; } - if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri))) + if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &root_uri))) { WARN("Failed to create root uri, hr %#x.\n", hr); IUri_Release(part_uri); diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 6ed7f6bcd7c..df1a71e17e8 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1201,12 +1201,11 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->id = CoTaskMemAlloc(10 * sizeof(WCHAR)); if (relationship->id) { - static const WCHAR fmtW[] = {'R','%','0','8','X',0}; DWORD generated; /* FIXME: test that generated id is unique */ RtlGenRandom(&generated, sizeof(generated)); - swprintf(relationship->id, 10, fmtW, generated); + swprintf(relationship->id, 10, L"R%08X", generated); if (opc_relationshipset_get_rel(set, relationship->id)) { @@ -1733,31 +1732,18 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co static HRESULT opc_package_write_default_type(const WCHAR *ext, const WCHAR *type, IXmlWriter *writer) { - static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; HRESULT hr; - hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Default", NULL); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, ext); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Extension", NULL, ext); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"ContentType", NULL, type); return hr; } static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_archive *archive, IXmlWriter *writer) { - static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', - 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; - static const WCHAR relstypeW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','v','n','d','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','-', - 'p','a','c','k','a','g','e','.','r','e','l','a','t','i','o','n','s','h','i','p','s','+','x','m','l',0}; - static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; - static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR overrideW[] = {'O','v','e','r','r','i','d','e',0}; - static const WCHAR partnameW[] = {'P','a','r','t','N','a','m','e',0}; - static const WCHAR typesW[] = {'T','y','p','e','s',0}; - static const WCHAR relsW[] = {'r','e','l','s',0}; struct content_type *content_type, *content_type2; struct content_types types; IStream *content = NULL; @@ -1774,11 +1760,13 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Types", + L"http://schemas.openxmlformats.org/package/2006/content-types"); if (SUCCEEDED(hr) && types.has_rels_part) { - hr = opc_package_write_default_type(relsW, relstypeW, writer); + hr = opc_package_write_default_type(L"rels", + L"application/vnd.openxmlformats-package.relationships+xml", writer); if (SUCCEEDED(hr)) hr = IXmlWriter_WriteEndElement(writer); } @@ -1799,17 +1787,17 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a BSTR name = NULL; if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, overrideW, NULL); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Override", NULL); if (SUCCEEDED(hr)) hr = IOpcPart_GetName(content_type->u.override.part, &uri); if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(uri, &name); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, partnameW, NULL, name); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"PartName", NULL, name); if (SUCCEEDED(hr)) hr = IOpcPart_GetContentType(content_type->u.override.part, &type); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"ContentType", NULL, type); if (uri) IOpcPartUri_Release(uri); @@ -1831,7 +1819,7 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a hr = IXmlWriter_Flush(writer); if (SUCCEEDED(hr)) - hr = compress_add_file(archive, contenttypesW, content, OPC_COMPRESSION_NORMAL); + hr = compress_add_file(archive, L"[Content_Types].xml", content, OPC_COMPRESSION_NORMAL); if (content) IStream_Release(content); @@ -1841,16 +1829,12 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) { - static const WCHAR relationshipW[] = {'R','e','l','a','t','i','o','n','s','h','i','p',0}; - static const WCHAR targetW[] = {'T','a','r','g','e','t',0}; - static const WCHAR typeW[] = {'T','y','p','e',0}; - static const WCHAR idW[] = {'I','d',0}; BSTR target_uri; HRESULT hr; WCHAR *str; IUri *uri; - if (FAILED(hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipW, NULL))) + if (FAILED(hr = IXmlWriter_WriteStartElement(writer, NULL, L"Relationship", NULL))) return hr; if (FAILED(hr = IOpcRelationship_GetTargetUri(rel, &uri))) @@ -1859,7 +1843,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) IUri_GetRawUri(uri, &target_uri); IUri_Release(uri); - hr = IXmlWriter_WriteAttributeString(writer, NULL, targetW, NULL, target_uri); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Target", NULL, target_uri); SysFreeString(target_uri); if (FAILED(hr)) return hr; @@ -1867,7 +1851,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) if (FAILED(hr = IOpcRelationship_GetId(rel, &str))) return hr; - hr = IXmlWriter_WriteAttributeString(writer, NULL, idW, NULL, str); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Id", NULL, str); CoTaskMemFree(str); if (FAILED(hr)) return hr; @@ -1875,7 +1859,7 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) if (FAILED(hr = IOpcRelationship_GetRelationshipType(rel, &str))) return hr; - hr = IXmlWriter_WriteAttributeString(writer, NULL, typeW, NULL, str); + hr = IXmlWriter_WriteAttributeString(writer, NULL, L"Type", NULL, str); CoTaskMemFree(str); if (FAILED(hr)) return hr; @@ -1886,9 +1870,6 @@ static HRESULT opc_package_write_rel(IOpcRelationship *rel, IXmlWriter *writer) static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelationshipSet *rels, IOpcUri *uri, IXmlWriter *writer) { - static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', - 'p','a','c','k','a','g','e','/','2','0','0','6','/','r','e','l','a','t','i','o','n','s','h','i','p','s',0}; - static const WCHAR relationshipsW[] = {'R','e','l','a','t','i','o','n','s','h','i','p','s',0}; IOpcRelationshipEnumerator *enumerator; BSTR rels_part_uri = NULL; IOpcPartUri *rels_uri; @@ -1916,7 +1897,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, relationshipsW, uriW); + hr = IXmlWriter_WriteStartElement(writer, NULL, L"Relationships", + L"http://schemas.openxmlformats.org/package/2006/relationships"); while (has_next) { diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index db889f7144b..5cba14aa78b 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -449,8 +449,8 @@ static const IOpcPartUriVtbl opc_part_uri_vtbl = static IUri *opc_part_uri_get_rels_uri(IUri *uri) { - static const WCHAR relsdirW[] = {'/','_','r','e','l','s',0}; - static const WCHAR relsextW[] = {'.','r','e','l','s',0}; + static const WCHAR relsdirW[] = L"/_rels"; + static const WCHAR relsextW[] = L".rels"; WCHAR *start = NULL, *end, *ret; IUri *rels_uri; HRESULT hr; @@ -578,7 +578,6 @@ HRESULT opc_part_uri_create(IUri *uri, struct opc_uri *source_uri, IOpcPartUri * HRESULT opc_root_uri_create(IOpcUri **out) { - static const WCHAR rootW[] = {'/',0}; struct opc_uri *obj; HRESULT hr; IUri *uri; @@ -588,7 +587,7 @@ HRESULT opc_root_uri_create(IOpcUri **out) if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; - if (FAILED(hr = CreateUri(rootW, Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) + if (FAILED(hr = CreateUri(L"/", Uri_CREATE_ALLOW_RELATIVE, 0, &uri))) { WARN("Failed to create rels uri, hr %#x.\n", hr); heap_free(obj); -- 2.26.2

1 0

[PATCH] iexplore: Use wide-char string literals.
by Michael Stefaniuc 12 Oct '20

12 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/iexplore/main.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 01ad9d02f5f..ade9f8c5226 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -35,28 +35,18 @@ static BOOL check_native_ie(void) void* buf; BOOL ret = TRUE; LPWORD translation; - - static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR translationW[] = - {'\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0}; - static const WCHAR file_desc_fmtW[] = - {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; WCHAR file_desc_strW[48]; - size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + size = GetFileVersionInfoSizeW(L"browseui.dll", &handle); if(!size) return TRUE; buf = HeapAlloc(GetProcessHeap(), 0, size); - GetFileVersionInfoW(browseui_dllW, 0, size,buf); - if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + GetFileVersionInfoW(L"browseui.dll", 0, size,buf); + if (VerQueryValueW(buf, L"\\VarFileInfo\\Translation", (void **)&translation, &bytes)) { - wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); + wsprintfW(file_desc_strW, L"\\StringFileInfo\\%04x%04x\\FileDescription", translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, L"Wine"); } HeapFree(GetProcessHeap(), 0, buf); @@ -78,13 +68,10 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { - static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; - static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; - if(*cmdline == '-' || *cmdline == '/') { - if(!wcsicmp(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); - if(!wcsicmp(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, L"unregserver")) return register_iexplore(FALSE); } -- 2.26.2

1 0

[PATCH v2] d3dcompiler: Fix a leak on error path (Coverity).
by Sven Baars 12 Oct '20

12 Oct '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- v2: Moved the alloc instead. dlls/d3dcompiler_43/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index df39716b495..21ad98f2b5c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1446,7 +1446,7 @@ static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsig struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { - struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); + struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; DWORD writemask = 0; @@ -1459,6 +1459,7 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return NULL; } + assign = d3dcompiler_alloc(sizeof(*assign)); if (!assign) { ERR("Out of memory\n"); -- 2.25.1

2 1

[PATCH] jscript: cc_parser_parse implement '&&' expression.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 4bc6260f194..dd72f61b03b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -161,7 +161,7 @@ CCLogicalORExpression CCLogicalANDExpression : CCBitwiseORExpression { $$ = $1; } | CCBitwiseANDExpression tAND CCBitwiseORExpression - { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccbool($1) && get_ccbool($3)); } CCBitwiseORExpression : CCBitwiseXORExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 8f45a3dd331..2232d2fb689 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -180,6 +180,23 @@ expect(@test, true); @set @test = (1 >= true-1) expect(@test, true); +(a)set @test = (true && true) +expect(@test, true); + +(a)set @test = (false && true) +expect(@test, false); + +(a)set @test = (true && false) +expect(@test, false); + +(a)set @test = (false && false) +expect(@test, false); + +if(!isWin64) { +(a)set @test = (@_win32&&@_jscript_version>=5) +expect(@test, true); +} + @if (false) this wouldn not parse "@end -- 2.26.2

2 1

[PATCH 2/2] vbscript: support for class default sub.
by Robert Wilhelm 12 Oct '20

12 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 26 +++++++++++++++++++++----- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 +- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e9f6361aee9..2d75f4d4a5f 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1670,7 +1670,8 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) function_decl_t *func_decl, *func_prop_decl; class_desc_t *class_desc; dim_decl_t *prop_decl; - unsigned i; + unsigned i, def=0; + BOOL is_default; HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; @@ -1690,15 +1691,25 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) if(!class_desc->name) return E_OUTOFMEMORY; - class_desc->func_cnt = 1; /* always allocate slot for default getter */ + class_desc->func_cnt = 1; /* always allocate slot for default getter or method */ for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { + is_default = FALSE; + if (func_decl->is_default) is_default = TRUE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) + is_default = TRUE; break; } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; + else + def++; + } + + if(def > 1) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; } class_desc->funcs = compiler_alloc(ctx->code, class_desc->func_cnt*sizeof(*class_desc->funcs)); @@ -1707,12 +1718,17 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) memset(class_desc->funcs, 0, class_desc->func_cnt*sizeof(*class_desc->funcs)); for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { + is_default = FALSE; + if (func_decl->is_default) is_default = TRUE; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { if(func_prop_decl->is_default) { - i--; + is_default = TRUE; break; } } + if(is_default) { + i--; + } if(!wcsicmp(class_initializeW, func_decl->name)) { if(func_decl->type != FUNC_SUB) { @@ -1730,7 +1746,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->class_terminate_id = i; } - hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (is_default ? 0 : i)); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7e6cc17efd6..942e76459c2 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -993,7 +993,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { - if(type == FUNC_PROPGET) { + if(type == FUNC_PROPGET || type == FUNC_FUNCTION || type == FUNC_SUB) { is_default = TRUE; }else { FIXME("Invalid default property\n"); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fc762450a3b..65f8a458cd7 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1750,6 +1750,36 @@ call ok(x.getprop.getprop().prop is obj, "x.getprop.getprop().prop is not obj (e ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) +funcCalled = "" +class DefaultSubTest1 + Public default Sub init(a) + funcCalled = "init" & a + end sub +end class + +Set obj = New DefaultSubTest1 +obj.init(1) +call ok(funcCalled = "init1","funcCalled=" & funcCalled) +funcCalled = "" +obj(2) +call ok(funcCalled = "init2","funcCalled=" & funcCalled) + +class DefaultSubTest2 + Public Default Function init + funcCalled = "init" + end function +end class + +Set obj = New DefaultSubTest2 +funcCalled = "" +obj.init() +call ok(funcCalled = "init","funcCalled=" & funcCalled) +funcCalled = "" +' todo this is not yet supported +'funcCalled = "" +'obj() +'call ok(funcCalled = "init","funcCalled=" & funcCalled) + with nothing end with diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1ff1110e56b..864c36681e3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,7 +38,7 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t { unsigned i; - for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + for(i = 0; i < This->desc->func_cnt; i++) { if(invoke_type == VBDISP_ANY) { if(!search_private && !This->desc->funcs[i].is_public) continue; -- 2.26.2

2 1

[PATCH 6/6] wineconsole: Reimplement as AllocConsole wrapper.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/Makefile.in | 5 +- programs/wineconsole/dialog.c | 872 -------------- programs/wineconsole/registry.c | 367 ------ programs/wineconsole/user.c | 1445 ------------------------ programs/wineconsole/winecon_private.h | 106 -- programs/wineconsole/winecon_user.h | 57 - programs/wineconsole/wineconsole.c | 879 +------------- programs/wineconsole/wineconsole.rc | 104 -- programs/wineconsole/wineconsole_res.h | 68 -- 9 files changed, 41 insertions(+), 3862 deletions(-) delete mode 100644 programs/wineconsole/dialog.c delete mode 100644 programs/wineconsole/registry.c delete mode 100644 programs/wineconsole/user.c delete mode 100644 programs/wineconsole/winecon_private.h delete mode 100644 programs/wineconsole/winecon_user.h

1 0

[PATCH 5/6] kernelbase: Use conhost in AllocConsole.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH 4/6] conhost: Set console window title.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 3/6] conhost: Store title as zero terminated string.
by Jacek Caban 12 Oct '20

12 Oct '20

To make it usable for Windows functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 19 ++++++++++--------- programs/conhost/conhost.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH 2/6] conhost: Import scrolling support from wineconsole.
by Jacek Caban 12 Oct '20

12 Oct '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

1 0