Skip to content

W
wine-cw
Commit 0456e3c9 authored by Kevin Puetz's avatar Kevin Puetz Committed by Alexandre Julliard
Browse files
Options

vbscript: Do HRESULT->VBSERROR mapping for the whole EXCEPINFO at once.

parent e19b8b63
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 90 deletions
dlls/vbscript/compile.c
View file @ 0456e3c9
......@@ -399,9 +399,9 @@ static HRESULT compile_error(script_ctx_t *ctx, compile_ctx_t *compiler, HRESULT
return error;
clear_ei(&ctx->ei);
ctx->ei.scode = error = map_hres(error);
ctx->ei.scode = error;
ctx->ei.bstrSource = get_vbscript_string(VBS_COMPILE_ERROR);
ctx->ei.bstrDescription = get_vbscript_error_string(error);
map_vbs_exception(&ctx->ei);
return report_script_error(ctx, compiler->code, compiler->loc);
}
......
dlls/vbscript/global.c
View file @ 0456e3c9
......@@ -3288,7 +3288,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA
{
BSTR source = NULL, description = NULL, helpfile = NULL;
int code, helpcontext = 0;
HRESULT hres, error;
HRESULT hres;
TRACE("%s %u...\n", debugstr_variant(args), args_cnt);
......@@ -3310,20 +3310,14 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA
if(SUCCEEDED(hres)) {
script_ctx_t *ctx = This->ctx;
error = (code & ~0xffff) ? map_hres(code) : MAKE_VBSERROR(code);
if(source) {
SysFreeString(ctx->ei.bstrSource);
ctx->ei.bstrSource = source;
}
if(!ctx->ei.bstrSource)
ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR);
if(description) {
SysFreeString(ctx->ei.bstrDescription);
ctx->ei.bstrDescription = description;
}
if(!ctx->ei.bstrDescription)
ctx->ei.bstrDescription = get_vbscript_error_string(error);
if(helpfile) {
SysFreeString(ctx->ei.bstrHelpFile);
ctx->ei.bstrHelpFile = helpfile;
......@@ -3331,7 +3325,9 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA
if(args_cnt >= 5)
ctx->ei.dwHelpContext = helpcontext;
ctx->ei.scode = error;
ctx->ei.scode = (code & ~0xffff) ? code : MAKE_VBSERROR(code);
map_vbs_exception(&ctx->ei);
hres = SCRIPT_E_RECORDED;
}else {
SysFreeString(source);
......
dlls/vbscript/interp.c
View file @ 0456e3c9
......@@ -2489,27 +2489,18 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd
hres = op_funcs[op](&exec);
if(FAILED(hres)) {
if(hres != SCRIPT_E_RECORDED) {
/* SCRIPT_E_RECORDED means ctx->ei is already populated */
clear_ei(&ctx->ei);
hres = map_hres(hres);
}else if(!ctx->ei.bstrDescription) {
hres = map_hres(ctx->ei.scode);
}else {
hres = ctx->ei.scode;
ctx->ei.scode = hres;
}
ctx->ei.scode = hres;
if(HRESULT_FACILITY(hres) == FACILITY_VBS)
{
if(!ctx->ei.bstrSource)
ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR);
if(!ctx->ei.bstrDescription)
ctx->ei.bstrDescription = get_vbscript_error_string(hres);
}
if(!ctx->ei.bstrDescription)
map_vbs_exception(&ctx->ei);
if(exec.resume_next) {
unsigned stack_off;
WARN("Failed %08lx in resume next mode\n", hres);
WARN("Failed %08lx in resume next mode\n", ctx->ei.scode);
/*
* Unwinding here is simple. We need to find the next OP_catch, which contains
......
dlls/vbscript/vbdisp.c
View file @ 0456e3c9
......@@ -1563,65 +1563,74 @@ HRESULT disp_get_id(IDispatch *disp, BSTR name, vbdisp_invoke_type_t invoke_type
#define RPC_E_SERVER_UNAVAILABLE 0x800706ba
HRESULT map_hres(HRESULT hres)
void map_vbs_exception(EXCEPINFO *ei)
{
if(SUCCEEDED(hres) || HRESULT_FACILITY(hres) == FACILITY_VBS)
return hres;
int vbse_number;
switch(hres) {
case E_NOTIMPL: return MAKE_VBSERROR(VBSE_ACTION_NOT_SUPPORTED);
case E_NOINTERFACE: return MAKE_VBSERROR(VBSE_OLE_NOT_SUPPORTED);
case DISP_E_UNKNOWNINTERFACE: return MAKE_VBSERROR(VBSE_OLE_NO_PROP_OR_METHOD);
case DISP_E_MEMBERNOTFOUND: return MAKE_VBSERROR(VBSE_OLE_NO_PROP_OR_METHOD);
case DISP_E_PARAMNOTFOUND: return MAKE_VBSERROR(VBSE_NAMED_PARAM_NOT_FOUND);
case DISP_E_TYPEMISMATCH: return MAKE_VBSERROR(VBSE_TYPE_MISMATCH);
case DISP_E_UNKNOWNNAME: return MAKE_VBSERROR(VBSE_OLE_NO_PROP_OR_METHOD);
case DISP_E_NONAMEDARGS: return MAKE_VBSERROR(VBSE_NAMED_ARGS_NOT_SUPPORTED);
case DISP_E_BADVARTYPE: return MAKE_VBSERROR(VBSE_INVALID_TYPELIB_VARIABLE);
case DISP_E_OVERFLOW: return MAKE_VBSERROR(VBSE_OVERFLOW);
case DISP_E_BADINDEX: return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS);
case DISP_E_UNKNOWNLCID: return MAKE_VBSERROR(VBSE_LOCALE_SETTING_NOT_SUPPORTED);
case DISP_E_ARRAYISLOCKED: return MAKE_VBSERROR(VBSE_ARRAY_LOCKED);
case DISP_E_BADPARAMCOUNT: return MAKE_VBSERROR(VBSE_FUNC_ARITY_MISMATCH);
case DISP_E_PARAMNOTOPTIONAL: return MAKE_VBSERROR(VBSE_PARAMETER_NOT_OPTIONAL);
case DISP_E_NOTACOLLECTION: return MAKE_VBSERROR(VBSE_NOT_ENUM);
case TYPE_E_DLLFUNCTIONNOTFOUND: return MAKE_VBSERROR(VBSE_INVALID_DLL_FUNCTION_NAME);
case TYPE_E_TYPEMISMATCH: return MAKE_VBSERROR(VBSE_TYPE_MISMATCH);
case TYPE_E_OUTOFBOUNDS: return MAKE_VBSERROR(VBSE_OUT_OF_BOUNDS);
case TYPE_E_IOERROR: return MAKE_VBSERROR(VBSE_IO_ERROR);
case TYPE_E_CANTCREATETMPFILE: return MAKE_VBSERROR(VBSE_CANT_CREATE_TMP_FILE);
case STG_E_FILENOTFOUND: return MAKE_VBSERROR(VBSE_OLE_FILE_NOT_FOUND);
case STG_E_PATHNOTFOUND: return MAKE_VBSERROR(VBSE_PATH_NOT_FOUND);
case STG_E_TOOMANYOPENFILES: return MAKE_VBSERROR(VBSE_TOO_MANY_FILES);
case STG_E_ACCESSDENIED: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case STG_E_INSUFFICIENTMEMORY: return MAKE_VBSERROR(VBSE_OUT_OF_MEMORY);
case STG_E_NOMOREFILES: return MAKE_VBSERROR(VBSE_TOO_MANY_FILES);
case STG_E_DISKISWRITEPROTECTED: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case STG_E_WRITEFAULT: return MAKE_VBSERROR(VBSE_IO_ERROR);
case STG_E_READFAULT: return MAKE_VBSERROR(VBSE_IO_ERROR);
case STG_E_SHAREVIOLATION: return MAKE_VBSERROR(VBSE_PATH_FILE_ACCESS);
case STG_E_LOCKVIOLATION: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case STG_E_FILEALREADYEXISTS: return MAKE_VBSERROR(VBSE_FILE_ALREADY_EXISTS);
case STG_E_MEDIUMFULL: return MAKE_VBSERROR(VBSE_DISK_FULL);
case STG_E_INVALIDNAME: return MAKE_VBSERROR(VBSE_FILE_NOT_FOUND);
case STG_E_INUSE: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case STG_E_NOTCURRENT: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case STG_E_CANTSAVE: return MAKE_VBSERROR(VBSE_IO_ERROR);
case REGDB_E_CLASSNOTREG: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
case MK_E_UNAVAILABLE: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
case MK_E_INVALIDEXTENSION: return MAKE_VBSERROR(VBSE_OLE_FILE_NOT_FOUND);
case MK_E_CANTOPENFILE: return MAKE_VBSERROR(VBSE_OLE_FILE_NOT_FOUND);
case CO_E_CLASSSTRING: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
case CO_E_APPNOTFOUND: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
case CO_E_APPDIDNTREG: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
case E_ACCESSDENIED: return MAKE_VBSERROR(VBSE_PERMISSION_DENIED);
case E_OUTOFMEMORY: return MAKE_VBSERROR(VBSE_OUT_OF_MEMORY);
case E_INVALIDARG: return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL);
case RPC_E_SERVER_UNAVAILABLE: return MAKE_VBSERROR(VBSE_SERVER_NOT_FOUND);
case CO_E_SERVER_EXEC_FAILURE: return MAKE_VBSERROR(VBSE_CANT_CREATE_OBJECT);
if(HRESULT_FACILITY(ei->scode) == FACILITY_VBS)
vbse_number = HRESULT_CODE(ei->scode);
else
{
switch(ei->scode) {
case E_NOTIMPL: vbse_number = VBSE_ACTION_NOT_SUPPORTED; break;
case E_NOINTERFACE: vbse_number = VBSE_OLE_NOT_SUPPORTED; break;
case DISP_E_UNKNOWNINTERFACE: vbse_number = VBSE_OLE_NO_PROP_OR_METHOD; break;
case DISP_E_MEMBERNOTFOUND: vbse_number = VBSE_OLE_NO_PROP_OR_METHOD; break;
case DISP_E_PARAMNOTFOUND: vbse_number = VBSE_NAMED_PARAM_NOT_FOUND; break;
case DISP_E_TYPEMISMATCH: vbse_number = VBSE_TYPE_MISMATCH; break;
case DISP_E_UNKNOWNNAME: vbse_number = VBSE_OLE_NO_PROP_OR_METHOD; break;
case DISP_E_NONAMEDARGS: vbse_number = VBSE_NAMED_ARGS_NOT_SUPPORTED; break;
case DISP_E_BADVARTYPE: vbse_number = VBSE_INVALID_TYPELIB_VARIABLE; break;
case DISP_E_OVERFLOW: vbse_number = VBSE_OVERFLOW; break;
case DISP_E_BADINDEX: vbse_number = VBSE_OUT_OF_BOUNDS; break;
case DISP_E_UNKNOWNLCID: vbse_number = VBSE_LOCALE_SETTING_NOT_SUPPORTED; break;
case DISP_E_ARRAYISLOCKED: vbse_number = VBSE_ARRAY_LOCKED; break;
case DISP_E_BADPARAMCOUNT: vbse_number = VBSE_FUNC_ARITY_MISMATCH; break;
case DISP_E_PARAMNOTOPTIONAL: vbse_number = VBSE_PARAMETER_NOT_OPTIONAL; break;
case DISP_E_NOTACOLLECTION: vbse_number = VBSE_NOT_ENUM; break;
case TYPE_E_DLLFUNCTIONNOTFOUND: vbse_number = VBSE_INVALID_DLL_FUNCTION_NAME; break;
case TYPE_E_TYPEMISMATCH: vbse_number = VBSE_TYPE_MISMATCH; break;
case TYPE_E_OUTOFBOUNDS: vbse_number = VBSE_OUT_OF_BOUNDS; break;
case TYPE_E_IOERROR: vbse_number = VBSE_IO_ERROR; break;
case TYPE_E_CANTCREATETMPFILE: vbse_number = VBSE_CANT_CREATE_TMP_FILE; break;
case STG_E_FILENOTFOUND: vbse_number = VBSE_OLE_FILE_NOT_FOUND; break;
case STG_E_PATHNOTFOUND: vbse_number = VBSE_PATH_NOT_FOUND; break;
case STG_E_TOOMANYOPENFILES: vbse_number = VBSE_TOO_MANY_FILES; break;
case STG_E_ACCESSDENIED: vbse_number = VBSE_PERMISSION_DENIED; break;
case STG_E_INSUFFICIENTMEMORY: vbse_number = VBSE_OUT_OF_MEMORY; break;
case STG_E_NOMOREFILES: vbse_number = VBSE_TOO_MANY_FILES; break;
case STG_E_DISKISWRITEPROTECTED: vbse_number = VBSE_PERMISSION_DENIED; break;
case STG_E_WRITEFAULT: vbse_number = VBSE_IO_ERROR; break;
case STG_E_READFAULT: vbse_number = VBSE_IO_ERROR; break;
case STG_E_SHAREVIOLATION: vbse_number = VBSE_PATH_FILE_ACCESS; break;
case STG_E_LOCKVIOLATION: vbse_number = VBSE_PERMISSION_DENIED; break;
case STG_E_FILEALREADYEXISTS: vbse_number = VBSE_FILE_ALREADY_EXISTS; break;
case STG_E_MEDIUMFULL: vbse_number = VBSE_DISK_FULL; break;
case STG_E_INVALIDNAME: vbse_number = VBSE_FILE_NOT_FOUND; break;
case STG_E_INUSE: vbse_number = VBSE_PERMISSION_DENIED; break;
case STG_E_NOTCURRENT: vbse_number = VBSE_PERMISSION_DENIED; break;
case STG_E_CANTSAVE: vbse_number = VBSE_IO_ERROR; break;
case REGDB_E_CLASSNOTREG: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
case MK_E_UNAVAILABLE: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
case MK_E_INVALIDEXTENSION: vbse_number = VBSE_OLE_FILE_NOT_FOUND; break;
case MK_E_CANTOPENFILE: vbse_number = VBSE_OLE_FILE_NOT_FOUND; break;
case CO_E_CLASSSTRING: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
case CO_E_APPNOTFOUND: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
case CO_E_APPDIDNTREG: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
case E_ACCESSDENIED: vbse_number = VBSE_PERMISSION_DENIED; break;
case E_OUTOFMEMORY: vbse_number = VBSE_OUT_OF_MEMORY; break;
case E_INVALIDARG: vbse_number = VBSE_ILLEGAL_FUNC_CALL; break;
case RPC_E_SERVER_UNAVAILABLE: vbse_number = VBSE_SERVER_NOT_FOUND; break;
case CO_E_SERVER_EXEC_FAILURE: vbse_number = VBSE_CANT_CREATE_OBJECT; break;
default: return; /* early return, all other HRESULT left as-is */
}
ei->scode = MAKE_VBSERROR(vbse_number);
}
return hres;
if(!ei->bstrSource)
ei->bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR);
if(!ei->bstrDescription)
if(!(ei->bstrDescription = get_vbscript_string(vbse_number)))
ei->bstrDescription = get_vbscript_string(VBS_UNKNOWN_RUNTIME_ERROR);
}
HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, VARIANT *retv)
......
dlls/vbscript/vbscript.h
View file @ 0456e3c9
......@@ -399,7 +399,7 @@ static inline BOOL is_digit(WCHAR c)
HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN;
BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN;
HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN;
void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN;
HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN;
......@@ -410,7 +410,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,vo
HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
BSTR get_vbscript_string(int) DECLSPEC_HIDDEN;
BSTR get_vbscript_error_string(HRESULT) DECLSPEC_HIDDEN;
static inline LPWSTR heap_strdupW(LPCWSTR str)
{
......
dlls/vbscript/vbscript_main.c
View file @ 0456e3c9
......@@ -43,14 +43,6 @@ BSTR get_vbscript_string(int id)
return SysAllocString(buf);
}
BSTR get_vbscript_error_string(HRESULT error)
{
BSTR ret;
if(HRESULT_FACILITY(error) != FACILITY_VBS || !(ret = get_vbscript_string(HRESULT_CODE(error))))
ret = get_vbscript_string(VBS_UNKNOWN_RUNTIME_ERROR);
return ret;
}
#define MIN_BLOCK_SIZE 128
#define ARENA_FREE_FILLER 0xaa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment