Jacek Caban : vbscript: Return only code part of HRESULT for vbscript errors as Err.number.
Alexandre Julliard
julliard at winehq.org
Thu Mar 27 14:40:05 CDT 2014
Module: wine
Branch: master
Commit: 4effb57f8862c90b5004c0045d24b5fd13400b2d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4effb57f8862c90b5004c0045d24b5fd13400b2d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Mar 27 14:44:26 2014 +0100
vbscript: Return only code part of HRESULT for vbscript errors as Err.number.
---
dlls/vbscript/global.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 9b6ca48..9983509 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1886,6 +1886,8 @@ static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA
static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
{
+ HRESULT hres;
+
TRACE("\n");
if(!This->desc)
@@ -1896,7 +1898,8 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI
return E_NOTIMPL;
}
- return return_int(res, This->desc->ctx->err_number);
+ hres = This->desc->ctx->err_number;
+ return return_int(res, HRESULT_FACILITY(hres) == FACILITY_VBS ? HRESULT_CODE(hres) : hres);
}
static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
More information about the wine-cvs
mailing list