March 2021 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msado15: Implement _Command get/putref ActiveConnection.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 15b017e53a4293c98f71ffaeae10660dfdc97579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b017e53a4293c98f71ffae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:57:15 2020 +1100 msado15: Implement _Command get/putref ActiveConnection. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aff59389658461630206c3683d84bd754555bc30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035eb..d19108a1a25 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 27e917ce626..b2ef3183dfb 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -744,6 +744,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -797,6 +798,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Jan Sikorski : dbghelp: Avoid forwarded exports.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 2360f56f695391c62a7b858f6b038b6cfd8a3143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2360f56f695391c62a7b858f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Oct 19 13:03:14 2020 +0200 dbghelp: Avoid forwarded exports. Fallout 76 does not handle forwarded exports of these functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd4b700ad559b512b150acacd3fae3016180c8bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6ffa82da926..b17c7b18655 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -19,9 +19,9 @@ @ stdcall GetTimestampForLoadedLibrary(long) @ stdcall ImageDirectoryEntryToData(ptr long long ptr) @ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) -@ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader -@ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection -@ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa +@ stdcall -import ImageNtHeader(ptr) RtlImageNtHeader +@ stdcall -import ImageRvaToSection(ptr ptr long) RtlImageRvaToSection +@ stdcall -import ImageRvaToVa(ptr ptr long ptr) RtlImageRvaToVa @ stdcall ImagehlpApiVersion() @ stdcall ImagehlpApiVersionEx(ptr) @ stdcall MakeSureDirectoryPathExists(str)

1 0

Hans Leidekker : odbccp32: Map system DSN requests to user DSN requests in SQLConfigDataSource.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: e4e43e4b780e73d8b7d27ec1063762b583812b3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e43e4b780e73d8b7d27ec1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 12 11:35:13 2020 +0100 odbccp32: Map system DSN requests to user DSN requests in SQLConfigDataSource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50116 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c8eae716b6857f312d921bba6bcbaa1d59cc53f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index c842872fa6e..0e4a12534c8 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -338,10 +338,40 @@ fail: return FALSE; } +static WORD map_request(WORD request) +{ + switch (request) + { + case ODBC_ADD_DSN: + case ODBC_ADD_SYS_DSN: + return ODBC_ADD_DSN; + + case ODBC_CONFIG_DSN: + case ODBC_CONFIG_SYS_DSN: + return ODBC_CONFIG_DSN; + + case ODBC_REMOVE_DSN: + case ODBC_REMOVE_SYS_DSN: + return ODBC_REMOVE_DSN; + + default: + FIXME("unhandled request %u\n", request); + return 0; + } +} + +static UWORD get_config_mode(WORD request) +{ + if (request == ODBC_ADD_DSN || request == ODBC_CONFIG_DSN || request == ODBC_REMOVE_DSN) return ODBC_USER_DSN; + return ODBC_SYSTEM_DSN; +} + BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) { HMODULE mod; BOOL ret = FALSE; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); if (TRACE_ON(odbc)) @@ -353,16 +383,24 @@ BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWST clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + mod = load_config_driver(driver); if (!mod) return FALSE; + config_mode = get_config_mode(request); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); if(pConfigDSNW) - ret = pConfigDSNW(hwnd, request, driver, attributes); + ret = pConfigDSNW(hwnd, mapped_request, driver, attributes); else ERR("Failed to find ConfigDSNW\n"); + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); @@ -376,6 +414,8 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a HMODULE mod; BOOL ret = FALSE; WCHAR *driverW; + UWORD config_mode_prev = config_mode; + WORD mapped_request; TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); @@ -388,6 +428,10 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a clear_errors(); + mapped_request = map_request(request); + if (!mapped_request) + return FALSE; + driverW = heap_strdupAtoW(driver); if (!driverW) { @@ -402,11 +446,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a return FALSE; } + config_mode = get_config_mode(request); + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); if (pConfigDSN) { TRACE("Calling ConfigDSN\n"); - ret = pConfigDSN(hwnd, request, driver, attributes); + ret = pConfigDSN(hwnd, mapped_request, driver, attributes); } else { @@ -418,11 +464,13 @@ BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR a attr = SQLInstall_strdup_multi(attributes); if(attr) - ret = pConfigDSNW(hwnd, request, driverW, attr); + ret = pConfigDSNW(hwnd, mapped_request, driverW, attr); heap_free(attr); } } + config_mode = config_mode_prev; + if (!ret) push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed);

1 0

Gijs Vermeulen : quartz: Return E_INVALIDARG when cursor is NULL in IEnumFilters::Skip().
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 49064d4311e948a83e262610054a69bf260fa432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49064d4311e948a83e262610… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Nov 23 17:29:27 2020 +0100 quartz: Return E_INVALIDARG when cursor is NULL in IEnumFilters::Skip(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68d03ba8bbeb07116e15373938e511d693346f4a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1ed41bdcec5..ffd481fb171 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -313,7 +313,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count); if (!enum_filters->cursor) - return S_FALSE; + return E_INVALIDARG; while (count--) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 62546342097..ab573b74008 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -677,6 +677,12 @@ static void test_enum_filters(void) hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 0); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + IFilterGraph2_AddFilter(graph, filter1, NULL); IFilterGraph2_AddFilter(graph, filter2, NULL);

1 0

Robert Wilhelm : jscript: Cc_parser_parse implement '&&' expression.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 0c1d6a6f174da3f5956ac77b19c842ac1eaa75f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1d6a6f174da3f5956ac77b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Oct 12 22:25:33 2020 +0200 jscript: Cc_parser_parse implement '&&' expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f586348deb97e8dea5f78ea3e45db39951ee8d30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- 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

1 0

Robert Wilhelm : vbscript: Support class default sub.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 5675b9a2e206efc91ec4d4dd6fe83bc03793caaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=5675b9a2e206efc91ec4d4dd… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:21 2020 +0200 vbscript: Support class default sub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16fe2037fb2b3ddec1e6312b076cc76d88e9240a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/compile.c | 14 +++++++++++--- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fc0b22c65c8..0674f634078 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1644,6 +1644,7 @@ static BOOL lookup_class_funcs(class_desc_t *class_desc, const WCHAR *name) static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) { function_decl_t *func_decl, *func_prop_decl; + BOOL is_default, have_default = FALSE; class_desc_t *class_desc; dim_decl_t *prop_decl; unsigned i; @@ -1666,14 +1667,21 @@ 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; for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->is_default) + if(func_prop_decl->is_default) { + if(have_default) { + FIXME("multiple default getters or methods\n"); + return E_FAIL; + } + is_default = have_default = TRUE; break; + } } - if(!func_prop_decl) + if(!is_default) class_desc->func_cnt++; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4a4708e7785..20ec89343af 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -995,7 +995,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 14761cf5a52..2cd4f3ef2f7 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1671,6 +1671,36 @@ call ok(x.getProp.prop.prop = 3, "x.getProp.prop.prop = " & x.getProp.prop.prop) 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 7db333660d7..33366b9de51 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -38,19 +38,17 @@ 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; - if(!i && !This->desc->funcs[0].name) /* default value may not exist */ - continue; }else { if(!This->desc->funcs[i].entries[invoke_type] || (!search_private && !This->desc->funcs[i].entries[invoke_type]->is_public)) continue; } - if(!wcsicmp(This->desc->funcs[i].name, name)) { + if(This->desc->funcs[i].name && !wcsicmp(This->desc->funcs[i].name, name)) { *id = i; return TRUE; }

1 0

Robert Wilhelm : vbscript: Add is_default flag to function_decl_t.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 3f5ca5b5b163a752e65454cefc980629f15d07e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5ca5b5b163a752e65454ce… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Oct 13 18:58:06 2020 +0200 vbscript: Add is_default flag to function_decl_t. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 54740a5cb8dfb8ccedad988aaf46125893cebd15) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c76ba73bd8c..fc0b22c65c8 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1444,7 +1444,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1606,7 +1605,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1672,7 +1670,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1686,7 +1684,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 66ad2068375..a3d37d23dd5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -119,7 +119,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 4bf82cbedb3..a9875f2efec 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -183,6 +183,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9507e97e8ca..4a4708e7785 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -992,10 +992,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1010,6 +1011,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b4c71..7db333660d7 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 19431e23c34..9b2d28050e2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -310,7 +310,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct {

1 0

Michael Müller : dxdiagn: Calling GetChildContainer with an empty string on a leaf container returns the object itself.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 5d639d4b7baf1bbffbe8500191cd7da68b2f3b81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d639d4b7baf1bbffbe85001… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Nov 12 17:37:49 2020 +0100 dxdiagn: Calling GetChildContainer with an empty string on a leaf container returns the object itself. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38014 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7fd541cb6d87a41878eacc6335f73c0bf0d8041) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/container.c | 12 ++++++++++-- dlls/dxdiagn/tests/container.c | 22 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 87d593a15a7..7a5a7e9d0a5 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -160,6 +160,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i if (NULL == tmp) return E_FAIL; lstrcpynW(tmp, pwszContainer, tmp_len); + /* special handling for an empty string and leaf container */ + if (!tmp[0] && list_empty(&pContainer->subContainers)) { + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance); + if (SUCCEEDED(hr)) + TRACE("Succeeded in getting the container instance\n"); + goto out; + } + cur = wcschr(tmp, '.'); while (NULL != cur) { *cur = '\0'; /* cut tmp string to '.' */ @@ -167,7 +175,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Trying to get parent container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (FAILED(hr)) - goto on_error; + goto out; cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = wcschr(tmp, '.'); @@ -181,7 +189,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Succeeded in getting the container instance\n"); } -on_error: +out: HeapFree(GetProcessHeap(), 0, orig_tmp); return hr; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index e335cf5b42e..a43324b3e8f 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -819,7 +819,7 @@ static void test_DxDiag_SystemInfo(void) {L"szProcessorEnglish", VT_BSTR}, }; - IDxDiagContainer *container; + IDxDiagContainer *container, *container2; HRESULT hr; if (!create_root_IDxDiagContainer()) @@ -828,6 +828,9 @@ static void test_DxDiag_SystemInfo(void) return; } + hr = IDxDiagContainer_GetChildContainer(pddc, L"", &container2); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_SystemInfo", &container); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); @@ -835,6 +838,14 @@ static void test_DxDiag_SystemInfo(void) { trace("Testing container DxDiag_SystemInfo\n"); test_container_properties(container, property_tests, ARRAY_SIZE(property_tests)); + + container2 = NULL; + hr = IDxDiagContainer_GetChildContainer(container, L"", &container2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(container2 != NULL, "Expected container2 != NULL\n"); + ok(container2 != container, "Expected container != container2\n"); + + IDxDiagContainer_Release(container2); IDxDiagContainer_Release(container); } @@ -954,8 +965,8 @@ static void test_DxDiag_SoundDevices(void) for (i = 0; i < count; i++) { + IDxDiagContainer *child, *child2; WCHAR child_container[256]; - IDxDiagContainer *child; hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, ARRAY_SIZE(child_container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); @@ -966,6 +977,13 @@ static void test_DxDiag_SoundDevices(void) trace("Testing container %s\n", wine_dbgstr_w(child_container)); test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); + child2 = NULL; + hr = IDxDiagContainer_GetChildContainer(child, L"", &child2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(child2 != NULL, "Expected child2 != NULL\n"); + ok(child2 != child, "Expected child != child2\n"); + + IDxDiagContainer_Release(child2); IDxDiagContainer_Release(child); }

1 0

Michael Stefaniuc : dxdiagn/tests: Use wide-char string literals.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 4f5b3353bbed111cbb87e21d83a132bad36891a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5b3353bbed111cbb87e21d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:13 2020 +0200 dxdiagn/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 521f954d3cf1be2dd41e6cc2eeb4e11c510c10b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 205 ++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5b3353bbed111cbb87…

1 0

Hirofumi Katayama : comctl32/ipaddress: Focus first field on WM_SETFOCUS.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: a16032898d25dc0869eac748a2bf4a3249d01a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16032898d25dc0869eac748… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Thu Oct 8 17:03:27 2020 +0300 comctl32/ipaddress: Focus first field on WM_SETFOCUS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49924 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c291085235b57bb1f2ef92ccde4ca8035928a1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/ipaddress.c | 4 ++++ dlls/comctl32/tests/ipaddress.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 7c69d4ec01f..e8632d2dae3 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -638,6 +638,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); + case WM_SETFOCUS: + IPADDRESS_SetFocusToField (infoPtr, 0); + break; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 5a5aafe7aa8..6e6512514d9 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -114,6 +114,37 @@ todo_wine DestroyWindow(hwnd); } +static void test_WM_SETFOCUS(void) +{ + struct child_enum child_enum = {{ 0 }}; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + SetFocus(child_enum.fields[3]); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + SetFocus(hwnd); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -121,12 +152,14 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0