wine-commits

wine-commits@winehq.org

1 participants
185780 discussions

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

10 Jul '24

Module: wine Branch: master Commit: 0b903e32380395710bcbb6e7a6f7c9de56b78854 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b903e32380395710bcbb6e7a6f7c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 9 23:50:38 2024 +0200 mshtml: Use host object script bindings for DOMImplementation class. --- dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- dlls/mshtml/tests/es5.js | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 88dfa1b5bf9..acb4e995425 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -242,7 +242,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; dom_implementation->browser = doc_node->browser; - init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, NULL, doc_node->document_mode); + init_dispatch(&dom_implementation->dispex, &HTMLDOMImplementation_dispex, doc_node->window, doc_node->document_mode); nsres = nsIDOMDocument_GetImplementation(doc_node->dom_document, &dom_implementation->implementation); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 151ff0f1683..4368e4e45bd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -301,7 +301,7 @@ sync_test("builtin_toString", function() { if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument", null, true); test("elements", document.getElementsByTagName("body"), "HTMLCollection", null, true); test("history", window.history, "History", null, true); - test("implementation", document.implementation, "DOMImplementation", null, true); + test("implementation", document.implementation, "DOMImplementation"); if(localStorage) test("localStorage", localStorage, "Storage", null, true); 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); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index b1340918fad..b04c13de984 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2646,3 +2646,15 @@ sync_test("screen", function() { ok(!check_enum(o, "defprop"), "defprop enumerated"); ok(!check_enum(o, "prop2"), "prop2 enumerated"); }); + +sync_test("builtin_func", function() { + var o = document.implementation; + var f = o.hasFeature; + + ok(f instanceof Function, "f is not an instance of Function"); + ok(Object.getPrototypeOf(f) === Function.prototype, "Object.getPrototypeOf(f) = " + Object.getPrototypeOf(f)); + ok(!f.hasOwnProperty("length"), "f has own length property"); + ok(f.length === 0, "f.length = " + f.length); + ok(f.call(o, "test", 1) === false, 'f.call(o, "test", 1) = ' + f.call(o, "test", 1)); + ok("" + f === "\nfunction hasFeature() {\n [native code]\n}\n", "f = " + f); +});

1 0

Jacek Caban : mshtml/tests: Make todo_wine explicit in builtin_toString tests.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: f8fcf2eb7b24a3b0edd9e03186f843ba352a5491 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8fcf2eb7b24a3b0edd9e03186f843… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 00:06:44 2024 +0200 mshtml/tests: Make todo_wine explicit in builtin_toString tests. --- dlls/mshtml/tests/documentmode.js | 94 +++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2cffff79479..151ff0f1683 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -234,7 +234,7 @@ sync_test("builtin_toString", function() { ]; var v = document.documentMode, e; - function test(msg, obj, name, tostr) { + function test(msg, obj, name, tostr, is_todo) { var s; if(obj.toString) { s = obj.toString(); @@ -242,23 +242,23 @@ sync_test("builtin_toString", function() { ok(s === (tostr ? tostr : (v < 9 ? "[object]" : "[object " + name + "]")), msg + " toString returned " + s); } s = Object.prototype.toString.call(obj); - todo_wine_if(v >= 9 && name != "Object" && name != "Screen"). + todo_wine_if(v >= 9 && is_todo). ok(s === (v < 9 ? "[object Object]" : "[object " + name + "]"), msg + " Object.toString returned " + s); } for(var i = 0; i < tags.length; i++) if(tags[i].length < 3 || v >= tags[i][2]) - test("tag '" + tags[i][0] + "'", document.createElement(tags[i][0]), "HTML" + tags[i][1] + "Element"); + test("tag '" + tags[i][0] + "'", document.createElement(tags[i][0]), "HTML" + tags[i][1] + "Element", null, true); e = document.createElement("a"); ok(e.toString() === "", "tag 'a' (without href) toString returned " + e.toString()); e.href = "https://www.winehq.org/"; - test("tag 'a'", e, "HTMLAnchorElement", "https://www.winehq.org/"); + test("tag 'a'", e, "HTMLAnchorElement", "https://www.winehq.org/", true); e = document.createElement("area"); ok(e.toString() === "", "tag 'area' (without href) toString returned " + e.toString()); e.href = "https://www.winehq.org/"; - test("tag 'area'", e, "HTMLAreaElement", "https://www.winehq.org/"); + test("tag 'area'", e, "HTMLAreaElement", "https://www.winehq.org/", true); e = document.createElement("style"); document.body.appendChild(e); @@ -292,63 +292,63 @@ sync_test("builtin_toString", function() { } if(!localStorage) win_skip("localStorage is buggy and not available, skipping"); - test("attribute", document.createAttribute("class"), "Attr"); + test("attribute", document.createAttribute("class"), "Attr", null, true); if(false /* todo_wine */) test("attributes", e.attributes, "NamedNodeMap"); - test("childNodes", document.body.childNodes, "NodeList"); - if(clientRects) test("clientRect", clientRects[0], "ClientRect"); - if(clientRects) test("clientRects", clientRects, "ClientRectList"); - if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties"); - if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument"); - test("elements", document.getElementsByTagName("body"), "HTMLCollection"); - test("history", window.history, "History"); - test("implementation", document.implementation, "DOMImplementation"); - if(localStorage) test("localStorage", localStorage, "Storage"); - test("location", window.location, "Object", window.location.href); - if(v >= 11 /* todo_wine */) test("mimeTypes", window.navigator.mimeTypes, v < 11 ? "MSMimeTypesCollection" : "MimeTypeArray"); - test("navigator", window.navigator, "Navigator"); - 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"); + test("childNodes", document.body.childNodes, "NodeList", null, true); + if(clientRects) test("clientRect", clientRects[0], "ClientRect", null, true); + if(clientRects) test("clientRects", clientRects, "ClientRectList", null, true); + if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties", null, true); + if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument", null, true); + test("elements", document.getElementsByTagName("body"), "HTMLCollection", null, true); + test("history", window.history, "History", null, true); + test("implementation", document.implementation, "DOMImplementation", null, true); + if(localStorage) test("localStorage", localStorage, "Storage", null, true); + 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("performanceNavigation", window.performance.navigation, "PerformanceNavigation", null, true); + test("performanceTiming", window.performance.timing, "PerformanceTiming", null, true); + 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"); - test("style", document.body.style, "MSStyleCSSProperties"); - test("styleSheet", sheet, "CSSStyleSheet"); - test("styleSheetRule", sheet.rules[0], "CSSStyleRule"); - test("styleSheetRules", sheet.rules, "MSCSSRuleList"); - test("styleSheets", document.styleSheets, "StyleSheetList"); - test("textNode", document.createTextNode("testNode"), "Text", v < 9 ? "testNode" : null); - test("textRange", txtRange, "TextRange"); - test("window", window, "Window", "[object Window]"); - test("xmlHttpRequest", new XMLHttpRequest(), "XMLHttpRequest"); + test("sessionStorage", window.sessionStorage, "Storage", null, true); + test("style", document.body.style, "MSStyleCSSProperties", null, true); + test("styleSheet", sheet, "CSSStyleSheet", null, true); + test("styleSheetRule", sheet.rules[0], "CSSStyleRule", null, true); + test("styleSheetRules", sheet.rules, "MSCSSRuleList", null, true); + test("styleSheets", document.styleSheets, "StyleSheetList", null, true); + test("textNode", document.createTextNode("testNode"), "Text", v < 9 ? "testNode" : null, true); + test("textRange", txtRange, "TextRange", null, true); + test("window", window, "Window", "[object Window]", true); + test("xmlHttpRequest", new XMLHttpRequest(), "XMLHttpRequest", null, true); if(v < 10) { - test("namespaces", document.namespaces, "MSNamespaceInfoCollection"); + test("namespaces", document.namespaces, "MSNamespaceInfoCollection", null, true); } if(v < 11) { - test("eventObject", document.createEventObject(), "MSEventObj"); - test("selection", document.selection, "MSSelection"); + test("eventObject", document.createEventObject(), "MSEventObj", null, true); + test("selection", document.selection, "MSSelection", null, true); } if(v >= 9) { - test("computedStyle", window.getComputedStyle(e), "CSSStyleDeclaration"); - test("doctype", document.doctype, "DocumentType"); + test("computedStyle", window.getComputedStyle(e), "CSSStyleDeclaration", null, true); + test("doctype", document.doctype, "DocumentType", null, true); - test("Event", document.createEvent("Event"), "Event"); - test("CustomEvent", document.createEvent("CustomEvent"), "CustomEvent"); - test("KeyboardEvent", document.createEvent("KeyboardEvent"), "KeyboardEvent"); - test("MouseEvent", document.createEvent("MouseEvent"), "MouseEvent"); - test("UIEvent", document.createEvent("UIEvent"), "UIEvent"); + test("Event", document.createEvent("Event"), "Event", null, true); + test("CustomEvent", document.createEvent("CustomEvent"), "CustomEvent", null, true); + test("KeyboardEvent", document.createEvent("KeyboardEvent"), "KeyboardEvent", null, true); + test("MouseEvent", document.createEvent("MouseEvent"), "MouseEvent", null, true); + test("UIEvent", document.createEvent("UIEvent"), "UIEvent", null, true); } if(v >= 10) { - test("classList", e.classList, "DOMTokenList", "testclass another "); - test("console", window.console, "Console"); - test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList"); + test("classList", e.classList, "DOMTokenList", "testclass another ", true); + test("console", window.console, "Console", null, true); + test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList", null, true); } if(v >= 11) { - test("MutationObserver", new window.MutationObserver(function() {}), "MutationObserver"); + test("MutationObserver", new window.MutationObserver(function() {}), "MutationObserver", null, true); } if(v >= 9) { document.body.innerHTML = ""; - test("comment", document.body.firstChild, "Comment"); + test("comment", document.body.firstChild, "Comment", null, true); } });

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

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

Paul Gofman : ntdll: Make sure wakeups from already unset events are ignored in waitqueue_thread_proc().
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: e105c1987ac8536ab854fdbf25e340e9125792dc URL: https://gitlab.winehq.org/wine/wine/-/commit/e105c1987ac8536ab854fdbf25e340… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 19:14:40 2024 -0600 ntdll: Make sure wakeups from already unset events are ignored in waitqueue_thread_proc(). --- dlls/ntdll/threadpool.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index c9c61d582bf..81cf894d943 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -160,6 +160,7 @@ struct threadpool_object LONG num_pending_callbacks; LONG num_running_callbacks; LONG num_associated_callbacks; + LONG update_serial; /* arguments for callback */ union { @@ -1243,6 +1244,7 @@ static void tp_timerqueue_unlock( struct threadpool_object *timer ) static void CALLBACK waitqueue_thread_proc( void *param ) { struct threadpool_object *objects[MAXIMUM_WAITQUEUE_OBJECTS]; + LONG update_serials[MAXIMUM_WAITQUEUE_OBJECTS]; HANDLE handles[MAXIMUM_WAITQUEUE_OBJECTS + 1]; struct waitqueue_bucket *bucket = param; struct threadpool_object *wait, *next; @@ -1295,6 +1297,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) InterlockedIncrement( &wait->refcount ); objects[num_handles] = wait; handles[num_handles] = wait->u.wait.handle; + update_serials[num_handles] = wait->update_serial; num_handles++; } } @@ -1323,7 +1326,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { wait = objects[status - STATUS_WAIT_0]; assert( wait->type == TP_OBJECT_TYPE_WAIT ); - if (wait->u.wait.bucket) + if (wait->u.wait.bucket && wait->update_serial == update_serials[status - STATUS_WAIT_0]) { /* Wait object signaled. */ assert( wait->u.wait.bucket == bucket ); @@ -1344,7 +1347,10 @@ static void CALLBACK waitqueue_thread_proc( void *param ) else tp_object_submit( wait, TRUE ); } else - WARN("wait object %p triggered while object was destroyed\n", wait); + { + WARN("wait object %p triggered while object was %s.\n", + wait, wait->u.wait.bucket ? "updated" : "destroyed"); + } } /* Release temporary references to wait objects. */ @@ -1917,6 +1923,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->num_pending_callbacks = 0; object->num_running_callbacks = 0; object->num_associated_callbacks = 0; + object->update_serial = 0; if (environment) { @@ -3051,12 +3058,15 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) { struct threadpool_object *this = impl_from_TP_WAIT( wait ); ULONGLONG timestamp = MAXLONGLONG; + BOOL same_handle; TRACE( "%p %p %p\n", wait, handle, timeout ); RtlEnterCriticalSection( &waitqueue.cs ); assert( this->u.wait.bucket ); + + same_handle = this->u.wait.handle == handle; this->u.wait.handle = handle; if (handle || this->u.wait.wait_pending) @@ -3090,6 +3100,8 @@ VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) } /* Wake up the wait queue thread. */ + if (!same_handle) + ++this->update_serial; NtSetEvent( bucket->update_event, NULL ); }

1 0

Paul Gofman : ntdll: Better track thread pool wait's wait_pending state.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 54579761943c97a18af5f2e288cfee1da8ef2634 URL: https://gitlab.winehq.org/wine/wine/-/commit/54579761943c97a18af5f2e288cfee… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 6 19:05:00 2024 -0600 ntdll: Better track thread pool wait's wait_pending state. --- dlls/ntdll/threadpool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index c6e40fc78f4..c9c61d582bf 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1265,6 +1265,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) u.wait.wait_entry ) { assert( wait->type == TP_OBJECT_TYPE_WAIT ); + assert( wait->u.wait.wait_pending ); if (wait->u.wait.timeout <= now.QuadPart) { /* Wait object timed out. */ @@ -1272,6 +1273,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { list_remove( &wait->u.wait.wait_entry ); list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry ); + wait->u.wait.wait_pending = FALSE; } if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD))) { @@ -1329,6 +1331,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) { list_remove( &wait->u.wait.wait_entry ); list_add_tail( &bucket->reserved, &wait->u.wait.wait_entry ); + wait->u.wait.wait_pending = FALSE; } if ((wait->u.wait.flags & (WT_EXECUTEINWAITTHREAD | WT_EXECUTEINIOTHREAD))) {

1 0

Eric Pouech : cmd: Cleanup transition bits.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: dfa157f831dc481d6b0294c5623b1fb67058d598 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfa157f831dc481d6b0294c5623b1f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 15:09:07 2024 +0200 cmd: Cleanup transition bits. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 2 -- programs/cmd/wcmdmain.c | 22 ++-------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index dfa4c00e4cd..6c25b86f7d1 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -156,8 +156,6 @@ typedef int RETURN_CODE; #define RETURN_CODE_SYNTAX_ERROR 255 #define RETURN_CODE_CANT_LAUNCH 9009 #define RETURN_CODE_ABORTED (-999999) -/* temporary to detect builtin commands not migrated to handle return code */ -#define RETURN_CODE_OLD_CHAINING (-999998) BOOL WCMD_print_volume_information(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d53072ca567..d44a505dc47 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1600,7 +1600,7 @@ RETURN_CODE WCMD_run_program(WCHAR *command, BOOL called) TRACE("Batch completed, but was not 'called' so skipping outer batch too\n"); context->skip_rest = TRUE; } - if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) + if (return_code != RETURN_CODE_ABORTED) errorlevel = return_code; return return_code; } else { @@ -1803,7 +1803,6 @@ static RETURN_CODE execute_single_command(const WCHAR *command) parms_start[count] = '\0'; } - return_code = RETURN_CODE_OLD_CHAINING; switch (cmd_index) { case WCMD_CALL: @@ -1858,6 +1857,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_prompt(); break; case WCMD_REM: + return_code = NO_ERROR; break; case WCMD_REN: case WCMD_RENAME: @@ -3653,16 +3653,6 @@ static RETURN_CODE for_control_execute(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *node return return_code; } -static RETURN_CODE temp_fixup_return_code(CMD_NODE *node, RETURN_CODE return_code, RETURN_CODE fallback_return_code) -{ - if (return_code == RETURN_CODE_OLD_CHAINING) - { - FIXME("Not migrated (%ls) used in chaining\n", node->op == CMD_SINGLE ? node->command->command : L"Too complex"); - return_code = fallback_return_code; - } - return return_code; -} - RETURN_CODE node_execute(CMD_NODE *node) { HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), @@ -3694,22 +3684,16 @@ RETURN_CODE node_execute(CMD_NODE *node) break; case CMD_ONSUCCESS: return_code = node_execute(node->left); - return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR) - { return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); - } break; case CMD_ONFAILURE: return_code = node_execute(node->left); - return_code = temp_fixup_return_code(node->left, return_code, ERROR_INVALID_FUNCTION); if (return_code != NO_ERROR && return_code != RETURN_CODE_ABORTED) { /* that's needed for commands (POPD, RMDIR) that don't set errorlevel in case of failure. */ errorlevel = return_code; return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); } break; case CMD_PIPE: @@ -3744,7 +3728,6 @@ RETURN_CODE node_execute(CMD_NODE *node) CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); SetStdHandle(STD_OUTPUT_HANDLE, saved_output); - return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR) { HANDLE h = CreateFileW(filename, GENERIC_READ, @@ -3754,7 +3737,6 @@ RETURN_CODE node_execute(CMD_NODE *node) { SetStdHandle(STD_INPUT_HANDLE, h); return_code = node_execute(node->right); - temp_fixup_return_code(node->right, return_code, 0 /* not used */); } else return_code = ERROR_INVALID_FUNCTION; }

1 0

Eric Pouech : cmd: Improve return code/errorlevel support for external commands.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 25275895273360f70969d0dca88be3d3d49524a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/25275895273360f70969d0dca88be3… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 10:21:30 2024 +0200 cmd: Improve return code/errorlevel support for external commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 31 ++++++++++++++----------------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d028c3fe1e6..a96c7dde10b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -466,9 +466,9 @@ SUCCESS 666 SUCCESS 0 FAILURE 33 --- success/failure for external command -@todo_wine@FAILURE 1 +FAILURE 1 @todo_wine@ERRORLEVEL 3 -@todo_wine@FAILURE 1 +FAILURE 1 ERRORLEVEL 9009 foo@space@ SUCCESS 0 @@ -482,7 +482,7 @@ foo@space@ SUCCESS 0 foo@space@ FAILURE 1025 -@todo_wine@FAILURE 2 +FAILURE 2 --- success/failure for START command @todo_wine@FAILURE 1 foo@space@ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c61f9b41cd5..dfa4c00e4cd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -193,7 +193,7 @@ void WCMD_print_error (void); RETURN_CODE WCMD_pushd(const WCHAR *args); RETURN_CODE WCMD_remove_dir(WCHAR *command); RETURN_CODE WCMD_rename(void); -void WCMD_run_program (WCHAR *command, BOOL called); +RETURN_CODE WCMD_run_program (WCHAR *command, BOOL called); RETURN_CODE WCMD_setlocal(WCHAR *args); RETURN_CODE WCMD_setshow_date(void); RETURN_CODE WCMD_setshow_default(const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 53b08c0b137..d53072ca567 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1413,7 +1413,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command); * so go back through wcmd_execute. */ -void WCMD_run_program (WCHAR *command, BOOL called) +RETURN_CODE WCMD_run_program(WCHAR *command, BOOL called) { WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; @@ -1432,7 +1432,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); - if (!firstParam[0]) return; + if (!firstParam[0]) return NO_ERROR; /* Calculate the search path and stem to search for */ if (wcspbrk(firstParam, L"/\\:") == NULL) { /* No explicit path given, search path */ @@ -1445,7 +1445,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (lstrlenW(firstParam) >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); - return; + return ERROR_INVALID_FUNCTION; } lstrcpyW(stemofsearch, firstParam); @@ -1453,7 +1453,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) } else { /* Convert eg. ..\fred to include a directory by removing file part */ - if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) return; + if (!WCMD_get_fullpath(firstParam, ARRAY_SIZE(pathtosearch), pathtosearch, NULL)) + return ERROR_INVALID_FUNCTION; lastSlash = wcsrchr(pathtosearch, '\\'); if (lastSlash && wcschr(lastSlash, '.') != NULL) extensionsupplied = TRUE; lstrcpyW(stemofsearch, lastSlash+1); @@ -1527,7 +1528,8 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Since you can have eg. ..\.. on the path, need to expand to full information */ - if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) return; + if (!WCMD_get_fullpath(temp, ARRAY_SIZE(thisDir), thisDir, NULL)) + return ERROR_INVALID_FUNCTION; } /* 1. If extension supplied, see if that file exists */ @@ -1600,7 +1602,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) } if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING) errorlevel = return_code; - return; + return return_code; } else { DWORD exit_code; /* thisDir contains the file to be launched, but with what? @@ -1625,8 +1627,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* strip first and last quote WCHARacters and try again */ WCMD_strip_quotes(command); opt_s = TRUE; - WCMD_run_program(command, called); - return; + return WCMD_run_program(command, called); } if (!status) @@ -1641,16 +1642,14 @@ void WCMD_run_program (WCHAR *command, BOOL called) CloseHandle(pe.hProcess); CloseHandle(pe.hThread); - return; + return errorlevel; } } } /* Not found anywhere - were we called? */ - if (called) { - execute_single_command(command); - return; - } + if (called) + return errorlevel = execute_single_command(command); /* Not found anywhere - give up */ WCMD_output_stderr(WCMD_LoadMessage(WCMD_NO_COMMAND_FOUND), command); @@ -1658,8 +1657,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* If a command fails to launch, it sets errorlevel 9009 - which does not seem to have any associated constant definition */ errorlevel = RETURN_CODE_CANT_LAUNCH; - return; - + return ERROR_INVALID_FUNCTION; } /* this is obviously wrong... will require more work to be fixed */ @@ -1931,8 +1929,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; default: prev_echo_mode = echo_mode; - WCMD_run_program (whichcmd, FALSE); - return_code = errorlevel; + return_code = WCMD_run_program(whichcmd, FALSE); echo_mode = prev_echo_mode; }

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

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

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