July 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use host object script bindings for PerformanceTiming class.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 6f0cfc7b1b0dde91db43187b81ba4c7878c4a673 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f0cfc7b1b0dde91db43187b81ba4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 12:32:41 2024 +0200 mshtml: Use host object script bindings for PerformanceTiming class. --- dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 76c14ec08a7..93a80303fa0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1713,7 +1713,7 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP timing->window = This->window; IHTMLWindow2_AddRef(&This->window->base.IHTMLWindow2_iface); - init_dispatch(&timing->dispex, &HTMLPerformanceTiming_dispex, NULL, + init_dispatch(&timing->dispex, &HTMLPerformanceTiming_dispex, This->window, dispex_compat_mode(&This->dispex)); This->timing = &timing->IHTMLPerformanceTiming_iface; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d85bdc74ed7..795701017c9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -308,7 +308,7 @@ sync_test("builtin_toString", function() { test("navigator", window.navigator, "Navigator", null, true); test("performance", window.performance, "Performance", null, true); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); - test("performanceTiming", window.performance.timing, "PerformanceTiming", null, true); + test("performanceTiming", window.performance.timing, "PerformanceTiming"); if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray", null, true); test("screen", window.screen, "Screen"); test("sessionStorage", window.sessionStorage, "Storage", null, true);

1 0

Jacek Caban : mshtml: Use host object script bindings for Performance class.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: fdb9bec6ede072c17da1f694d380151e996566c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fdb9bec6ede072c17da1f694d38015… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 12:35:09 2024 +0200 mshtml: Use host object script bindings for Performance class. --- dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 93a80303fa0..7ba92cca10e 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1828,7 +1828,7 @@ HRESULT create_performance(HTMLInnerWindow *window, IHTMLPerformance **ret) performance->window = window; IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); - init_dispatch(&performance->dispex, &HTMLPerformance_dispex, NULL, compat_mode); + init_dispatch(&performance->dispex, &HTMLPerformance_dispex, window, compat_mode); *ret = &performance->IHTMLPerformance_iface; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 795701017c9..7362e0d16bf 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -306,7 +306,7 @@ sync_test("builtin_toString", function() { test("location", window.location, "Object", window.location.href, null, true); if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray", null, true); test("navigator", window.navigator, "Navigator", null, true); - test("performance", window.performance, "Performance", null, true); + test("performance", window.performance, "Performance"); test("performanceNavigation", window.performance.navigation, "PerformanceNavigation"); test("performanceTiming", window.performance.timing, "PerformanceTiming"); if(v >= 11 /* todo_wine */) test("plugins", window.navigator.plugins, v < 11 ? "MSPluginsCollection" : "PluginArray", null, true);

1 0

Rémi Bernon : server: Use a shared_object_t for the dummy object.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: c1d5cae54b80449308dd8f9aaa85a1a6a5bd2025 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1d5cae54b80449308dd8f9aaa85a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 10 10:01:00 2024 +0200 server: Use a shared_object_t for the dummy object. The sequence lives in the object header, and the object is containing the shm struct. The code was reading before the dummy_shm variable and sometimes asserted that the sequence isn't initialized to zero. --- server/queue.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 9ccd93c4280..ee03ceb55c8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -624,11 +624,12 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsig /* change the foreground input and reset the cursor clip rect */ static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { - const input_shm_t *input_shm, *old_input_shm, dummy_shm = {0}; + const input_shm_t *input_shm, *old_input_shm; + shared_object_t dummy_obj = {0}; if (desktop->foreground_input == input) return; - input_shm = input ? input->shared : &dummy_shm; - old_input_shm = desktop->foreground_input ? desktop->foreground_input->shared : &dummy_shm; + input_shm = input ? input->shared : &dummy_obj.shm.input; + old_input_shm = desktop->foreground_input ? desktop->foreground_input->shared : &dummy_obj.shm.input; set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 1 ); desktop->foreground_input = input;

1 0

Jacek Caban : jscript: Factor out native_function_string.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: c0a186dac193d48bd8b7fd3634760054b33e7ee7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0a186dac193d48bd8b7fd36347600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 11:39:21 2024 +0200 jscript: Factor out native_function_string. Based on patch by Gabriel Ivăncescu. --- dlls/jscript/function.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 27678fc167c..23b1308cbc0 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -312,6 +312,30 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } +static HRESULT native_function_string(const WCHAR *name, jsstr_t **ret) +{ + DWORD name_len; + jsstr_t *str; + WCHAR *ptr; + + static const WCHAR native_prefixW[] = L"\nfunction "; + static const WCHAR native_suffixW[] = L"() {\n [native code]\n}\n"; + + name_len = name ? lstrlenW(name) : 0; + str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len - 2, &ptr); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, native_prefixW, sizeof(native_prefixW)); + ptr += ARRAY_SIZE(native_prefixW) - 1; + memcpy(ptr, name, name_len * sizeof(WCHAR)); + ptr += name_len; + memcpy(ptr, native_suffixW, sizeof(native_suffixW)); + + *ret = str; + return S_OK; +} + static HRESULT Function_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -669,26 +693,7 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, js static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) { NativeFunction *function = (NativeFunction*)func; - DWORD name_len; - jsstr_t *str; - WCHAR *ptr; - - static const WCHAR native_prefixW[] = L"\nfunction "; - static const WCHAR native_suffixW[] = L"() {\n [native code]\n}\n"; - - name_len = function->name ? lstrlenW(function->name) : 0; - str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len - 2, &ptr); - if(!str) - return E_OUTOFMEMORY; - - memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - ptr += ARRAY_SIZE(native_prefixW) - 1; - memcpy(ptr, function->name, name_len*sizeof(WCHAR)); - ptr += name_len; - memcpy(ptr, native_suffixW, sizeof(native_suffixW)); - - *ret = str; - return S_OK; + return native_function_string(function->name, ret); } static function_code_t *NativeFunction_get_code(FunctionInstance *function)

1 0

Jacek Caban : jscript: Add support for host functions.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 5fea362a1f87427b8f7a0fa47481eb52aae35363 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fea362a1f87427b8f7a0fa47481eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 9 23:36:25 2024 +0200 jscript: Add support for host functions. Based on patch by Gabriel Ivăncescu. --- dlls/jscript/dispex.c | 36 ++++++++++++-- dlls/jscript/function.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsdisp.idl | 1 + dlls/mshtml/dispex.c | 7 ++- 5 files changed, 160 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 26d89ab2b5e..dbdc64659a8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -268,6 +268,28 @@ static dispex_prop_t *lookup_dispex_prop(jsdisp_t *obj, unsigned hash, const WCH return NULL; } +static HRESULT update_external_prop(jsdisp_t *obj, dispex_prop_t *prop, const struct property_info *desc) +{ + if(desc->func_iid) { + jsdisp_t *func; + HRESULT hres; + + hres = create_host_function(obj->ctx, desc, &func); + if(FAILED(hres)) + return hres; + + prop->type = PROP_JSVAL; + prop->flags = desc->flags; + prop->u.val = jsval_obj(func); + return S_OK; + } + + prop->type = PROP_EXTERN; + prop->flags = desc->flags; + prop->u.id = desc->id; + return S_OK; +} + static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_insens, dispex_prop_t **ret) { dispex_prop_t *prop; @@ -282,13 +304,13 @@ static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_i if(FAILED(hres)) return hres; - prop = alloc_prop(This, desc.name ? desc.name : name, PROP_EXTERN, desc.flags); + prop = alloc_prop(This, desc.name ? desc.name : name, PROP_DELETED, 0); if(!prop) return E_OUTOFMEMORY; - prop->u.id = desc.id; + hres = update_external_prop(This, prop, &desc); *ret = prop; - return S_OK; + return hres; } } @@ -427,6 +449,7 @@ HRESULT jsdisp_index_lookup(jsdisp_t *obj, const WCHAR *name, unsigned length, s desc->flags |= PROPF_WRITABLE; desc->name = NULL; desc->index = idx; + desc->func_iid = 0; return S_OK; } @@ -440,6 +463,7 @@ HRESULT jsdisp_next_index(jsdisp_t *obj, unsigned length, unsigned id, struct pr desc->flags |= PROPF_WRITABLE; desc->name = NULL; desc->index = desc->id; + desc->func_iid = 0; return S_OK; } @@ -685,10 +709,12 @@ static HRESULT fill_props(jsdisp_t *obj) prop = lookup_dispex_prop(obj, string_hash(desc.name), desc.name, FALSE); if(!prop) { - prop = alloc_prop(obj, desc.name, PROP_EXTERN, desc.flags); + prop = alloc_prop(obj, desc.name, PROP_DELETED, 0); if(!prop) return E_OUTOFMEMORY; - prop->u.id = desc.id; + hres = update_external_prop(obj, prop, &desc); + if(FAILED(hres)) + return hres; } id = desc.id; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 23b1308cbc0..40ff015121b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -63,6 +63,13 @@ typedef struct { jsval_t args[1]; } BindFunction; +typedef struct { + FunctionInstance function; + const WCHAR *name; + UINT32 id; + UINT32 iid; +} HostFunction; + typedef struct { jsdisp_t jsdisp; jsval_t *buf; @@ -918,6 +925,120 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } +static const builtin_info_t HostFunction_info = { + .class = JSCLASS_FUNCTION, + .call = Function_value, + .destructor = Function_destructor, + .gc_traverse = Function_gc_traverse +}; + +static HRESULT HostFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + HostFunction *function = (HostFunction*)func; + VARIANT buf[6], retv; + DISPPARAMS dp = { .cArgs = argc, .rgvarg = buf }; + IWineJSDispatchHost *obj; + EXCEPINFO ei = { 0 }; + IDispatch *this_obj; + HRESULT hres = S_OK; + unsigned i; + + if(flags & DISPATCH_CONSTRUCT) + return E_UNEXPECTED; + + if(is_object_instance(vthis)) + this_obj = get_object(vthis); + else if(is_undefined(vthis) || is_null(vthis)) + this_obj = lookup_global_host(ctx); + else + return E_UNEXPECTED; + + obj = get_host_dispatch(this_obj); + if(!obj) { + TRACE("no host dispatch\n"); + return E_UNEXPECTED; + } + + if(argc > ARRAYSIZE(buf) && !(dp.rgvarg = malloc(argc * sizeof(*dp.rgvarg)))) { + IWineJSDispatchHost_Release(obj); + return E_OUTOFMEMORY; + } + + for(i = 0; i < argc; i++) { + hres = jsval_to_variant(argv[i], &dp.rgvarg[dp.cArgs - i - 1]); + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres)) { + V_VT(&retv) = VT_EMPTY; + hres = IWineJSDispatchHost_CallFunction(obj, function->id, function->iid, &dp, r ? &retv : NULL, &ei, + &ctx->jscaller->IServiceProvider_iface); + if(hres == DISP_E_EXCEPTION) + handle_dispatch_exception(ctx, &ei); + if(SUCCEEDED(hres) && r) { + hres = variant_to_jsval(ctx, &retv, r); + VariantClear(&retv); + } + } + + while(i--) + VariantClear(&dp.rgvarg[dp.cArgs - i - 1]); + if(dp.rgvarg != buf) + free(dp.rgvarg); + IWineJSDispatchHost_Release(obj); + return hres; +} + +static HRESULT HostFunction_toString(FunctionInstance *func, jsstr_t **ret) +{ + HostFunction *function = (HostFunction*)func; + return native_function_string(function->name, ret); +} + +static function_code_t *HostFunction_get_code(FunctionInstance *function) +{ + return NULL; +} + +static void HostFunction_destructor(FunctionInstance *func) +{ +} + +static HRESULT HostFunction_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, FunctionInstance *func) +{ + return S_OK; +} + +static const function_vtbl_t HostFunctionVtbl = { + HostFunction_call, + HostFunction_toString, + HostFunction_get_code, + HostFunction_destructor, + HostFunction_gc_traverse +}; + +HRESULT create_host_function(script_ctx_t *ctx, const struct property_info *desc, jsdisp_t **ret) +{ + HostFunction *function; + HRESULT hres; + + if(!ctx->function_constr) + return E_UNEXPECTED; + + hres = create_function(ctx, &HostFunction_info, &HostFunctionVtbl, sizeof(HostFunction), PROPF_METHOD, + FALSE, NULL, (void**)&function); + if(FAILED(hres)) + return hres; + + function->name = desc->name; + function->id = desc->id; + function->iid = desc->func_iid; + *ret = &function->function.dispex; + return S_OK; +} + static HRESULT BindFunction_get_arguments(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { return JS_E_INVALID_ACTION; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index fdcead4a064..1cb423cff31 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,6 +276,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**); HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**); +HRESULT create_host_function(script_ctx_t*,const struct property_info*,jsdisp_t**); HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*); HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*); diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index 533677f6cad..8ea53396f09 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -27,6 +27,7 @@ struct property_info UINT32 flags; const WCHAR *name; UINT32 index; + UINT32 func_iid; }; const unsigned int PROPF_ENUMERABLE = 0x0400; diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 61e7dae650e..7b334ac3001 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2310,8 +2310,12 @@ static HRESULT WINAPI JSDispatchHost_LookupProperty(IWineJSDispatchHost *iface, return hres; desc->id = id; desc->flags = PROPF_WRITABLE | PROPF_CONFIGURABLE; - if(func->func_disp_idx < 0) + if(func->func_disp_idx < 0) { desc->flags |= PROPF_ENUMERABLE; + desc->func_iid = 0; + }else { + desc->func_iid = func->tid; + } desc->name = func->name; return S_OK; } @@ -2338,6 +2342,7 @@ static HRESULT WINAPI JSDispatchHost_NextProperty(IWineJSDispatchHost *iface, DI desc->id = func->id; desc->name = func->name; desc->flags = PROPF_WRITABLE | PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + desc->func_iid = 0; return S_OK; } func++;

1 0

Eric Pouech : cmd: Get rid of CTTY command.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 2547209674cf38f1f8ceef39be9e076678d4d901 URL: https://gitlab.winehq.org/wine/wine/-/commit/2547209674cf38f1f8ceef39be9e07… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:58:30 2024 +0200 cmd: Get rid of CTTY command. Looks a sane operation as: - it's not supported in modern Windows' cmd.exe, - could only find reference from DOS interpreter, - and it's not implemented in Wine. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- po/ar.po | 180 +++++++++++++++++++++++------------------------- po/ast.po | 180 +++++++++++++++++++++++------------------------- po/bg.po | 180 +++++++++++++++++++++++------------------------- po/ca.po | 180 +++++++++++++++++++++++------------------------- po/cs.po | 180 +++++++++++++++++++++++------------------------- po/da.po | 180 +++++++++++++++++++++++------------------------- po/de.po | 180 +++++++++++++++++++++++------------------------- po/el.po | 180 +++++++++++++++++++++++------------------------- po/en.po | 180 +++++++++++++++++++++++------------------------- po/en_US.po | 180 +++++++++++++++++++++++------------------------- po/eo.po | 180 +++++++++++++++++++++++------------------------- po/es.po | 180 +++++++++++++++++++++++------------------------- po/fa.po | 180 +++++++++++++++++++++++------------------------- po/fi.po | 180 +++++++++++++++++++++++------------------------- po/fr.po | 180 +++++++++++++++++++++++------------------------- po/he.po | 180 +++++++++++++++++++++++------------------------- po/hi.po | 180 +++++++++++++++++++++++------------------------- po/hr.po | 180 +++++++++++++++++++++++------------------------- po/hu.po | 180 +++++++++++++++++++++++------------------------- po/it.po | 180 +++++++++++++++++++++++------------------------- po/ja.po | 180 +++++++++++++++++++++++------------------------- po/ka.po | 180 +++++++++++++++++++++++------------------------- po/ko.po | 180 +++++++++++++++++++++++------------------------- po/lt.po | 180 +++++++++++++++++++++++------------------------- po/ml.po | 180 +++++++++++++++++++++++------------------------- po/nb_NO.po | 180 +++++++++++++++++++++++------------------------- po/nl.po | 180 +++++++++++++++++++++++------------------------- po/or.po | 180 +++++++++++++++++++++++------------------------- po/pa.po | 180 +++++++++++++++++++++++------------------------- po/pl.po | 180 +++++++++++++++++++++++------------------------- po/pt_BR.po | 180 +++++++++++++++++++++++------------------------- po/pt_PT.po | 180 +++++++++++++++++++++++------------------------- po/rm.po | 180 +++++++++++++++++++++++------------------------- po/ro.po | 180 +++++++++++++++++++++++------------------------- po/ru.po | 180 +++++++++++++++++++++++------------------------- po/si.po | 180 +++++++++++++++++++++++------------------------- po/sk.po | 180 +++++++++++++++++++++++------------------------- po/sl.po | 180 +++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 180 +++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 180 +++++++++++++++++++++++------------------------- po/sv.po | 180 +++++++++++++++++++++++------------------------- po/ta.po | 180 +++++++++++++++++++++++------------------------- po/te.po | 180 +++++++++++++++++++++++------------------------- po/th.po | 180 +++++++++++++++++++++++------------------------- po/tr.po | 180 +++++++++++++++++++++++------------------------- po/uk.po | 180 +++++++++++++++++++++++------------------------- po/wa.po | 180 +++++++++++++++++++++++------------------------- po/wine.pot | 180 +++++++++++++++++++++++------------------------- po/zh_CN.po | 180 +++++++++++++++++++++++------------------------- po/zh_TW.po | 180 +++++++++++++++++++++++------------------------- programs/cmd/builtins.c | 14 +--- programs/cmd/cmd.rc | 3 - programs/cmd/wcmd.h | 3 +- programs/cmd/wcmdmain.c | 5 +- 54 files changed, 4403 insertions(+), 4622 deletions(-)

1 0

Eric Pouech : cmd: Add more tests for return codes in builtin commands.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 66042a1184ab80ae7639bf90a15bd6a7c83c82b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/66042a1184ab80ae7639bf90a15bd6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jul 9 11:46:57 2024 +0200 cmd: Add more tests for return codes in builtin commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 41 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 30 +++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b43848575fc..66d5e894662 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -468,6 +468,35 @@ call :setError 666 & ((for %%i in () do call :setError 33) &&echo SUCCESS !error call :setError 666 & ((for %%i in (a) do call :setError 0) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & ((for %%i in (a) do call :setError 33) &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for external command +mkdir foo & cd foo +call :setError 666 & (I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & I\dont\exist.exe & echo ERRORLEVEL !errorlevel! +call :setError 666 & (Idontexist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & Idontexist.exe & echo ERRORLEVEL !errorlevel! +call :setError 666 & (cmd.exe /c "echo foo & exit /b 0" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cmd.exe /c "echo foo & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo +echo --- success/failure for CALL command +mkdir foo & cd foo +echo exit /b %%1 > foobar.bat +rem call :setError 666 & (call I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem terminates batch exec on native... +call :setError 666 & (call Idontexist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call .\foobar.bat 0 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call .\foobar.bat 1024 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call cmd.exe /c "echo foo & exit /b 0" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call cmd.exe /c "echo foo & exit /b 1025" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (call rmdir foobar.dir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo +echo --- success/failure for START command +call :setError 666 & (start "" /foobar >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem call :setError 666 & (start /B I\dont\exist.exe &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem can't run this test, generates a nice popup under windows +call :setError 666 & (start "" /B /WAIT cmd.exe /c "echo foo & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem A call :setError 666 & (start "" /B cmd.exe /c "(choice /C:YN /T:3 /D:Y > NUL) & exit /b 1024" &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem can't do on Wine until /T is properly handled in CHOICE +rem SUCCESS 666 echo --- success/failure for TYPE command mkdir foo & cd foo echo a > fileA @@ -591,6 +620,18 @@ call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! call :setError 666 & rmdir @:\cba\abc & echo ERRORLEVEL !errorlevel! cd .. && rd /q /s foo +echo --- success/failure for MKLINK command +mkdir foo & cd foo +call :setError 666 & (mklink &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /z foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo bar > foo +call :setError 666 & (mklink /h foo foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h bar foo >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mklink /h bar foo &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + echo --- success/failure for SETLOCAL/ENDLOCAL commands call :setError 666 & (setlocal foobar &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (setlocal &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4b162af9a8e..ed0e7d8d1e3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -465,6 +465,28 @@ SUCCESS 666 SUCCESS 666 SUCCESS 0 FAILURE 33 +--- success/failure for external command +(a)todo_wine@FAILURE 1 +(a)todo_wine@ERRORLEVEL 3 +(a)todo_wine@FAILURE 1 +ERRORLEVEL 9009 +foo(a)space@ +SUCCESS 0 +foo(a)space@ +FAILURE 1024 +--- success/failure for CALL command +FAILURE 1 +SUCCESS 0 +FAILURE 1024 +foo(a)space@ +SUCCESS 0 +foo(a)space@ +FAILURE 1025 +(a)todo_wine@FAILURE 2 +--- success/failure for START command +(a)todo_wine@FAILURE 1 +foo(a)space@ +SUCCESS 1024 --- success/failure for TYPE command FAILURE 1 SUCCESS 0 @@ -535,6 +557,14 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 +--- success/failure for MKLINK command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 --- success/failure for SETLOCAL/ENDLOCAL commands FAILURE 1 SUCCESS 0

1 0

Eric Pouech : cmd: Set success/failure return code for MKLINK command.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: cd331dd3a47bdcd7e53f95fb52628db3cf05d5af URL: https://gitlab.winehq.org/wine/wine/-/commit/cd331dd3a47bdcd7e53f95fb52628d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:44:44 2024 +0200 cmd: Set success/failure return code for MKLINK command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 35 ++++++++++++++++++-------------- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d1be9aab967..869c3d9d088 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4088,7 +4088,7 @@ RETURN_CODE WCMD_color(void) * WCMD_mklink */ -void WCMD_mklink(WCHAR *args) +RETURN_CODE WCMD_mklink(WCHAR *args) { int argno = 0; WCHAR *argN = args; @@ -4099,11 +4099,6 @@ void WCMD_mklink(WCHAR *args) WCHAR file1[MAX_PATH]; WCHAR file2[MAX_PATH]; - if (param1[0] == 0x00 || param2[0] == 0x00) { - WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; - } - file1[0] = 0; while (argN) { @@ -4119,7 +4114,12 @@ void WCMD_mklink(WCHAR *args) hard = TRUE; else if (lstrcmpiW(thisArg, L"/J") == 0) junction = TRUE; - else { + else if (*thisArg == L'/') + { + return errorlevel = ERROR_INVALID_FUNCTION; + } + else + { if(!file1[0]) lstrcpyW(file1, thisArg); else @@ -4127,13 +4127,18 @@ void WCMD_mklink(WCHAR *args) } } - if(hard) - ret = CreateHardLinkW(file1, file2, NULL); - else if(!junction) - ret = CreateSymbolicLinkW(file1, file2, isdir); - else - WINE_TRACE("Juction links currently not supported.\n"); + if (*file1 && *file2) + { + if (hard) + ret = CreateHardLinkW(file1, file2, NULL); + else if(!junction) + ret = CreateSymbolicLinkW(file1, file2, isdir); + else + TRACE("Junction links currently not supported.\n"); + } + + if (ret) return errorlevel = NO_ERROR; - if(!ret) - WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1); + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), file1); + return errorlevel = ERROR_INVALID_FUNCTION; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ed0e7d8d1e3..d028c3fe1e6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -558,13 +558,13 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 --- success/failure for MKLINK command -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +FAILURE 1 +SUCCESS 0 +FAILURE 1 --- success/failure for SETLOCAL/ENDLOCAL commands FAILURE 1 SUCCESS 0 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5a54fc5e925..a727a651516 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -208,7 +208,7 @@ RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); RETURN_CODE WCMD_version(void); RETURN_CODE WCMD_volume(void); -void WCMD_mklink(WCHAR *args); +RETURN_CODE WCMD_mklink(WCHAR *args); WCHAR *WCMD_fgets (WCHAR *buf, DWORD n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 505d816eabb..2826f9a609a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1928,7 +1928,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_choice(parms_start); break; case WCMD_MKLINK: - WCMD_mklink(parms_start); + return_code = WCMD_mklink(parms_start); break; case WCMD_EXIT: return_code = WCMD_exit();

1 0

Eric Pouech : cmd: Set success/failure return code for START command.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: f0eb0c3ec9d3a37769c35ae0da49fa15864a704b URL: https://gitlab.winehq.org/wine/wine/-/commit/f0eb0c3ec9d3a37769c35ae0da49fa… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 15:06:18 2024 +0200 cmd: Set success/failure return code for START command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 11 +++++++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 869c3d9d088..17671c32eba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3408,8 +3408,9 @@ RETURN_CODE WCMD_shift(const WCHAR *args) /**************************************************************************** * WCMD_start */ -void WCMD_start(WCHAR *args) +RETURN_CODE WCMD_start(WCHAR *args) { + RETURN_CODE return_code = NO_ERROR; int argno; int have_title; WCHAR file[MAX_PATH]; @@ -3457,6 +3458,11 @@ void WCMD_start(WCHAR *args) * * WCMD_parameter_with_delims will take care of everything for us. */ + /* FIXME: using an external start.exe has several caveats: + * - cannot discriminate syntax error in arguments from child's return code + * - need to access start.exe's child to get its running state + * (not start.exe itself) + */ have_title = FALSE; for (argno=0; ; argno++) { WCHAR *thisArg, *argN; @@ -3521,9 +3527,10 @@ void WCMD_start(WCHAR *args) { SetLastError(ERROR_FILE_NOT_FOUND); WCMD_print_error (); - errorlevel = RETURN_CODE_CANT_LAUNCH; + return_code = errorlevel = ERROR_INVALID_FUNCTION; } free(cmdline); + return return_code; } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index a727a651516..c61f9b41cd5 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -202,7 +202,7 @@ RETURN_CODE WCMD_setshow_path(const WCHAR *args); RETURN_CODE WCMD_setshow_prompt(void); RETURN_CODE WCMD_setshow_time(void); RETURN_CODE WCMD_shift(const WCHAR *args); -void WCMD_start (WCHAR *args); +RETURN_CODE WCMD_start(WCHAR *args); RETURN_CODE WCMD_title(const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2826f9a609a..b1d3ff81c04 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1886,7 +1886,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_shift(parms_start); break; case WCMD_START: - WCMD_start (parms_start); + return_code = WCMD_start(parms_start); break; case WCMD_TIME: return_code = WCMD_setshow_time();

1 0

Eric Pouech : cmd: Move empty batch command handling to WCMD_batch() callers.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: c8681975147f567b8ad95a6e04386f9502df28d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8681975147f567b8ad95a6e04386f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 12:22:07 2024 +0200 cmd: Move empty batch command handling to WCMD_batch() callers. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 18 +++++++++++++----- programs/cmd/wcmdmain.c | 6 +----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 17ef569dc3f..d2ad690967d 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -664,11 +664,19 @@ RETURN_CODE WCMD_call(WCHAR *command) /* Run other program if no leading ':' */ if (*command != ':') { - WCMD_run_program(buffer, TRUE); - /* If the thing we try to run does not exist, call returns 1 */ - if (errorlevel == RETURN_CODE_CANT_LAUNCH) - errorlevel = ERROR_INVALID_FUNCTION; - return_code = errorlevel; + if (*WCMD_skip_leading_spaces(buffer) == L'\0') + /* FIXME it's incomplete as (call) should return 1, and (call ) should return 0... + * but we need to get the untouched string in command + */ + return_code = errorlevel = NO_ERROR; + else + { + WCMD_run_program(buffer, TRUE); + /* If the thing we try to run does not exist, call returns 1 */ + if (errorlevel == RETURN_CODE_CANT_LAUNCH) + errorlevel = ERROR_INVALID_FUNCTION; + return_code = errorlevel; + } } else if (context) { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b1d3ff81c04..53b08c0b137 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1431,12 +1431,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Quick way to get the filename is to extract the first argument. */ WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); - if (!firstParam) return; - if (!firstParam[0]) { - errorlevel = NO_ERROR; - return; - } + if (!firstParam[0]) return; /* Calculate the search path and stem to search for */ if (wcspbrk(firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */

1 0