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
1f6febea
Commit
1f6febea
authored
Jul 24, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 24, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Clean up InvokeEx implementation by using get_dispid_type.
parent
af496718
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
15 deletions
+22
-15
dispex.c
dlls/mshtml/dispex.c
+22
-15
No files found.
dlls/mshtml/dispex.c
View file @
1f6febea
...
...
@@ -1147,22 +1147,13 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
TRACE
(
"(%p)->(%x %x %x %p %p %p %p)
\n
"
,
This
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
if
(
is_custom_dispid
(
id
)
&&
This
->
data
->
vtbl
&&
This
->
data
->
vtbl
->
invoke
)
switch
(
get_dispid_type
(
id
))
{
case
DISPEXPROP_CUSTOM
:
if
(
!
This
->
data
->
vtbl
||
!
This
->
data
->
vtbl
->
invoke
)
return
DISP_E_UNKNOWNNAME
;
return
This
->
data
->
vtbl
->
invoke
(
This
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
if
(
wFlags
==
DISPATCH_CONSTRUCT
)
{
if
(
id
==
DISPID_VALUE
)
{
if
(
This
->
data
->
vtbl
&&
This
->
data
->
vtbl
->
value
)
{
return
This
->
data
->
vtbl
->
value
(
This
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
}
FIXME
(
"DISPATCH_CONSTRUCT flag but missing value function
\n
"
);
return
E_FAIL
;
}
FIXME
(
"DISPATCH_CONSTRUCT flag without DISPID_VALUE
\n
"
);
return
E_FAIL
;
}
if
(
is_dynamic_dispid
(
id
))
{
case
DISPEXPROP_DYNAMIC
:
{
DWORD
idx
=
id
-
DISPID_DYNPROP_0
;
dynamic_prop_t
*
prop
;
...
...
@@ -1209,8 +1200,24 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
return
E_NOTIMPL
;
}
}
case
DISPEXPROP_BUILTIN
:
if
(
wFlags
==
DISPATCH_CONSTRUCT
)
{
if
(
id
==
DISPID_VALUE
)
{
if
(
This
->
data
->
vtbl
&&
This
->
data
->
vtbl
->
value
)
{
return
This
->
data
->
vtbl
->
value
(
This
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
}
FIXME
(
"DISPATCH_CONSTRUCT flag but missing value function
\n
"
);
return
E_FAIL
;
}
FIXME
(
"DISPATCH_CONSTRUCT flag without DISPID_VALUE
\n
"
);
return
E_FAIL
;
}
return
invoke_builtin_prop
(
This
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
return
invoke_builtin_prop
(
This
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
default:
assert
(
0
);
return
E_FAIL
;
}
}
static
HRESULT
WINAPI
DispatchEx_DeleteMemberByName
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
)
...
...
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