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

Hans Leidekker : msado15: Avoid a crash with tracing on.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 40514b8a280d3089a3f3f32d9d0c3a8b3ef9cd14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40514b8a280d3089a3f3f32d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 21 11:47:13 2020 +0200 msado15: Avoid a crash with tracing on. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45295c5e07f13c7ff98e73e5e0134b19d8f8aa17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b90486b7cd9..1361f6490c5 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -179,7 +179,7 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR struct connection *connection = impl_from_Connection( iface ); WCHAR *source = NULL; - TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + TRACE( "%p, %s\n", connection, debugstr_w( str && !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; heap_free( connection->datasource );

1 0

Rémi Bernon : mscoree/tests: Test invalid assembly paths in registry.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 971ab954f768624e0242726f9686f2889ecdf7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971ab954f768624e0242726f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:44 2020 +0200 mscoree/tests: Test invalid assembly paths in registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7612ff5930c7de8c2279f2b6613c8dbaeea9894e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/comtest.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index f65e1bc6c25..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid shell32 +IMPORTS = ole32 shlwapi uuid shell32 advapi32 C_SRCS = \ comtest.c \ diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4879e3b7622..63df3219a79 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -148,6 +148,51 @@ static void run_test(BOOL expect_success) } IClassFactory_Release(classFactory); } + +} + +static void run_registry_test(run_type run) +{ + char buffer[256]; + ITest *test = NULL; + HRESULT hr, result_expected; + HKEY hkey; + DWORD ret; + int i = 0; + + if (run == run_type_exe_directory) result_expected = S_OK; + else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + + ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + RegDeleteKeyValueA(hkey, "InprocServer32", "CodeBase"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Class"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Assembly"); + RegDeleteKeyValueA(hkey, "InprocServer32", NULL); + RegDeleteKeyA(hkey, "InprocServer32"); + RegCloseKey(hkey); } static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) @@ -247,6 +292,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) SetCurrentDirectoryA(path_tmp); run_test(run == run_type_exe_directory); + run_registry_test(run); cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE)

1 0

Rémi Bernon : mscoree: Fallback to assembly name if codebase path is invalid.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 4264a498a02f3df1fa2e3123c9649f84402b8f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4264a498a02f3df1fa2e3123… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:46 2020 +0200 mscoree: Fallback to assembly name if codebase path is invalid. Also use the InprocServer32 key values if there's no subkeys, as shown by the test results. L.A.Noire game crashes on startup after failing to load its ErrorHandler assembly, that has an invalid CodeBase path in the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7b0a939a1fb9f0acc7b450cd849fb4e1d93eb499) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 44 +++++++++++++++++++++++++++++-------------- dlls/mscoree/tests/comtest.c | 3 ++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index a900ed6a3e2..886267546c5 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1759,6 +1759,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) HKEY key, subkey; LONG res; int offset = 0; + HANDLE file = INVALID_HANDLE_VALUE; DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; WCHAR classname[350], subkeyName[256]; @@ -1794,7 +1795,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) offset = lstrlenW(wszFileSlash); lstrcpyW(filename, codebase + offset); + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); } + + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); else { WCHAR assemblyname[MAX_PATH + 8]; @@ -1803,27 +1809,37 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WARN("CodeBase value cannot be found, trying Assembly.\n"); /* get the last subkey of InprocServer32 */ res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; + if (numKeys > 0) + { + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + } + else + { + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + if (res != ERROR_SUCCESS) + goto cleanup; + } hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); if (FAILED(hr)) { /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. + * The registry doesn't have a CodeBase entry or the file isn't there, and it's not in the GAC. * * Use the Assembly Key to retrieve the filename. * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 63df3219a79..87d7626a3dd 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -177,7 +177,8 @@ static void run_registry_test(run_type run) ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + todo_wine_if(result_expected != S_OK) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) {

1 0

Arkadiusz Hiler : user32: Fix WM_DEVICECHANGE handling.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 01f17546c491d0709012e96a55e1c5ac175dba72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f17546c491d0709012e96a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Nov 25 17:04:14 2020 +0200 user32: Fix WM_DEVICECHANGE handling. WM_DEVICECHANGE's lParam can be either a pointer to a variant of DEV_BROADCAST_HDR or an immediate value (usually 0) depending on the wParam's value. This fixes a crash when broadcasting WM_DEVICECHANGE with wParam = DBT_DEVNODES_CHANGED, lParam = 0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4abe3889f95e74df77f9fac117b30d236b2b2cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2ab82837d1b..37e7cb7735d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1028,7 +1028,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_DEVICECHANGE: { DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam; - push_data( data, header, header->dbch_size ); + if ((wparam & 0x8000) && header) push_data( data, header, header->dbch_size ); return 0; } case WM_WINE_KEYBOARD_LL_HOOK: @@ -1431,6 +1431,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!get_buffer_space( buffer, sizeof(BOOL) )) return FALSE; break; case WM_DEVICECHANGE: + if (!(*wparam & 0x8000)) return TRUE; minsize = sizeof(DEV_BROADCAST_HDR); break; case WM_WINE_KEYBOARD_LL_HOOK:

1 0

Hans Leidekker : winhttp: Avoid a crash when the connection is closed while handling a redirect.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 36ce75e0e6db46c8dc79f39a97f0f07aba3a6213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ce75e0e6db46c8dc79f39a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 16:52:08 2021 +0100 winhttp: Avoid a crash when the connection is closed while handling a redirect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48870 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83afd177b3735f88e38f926aaf3aa0a20178e458) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7c8e6ba89e0..aaa3c0df240 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2759,7 +2759,7 @@ static BOOL receive_response( struct request *request, BOOL async ) break; } - netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) ret = refill_buffer( request, FALSE ); if (async)

1 0

Gijs Vermeulen : quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 9167d99c9b1bddf212098d05f223f130ae06f7fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9167d99c9b1bddf212098d05… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Nov 23 17:29:28 2020 +0100 quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28332 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 4807a8f588c67e2296474399368a96c0046120fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ffd481fb171..7114d47753c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -318,7 +318,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) while (count--) { if (!(enum_filters->cursor = list_next(&enum_filters->graph->filters, enum_filters->cursor))) - return S_FALSE; + return count ? S_FALSE : S_OK; } return S_OK; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ab573b74008..b76e6fcbe23 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -692,6 +692,30 @@ static void test_enum_filters(void) hr = IEnumFilters_Reset(enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(filters[0] == filter2, "Got filter %p.\n", filters[0]);

1 0

Robert Wilhelm : vbscript: Allow keywords to be used as function name.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 90958b10be2ebe1bba5e3841e6b79f8806e90d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90958b10be2ebe1bba5e3841… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Nov 5 23:12:15 2020 +0100 vbscript: Allow keywords to be used as function name. 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 72977a75a4e281dff69f150b608f50a73bb5c81f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 10 +++++----- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 20ec89343af..924f6d61c7d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -486,11 +486,11 @@ ArgumentDecl /* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tDEFAULT { $$ = $1; } - | tERROR { $$ = $1; } - | tEXPLICIT { $$ = $1; } - | tPROPERTY { $$ = $1; } - | tSTEP { $$ = $1; } + | tDEFAULT { ctx->last_token = tIdentifier; $$ = $1; } + | tERROR { ctx->last_token = tIdentifier; $$ = $1; } + | tEXPLICIT { ctx->last_token = tIdentifier; $$ = $1; } + | tPROPERTY { ctx->last_token = tIdentifier; $$ = $1; } + | tSTEP { ctx->last_token = tIdentifier; $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2cd4f3ef2f7..7504da16e35 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1556,9 +1556,31 @@ sub test_identifiers Dim step step = "xx" Call ok(step = "xx", "step = " & step & " expected ""xx""") + + Dim property + property = "xx" + Call ok(property = "xx", "property = " & property & " expected ""xx""") end sub call test_identifiers() +Class class_test_identifiers_as_function_name + Sub Property ( par ) + End Sub + + Function Error( par ) + End Function + + Sub Default () + End Sub + + Function Explicit (par) + Explicit = par + End Function + + Sub Step ( default ) + End Sub +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0

Robert Wilhelm : vbscript: Allow keywords to be used as property name.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 5a0ea90c5b57a29d5e169b55bc9ae1b2932c8fea URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0ea90c5b57a29d5e169b55… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Nov 9 22:09:40 2020 +0100 vbscript: Allow keywords to be used as property name. 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 04b43c721a9f006c4c7d2a097eec7116958db8a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 924f6d61c7d..2e329fd0ad6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -448,11 +448,11 @@ ClassBody | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY + : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 7504da16e35..4fd4291e621 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1581,6 +1581,19 @@ Class class_test_identifiers_as_function_name End Sub End Class +Class class_test_identifiers_as_property_name + Public Property Get Property() + End Property + + Public Property Let Error(par) + Error = par + End Property + + Public Property Set Default(par) + Set Default = par + End Property +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0

Robert Wilhelm : vbscript: Support properties with parameters.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 673810f0f631fc9d40d4bf046eb11775216d399a URL: https://source.winehq.org/git/wine.git/?a=commit;h=673810f0f631fc9d40d4bf04… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 17 21:11:32 2020 +0100 vbscript: Support properties with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 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 a839ac952a8d5673b0aff6307cc7ecc0eabb3d99) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2e329fd0ad6..390a42f7fad 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -450,7 +450,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4fd4291e621..dd6012bbd35 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1695,6 +1695,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey,newKey) + oDict = oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict = uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict = a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 33366b9de51..556ea144ff6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -197,28 +197,43 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT i; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for(i=1; i < dp.cArgs; i++) { + dp.rgvarg[i]=params->rgvarg[params->cNamedArgs+i-1]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default:

1 0

Robert Wilhelm : vbscript: Support property set with parameters.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: be8ffcef055071315a0771fcd7c9106759bece3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8ffcef055071315a0771fc… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 21 10:27:32 2020 +0100 vbscript: Support property set with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 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 c39cd37383f402286c79a58e064adb98c0e7c6dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 11 +++-------- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a3d37d23dd5..9723d332d0e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -963,12 +963,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - - hres = stack_assume_disp(ctx, 1, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -977,7 +972,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; @@ -989,7 +984,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 390a42f7fad..b4ec921a188 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,7 +452,7 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dd6012bbd35..1ab3b6274e6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1697,6 +1697,17 @@ end class Class TestPropParam Public oDict + Public gotNothing + Public m_obj + + Public Property Set bar(obj) + Set m_obj = obj + End Property + Public Property Set foo(par,obj) + Set m_obj = obj + if obj is Nothing Then gotNothing = True + oDict = par + End Property Public Property Let Key(oldKey,newKey) oDict = oldKey & newKey End Property @@ -1715,6 +1726,11 @@ x.three(1,2) = 3 call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") x.ten(1,2,3,4,5,6,7,8,9) = 0 call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") +Set x.bar = Nothing +call ok(x.gotNothing=Empty,"x.gotNothing = " & x.gotNothing & " expected Empty") +Set x.foo("123") = Nothing +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +call ok(x.gotNothing=True,"x.gotNothing = " & x.gotNothing & " expected true") set x = new TestPropSyntax set x.prop = new TestPropSyntax

1 0