Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Billy Laws
wine
Commits
252fbb6a
Commit
252fbb6a
authored
4 months ago
by
Jacek Caban
Committed by
Alexandre Julliard
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
jscript: Move property allocation to update_external_prop.
parent
d71acd69
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/jscript/dispex.c
+11
-17
11 additions, 17 deletions
dlls/jscript/dispex.c
with
11 additions
and
17 deletions
dlls/jscript/dispex.c
+
11
−
17
View file @
252fbb6a
...
...
@@ -268,10 +268,15 @@ static dispex_prop_t *lookup_dispex_prop(jsdisp_t *obj, unsigned hash, const WCH
return
NULL
;
}
static
HRESULT
update_external_prop
(
jsdisp_t
*
obj
,
dispex_prop_t
*
prop
,
const
struct
property_info
*
desc
)
static
HRESULT
update_external_prop
(
jsdisp_t
*
obj
,
const
WCHAR
*
name
,
dispex_prop_t
*
prop
,
const
struct
property_info
*
desc
,
dispex_prop_t
**
ret
)
{
HRESULT
hres
;
if
(
desc
->
name
)
name
=
desc
->
name
;
if
(
!
prop
&&
!
(
prop
=
alloc_prop
(
obj
,
name
,
PROP_DELETED
,
0
)))
return
E_OUTOFMEMORY
;
if
(
!
desc
->
iid
)
{
prop
->
type
=
PROP_EXTERN
;
prop
->
u
.
id
=
desc
->
id
;
...
...
@@ -305,6 +310,7 @@ static HRESULT update_external_prop(jsdisp_t *obj, dispex_prop_t *prop, const st
}
prop
->
flags
=
desc
->
flags
&
PROPF_ALL
;
*
ret
=
prop
;
return
S_OK
;
}
...
...
@@ -327,12 +333,8 @@ static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_i
return
S_OK
;
}
}
if
(
!
prop
&&
!
(
prop
=
alloc_prop
(
This
,
desc
.
name
?
desc
.
name
:
name
,
PROP_DELETED
,
0
)))
return
E_OUTOFMEMORY
;
hres
=
update_external_prop
(
This
,
prop
,
&
desc
);
*
ret
=
prop
;
return
hres
;
return
update_external_prop
(
This
,
name
,
prop
,
&
desc
,
ret
);
}
else
if
(
prop
&&
prop
->
type
==
PROP_EXTERN
)
{
prop
->
type
=
PROP_DELETED
;
}
...
...
@@ -456,13 +458,8 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, DWORD create_
if
(
This
->
builtin_info
->
lookup_prop
)
{
struct
property_info
desc
;
hres
=
This
->
builtin_info
->
lookup_prop
(
This
,
name
,
fdexNameEnsure
,
&
desc
);
if
(
hres
==
S_OK
)
{
hres
=
update_external_prop
(
This
,
prop
,
&
desc
);
if
(
FAILED
(
hres
))
return
hres
;
*
ret
=
prop
;
return
S_OK
;
}
if
(
hres
==
S_OK
)
return
update_external_prop
(
This
,
name
,
prop
,
&
desc
,
ret
);
}
hres
=
S_OK
;
...
...
@@ -765,10 +762,7 @@ static HRESULT fill_props(jsdisp_t *obj)
prop
=
lookup_dispex_prop
(
obj
,
string_hash
(
desc
.
name
),
desc
.
name
,
FALSE
);
if
(
!
prop
)
{
prop
=
alloc_prop
(
obj
,
desc
.
name
,
PROP_DELETED
,
0
);
if
(
!
prop
)
return
E_OUTOFMEMORY
;
hres
=
update_external_prop
(
obj
,
prop
,
&
desc
);
hres
=
update_external_prop
(
obj
,
desc
.
name
,
NULL
,
&
desc
,
&
prop
);
if
(
FAILED
(
hres
))
return
hres
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment