Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
412e0af2
Commit
412e0af2
authored
Jul 22, 2009
by
Piotr Caban
Committed by
Alexandre Julliard
Jul 22, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Throw error in to_primitive function.
parent
fba4e376
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
jscript_En.rc
dlls/jscript/jscript_En.rc
+1
-0
jsutils.c
dlls/jscript/jsutils.c
+4
-4
resource.h
dlls/jscript/resource.h
+1
-0
No files found.
dlls/jscript/jscript_En.rc
View file @
412e0af2
...
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
{
IDS_TO_PRIMITIVE "Error converting object to primitive type"
IDS_INVALID_CALL_ARG "Invalid procedure call or argument"
IDS_NO_PROPERTY "Object doesn't support this property or method"
IDS_ARG_NOT_OPT "Argument not optional"
...
...
dlls/jscript/jsutils.c
View file @
412e0af2
...
...
@@ -211,7 +211,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
if
(
SUCCEEDED
(
hres
))
{
hres
=
jsdisp_call
(
jsdisp
,
id
,
ctx
->
lcid
,
DISPATCH_METHOD
,
&
dp
,
ret
,
ei
,
NULL
/*FIXME*/
);
if
(
FAILED
(
hres
))
{
FIXME
(
"throw TypeError
\n
"
);
WARN
(
"call error - forwarding exception
\n
"
);
jsdisp_release
(
jsdisp
);
return
hres
;
}
...
...
@@ -227,7 +227,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
if
(
SUCCEEDED
(
hres
))
{
hres
=
jsdisp_call
(
jsdisp
,
id
,
ctx
->
lcid
,
DISPATCH_METHOD
,
&
dp
,
ret
,
ei
,
NULL
/*FIXME*/
);
if
(
FAILED
(
hres
))
{
FIXME
(
"throw TypeError
\n
"
);
WARN
(
"call error - forwarding exception
\n
"
);
jsdisp_release
(
jsdisp
);
return
hres
;
}
...
...
@@ -241,8 +241,8 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
jsdisp_release
(
jsdisp
);
FIXME
(
"throw TypeError
\n
"
);
return
E_FAIL
;
WARN
(
"failed
\n
"
);
return
throw_type_error
(
ctx
,
ei
,
IDS_TO_PRIMITIVE
,
NULL
)
;
}
default:
FIXME
(
"Unimplemented for vt %d
\n
"
,
V_VT
(
v
));
...
...
dlls/jscript/resource.h
View file @
412e0af2
...
...
@@ -18,6 +18,7 @@
#include <windef.h>
#define IDS_TO_PRIMITIVE 0x0001
#define IDS_INVALID_CALL_ARG 0x0005
#define IDS_NO_PROPERTY 0x01B6
#define IDS_ARG_NOT_OPT 0x01c1
...
...
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