From: Robert Gerigk <Robert-Gerigk@online.de> vbscript: Treat empty string as NULL in GetScriptDispatch. On Windows, GetScriptDispatch(L"") returns the global dispatch object, same as GetScriptDispatch(NULL). Wine previously returned E_INVALIDARG because it only checked for NULL, not for an empty string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59504 --- dlls/jscript/jscript.c | 2 +- dlls/vbscript/vbscript.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 30727a5ab2b..02b157749ce 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -962,7 +962,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR } script_obj = This->ctx->global; - if(pstrItemName) { + if(pstrItemName && *pstrItemName) { named_item_t *item = lookup_named_item(This->ctx, pstrItemName, 0); if(!item) return E_INVALIDARG; if(item->script_obj) script_obj = item->script_obj; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 84a8e0bb97f..715c98d32bb 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -859,7 +859,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR } script_obj = This->ctx->script_obj; - if(pstrItemName) { + if(pstrItemName && *pstrItemName) { named_item_t *item = lookup_named_item(This->ctx, pstrItemName, 0); if(!item) return E_INVALIDARG; if(item->script_obj) script_obj = item->script_obj; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10300