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
e458e706
Commit
e458e706
authored
Aug 21, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Support properties argument in Object.create.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
34d4a9c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
object.c
dlls/jscript/object.c
+11
-11
No files found.
dlls/jscript/object.c
View file @
e458e706
...
...
@@ -598,11 +598,6 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
TRACE
(
"(%s)
\n
"
,
debugstr_jsval
(
argv
[
0
]));
if
(
argc
>
1
)
{
FIXME
(
"Unsupported properties argument %s
\n
"
,
debugstr_jsval
(
argv
[
1
]));
return
E_NOTIMPL
;
}
if
(
argc
&&
is_object_instance
(
argv
[
0
]))
{
if
(
get_object
(
argv
[
0
]))
proto
=
to_jsdisp
(
get_object
(
argv
[
0
]));
...
...
@@ -615,13 +610,18 @@ static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
return
E_INVALIDARG
;
}
if
(
r
)
{
hres
=
create_dispex
(
ctx
,
NULL
,
proto
,
&
obj
);
if
(
FAILED
(
hres
))
return
hres
;
hres
=
create_dispex
(
ctx
,
NULL
,
proto
,
&
obj
);
if
(
FAILED
(
hres
))
return
hres
;
if
(
argc
>=
2
&&
!
is_undefined
(
argv
[
1
]))
hres
=
jsdisp_define_properties
(
ctx
,
obj
,
argv
[
1
]);
if
(
SUCCEEDED
(
hres
)
&&
r
)
*
r
=
jsval_obj
(
obj
);
}
return
S_OK
;
else
jsdisp_release
(
obj
);
return
hres
;
}
static
HRESULT
Object_getPrototypeOf
(
script_ctx_t
*
ctx
,
vdisp_t
*
jsthis
,
WORD
flags
,
...
...
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