Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
707f7eb2
Commit
707f7eb2
authored
Oct 03, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Add err.source implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0d9f024d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
global.c
dlls/vbscript/global.c
+2
-2
interp.c
dlls/vbscript/interp.c
+1
-0
api.vbs
dlls/vbscript/tests/api.vbs
+1
-0
No files found.
dlls/vbscript/global.c
View file @
707f7eb2
...
...
@@ -2500,8 +2500,8 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI
static
HRESULT
Err_Source
(
vbdisp_t
*
This
,
VARIANT
*
args
,
unsigned
args_cnt
,
VARIANT
*
res
)
{
FIXM
E
(
"
\n
"
);
return
E_NOTIMPL
;
TRAC
E
(
"
\n
"
);
return
!
This
->
desc
?
E_UNEXPECTED
:
err_string_prop
(
&
This
->
desc
->
ctx
->
ei
.
bstrSource
,
args
,
args_cnt
,
res
)
;
}
static
HRESULT
Err_Clear
(
vbdisp_t
*
This
,
VARIANT
*
args
,
unsigned
args_cnt
,
VARIANT
*
res
)
...
...
dlls/vbscript/interp.c
View file @
707f7eb2
...
...
@@ -2170,6 +2170,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP
clear_ei
(
&
ctx
->
ei
);
ctx
->
ei
.
scode
=
hres
=
map_hres
(
hres
);
ctx
->
ei
.
bstrSource
=
get_vbscript_string
(
VBS_RUNTIME_ERROR
);
ctx
->
ei
.
bstrDescription
=
get_vbscript_error_string
(
hres
);
}
else
{
hres
=
ctx
->
ei
.
scode
;
...
...
dlls/vbscript/tests/api.vbs
View file @
707f7eb2
...
...
@@ -134,6 +134,7 @@ sub testCStrError()
Error
.
clear
()
CStr
(
null
)
call
ok
(
Err
.
number
=
94
,
"Err.number = "
&
Err
.
number
)
if
isEnglishLang
then
call
ok
(
Err
.
source
=
"Microsoft VBScript runtime error"
,
"Err.source = "
&
Err
.
source
)
if
isEnglishLang
then
call
ok
(
Err
.
description
=
"Invalid use of Null"
,
"Err.description = "
&
Err
.
description
)
end
sub
call
testCStrError
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment