wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Alexandre Julliard : kernel32: Move support for running wineboot to ntdll.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 461b5e56f95eb095d97e4af1cb1c5fd64bb2862a URL: https://source.winehq.org/git/wine.git/?a=commit;h=461b5e56f95eb095d97e4af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:05:07 2019 +0100 kernel32: Move support for running wineboot to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 296 +------------------------------------------ dlls/ntdll/env.c | 100 +++++++++++++-- programs/wineboot/wineboot.c | 14 +- 3 files changed, 97 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=461b5e56f95eb095d97e…

1 0

Alexandre Julliard : ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess().
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 326df4c18042bdb6243a75a0843a71f85927dc71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=326df4c18042bdb6243a75a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 5 11:03:54 2019 +0100 ntdll: Support running a builtin without corresponding file in RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c7e2cdb1b7..7c108f2896 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1135,6 +1135,32 @@ static NTSTATUS spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int soc } +/*************************************************************************** + * is_builtin_path + */ +static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) +{ + static const WCHAR systemW[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\'}; + static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','w','o','w','6','4'}; + + *is_64bit = is_win64; + if (path->Length > sizeof(systemW) && !strncmpiW( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + { + if (is_wow64 && !ntdll_get_thread_data()->wow64_redir) *is_64bit = TRUE; + return TRUE; + } + if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && + !strncmpiW( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) + { + *is_64bit = FALSE; + return TRUE; + } + return FALSE; +} + + /*********************************************************************** * get_pe_file_info */ @@ -1148,7 +1174,29 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, InitializeObjectAttributes( &attr, path, attributes, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) return status; + FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) + { + BOOL is_64bit; + + if (is_builtin_path( path, &is_64bit )) + { + TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); + memset( info, 0, sizeof(*info) ); + /* assume current arch */ +#if defined(__i386__) || defined(__x86_64__) + info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; +#elif defined(__powerpc__) + info->cpu = CPU_POWERPC; +#elif defined(__arm__) + info->cpu = CPU_ARM; +#elif defined(__aarch64__) + info->cpu = CPU_ARM64; +#endif + *handle = 0; + return STATUS_SUCCESS; + } + return status; + } if (!(status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, @@ -1355,10 +1403,10 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, process_handle = thread_handle = 0; status = STATUS_SUCCESS; } - else status = err ? err : ERROR_INTERNAL_ERROR; + else status = err ? err : STATUS_INTERNAL_ERROR; done: - NtClose( file_handle ); + if (file_handle) NtClose( file_handle ); if (process_info) NtClose( process_info ); if (process_handle) NtClose( process_handle ); if (thread_handle) NtClose( thread_handle );

1 0

Zebediah Figura : d3d8/tests: Flush events after sending SC_MAXIMIZE.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b29d02aa5ba65465b4adc01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 1 10:52:03 2019 -0500 d3d8/tests: Flush events after sending SC_MAXIMIZE. For some reason, on fvwm2 sometimes focus_window will be restored and activated between the subsequent call to SetForegroundWindow() and the next call to ShowWindow(SW_RESTORE), causing the next test to fail. Flushing first seems to reliably work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 819c1cd944..9fc06c3c9d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3151,6 +3151,7 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; + flush_events(); SetForegroundWindow(GetDesktopWindow()); flush_events();

1 0

Zebediah Figura : d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b2165875771a3a2f9173ccddc8f36d17829f3519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2165875771a3a2f9173ccdd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 3 20:44:07 2019 -0600 d3d9/tests: Reorder two occlusion query tests to work around a timeout with llvmpipe. llvmpipe is extraordinarily slow to execute glBeginQuery() [as much as 10ms per call] when the regression test for bug 45932 is run after the previous test drawing a 33-bit number of samples. Swap the two tests to work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ca639001..75cddbb6db 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6007,6 +6007,26 @@ static void test_occlusion_query(void) if (broken_occlusion) goto done; + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Failed to begin scene, hr %#x.\n", hr); + for (i = 0; i < 50000; ++i) + { + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Failed to end scene, hr %#x.\n", hr); + + wait_query(query); + + memset(&data, 0xff, sizeof(data)); + hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0 && data.dword[1] == 0, + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -6062,26 +6082,6 @@ static void test_occlusion_query(void) || broken(data.dword[0] < 0xffffffff && !data.dword[1]), "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - for (i = 0; i < 50000; ++i) - { - hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - wait_query(query); - - memset(&data, 0xff, sizeof(data)); - hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(data.dword[0] == 0 && data.dword[1] == 0, - "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); - IDirect3DSurface9_Release(rt); done:

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for "any"-stream requests.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 9d14077e29eb12546dd70c078b03d6f9c386fe51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d14077e29eb12546dd70c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 23:02:45 2019 +0300 mfreadwrite/tests: Add some tests for "any"-stream requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 511 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 511 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d14077e29eb12546dd7…

1 0

Vincent Povirk : Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.".
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 1fddf230ffff2b0946f6b9ae13648b454785e23e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fddf230ffff2b0946f6b9ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:30 2019 -0600 Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.". This reverts commit d10f2c0723585da66a7b1e822e852ce54d56c5f1. The bug we were working around has been fixed in upstream Mono and in Wine Mono 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 -- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b72af709c0..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,8 +1544,6 @@ __int32 WINAPI _CorExeMain(void) if (domain) { - int dummy; - mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 575d6ce1d3..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,7 +124,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); -void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -225,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); - LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5847126b3e..d5f78b61f0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,7 +177,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; -extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.9.4.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: b06d272d635d30f570b440da2308b53fcc43c7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b06d272d635d30f570b440da… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 4 13:34:29 2019 -0600 mscoree: Update Wine Mono to 4.9.4. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index e501054e16..350c25ef90 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.3" -#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" +#define MONO_VERSION "4.9.4" +#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 250bd24ad1..5847126b3e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.3" +#define WINE_MONO_VERSION "4.9.4" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Jacek Caban : vbscript: Allow arbitrary number of arguments in builtin functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 2dceea6f35ae607c781a6452aa020244ac3a6cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dceea6f35ae607c781a6452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:57 2019 +0100 vbscript: Allow arbitrary number of arguments in builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 16 +++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4171df3915..e4ff572412 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -172,8 +172,9 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L { BuiltinDisp *This = impl_from_IDispatch(iface); const builtin_prop_t *prop; - VARIANT args[8]; + VARIANT args_buf[8], *args; unsigned argn, i; + HRESULT hres; TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, id, debugstr_guid(riid), lcid, flags, dp, res, ei, err); @@ -248,7 +249,13 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH); } - assert(argn < ARRAY_SIZE(args)); + if(argn <= ARRAY_SIZE(args_buf)) { + args = args_buf; + }else { + args = heap_alloc(argn * sizeof(*args)); + if(!args) + return E_OUTOFMEMORY; + } for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -257,7 +264,10 @@ static HRESULT WINAPI Builtin_Invoke(IDispatch *iface, DISPID id, REFIID riid, L args[i] = dp->rgvarg[dp->cArgs-i-1]; } - return prop->proc(This, args, dp->cArgs, res); + hres = prop->proc(This, args, dp->cArgs, res); + if(args != args_buf) + heap_free(args); + return hres; } static const IDispatchVtbl BuiltinDispVtbl = { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index afa0c2bb1f..d4f3eeaa47 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -243,6 +243,11 @@ Call ok(UBound(x) = 2, "UBound(x) = " & UBound(x)) Call ok(getVT(UBound(x, 1)) = "VT_I4", "getVT(UBound(x, 1)) = " & getVT(UBound(x, 1))) Call ok(UBound(x, 1) = 2, "UBound(x) = " & UBound(x, 1)) +x = Array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33) +ok x(1) = 2, "x(1) = " & x(1) +ok x(32) = 33, "x(32) = " & x(32) +ok ubound(x) = 32, "ubound(x) = " & ubound(x) + Dim arr2(2, 4) Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x))

1 0

Jacek Caban : vbscript: Replace existing function for duplicated functions.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 52bbac0a3661d1437b22cce40d4a7980c3efeaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bbac0a3661d1437b22cce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:42 2019 +0100 vbscript: Replace existing function for duplicated functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 24 +++++++++++++----------- dlls/vbscript/tests/lang.vbs | 15 +++++++++++++++ dlls/vbscript/tests/run.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index dae8a97c83..6b0e113bef 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1571,7 +1571,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi function_t *func; HRESULT hres; - if(lookup_dim_decls(ctx, decl->name) || lookup_funcs_name(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { + if(lookup_dim_decls(ctx, decl->name) || lookup_const_decls(ctx, decl->name, FALSE)) { FIXME("%s: redefinition\n", debugstr_w(decl->name)); return E_FAIL; } @@ -1826,7 +1826,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { class_desc_t *class; dynamic_var_t *var; - function_t *func; for(var = ctx->global_vars; var; var = var->next) { if(lookup_script_identifier(script, var->name)) { @@ -1835,13 +1834,6 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) } } - for(func = ctx->funcs; func; func = func->next) { - if(lookup_script_identifier(script, func->name)) { - FIXME("%s: redefined\n", debugstr_w(func->name)); - return E_FAIL; - } - } - for(class = ctx->classes; class; class = class->next) { if(lookup_script_identifier(script, class->name)) { FIXME("%s: redefined\n", debugstr_w(class->name)); @@ -1997,8 +1989,18 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs = new_funcs; script->global_funcs_size = cnt; } - for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) - script->global_funcs[script->global_funcs_cnt++] = func_iter; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { + unsigned i; + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, func_iter->name)) { + /* global function already exists, replace it */ + script->global_funcs[i] = func_iter; + break; + } + } + if(i == script->global_funcs_cnt) + script->global_funcs[script->global_funcs_cnt++] = func_iter; + } if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 4623a08e2b..8a6f0ecd45 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -886,6 +886,21 @@ Public Function TestSepFunc(ByVal a) : : End Function Call ok(TestSepFunc(1) = 1, "Function did not return 1") +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() + +function duplicatedfunc + ok false, "duplicatedfunc called" +end function + +sub duplicatedfunc + ok false, "duplicatedfunc called" +end sub + +function duplicatedfunc + duplicatedfunc = 2 +end function + +ok duplicatedfunc() = 2, "duplicatedfunc = " & duplicatedfunc() ' Stop has an effect only in debugging mode Stop diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d3d41a80d2..9ed1096a4d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2688,6 +2688,47 @@ static void test_isexpression(void) close_script(engine); } +static void test_multiple_parse(void) +{ + IActiveScriptParse *parser; + IActiveScript *script; + HRESULT hres; + + script = create_and_init_script(SCRIPTITEM_GLOBALMEMBERS, TRUE); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"sub duplicatedfunc\n" + L" ok false, \"duplicatedfunc called\"\n" + L"end sub\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"function duplicatedfunc\n" + L" duplicatedfunc = 2\n" + L"end function\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + hres = IActiveScriptParse_ParseScriptText(parser, + L"ok duplicatedfunc() = 2, \"duplicatedfunc = \" & duplicatedfunc()\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + IActiveScriptParse_Release(parser); + close_script(script); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -3037,6 +3078,7 @@ static void run_tests(void) test_parse_errors(); test_parse_context(); test_callbacks(); + test_multiple_parse(); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Store global functions in an array.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ea7a3953fcc495aba23c7c638effed6085bb0c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea7a3953fcc495aba23c7c63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 4 17:37:24 2019 +0100 vbscript: Store global functions in an array. Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 31 +++++++++++++++++++++---------- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/vbdisp.c | 5 +++-- dlls/vbscript/vbscript.c | 5 +++++ dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 90b0cf5342..dae8a97c83 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1802,15 +1802,15 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi { class_desc_t *class; dynamic_var_t *var; - function_t *func; + unsigned i; for(var = script->global_vars; var; var = var->next) { if(!wcsicmp(var->name, identifier)) return TRUE; } - for(func = script->global_funcs; func; func = func->next) { - if(!wcsicmp(func->name, identifier)) + for(i = 0; i < script->global_funcs_cnt; i++) { + if(!wcsicmp(script->global_funcs[i]->name, identifier)) return TRUE; } @@ -1914,11 +1914,12 @@ static void release_compiler(compile_ctx_t *ctx) HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { - function_t *new_func; + function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; compile_ctx_t ctx; vbscode_t *code; + size_t cnt; HRESULT hres; if (!src) src = L""; @@ -1982,12 +1983,22 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_vars = ctx.global_vars; } - if(ctx.funcs) { - for(new_func = ctx.funcs; new_func->next; new_func = new_func->next); - - new_func->next = script->global_funcs; - script->global_funcs = ctx.funcs; - } + cnt = script->global_funcs_cnt; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + cnt++; + if(cnt > script->global_funcs_size) { + function_t **new_funcs; + if(script->global_funcs) + new_funcs = heap_realloc(script->global_funcs, cnt * sizeof(*new_funcs)); + else + new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); + if(!new_funcs) + return compile_error(script, E_OUTOFMEMORY); + script->global_funcs = new_funcs; + script->global_funcs_size = cnt; + } + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) + script->global_funcs[script->global_funcs_cnt++] = func_iter; if(ctx.classes) { class_desc_t *class = ctx.classes; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 191622e8e7..4800ae7ce6 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -98,7 +98,6 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; - function_t *func; IDispatch *disp; unsigned i; DISPID id; @@ -164,7 +163,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; - for(func = ctx->script->global_funcs; func; func = func->next) { + for(i = 0; i < ctx->script->global_funcs_cnt; i++) { + function_t *func = ctx->script->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 25a80fc89d..a5ae40d098 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -677,7 +677,7 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); dynamic_var_t *var; ident_map_t *ident; - function_t *func; + unsigned i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -704,7 +704,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(func = This->ctx->global_funcs; func; func = func->next) { + for(i = 0; i < This->ctx->global_funcs_cnt; i++) { + function_t *func = This->ctx->global_funcs[i]; if(!wcsicmp(func->name, bstrName)) { ident = add_ident(This, func->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 56c53b4015..59ec577846 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -138,6 +138,11 @@ static void release_script(script_ctx_t *ctx) release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; + heap_free(ctx->global_funcs); + ctx->global_funcs = NULL; + ctx->global_funcs_cnt = 0; + ctx->global_funcs_size = 0; + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2d9647eb2e..8543813c49 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -187,8 +187,11 @@ struct _script_ctx_t { EXCEPINFO ei; + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + dynamic_var_t *global_vars; - function_t *global_funcs; class_desc_t *classes; class_desc_t *procs;

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019