Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
52fc8b3d
Commit
52fc8b3d
authored
Mar 11, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 11, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Use BSTR also for pure IDispatch call in Object.hasOwnProperty.
parent
67d86e63
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
object.c
dlls/jscript/object.c
+13
-13
No files found.
dlls/jscript/object.c
View file @
52fc8b3d
...
...
@@ -113,6 +113,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
{
jsstr_t
*
name
;
DISPID
id
;
BSTR
bstr
;
HRESULT
hres
;
TRACE
(
"
\n
"
);
...
...
@@ -131,6 +132,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
BOOL
result
;
hres
=
jsdisp_is_own_prop
(
jsthis
->
u
.
jsdisp
,
name
->
str
,
&
result
);
jsstr_release
(
name
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -139,22 +141,20 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return
S_OK
;
}
if
(
is_dispex
(
jsthis
))
{
BSTR
bstr
;
bstr
=
SysAllocStringLen
(
name
->
str
,
jsstr_length
(
name
));
if
(
!
bstr
)
return
E_OUTOFMEMORY
;
bstr
=
SysAllocStringLen
(
NULL
,
jsstr_length
(
name
));
if
(
bstr
)
jsstr_flush
(
name
,
bstr
);
jsstr_release
(
name
);
if
(
!
bstr
)
return
E_OUTOFMEMORY
;
hres
=
IDispatchEx_GetDispID
(
jsthis
->
u
.
dispex
,
bstr
,
make_grfdex
(
ctx
,
fdexNameCaseSensitive
),
&
id
);
SysFreeString
(
bstr
);
}
else
{
OLECHAR
*
names
=
name
->
str
;
hres
=
IDispatch_GetIDsOfNames
(
jsthis
->
u
.
disp
,
&
IID_NULL
,
&
names
,
1
,
ctx
->
lcid
,
&
id
);
}
if
(
is_dispex
(
jsthis
))
hres
=
IDispatchEx_GetDispID
(
jsthis
->
u
.
dispex
,
bstr
,
make_grfdex
(
ctx
,
fdexNameCaseSensitive
),
&
id
);
else
hres
=
IDispatch_GetIDsOfNames
(
jsthis
->
u
.
disp
,
&
IID_NULL
,
&
bstr
,
1
,
ctx
->
lcid
,
&
id
);
SysFreeString
(
bstr
);
if
(
r
)
*
r
=
jsval_bool
(
SUCCEEDED
(
hres
));
return
S_OK
;
...
...
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