October 2019 - Wine-commits

Alexandre Julliard : Wine release 4.18
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: website Branch: master Commit: fbc598fe52830e270bbebcfb8c4f387a432ced63 URL: https://source.winehq.org/git/website.git/?a=commit;h=fbc598fe52830e270bbeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 21:01:41 2019 +0200 Wine release 4.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019101801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019101801.xml b/news/en/2019101801.xml new file mode 100644 index 00000000..4d059e1a --- /dev/null +++ b/news/en/2019101801.xml @@ -0,0 +1,15 @@ +<news> +<date>October 18, 2019</date> +<title>Wine 4.18 Released</title> +<body> + The Wine development release 4.18 is now available. + <a href="{$root}/announce/4.18">What's new</a> in this release: +<ul> + <li>Many new VBScript functions.</li> + <li>A number of cleanups and improvements in Quartz.</li> + <li>Fixes for several test failures.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Gijs Vermeulen : wined3d: Add default case in wined3d_calculate_fog_factor.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: b77ac263777304df214285bef4eaf1a42c35e163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b77ac263777304df214285be… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Oct 4 22:26:49 2019 +0200 wined3d: Add default case in wined3d_calculate_fog_factor. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b1b630014..0a668c46b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,9 @@ static float wined3d_calculate_fog_factor(float fog_coord, const struct lights_s return expf(-fog_coord * ls->fog_density); case WINED3D_FOG_EXP2: return expf(-fog_coord * fog_coord * ls->fog_density * ls->fog_density); + default: + ERR("Unhandled fog mode %#x.\n", ls->fog_mode); + return 0.0f; } }

1 0

Sven Baars : ddraw/tests: Fix some test failures on 64-bit Windows.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 79c5d8af2277cf05b059b25e42dacc7c995e0685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c5d8af2277cf05b059b25e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 11:25:21 2019 +0200 ddraw/tests: Fix some test failures on 64-bit Windows. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a23e76e1f7..64c03c87d0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12998,7 +12998,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { memset(&hal_caps, 0, sizeof(hal_caps)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2156bd5849..bf0cfef0b1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13878,7 +13878,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw);

1 0

Gijs Vermeulen : mscoree: Support loading assemblies from path specified in config file.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: d7031be8920e30463a3825e866a70f49e9a67740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7031be8920e30463a3825e8… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Oct 17 22:12:32 2019 +0200 mscoree: Support loading assemblies from path specified in config file. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 13 ++++++++++-- dlls/mscoree/corruntimehost.c | 45 ++++++++++++++++++++++++++++++++---------- dlls/mscoree/metahost.c | 38 ++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 3 +++ 4 files changed, 86 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index f2abf107a5..035247442c 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -347,8 +347,15 @@ static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); if (SUCCEEDED(hr)) - FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); - hr = S_OK; + { + TRACE("%s\n", debugstr_wn(value, value_size)); + + This->result->private_path = HeapAlloc(GetProcessHeap(), 0, (value_size + 1) * sizeof(WCHAR)); + if (This->result->private_path) + wcscpy(This->result->private_path, value); + else + hr = E_OUTOFMEMORY; + } return hr; } @@ -698,4 +705,6 @@ void free_parsed_config_file(parsed_config_file *file) list_remove(&cursor->entry); HeapFree(GetProcessHeap(), 0, cursor); } + + HeapFree(GetProcessHeap(), 0, file->private_path); } diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 2ccc7bc4f5..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -58,6 +58,8 @@ static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute pe static struct list dll_fixups; +WCHAR **private_path = NULL; + struct dll_fixup { struct list entry; @@ -1436,6 +1438,8 @@ static void FixupVTable(HMODULE hmodule) __int32 WINAPI _CorExeMain(void) { + static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; + static const WCHAR scW[] = {';',0}; int exit_code; int argc; char **argv; @@ -1443,12 +1447,14 @@ __int32 WINAPI _CorExeMain(void) MonoImage *image; MonoImageOpenStatus status; MonoAssembly *assembly=NULL; - WCHAR filename[MAX_PATH]; + WCHAR filename[MAX_PATH], config_file[MAX_PATH], *temp, **priv_path; + SIZE_T config_file_dir_size; char *filenameA; ICLRRuntimeInfo *info; RuntimeHost *host; + parsed_config_file parsed_config; HRESULT hr; - int i; + int i, number_of_private_paths = 0; get_utf8_args(&argc, &argv); @@ -1468,6 +1474,33 @@ __int32 WINAPI _CorExeMain(void) FixupVTable(GetModuleHandleW(NULL)); + wcscpy(config_file, filename); + wcscat(config_file, dotconfig); + + hr = parse_config_file(config_file, &parsed_config); + if (SUCCEEDED(hr) && parsed_config.private_path) + { + for(i = 0; parsed_config.private_path[i] != 0; i++) + if (parsed_config.private_path[i] == ';') number_of_private_paths++; + if (parsed_config.private_path[wcslen(parsed_config.private_path) - 1] != ';') number_of_private_paths++; + config_file_dir_size = (wcsrchr(config_file, '\\') - config_file) + 1; + priv_path = HeapAlloc(GetProcessHeap(), 0, (number_of_private_paths + 1) * sizeof(WCHAR *)); + /* wcstok ignores trailing semicolons */ + temp = wcstok(parsed_config.private_path, scW); + for (i = 0; i < number_of_private_paths; i++) + { + priv_path[i] = HeapAlloc(GetProcessHeap(), 0, (config_file_dir_size + wcslen(temp) + 1) * sizeof(WCHAR)); + memcpy(priv_path[i], config_file, config_file_dir_size * sizeof(WCHAR)); + wcscpy(priv_path[i] + config_file_dir_size, temp); + temp = wcstok(NULL, scW); + } + priv_path[number_of_private_paths] = NULL; + if (InterlockedCompareExchangePointer((void **)&private_path, priv_path, NULL)) + ERR("private_path was already set\n"); + } + + free_parsed_config_file(&parsed_config); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -1475,15 +1508,7 @@ __int32 WINAPI _CorExeMain(void) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - { - WCHAR config_file[MAX_PATH]; - static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; - - lstrcpyW(config_file, filename); - lstrcatW(config_file, dotconfig); - hr = RuntimeHost_GetDefaultDomain(host, config_file, &domain); - } if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f87737cd83..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1610,20 +1610,56 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; + const char *assemblyname; LPWSTR stringnameW; int stringnameW_size; WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; DWORD search_flags; + int i; + static const WCHAR dotdllW[] = {'.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; stringname = mono_stringify_assembly_name(aname); + assemblyname = mono_assembly_name_get_name(aname); TRACE("%s\n", debugstr_a(stringname)); - if (!stringname) return NULL; + if (!stringname || !assemblyname) return NULL; search_flags = get_assembly_search_flags(aname); + if (private_path) + { + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, NULL, 0); + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); + for (i = 0; private_path[i] != NULL; i++) + { + wcscpy(path, private_path[i]); + wcscat(path, slashW); + wcscat(path, stringnameW); + wcscat(path, dotdllW); + pathA = WtoA(path); + if (pathA) + { + result = mono_assembly_open(pathA, &stat); + if (result) + { + TRACE("found: %s\n", debugstr_w(path)); + HeapFree(GetProcessHeap(), 0, pathA); + HeapFree(GetProcessHeap(), 0, stringnameW); + mono_free(stringname); + return result; + } + HeapFree(GetProcessHeap(), 0, pathA); + } + } + HeapFree(GetProcessHeap(), 0, stringnameW); + } + } /* FIXME: We should search the given paths before the GAC. */ diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index db18aff3eb..2b9c1dd35e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -117,6 +117,7 @@ extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDE typedef struct parsed_config_file { struct list supported_runtimes; + LPWSTR private_path; } parsed_config_file; typedef struct supported_runtime @@ -125,6 +126,8 @@ typedef struct supported_runtime LPWSTR version; } supported_runtime; +extern WCHAR **private_path; + extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; extern HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Release 4.18.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 8c74027ba60a360f24cf232ee233e71262d8f1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c74027ba60a360f24cf232e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 20:59:26 2019 +0200 Release 4.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 776 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 432 insertions(+), 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c74027ba60a360f24cf…

1 0

Tag wine-4.18 : Alexandre Julliard : Release 4.18
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: refs/tags/wine-4.18 Tag: 01fc89c0bb33ffde308a8811156a00e18660babd URL: https://source.winehq.org/git/wine.git/?a=tag;h=01fc89c0bb33ffde308a8811156… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 20:59:26 2019 +0200 Release 4.18

1 0

Jacek Caban : vbscript: Use global object property to expose Err object.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 087adea7dc503dadf55046622adf05d43555e822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087adea7dc503dadf5504662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:03 2019 +0200 vbscript: Use global object property to expose Err object. 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/interp.c | 8 -------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 50f54f38a6..0f85f66bad 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2486,6 +2486,21 @@ static HRESULT Global_GetRef(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } +static HRESULT Global_Err(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +{ + TRACE("\n"); + + if(args_cnt) { + FIXME("Setter not supported\n"); + return E_NOTIMPL; + } + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = &This->ctx->err_obj->IDispatch_iface; + IDispatch_AddRef(V_DISPATCH(res)); + return S_OK; +} + static const string_constant_t vbCr = {1, {'\r'}}; static const string_constant_t vbCrLf = {2, {'\r','\n'}}; static const string_constant_t vbNewLine = {2, {'\r','\n'}}; @@ -2526,6 +2541,7 @@ static const builtin_prop_t global_props[] = { {L"DateValue", Global_DateValue, 0, 1}, {L"Day", Global_Day, 0, 1}, {L"Erase", Global_Erase, 0, 1}, + {L"Err", Global_Err, BP_GETPUT}, {L"Escape", Global_Escape, 0, 1}, {L"Eval", Global_Eval, 0, 1}, {L"Execute", Global_Execute, 0, 1}, diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45dcb45303..251fd785cf 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,8 +104,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - static const WCHAR errW[] = {'e','r','r',0}; - if(invoke_type == VBDISP_LET && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !wcsicmp(name, ctx->func->name)) { @@ -175,12 +173,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(!wcsicmp(name, errW)) { - ref->type = REF_OBJ; - ref->u.obj = &ctx->script->err_obj->IDispatch_iface; - return S_OK; - } - hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP;

1 0

Jacek Caban : vbscript: Fix NULL IDispatch handling in get_disp_value.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 79f39c2a8c450ece6f128a27182373971ef1246d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f39c2a8c450ece6f128a27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:09 2019 +0200 vbscript: Fix NULL IDispatch handling in get_disp_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 23 ++++++++++++++--------- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 ++ dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 251fd785cf..80ecc41699 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -319,7 +319,7 @@ static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) HRESULT hres; hres = get_disp_value(ctx->script, V_DISPATCH(r->v), &r->store); - if(r->owned) + if(r->owned && V_DISPATCH(r->v)) IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) return hres; @@ -350,7 +350,8 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) disp = V_DISPATCH(v); hres = get_disp_value(ctx->script, disp, v); - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; } @@ -688,23 +689,27 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD flags) { + VARIANT value; HRESULT hres; - hres = VariantCopyInd(dst, src); + V_VT(&value) = VT_EMPTY; + hres = VariantCopyInd(&value, src); if(FAILED(hres)) return hres; - if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { - VARIANT value; + if(V_VT(&value) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { + IDispatch *disp = V_DISPATCH(&value); - hres = get_disp_value(ctx->script, V_DISPATCH(dst), &value); - IDispatch_Release(V_DISPATCH(dst)); + V_VT(&value) = VT_EMPTY; + hres = get_disp_value(ctx->script, disp, &value); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; - - *dst = value; } + VariantClear(dst); + *dst = value; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d9fb80617..6ddb2e79f5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1354,6 +1354,28 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_nothing_errors + dim x + on error resume next + + x = 1 + err.clear + x = nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = not nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = "" & nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) +end sub +call test_nothing_errors() + sub test_identifiers ' test keywords that can also be a declared identifier Dim default diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index cb902b9bc5..1dd6d4ed05 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -967,6 +967,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, HRESULT get_disp_value(script_ctx_t *ctx, IDispatch *disp, VARIANT *v) { DISPPARAMS dp = {NULL}; + if(!disp) + return MAKE_VBSERROR(VBSE_OBJECT_VARIABLE_NOT_SET); return disp_call(ctx, disp, DISPID_VALUE, &dp, v); } diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index e1d84501ba..360b1006d6 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -37,6 +37,7 @@ STRINGTABLE VBSE_PERMISSION_DENIED "Permission denied" VBSE_PATH_FILE_ACCESS "Path/File access error" VBSE_PATH_NOT_FOUND "Path not found" + VBSE_OBJECT_VARIABLE_NOT_SET "Object variable not set" VBSE_ILLEGAL_NULL_USE "Invalid use of Null" VBSE_CANT_CREATE_TMP_FILE "Can't create necessary temporary file" VBSE_CANT_CREATE_OBJECT "ActiveX component can't create object" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 42c1ff5786..44f005b640 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -250,6 +250,7 @@ #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_OBJECT_VARIABLE_NOT_SET 91 #define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_CANT_CREATE_TMP_FILE 322 #define VBSE_CANT_CREATE_OBJECT 429

1 0

Jacek Caban : vbscript: Create script context in CreateInstance.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 271819e7501686f9376f7643a614b9385acec30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=271819e7501686f9376f7643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:14 2019 +0200 vbscript: Create script context in CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 54 +++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 760a7a3256..976e751919 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -57,6 +57,7 @@ struct VBScript { script_ctx_t *ctx; LONG thread_id; LCID lcid; + BOOL is_initialized; }; typedef struct { @@ -227,9 +228,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) This->site = NULL; } - if(This->ctx) - release_script(This->ctx); - + release_script(This->ctx); This->thread_id = 0; break; case SCRIPTSTATE_CLOSED: @@ -405,11 +404,8 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); if(!ref) { - if(This->ctx) { - decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); - This->ctx = NULL; - } + decrease_state(This, SCRIPTSTATE_CLOSED); + destroy_script(This->ctx); if(This->site) IActiveScriptSite_Release(This->site); heap_free(This); @@ -442,7 +438,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->lcid = lcid; - return This->ctx ? set_ctx_site(This) : S_OK; + return This->is_initialized ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -470,7 +466,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->ctx) + if(!This->is_initialized) return E_UNEXPECTED; switch(ss) { @@ -534,7 +530,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->state == SCRIPTSTATE_CLOSED) + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { @@ -597,7 +593,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR if(!ppdisp) return E_POINTER; - if(This->thread_id != GetCurrentThreadId() || !This->ctx || !This->ctx->script_obj) { + if(This->thread_id != GetCurrentThreadId() || !This->ctx->script_obj) { *ppdisp = NULL; return E_UNEXPECTED; } @@ -749,29 +745,14 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - script_ctx_t *ctx, *old_ctx; TRACE("(%p)\n", This); - if(This->ctx) - return E_UNEXPECTED; - - ctx = heap_alloc_zero(sizeof(script_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->safeopt = This->safeopt; - heap_pool_init(&ctx->heap); - list_init(&ctx->objects); - list_init(&ctx->code_list); - list_init(&ctx->named_items); - - old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(old_ctx) { - destroy_script(ctx); + if(This->is_initialized) return E_UNEXPECTED; - } + This->is_initialized = TRUE; + This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -961,6 +942,7 @@ static const IObjectSafetyVtbl VBScriptSafetyVtbl = { HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { + script_ctx_t *ctx; VBScript *ret; HRESULT hres; @@ -980,6 +962,18 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->state = SCRIPTSTATE_UNINITIALIZED; ret->safeopt = INTERFACE_USES_DISPEX; + ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); + if(!ctx) { + heap_free(ret); + return E_OUTOFMEMORY; + } + + ctx->safeopt = INTERFACE_USES_DISPEX; + heap_pool_init(&ctx->heap); + list_init(&ctx->objects); + list_init(&ctx->code_list); + list_init(&ctx->named_items); + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

Jacek Caban : vbscript: Store safety options only in script context.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: ad8917c6b709572b442b25a09fb48b6b99cdfb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8917c6b709572b442b25a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:18 2019 +0200 vbscript: Store safety options only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 976e751919..ae36e91588 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -51,7 +51,6 @@ struct VBScript { LONG ref; - DWORD safeopt; SCRIPTSTATE state; IActiveScriptSite *site; script_ctx_t *ctx; @@ -752,7 +751,6 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -914,7 +912,7 @@ static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *if return E_POINTER; *pdwSupportedOptions = SUPPORTED_OPTIONS; - *pdwEnabledOptions = This->safeopt; + *pdwEnabledOptions = This->ctx->safeopt; return S_OK; } @@ -928,7 +926,7 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if if(dwOptionSetMask & ~SUPPORTED_OPTIONS) return E_FAIL; - This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; + This->ctx->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->ctx->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; return S_OK; } @@ -960,7 +958,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; - ret->safeopt = INTERFACE_USES_DISPEX; ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); if(!ctx) {

1 0