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
29f4194d
Commit
29f4194d
authored
Sep 17, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 17, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop.
parent
bc768b09
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
dispex.c
dlls/jscript/dispex.c
+2
-2
jscript.h
dlls/jscript/jscript.h
+1
-1
jsutils.c
dlls/jscript/jsutils.c
+1
-1
object.c
dlls/jscript/object.c
+1
-1
No files found.
dlls/jscript/dispex.c
View file @
29f4194d
...
@@ -1415,7 +1415,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)
...
@@ -1415,7 +1415,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)
return
delete_prop
(
prop
);
return
delete_prop
(
prop
);
}
}
HRESULT
jsdisp_is_own_prop
(
jsdisp_t
*
obj
,
BSTR
name
,
VARIANT_
BOOL
*
ret
)
HRESULT
jsdisp_is_own_prop
(
jsdisp_t
*
obj
,
BSTR
name
,
BOOL
*
ret
)
{
{
dispex_prop_t
*
prop
;
dispex_prop_t
*
prop
;
HRESULT
hres
;
HRESULT
hres
;
...
@@ -1424,6 +1424,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret)
...
@@ -1424,6 +1424,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret)
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
return
hres
;
return
hres
;
*
ret
=
prop
&&
(
prop
->
type
==
PROP_JSVAL
||
prop
->
type
==
PROP_BUILTIN
)
?
VARIANT_TRUE
:
VARIANT_FALSE
;
*
ret
=
prop
&&
(
prop
->
type
==
PROP_JSVAL
||
prop
->
type
==
PROP_BUILTIN
);
return
S_OK
;
return
S_OK
;
}
}
dlls/jscript/jscript.h
View file @
29f4194d
...
@@ -220,7 +220,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HID
...
@@ -220,7 +220,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HID
HRESULT
jsdisp_get_idx
(
jsdisp_t
*
,
DWORD
,
jsval_t
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_get_idx
(
jsdisp_t
*
,
DWORD
,
jsval_t
*
,
jsexcept_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_get_id
(
jsdisp_t
*
,
const
WCHAR
*
,
DWORD
,
DISPID
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_get_id
(
jsdisp_t
*
,
const
WCHAR
*
,
DWORD
,
DISPID
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_delete_idx
(
jsdisp_t
*
,
DWORD
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_delete_idx
(
jsdisp_t
*
,
DWORD
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_is_own_prop
(
jsdisp_t
*
,
BSTR
,
VARIANT_
BOOL
*
)
DECLSPEC_HIDDEN
;
HRESULT
jsdisp_is_own_prop
(
jsdisp_t
*
,
BSTR
,
BOOL
*
)
DECLSPEC_HIDDEN
;
HRESULT
create_builtin_function
(
script_ctx_t
*
,
builtin_invoke_t
,
const
WCHAR
*
,
const
builtin_info_t
*
,
DWORD
,
HRESULT
create_builtin_function
(
script_ctx_t
*
,
builtin_invoke_t
,
const
WCHAR
*
,
const
builtin_info_t
*
,
DWORD
,
jsdisp_t
*
,
jsdisp_t
**
)
DECLSPEC_HIDDEN
;
jsdisp_t
*
,
jsdisp_t
**
)
DECLSPEC_HIDDEN
;
...
...
dlls/jscript/jsutils.c
View file @
29f4194d
...
@@ -452,7 +452,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret)
...
@@ -452,7 +452,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret)
switch
(
val
.
type
)
{
switch
(
val
.
type
)
{
case
JSV_UNDEFINED
:
case
JSV_UNDEFINED
:
case
JSV_NULL
:
case
JSV_NULL
:
*
ret
=
VARIANT_
FALSE
;
*
ret
=
FALSE
;
return
S_OK
;
return
S_OK
;
case
JSV_OBJECT
:
case
JSV_OBJECT
:
*
ret
=
get_object
(
val
)
!=
NULL
;
*
ret
=
get_object
(
val
)
!=
NULL
;
...
...
dlls/jscript/object.c
View file @
29f4194d
...
@@ -123,7 +123,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
...
@@ -123,7 +123,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return
hres
;
return
hres
;
if
(
is_jsdisp
(
jsthis
))
{
if
(
is_jsdisp
(
jsthis
))
{
VARIANT_
BOOL
result
;
BOOL
result
;
hres
=
jsdisp_is_own_prop
(
jsthis
->
u
.
jsdisp
,
name
,
&
result
);
hres
=
jsdisp_is_own_prop
(
jsthis
->
u
.
jsdisp
,
name
,
&
result
);
if
(
FAILED
(
hres
))
if
(
FAILED
(
hres
))
...
...
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